<div dir="ltr">Hi Ben, <div><br></div><div>Does this branch have the import guard in it? At the moment if I don't have vistrail in my PYTHONPATH its unable to load clt, even with the default algorithm?</div><div><br></div>
<div>Regards, </div><div><br></div><div>Chris</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Sep 3, 2013 at 1:12 PM, Ben Burnett <span dir="ltr"><<a href="mailto:bburnett@poly.edu" target="_blank">bburnett@poly.edu</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">This is an automated email from the git hooks/post-receive script. It was<br>
generated because a ref change was pushed to the repository containing<br>
the project "OpenGeoscience".<br>
<br>
The branch, 54-2-workflow-construction has been updated<br>
via 6c0940818e8215b2aef8ed1cfa27901e304a7dec (commit)<br>
via c962d44d91ccc330088119266aad3a6bdef96f50 (commit)<br>
via 262d2f22a16cd7f95d52571ad41cc4d2856bc480 (commit)<br>
via 7937ffad7a33a7cc45bf4f3b09f77e6941eb98e8 (commit)<br>
via 48257b81188ca858bf807f5a1b0804350649d564 (commit)<br>
via 9f92dc1fcc80edda1528be3cbef898f09dbf2300 (commit)<br>
via 6fe2bfc69a2611854e11c1d083dd3b0feddb7b83 (commit)<br>
via e16caa31195b5a2e3353b84b1554bfa024f7b19d (commit)<br>
via 7c6658e2e9558bb548f52707b5d6e76ff2b0a191 (commit)<br>
from e23a3633bb032ddac42f9f080f58725153c67d31 (commit)<br>
<br>
Those revisions listed above that are new to this repository have<br>
not appeared on any other notification email; so we list those<br>
revisions in full, below.<br>
<br>
- Log -----------------------------------------------------------------<br>
<a href="http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=6c0940818e8215b2aef8ed1cfa27901e304a7dec" target="_blank">http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=6c0940818e8215b2aef8ed1cfa27901e304a7dec</a><br>
commit 6c0940818e8215b2aef8ed1cfa27901e304a7dec<br>
Merge: c962d44 262d2f2<br>
Author: Ben Burnett <<a href="mailto:bburnett@poly.edu">bburnett@poly.edu</a>><br>
Date: Tue Sep 3 13:09:43 2013 -0400<br>
<br>
Merge branch 'vgl_cleanup' into 54-2-workflow-construction<br>
<br>
web/lib/vgl/actor.js | 7 +<br>
web/lib/vgl/blend.js | 7 +<br>
web/lib/vgl/boundingObject.js | 33 +++-<br>
web/lib/vgl/command.js | 12 +<br>
web/lib/vgl/data.js | 13 +-<br>
web/lib/vgl/defaultValue.js | 11 +<br>
web/lib/vgl/freezeObject.js | 16 ++-<br>
web/lib/vgl/geojsonReader.js | 344 +++++++++++++++++++------------<br>
web/lib/vgl/geomData.js | 7 +<br>
web/lib/vgl/groupMapper.js | 11 +<br>
web/lib/vgl/groupNode.js | 7 +<br>
web/lib/vgl/init.js | 38 ++++<br>
web/lib/vgl/interactorStyle.js | 7 +<br>
web/lib/vgl/lineSource.js | 9 +-<br>
web/lib/vgl/mapper.js | 7 +<br>
web/lib/vgl/material.js | 7 +<br>
web/lib/vgl/materialAttribute.js | 9 +-<br>
web/lib/vgl/modelViewMatrixStack.js | 7 +<br>
web/lib/vgl/node.js | 7 +<br>
web/lib/vgl/object.js | 13 +-<br>
web/lib/vgl/picker.js | 7 +<br>
web/lib/vgl/planeSource.js | 7 +<br>
web/lib/vgl/pointSource.js | 7 +<br>
web/lib/vgl/renderWindow.js | 7 +<br>
web/lib/vgl/renderer.js | 7 +<br>
web/lib/vgl/shader.js | 7 +<br>
web/lib/vgl/shaderProgram.js | 7 +<br>
web/lib/vgl/source.js | 7 +<br>
web/lib/vgl/texture.js | 7 +<br>
web/lib/vgl/timestamp.js | 16 ++-<br>
web/lib/vgl/trackballInteractorStyle.js | 7 +<br>
web/lib/vgl/uniform.js | 7 +<br>
web/lib/vgl/utils.js | 5 +<br>
web/lib/vgl/vertexAttribute.js | 7 +<br>
web/lib/vgl/viewer.js | 7 +<br>
web/lib/vgl/visitor.js | 7 +<br>
web/lib/vgl/vtkUnpack.js | 23 +--<br>
37 files changed, 560 insertions(+), 154 deletions(-)<br>
<br>
<a href="http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=c962d44d91ccc330088119266aad3a6bdef96f50" target="_blank">http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=c962d44d91ccc330088119266aad3a6bdef96f50</a><br>
commit c962d44d91ccc330088119266aad3a6bdef96f50<br>
Author: Ben Burnett <<a href="mailto:bburnett@poly.edu">bburnett@poly.edu</a>><br>
Date: Tue Sep 3 13:09:16 2013 -0400<br>
<br>
Hide algorithm select until used<br>
<br>
web/apps/archive/archive.js | 2 ++<br>
web/apps/archive/index.html | 2 +-<br>
2 files changed, 3 insertions(+), 1 deletions(-)<br>
<br>
<a href="http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=262d2f22a16cd7f95d52571ad41cc4d2856bc480" target="_blank">http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=262d2f22a16cd7f95d52571ad41cc4d2856bc480</a><br>
commit 262d2f22a16cd7f95d52571ad41cc4d2856bc480<br>
Author: Aashish Chaudhary <<a href="mailto:aashish.chaudhary@kitware.com">aashish.chaudhary@kitware.com</a>><br>
Date: Fri Aug 23 10:45:24 2013 -0400<br>
<br>
Some more style fixes<br>
<br>
web/lib/vgl/boundingObject.js | 2 ++<br>
1 files changed, 2 insertions(+), 0 deletions(-)<br>
<br>
<a href="http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=7937ffad7a33a7cc45bf4f3b09f77e6941eb98e8" target="_blank">http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=7937ffad7a33a7cc45bf4f3b09f77e6941eb98e8</a><br>
commit 7937ffad7a33a7cc45bf4f3b09f77e6941eb98e8<br>
Author: Aashish Chaudhary <<a href="mailto:aashish.chaudhary@kitware.com">aashish.chaudhary@kitware.com</a>><br>
Date: Fri Aug 23 10:42:36 2013 -0400<br>
<br>
Fixed remainder reader issues<br>
<br>
web/lib/vgl/geojsonReader.js | 172 +++++++++++++++++++++++++-----------------<br>
1 files changed, 103 insertions(+), 69 deletions(-)<br>
<br>
<a href="http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=48257b81188ca858bf807f5a1b0804350649d564" target="_blank">http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=48257b81188ca858bf807f5a1b0804350649d564</a><br>
commit 48257b81188ca858bf807f5a1b0804350649d564<br>
Author: Aashish Chaudhary <<a href="mailto:aashish.chaudhary@kitware.com">aashish.chaudhary@kitware.com</a>><br>
Date: Fri Aug 23 10:01:31 2013 -0400<br>
<br>
Cleaning geojson reader<br>
<br>
web/lib/vgl/geojsonReader.js | 163 +++++++++++++++++++++++++++---------------<br>
1 files changed, 104 insertions(+), 59 deletions(-)<br>
<br>
<a href="http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=9f92dc1fcc80edda1528be3cbef898f09dbf2300" target="_blank">http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=9f92dc1fcc80edda1528be3cbef898f09dbf2300</a><br>
commit 9f92dc1fcc80edda1528be3cbef898f09dbf2300<br>
Author: Aashish Chaudhary <<a href="mailto:aashish.chaudhary@kitware.com">aashish.chaudhary@kitware.com</a>><br>
Date: Fri Aug 23 02:49:44 2013 -0400<br>
<br>
Some more clean up<br>
<br>
web/lib/vgl/data.js | 3 ++-<br>
web/lib/vgl/defaultValue.js | 4 ++++<br>
web/lib/vgl/freezeObject.js | 7 +++++++<br>
web/lib/vgl/geojsonReader.js | 4 ++++<br>
4 files changed, 17 insertions(+), 1 deletions(-)<br>
<br>
<a href="http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=6fe2bfc69a2611854e11c1d083dd3b0feddb7b83" target="_blank">http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=6fe2bfc69a2611854e11c1d083dd3b0feddb7b83</a><br>
commit 6fe2bfc69a2611854e11c1d083dd3b0feddb7b83<br>
Author: Aashish Chaudhary <<a href="mailto:aashish.chaudhary@kitware.com">aashish.chaudhary@kitware.com</a>><br>
Date: Fri Aug 23 02:47:48 2013 -0400<br>
<br>
Fixed failing tests<br>
<br>
web/lib/vgl/boundingObject.js | 24 ++++++++++++++++++------<br>
web/lib/vgl/command.js | 5 +++++<br>
web/lib/vgl/init.js | 31 +++++++++++++++++++++++++++++++<br>
web/lib/vgl/object.js | 6 +++++-<br>
web/lib/vgl/timestamp.js | 5 ++++-<br>
5 files changed, 63 insertions(+), 8 deletions(-)<br>
<br>
<a href="http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=e16caa31195b5a2e3353b84b1554bfa024f7b19d" target="_blank">http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=e16caa31195b5a2e3353b84b1554bfa024f7b19d</a><br>
commit e16caa31195b5a2e3353b84b1554bfa024f7b19d<br>
Author: Aashish Chaudhary <<a href="mailto:aashish.chaudhary@kitware.com">aashish.chaudhary@kitware.com</a>><br>
Date: Fri Aug 23 02:37:39 2013 -0400<br>
<br>
Added header to each class<br>
<br>
web/lib/vgl/actor.js | 7 +++++++<br>
web/lib/vgl/blend.js | 7 +++++++<br>
web/lib/vgl/boundingObject.js | 7 +++++++<br>
web/lib/vgl/command.js | 7 +++++++<br>
web/lib/vgl/data.js | 10 ++++++++++<br>
web/lib/vgl/defaultValue.js | 7 +++++++<br>
web/lib/vgl/freezeObject.js | 9 ++++++++-<br>
web/lib/vgl/geojsonReader.js | 7 +++++++<br>
web/lib/vgl/geomData.js | 7 +++++++<br>
web/lib/vgl/groupMapper.js | 11 +++++++++++<br>
web/lib/vgl/groupNode.js | 7 +++++++<br>
web/lib/vgl/init.js | 7 +++++++<br>
web/lib/vgl/interactorStyle.js | 7 +++++++<br>
web/lib/vgl/lineSource.js | 9 ++++++++-<br>
web/lib/vgl/mapper.js | 7 +++++++<br>
web/lib/vgl/material.js | 7 +++++++<br>
web/lib/vgl/materialAttribute.js | 9 ++++++++-<br>
web/lib/vgl/modelViewMatrixStack.js | 7 +++++++<br>
web/lib/vgl/node.js | 7 +++++++<br>
web/lib/vgl/object.js | 7 +++++++<br>
web/lib/vgl/picker.js | 7 +++++++<br>
web/lib/vgl/planeSource.js | 7 +++++++<br>
web/lib/vgl/pointSource.js | 7 +++++++<br>
web/lib/vgl/renderWindow.js | 7 +++++++<br>
web/lib/vgl/renderer.js | 7 +++++++<br>
web/lib/vgl/shader.js | 7 +++++++<br>
web/lib/vgl/shaderProgram.js | 7 +++++++<br>
web/lib/vgl/source.js | 7 +++++++<br>
web/lib/vgl/texture.js | 7 +++++++<br>
web/lib/vgl/timestamp.js | 11 +++++++++++<br>
web/lib/vgl/trackballInteractorStyle.js | 7 +++++++<br>
web/lib/vgl/uniform.js | 7 +++++++<br>
web/lib/vgl/utils.js | 5 +++++<br>
web/lib/vgl/vertexAttribute.js | 7 +++++++<br>
web/lib/vgl/viewer.js | 7 +++++++<br>
web/lib/vgl/visitor.js | 7 +++++++<br>
web/lib/vgl/vtkUnpack.js | 23 ++++++++---------------<br>
37 files changed, 272 insertions(+), 18 deletions(-)<br>
<br>
<a href="http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=7c6658e2e9558bb548f52707b5d6e76ff2b0a191" target="_blank">http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=7c6658e2e9558bb548f52707b5d6e76ff2b0a191</a><br>
commit 7c6658e2e9558bb548f52707b5d6e76ff2b0a191<br>
Merge: 7e81366 08d15e2<br>
Author: Aashish Chaudhary <<a href="mailto:aashish.chaudhary@kitware.com">aashish.chaudhary@kitware.com</a>><br>
Date: Fri Aug 23 02:32:14 2013 -0400<br>
<br>
Merge remote-tracking branch 'origin/fix_zoom' into vgl_cleanup<br>
<br>
* origin/fix_zoom:<br>
Use a lower value for near plane<br>
Some more styles fixes<br>
Fixed run time error by adding missing variable separation<br>
Style fixes<br>
Tweaked compute zoom just a bit<br>
Fixed tiles not covering the entire region<br>
Fixing tiles not covering the entire viewport at high zoom<br>
Fixed zoom not behaving properly<br>
Fixed multiple import<br>
Check if the file metadata exists before adding it to the database<br>
Fixed bug where opacity was not maintained between animation steps<br>
Fixed bad merge resolution<br>
Time fixes<br>
Fixed various issues with logic and style<br>
Initial work on run time import<br>
Relocated import script<br>
Reorganized import script to import on file basis<br>
keep start date around too for completeness<br>
record enough time info to compare datasets<br>
put array ranges over all time into database<br>
<br>
modules/mongoimp.py | 212 +++++++++++++++++++++++++++++++++++++<br>
modules/reader.py | 33 +++++-<br>
modules/standardtime.py | 10 +-<br>
modules/vtk_reader.py | 6 +-<br>
scripts/mongoimp.py | 108 -------------------<br>
web/lib/geo/featureLayer.js | 6 +-<br>
web/lib/geo/layer.js | 7 +-<br>
web/lib/geo/map.js | 35 ++++--<br>
web/lib/geo/mapInteractorStyle.js | 13 ++-<br>
web/lib/geo/mercator.js | 6 +-<br>
web/lib/geo/openStreetMapLayer.js | 30 ++----<br>
web/lib/vgl/camera.js | 171 ++++++++++++++++++------------<br>
web/lib/vgl/renderer.js | 6 +-<br>
13 files changed, 403 insertions(+), 240 deletions(-)<br>
<br>
-----------------------------------------------------------------------<br>
<br>
Summary of changes:<br>
web/apps/archive/archive.js | 2 +<br>
web/apps/archive/index.html | 2 +-<br>
web/lib/vgl/actor.js | 7 +<br>
web/lib/vgl/blend.js | 7 +<br>
web/lib/vgl/boundingObject.js | 33 +++-<br>
web/lib/vgl/command.js | 12 +<br>
web/lib/vgl/data.js | 13 +-<br>
web/lib/vgl/defaultValue.js | 11 +<br>
web/lib/vgl/freezeObject.js | 16 ++-<br>
web/lib/vgl/geojsonReader.js | 344 +++++++++++++++++++------------<br>
web/lib/vgl/geomData.js | 7 +<br>
web/lib/vgl/groupMapper.js | 11 +<br>
web/lib/vgl/groupNode.js | 7 +<br>
web/lib/vgl/init.js | 38 ++++<br>
web/lib/vgl/interactorStyle.js | 7 +<br>
web/lib/vgl/lineSource.js | 9 +-<br>
web/lib/vgl/mapper.js | 7 +<br>
web/lib/vgl/material.js | 7 +<br>
web/lib/vgl/materialAttribute.js | 9 +-<br>
web/lib/vgl/modelViewMatrixStack.js | 7 +<br>
web/lib/vgl/node.js | 7 +<br>
web/lib/vgl/object.js | 13 +-<br>
web/lib/vgl/picker.js | 7 +<br>
web/lib/vgl/planeSource.js | 7 +<br>
web/lib/vgl/pointSource.js | 7 +<br>
web/lib/vgl/renderWindow.js | 7 +<br>
web/lib/vgl/renderer.js | 7 +<br>
web/lib/vgl/shader.js | 7 +<br>
web/lib/vgl/shaderProgram.js | 7 +<br>
web/lib/vgl/source.js | 7 +<br>
web/lib/vgl/texture.js | 7 +<br>
web/lib/vgl/timestamp.js | 16 ++-<br>
web/lib/vgl/trackballInteractorStyle.js | 7 +<br>
web/lib/vgl/uniform.js | 7 +<br>
web/lib/vgl/utils.js | 5 +<br>
web/lib/vgl/vertexAttribute.js | 7 +<br>
web/lib/vgl/viewer.js | 7 +<br>
web/lib/vgl/visitor.js | 7 +<br>
web/lib/vgl/vtkUnpack.js | 23 +--<br>
39 files changed, 563 insertions(+), 155 deletions(-)<br>
<br>
<br>
hooks/post-receive<br>
<span class="HOEnZb"><font color="#888888">--<br>
OpenGeoscience<br>
_______________________________________________<br>
Opengeoscience-developers mailing list<br>
<a href="mailto:Opengeoscience-developers@public.kitware.com">Opengeoscience-developers@public.kitware.com</a><br>
<a href="http://public.kitware.com/cgi-bin/mailman/listinfo/opengeoscience-developers" target="_blank">http://public.kitware.com/cgi-bin/mailman/listinfo/opengeoscience-developers</a><br>
</font></span></blockquote></div><br></div>