[Opengeoscience-developers] OpenGeoscience branch, master, updated. 2f3210aa23c39ca85b06eab16c0cb7cc1ce13f27

[Aashish Chaudhary]

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, master has been updated
       via  2f3210aa23c39ca85b06eab16c0cb7cc1ce13f27 (commit)
       via  fc866e472cab64ddc980b3e29ad60baec8fb5409 (commit)
       via  6a7312f227d58654529db47e44712af7335da746 (commit)
       via  582344b05d1a580d32d5a022c0d493413d649920 (commit)
       via  2bcd5d9b139585cb67b8c0f1508d4943560d9616 (commit)
       via  7c989c87ee7ba319f4cb16d68a2c1f17ead8d51f (commit)
       via  0111f724b6fd9cac159340726532c5478616ad45 (commit)
       via  0b73f0370cf8bd8aa5678c64ad99f6d27eb520fe (commit)
      from  39b658fae9ba9209bce7a0c0cf3348892fa5f5cb (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=2f3210aa23c39ca85b06eab16c0cb7cc1ce13f27
commit 2f3210aa23c39ca85b06eab16c0cb7cc1ce13f27
Merge: 39b658f fc866e4
Author: Aashish Chaudhary <aashish.chaudhary at kitware.com>
Date:   Tue May 21 09:40:34 2013 -0400

    Merge remote-tracking branch 'origin/colormap_rebased'
    
    * origin/colormap_rebased:
      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
      Add color map capability to vgl proper.
      add color map
      restore rendering demonstrations/tests

 geoweb.py                    |    5 +-
 modules/ogsvtk.py            |  543 +++++++++++++++++++++++++++++++++++-------
 modules/vtk_reader.py        |    1 +
 web/lib/geo/feature.js       |   22 ++-
 web/lib/geo/map.js           |    3 +-
 web/lib/vgl/geojsonReader.js |  179 +++++++-------
 web/lib/vgl/geomData.js      |   33 +++
 web/lib/vgl/texture.js       |  113 +++++++++-
 web/lib/vgl/utils.js         |  206 ++++++++++++++++
 web/lib/vgl/vtkUnpack.js     |    2 +-
 10 files changed, 911 insertions(+), 196 deletions(-)

-----------------------------------------------------------------------

Summary of changes:
 geoweb.py                    |    5 +-
 modules/ogsvtk.py            |  543 +++++++++++++++++++++++++++++++++++-------
 modules/vtk_reader.py        |    1 +
 web/lib/geo/feature.js       |   22 ++-
 web/lib/geo/map.js           |    3 +-
 web/lib/vgl/geojsonReader.js |  179 +++++++-------
 web/lib/vgl/geomData.js      |   33 +++
 web/lib/vgl/texture.js       |  113 +++++++++-
 web/lib/vgl/utils.js         |  206 ++++++++++++++++
 web/lib/vgl/vtkUnpack.js     |    2 +-
 10 files changed, 911 insertions(+), 196 deletions(-)


hooks/post-receive
-- 
OpenGeoscience