[Opengeoscience-developers] OpenGeoscience branch, services_modules_nodes, created. 12f54d400e1da221654891eb18e30d2999aa0134
Ben Burnett
bburnett at poly.edu
Tue Apr 23 14:54:35 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, services_modules_nodes has been created
at 12f54d400e1da221654891eb18e30d2999aa0134 (commit)
- Log -----------------------------------------------------------------
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=12f54d400e1da221654891eb18e30d2999aa0134
commit 12f54d400e1da221654891eb18e30d2999aa0134
Author: Ben Burnett <bburnett at poly.edu>
Date: Tue Apr 23 14:54:08 2013 -0400
Reworked server structure working
CMakeLists.txt | 18 +++-
modules/geowebsocket.py | 40 ++++++--
nodes/__init__.py | 47 ++++++----
nodes/streammaster.py | 199 +++++++++++++++++++--------------------
nodes/streamworker.py | 23 ++---
server.conf.in | 2 +-
services/streaming.py | 54 -----------
web/apps/streaming/index.html | 3 +-
web/apps/streaming/streaming.js | 4 +-
web/lib/srv/webSocket.js | 8 +-
10 files changed, 192 insertions(+), 206 deletions(-)
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=94a8ed6c8c74d72b836e3e8acf8715200d25a13f
commit 94a8ed6c8c74d72b836e3e8acf8715200d25a13f
Merge: 65e7638 fc1762b
Author: Ben Burnett <bburnett at poly.edu>
Date: Mon Apr 22 11:53:22 2013 -0400
Merge branch 'master' into services_modules_nodes
Conflicts:
CMakeLists.txt
.project | 17 +
.pydevproject | 7 +
CMakeLists.txt | 140 +-
configure_server.cmake.in | 2 +-
geoweb | 6 +-
geoweb.py | 30 +-
modules/geodata.py | 68 +
modules/mongo.py | 71 +
modules/reader.py | 19 +
modules/vtk_reader.py | 36 +
scripts/mongoimp.py | 59 +
scripts/setup-for-development.sh | 2 +-
scripts/setup_path.sh | 4 +
web/CMakeLists.txt | 1 +
web/apps/archive/archive.js | 209 ++-
web/apps/archive/index.html | 191 +-
web/common/css/bootstrap.css | 5363 ++++++++++++++++++------------------
web/common/css/bootstrap.min.css | 866 ++++++-
web/common/css/geoweb.css | 26 +
web/common/css/select2.css | 524 ++++
web/common/img/select2.png | Bin 0 -> 613 bytes
web/common/img/select2x2.png | Bin 0 -> 845 bytes
web/common/js/bootstrap.js | 1883 +++++++-------
web/common/js/bootstrap.min.js | 7 +
web/common/js/gl-matrix-min.js | 28 +
web/common/js/gl-matrix.js | 4118 +++++++++++++++++++++++++++
web/common/js/select2.min.js | 82 +
web/lib/CMakeLists.txt | 1 +
web/lib/geo/command.js | 7 +
web/lib/geo/data.js | 579 ++++
web/lib/geo/feature.js | 60 +
web/lib/geo/layer.js | 88 +-
web/lib/geo/map.js | 214 ++-
web/lib/geo/mapInteractorStyle.js | 82 +-
web/lib/ui/gis.js | 418 +++
web/lib/ui/init.js | 6 +
web/lib/vgl/CMakeLists.txt | 3 +
web/lib/vgl/actor.js | 55 +-
web/lib/vgl/boundingObject.js | 59 +-
web/lib/vgl/camera.js | 321 ++-
web/lib/vgl/geoJSONUnpack.js | 416 ---
web/lib/vgl/geojsonReader.js | 406 +++
web/lib/vgl/geomData.js | 159 +-
web/lib/vgl/gl-matrix.js | 3456 -----------------------
web/lib/vgl/groupMapper.js | 135 +
web/lib/vgl/groupNode.js | 67 +-
web/lib/vgl/mapper.js | 50 +-
web/lib/vgl/node.js | 23 +-
web/lib/vgl/renderWindow.js | 1 +
web/lib/vgl/renderer.js | 149 +-
web/lib/vgl/shader.js | 6 +-
web/lib/vgl/shaderProgram.js | 9 +-
web/lib/vgl/testing/CMakeLists.txt | 23 +
web/lib/vgl/testing/drawTest1.html | 69 +
54 files changed, 12688 insertions(+), 7933 deletions(-)
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=65e7638c84384fd1e965058de03afe7f14109d25
commit 65e7638c84384fd1e965058de03afe7f14109d25
Author: Ben Burnett <bburnett at poly.edu>
Date: Mon Apr 22 11:51:26 2013 -0400
Add webSocket.js to uglify list
CMakeLists.txt | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=ae15989a51353c066c3764882c36ea6276405a80
commit ae15989a51353c066c3764882c36ea6276405a80
Author: Ben Burnett <bburnett at poly.edu>
Date: Mon Apr 22 11:48:11 2013 -0400
Renamed websocket.js to webSocket.js
web/lib/srv/{sdfsdf.js => webSocket.js} | 0
1 files changed, 0 insertions(+), 0 deletions(-)
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=ad2013402b0f8a47dd2e9c453dfbacfae72062ca
commit ad2013402b0f8a47dd2e9c453dfbacfae72062ca
Author: Ben Burnett <bburnett at poly.edu>
Date: Mon Apr 22 11:47:27 2013 -0400
Finishing up structure and cleaning
CMakeLists.txt | 4 +-
modules/geowebsocket.py | 70 +++++++++++++++++++++++++++---
modules/logging.py | 12 ++++--
nodes/__init__.py | 49 ---------------------
web/apps/streaming/index.html | 1 +
web/apps/streaming/streaming.js | 65 ++++++++++++++++-------------
web/lib/srv/{websocket.js => sdfsdf.js} | 45 +++++++++++++++++--
7 files changed, 151 insertions(+), 95 deletions(-)
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=665da8b6da1bf062485d19bd12caaf5adda29a69
commit 665da8b6da1bf062485d19bd12caaf5adda29a69
Author: Ben Burnett <bburnett at poly.edu>
Date: Fri Apr 19 16:46:56 2013 -0400
Added js library for websockets, cleaned up server side structure
modules/geowebsocket.py | 22 +++-
nodes/__init__.py | 162 +++++++++++++++++++++++++++--
nodes/echo.py | 36 +------
nodes/streammaster.py | 144 ++++++++++----------------
nodes/streamworker.py | 64 ++----------
web/apps/streaming/streaming.js | 146 ++++++++++----------------
web/lib/srv/init.js | 6 +
web/lib/srv/websocket.js | 218 +++++++++++++++++++++++++++++++++++++++
web/lib/websocket.js | 107 +++++++++++++++++++
9 files changed, 622 insertions(+), 283 deletions(-)
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=c44ebbc70f0a726382d3e6dab3d4c47d852f33bb
commit c44ebbc70f0a726382d3e6dab3d4c47d852f33bb
Author: Ben Burnett <bburnett at poly.edu>
Date: Tue Apr 16 16:47:59 2013 -0400
WIP Cleaning up and organization
CMakeLists.txt | 1 +
geoweb.py | 9 +-
geowebsocket.py | 120 ----------------
modules/geowebsocket.py | 124 +++++++++++++++++
modules/logging.py | 9 ++
modules/websocket_chat.py | 125 -----------------
modules/websocket_pi.py | 146 --------------------
nodes/__init__.py | 38 +++++
services/streaming/client.py => nodes/echo.py | 5 +-
.../streaming/master.py => nodes/streammaster.py | 40 ++----
.../streaming/worker.py => nodes/streamworker.py | 0
server.conf.in | 3 +-
services/streaming.py | 8 +-
13 files changed, 197 insertions(+), 431 deletions(-)
-----------------------------------------------------------------------
hooks/post-receive
--
OpenGeoscience
More information about the Opengeoscience-developers
mailing list