[Opengeoscience-developers] OpenGeoscience branch, client_side_rendering, created. cf45453358602806fb451ae848eabec35a904240
Dave DeMarle
dave.demarle at kitware.com
Wed Mar 27 11:48:56 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, client_side_rendering has been created
at cf45453358602806fb451ae848eabec35a904240 (commit)
- Log -----------------------------------------------------------------
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=cf45453358602806fb451ae848eabec35a904240
commit cf45453358602806fb451ae848eabec35a904240
Author: Dave DeMarle <dave.demarle at kitware.com>
Date: Wed Mar 27 11:37:31 2013 -0400
mention color tests in options
ogsvtk.py | 18 ++----------------
1 files changed, 2 insertions(+), 16 deletions(-)
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=d19306f6befa08493f6ae283caa2d6ed779a34ca
commit d19306f6befa08493f6ae283caa2d6ed779a34ca
Author: Dave DeMarle <dave.demarle at kitware.com>
Date: Wed Mar 27 11:13:07 2013 -0400
fix merge conflict
CMakeLists.txt | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=a3a83ed2482058b3f479ccab8b6c127dc7d042e6
commit a3a83ed2482058b3f479ccab8b6c127dc7d042e6
Author: Dave DeMarle <dave.demarle at kitware.com>
Date: Wed Mar 20 18:47:51 2013 -0400
change from the sphere source to the clt.nc file and add isocontour
ogsvtk.py | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=648c0b45ce83d10c00cc0e8a188868530efe3996
commit 648c0b45ce83d10c00cc0e8a188868530efe3996
Author: Dave DeMarle <dave.demarle at kitware.com>
Date: Wed Mar 20 18:47:03 2013 -0400
handle attribute data in the form of point associated colors
ogsvtk.py | 92 ++++++++++++-----------
web/lib/vgl/geoJSONUnpack.js | 170 +++++++++++++++++++++++++++++++++---------
2 files changed, 181 insertions(+), 81 deletions(-)
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=b6451518c804b13d8a0fd36894ead8246ba82b05
commit b6451518c804b13d8a0fd36894ead8246ba82b05
Author: Dave DeMarle <dave.demarle at kitware.com>
Date: Tue Mar 19 17:00:36 2013 -0400
use write to buffer
ogsvtk.py | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=c7facf8164db210fa54a3d630be1c06b69a26d54
commit c7facf8164db210fa54a3d630be1c06b69a26d54
Author: Dave DeMarle <dave.demarle at kitware.com>
Date: Tue Mar 19 12:16:54 2013 -0400
make default page helpful
ogsvtk.py | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 deletions(-)
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=f926eeaca112ce2aa5031693379e8e506b12d617
commit f926eeaca112ce2aa5031693379e8e506b12d617
Author: Dave DeMarle <dave.demarle at kitware.com>
Date: Tue Mar 19 11:42:40 2013 -0400
add tests of vtkgeojson point and line data
ogsvtk.py | 75 +++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 51 insertions(+), 24 deletions(-)
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=e654660913f501dfda04f663d9957b6ee6eeadeb
commit e654660913f501dfda04f663d9957b6ee6eeadeb
Author: Dave DeMarle <dave.demarle at kitware.com>
Date: Mon Mar 18 17:19:01 2013 -0400
enable feature collection type
still need to change layer to allow multiple actors to do this
but this works for now.
also reset initial viewpoint for convenience
ogsvtk.py | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=c5f846b1fcef7c763699cbf8c84202a082c858d5
commit c5f846b1fcef7c763699cbf8c84202a082c858d5
Author: Dave DeMarle <dave.demarle at kitware.com>
Date: Mon Mar 18 16:29:49 2013 -0400
fix regression in vtk rendering
web/lib/vgl/vtkUnpack.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=2ac5672dd73b8c0643d52abba13e754d5dd3cb40
commit 2ac5672dd73b8c0643d52abba13e754d5dd3cb40
Author: Dave DeMarle <dave.demarle at kitware.com>
Date: Mon Mar 18 16:21:12 2013 -0400
More work on geojson rendering.
Corrected line, polygon and multipolygon rendering.
Removed original stub that just rendered the coordinates.
Made better polygon tests cases.
Make it gracefully fail when vtk python is not on the path.
ogsvtk.py | 43 +++++++---
web/lib/vgl/geoJSONUnpack.js | 182 +++++++++++++-----------------------------
web/lib/vgl/geomData.js | 2 +-
3 files changed, 87 insertions(+), 140 deletions(-)
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=0049149831c95a78db1b71e081df604993ca47a9
commit 0049149831c95a78db1b71e081df604993ca47a9
Author: Dave DeMarle <dave.demarle at kitware.com>
Date: Fri Mar 15 20:20:50 2013 -0400
add tests for primary geojson options and fix easy bugs
ogsvtk.py | 39 ++++++++++++++++++++++++---
web/lib/vgl/geoJSONUnpack.js | 59 +++++++++++++++++++----------------------
2 files changed, 61 insertions(+), 37 deletions(-)
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=eb58a7362477488691439e1b2fc1b8eee3c3ffc3
commit eb58a7362477488691439e1b2fc1b8eee3c3ffc3
Author: Dave DeMarle <dave.demarle at kitware.com>
Date: Fri Mar 15 19:16:53 2013 -0400
start on geojson parsing for real
ogsvtk.py | 44 +++----
web/lib/vgl/geoJSONUnpack.js | 287 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 305 insertions(+), 26 deletions(-)
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=db38a25560075c1919fc872f822667bf066d7bb8
commit db38a25560075c1919fc872f822667bf066d7bb8
Author: Dave DeMarle <dave.demarle at kitware.com>
Date: Thu Mar 14 17:42:36 2013 -0400
Clean up and fill in missing portions of vtk adapter
Fleshed out lines and points rendering modes and added colors.
Removed testing of normals since points won't render with that.
Removed older demonstration stubs I started with and gave the
remaining three better names.
Removed the hardocoded vtk string in sphere.js in favor
of making the server produce it witin the python script.
To use:
add a python wrapped vtk to your appropriate paths
start up ogs
point browser at one of the following
http://localhost:8080/vtk/?which=GJ1 #depends on presence of vtkGeoJSONWriter
http://localhost:8080/vtk/?which=GJ2 #depends on presence of vtkGeoJSONWriter
http://localhost:8080/vtk/?which=VTK&datasetString=points
http://localhost:8080/vtk/?which=VTK&datasetString=lines
http://localhost:8080/vtk/?which=VTK&datasetString=mesh
ogsvtk.py | 156 ++++++--------------------
web/lib/sphere.js | 1 -
web/lib/vgl/geomData.js | 22 ++++
web/lib/vgl/vtkUnpack.js | 287 ++++++++++++++++++++++++----------------------
4 files changed, 206 insertions(+), 260 deletions(-)
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=5f346722a58456b90ad62f947e09978d3c764d42
commit 5f346722a58456b90ad62f947e09978d3c764d42
Author: Dave DeMarle <dave.demarle at kitware.com>
Date: Tue Mar 12 11:58:45 2013 -0400
rendering first geojson data
Two new examples VGL2 and VGL3. These extract the coordinates from
a geojson string and render it on the VGL map.
Neither grap the connectivity and draw lines or polys yet, but rather
simply grep coordinates. Second example calls a VTK pipeline to
generate the data first, which requires my addition to VTK for the
GeoJSON writer.
web/lib/vgl/geoJSONUnpack.js | 48 ++++++++++++++++++++---------------------
1 files changed, 23 insertions(+), 25 deletions(-)
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=e3420decbf8d1594066eeb956aa1f7ded89e21ad
commit e3420decbf8d1594066eeb956aa1f7ded89e21ad
Author: Dave DeMarle <dave.demarle at kitware.com>
Date: Tue Mar 12 11:21:32 2013 -0400
rendering first geojson data nearing geojsoned vtk
CMakeLists.txt | 2 +
ogsvtk.py | 223 +++++++++++++++++++++++++++++++++++++++++-
web/lib/vgl/geoJSONUnpack.js | 108 ++++++++++++++++++++
3 files changed, 331 insertions(+), 2 deletions(-)
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=1b0f161b9199d35f7f14d22020e649399ef4965f
commit 1b0f161b9199d35f7f14d22020e649399ef4965f
Author: Dave DeMarle <dave.demarle at kitware.com>
Date: Mon Mar 11 12:14:09 2013 -0400
demonstrating connecting server side data with client side rendering
This adds a new page that takes a 'which' paremeter and produces one
of several results that demonstrate parts of deliver and rendering.
Conflicts:
web/lib/geo/map.js
web/lib/vgl/geomData.js
CMakeLists.txt | 4 +
ogs.py | 4 +
ogsvtk.py | 225 ++++++++++++++++++++++++++++++++++++++++++++++
server.conf.in | 1 +
web/lib/vgl/geomData.js | 6 +-
web/lib/vgl/vtkUnpack.js | 8 +-
6 files changed, 242 insertions(+), 6 deletions(-)
-----------------------------------------------------------------------
hooks/post-receive
--
OpenGeoscience
More information about the Opengeoscience-developers
mailing list