[Opengeoscience-developers] OpenGeoscience branch, wip_flatmap, updated. fc87045c2de79f9c8ca842c848d45dc384c237a4
Aashish Chaudhary
aashish.chaudhary at kitware.com
Thu May 23 09:45:17 EDT 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenGeoscience".
The branch, wip_flatmap has been updated
via fc87045c2de79f9c8ca842c848d45dc384c237a4 (commit)
via 864dc1bf28e01c0ce3dad69aeaeac409908c23f4 (commit)
via 2f3210aa23c39ca85b06eab16c0cb7cc1ce13f27 (commit)
via fc866e472cab64ddc980b3e29ad60baec8fb5409 (commit)
via 6a7312f227d58654529db47e44712af7335da746 (commit)
via 582344b05d1a580d32d5a022c0d493413d649920 (commit)
via 39b658fae9ba9209bce7a0c0cf3348892fa5f5cb (commit)
via 2bcd5d9b139585cb67b8c0f1508d4943560d9616 (commit)
via 1479c72754be40a3315bbceb5016c387f4c58e3d (commit)
via 6cca2e1b9033bc996a9172d054efd4bb7094f014 (commit)
via 337d07423f8be5ef584131db0f0bdc5d80414ec4 (commit)
via 8d82818f3fa5d077e9366141f46057dbc95ea050 (commit)
via 7c989c87ee7ba319f4cb16d68a2c1f17ead8d51f (commit)
via 0111f724b6fd9cac159340726532c5478616ad45 (commit)
via 0b73f0370cf8bd8aa5678c64ad99f6d27eb520fe (commit)
via 3a48831b8e9eb9ef443443046fe7de3b930ca60b (commit)
via 6c6e2758f8edf9ddccae026f30bb7127239ec0df (commit)
via 49bab1adeb6aab8679cbbef9679c29004f75ce65 (commit)
via b17800a98e7fd64e19c0daa4581029b45ae97229 (commit)
via 3ee23048a0fa1dcdbef34f0530beb87aa3319db7 (commit)
via ff8624b01f53267bb6b853eabcbaf6e961f7d512 (commit)
via c189c9e89ce7bfe4b87ba5aae4a5e183cf82949e (commit)
via e7502aadd148c259fac0627717a897f9c78d9253 (commit)
via c2ce2999ef0ebbf857c15e0704ee5df2a4903826 (commit)
via f6491b80653efe8b3d878716643c807e7fdae185 (commit)
via 5459b64f4170b1f9b4826b9c3f6bdd3ef0b48678 (commit)
via cecca1e5c5dc512a38c15279b74cf1a12498fe05 (commit)
via b998e661ea3d6847bdcf9c2a2430ee42264e5da7 (commit)
via a935ec2e3a266c01f2e150d03fca7f91d7dc2a44 (commit)
via 7c85d79e659131ad0657a5e1ce459e03bbc6c643 (commit)
via 7205745fb51bbf7405d597d0321c98ebe6158243 (commit)
via 81b1fecc6a4d9673002602444f8cb1a7f5f9c106 (commit)
via 59e6e9562276ed44ecf8d7567d6605c6b76c7936 (commit)
via bbef7977571a2f54b94a6f66816fed0f766b3c73 (commit)
via d63cfd1bf5fe64eae2574edc4752094241f4ba4a (commit)
via 2a1849709b2ac9ba50eb38178483561323b0eb18 (commit)
via 9d47582ab90bbe141c68df5df4d21c80ac0384c7 (commit)
via 1b27b5fb4d544e29d1327198e49d426cb60abbf1 (commit)
via ba75b62042a1bda4a4cc444f4b1d49ebc2a75253 (commit)
via 5966a476d42a60a091c4f3da131c8531d1e76e25 (commit)
via 55123aba2d47a70a392e33af0ce9453b8c65cad5 (commit)
via cff09a663d1eb353c4dd31238b1e9003fe75bd46 (commit)
via e706a5c3aebf8cb3cd8cbdd69eb10559ff5ab180 (commit)
via c11327da5c52a9bf2ed35deb86dab2bef1c9e310 (commit)
via 26816b920aa4dc5735aa8be2dde2d666abe4a085 (commit)
via 29c150707f37edf56b87aebedf8a2710bc76c8ca (commit)
via afa8c53b188494566785a5070e7690fc4544c821 (commit)
via 4065fde38f23d105ad4076c3f4a55293c4a051f1 (commit)
via 726f1812a95197c126d627eeeaa433c6e47c2cdd (commit)
via cad2e29028f9e5635e59e2d89bed0a90630d2b30 (commit)
via d9c18472e936334549d03395fde04393dd2b8c52 (commit)
via 4f68cc57acc3f26982a0c7ceec5e822d467952f6 (commit)
from 63bddc150c59742fa5006a94df7b8233e649b4e9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=fc87045c2de79f9c8ca842c848d45dc384c237a4
commit fc87045c2de79f9c8ca842c848d45dc384c237a4
Merge: 63bddc1 864dc1b
Author: Aashish Chaudhary <aashish.chaudhary at kitware.com>
Date: Thu May 23 09:44:54 2013 -0400
Merge branch 'wip_flatmap2' into wip_flatmap
* wip_flatmap2: (42 commits)
brought back solid color shader and cleaned up detection of scalar type
Removed shader that hard-coded the color
Added API to set / get scalar format
Comments and fixes
Fixed image path
Consistent 2 spaces for new code
Remove requirement on UglifyJS
Add color map capability to vgl proper.
add color map
restore rendering demonstrations/tests
Using better and consistent naming for variables and member functions
Fixed loop and other minor issues
Fixed inconsistent spacing
Remove tabs from CMakeLists.txt
Fix spelling typo
Lots of minor style and bug fixes
gis.js update @line #245
Fixed calculation of zoom delta
Fixing bugs with interactor
Re-implementing map interactor style
...
CMakeLists.txt | 46 ++-
cmake/cat.cmake | 11 +
geoweb.py | 5 +
modules/ogsvtk.py | 523 ++++++++++++++++----
modules/vtk_reader.py | 1 +
web/apps/archive/archive.js | 2 +-
web/common/css/select2.css | 2 +-
web/lib/geo/ellipsoid.js | 200 ++++++++
web/lib/geo/feature.js | 22 +-
web/lib/geo/map.js | 85 ++--
web/lib/geo/mapInteractorStyle.js | 20 +-
web/lib/ui/gis.js | 328 +++++++------
web/lib/ui/init.js | 1 +
web/lib/vgl/boundingObject.js | 2 +
web/lib/vgl/camera.js | 74 ++--
web/lib/vgl/defaultValue.js | 19 +
web/lib/vgl/freezeObject.js | 23 +
web/lib/vgl/geojsonReader.js | 183 ++++----
web/lib/vgl/geomData.js | 122 ++++--
web/lib/vgl/groupMapper.js | 5 +-
web/lib/vgl/interactorStyle.js | 10 +-
web/lib/vgl/mapper.js | 31 +-
web/lib/vgl/picker.js | 18 +-
web/lib/vgl/renderer.js | 157 +++++--
web/lib/vgl/testing/CMakeLists.txt | 1 +
web/lib/vgl/testing/drawSphere.html | 102 ++++
web/lib/vgl/testing/drawTest1.html | 1 -
web/lib/vgl/texture.js | 113 ++++-
.../trackballInteractorStyle.js} | 71 ++--
web/lib/vgl/utils.js | 206 ++++++++
web/lib/vgl/viewer.js | 29 ++
web/lib/vgl/vtkUnpack.js | 2 +-
32 files changed, 1822 insertions(+), 593 deletions(-)
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=864dc1bf28e01c0ce3dad69aeaeac409908c23f4
commit 864dc1bf28e01c0ce3dad69aeaeac409908c23f4
Merge: 2f3210a 63bddc1
Author: Aashish Chaudhary <aashish.chaudhary at kitware.com>
Date: Thu May 23 09:38:37 2013 -0400
Merge remote-tracking branch 'origin/wip_flatmap' into wip_flatmap2
* origin/wip_flatmap: (22 commits)
Wrapped long line
map being centralized using .center (latlong) specified
Forgot to initialize Actor Translation
Actor: Translation; Mercator: Simplified; FlatMap: fixed lvl 1 and 2
fixed mercator function
added mercator functions
works for different zoom levels
showing map with fixed size and zoom
first commit of wip_flatmap. created testing app for map.
Fixed merge
picking using actor BB. tested using drawTest1. Need more complex tests
Changed CMakeList to support old version of Uglify
restore rendering demonstrations/tests
tested picker with fixed BB. Need calculate BB of actors.
picker: half-way tested
Fixed build error for next
created picker class.
Fixed cmake to work with Uglify's last version. Fixed OGSVTK to use the geoweb
Fixed merged issue
Streaming data via websockets WIP
...
Conflicts:
CMakeLists.txt
geoweb.py
modules/ogsvtk.py
web/lib/vgl/picker.js
web/lib/vgl/renderer.js
.gitignore | 5 +-
CMakeLists.txt | 4 +
experimental/mpi/child.py | 23 ++
experimental/mpi/master.py | 15 ++
web/lib/geo/map2.js | 475 ++++++++++++++++++++++++++++++++++++
web/lib/geo/mapInteractorStyle.js | 8 +-
web/lib/geo/mercator.js | 69 ++++++
web/lib/vgl/actor.js | 5 +-
web/lib/vgl/testing/CMakeLists.txt | 1 +
web/lib/vgl/testing/drawMap.html | 43 ++++
ws/__init__.py | 2 +
ws/chat.py | 120 +++++++++
ws/pi.py | 145 +++++++++++
ws/stream.py | 335 +++++++++++++++++++++++++
ws/workers/cdmsProcess.py | 67 +++++
ws/workers/cpi.py | 20 ++
16 files changed, 1332 insertions(+), 5 deletions(-)
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 46 ++-
cmake/cat.cmake | 11 +
geoweb.py | 5 +
modules/ogsvtk.py | 523 ++++++++++++++++----
modules/vtk_reader.py | 1 +
web/apps/archive/archive.js | 2 +-
web/common/css/select2.css | 2 +-
web/lib/geo/ellipsoid.js | 200 ++++++++
web/lib/geo/feature.js | 22 +-
web/lib/geo/map.js | 85 ++--
web/lib/geo/mapInteractorStyle.js | 20 +-
web/lib/ui/gis.js | 328 +++++++------
web/lib/ui/init.js | 1 +
web/lib/vgl/boundingObject.js | 2 +
web/lib/vgl/camera.js | 74 ++--
web/lib/vgl/defaultValue.js | 19 +
web/lib/vgl/freezeObject.js | 23 +
web/lib/vgl/geojsonReader.js | 183 ++++----
web/lib/vgl/geomData.js | 122 ++++--
web/lib/vgl/groupMapper.js | 5 +-
web/lib/vgl/interactorStyle.js | 10 +-
web/lib/vgl/mapper.js | 31 +-
web/lib/vgl/picker.js | 18 +-
web/lib/vgl/renderer.js | 157 +++++--
web/lib/vgl/testing/CMakeLists.txt | 1 +
web/lib/vgl/testing/drawSphere.html | 102 ++++
web/lib/vgl/testing/drawTest1.html | 1 -
web/lib/vgl/texture.js | 113 ++++-
.../trackballInteractorStyle.js} | 71 ++--
web/lib/vgl/utils.js | 206 ++++++++
web/lib/vgl/viewer.js | 29 ++
web/lib/vgl/vtkUnpack.js | 2 +-
32 files changed, 1822 insertions(+), 593 deletions(-)
create mode 100644 cmake/cat.cmake
create mode 100644 web/lib/geo/ellipsoid.js
create mode 100644 web/lib/vgl/defaultValue.js
create mode 100644 web/lib/vgl/freezeObject.js
create mode 100644 web/lib/vgl/testing/drawSphere.html
copy web/lib/{geo/mapInteractorStyle.js => vgl/trackballInteractorStyle.js} (65%)
hooks/post-receive
--
OpenGeoscience
More information about the Opengeoscience-developers
mailing list