Changeset 4310

Timestamp:

Apr 1, 2014, 2:58:49 PM (10 years ago)

Author:

ldelgass

Message:

Add map graticule. Currently only works in 3D (geocentric) maps.

Location:

trunk/packages/vizservers/geovis

Files:

• Renderer.cpp (modified) (5 diffs)
• Renderer.h (modified) (3 diffs)
• RendererCmd.cpp (modified) (2 diffs)

trunk/packages/vizservers/geovis/Renderer.cpp

@@ -38 +38 @@
 #include <osgEarthUtil/AutoClipPlaneHandler>
 #include <osgEarthUtil/MouseCoordsTool>
+#include <osgEarthUtil/UTMGraticule>
+#include <osgEarthUtil/MGRSGraticule>
+#include <osgEarthUtil/GeodeticGraticule>
 #include <osgEarthUtil/LatLongFormatter>
 #include <osgEarthUtil/GLSLColorFilter>
@@ -91 +94 @@
     osgEarth::MapNode *mapNode = new osgEarth::MapNode(map, mapNodeOpts);
     _mapNode = mapNode;
-    _sceneRoot = mapNode;
+    _sceneRoot = new osg::Group;
+    _sceneRoot->addChild(mapNode);
     _viewer->setSceneData(_sceneRoot.get());
 
@@ -255 +259 @@
 }
 
+void Renderer::setGraticule(bool enable, GraticuleType type)
+{
+    if (!_mapNode.valid() || !_sceneRoot.valid())
+        return;
+    if (enable) {
+        if (_graticule.valid()) {
+            _sceneRoot->removeChild(_graticule.get());
+            _graticule = NULL;
+        }
+        switch (type) {
+        case GRATICULE_UTM: {
+            osgEarth::Util::UTMGraticule *gr = new osgEarth::Util::UTMGraticule(_mapNode.get());
+            _sceneRoot->addChild(gr);
+            _graticule = gr;
+        }
+            break;
+        case GRATICULE_MGRS: {
+            osgEarth::Util::MGRSGraticule *gr = new osgEarth::Util::MGRSGraticule(_mapNode.get());
+            _sceneRoot->addChild(gr);
+            _graticule = gr;
+        }
+            break;
+        case GRATICULE_GEODETIC:
+        default:
+            osgEarth::Util::GeodeticGraticule *gr = new osgEarth::Util::GeodeticGraticule(_mapNode.get());
+            osgEarth::Util::GeodeticGraticuleOptions opt = gr->getOptions();
+            opt.lineStyle()->getOrCreate<osgEarth::Symbology::LineSymbol>()->stroke()->color().set(1,0,0,1);
+            gr->setOptions(opt);
+            _sceneRoot->addChild(gr);
+            _graticule = gr;
+        }
+    } else if (_graticule.valid()) {
+        _sceneRoot->removeChild(_graticule.get());
+        _graticule = NULL;
+    }
+    _needsRedraw = true;
+}
+
 void Renderer::initMouseCoordsTool()
 {
@@ -311 +353 @@
     } else {
         initViewer();
-        osg::Group *group = new osg::Group;
-        group->addChild(node);
-        _sceneRoot = group;
+        _sceneRoot = new osg::Group;
+        _sceneRoot->addChild(node);
         _map = mapNode->getMap();
     }
@@ -400 +441 @@
         _sceneRoot = sky;
 #else
-        osg::Group *group = new osg::Group();
-        group->addChild(_mapNode.get());
-        _sceneRoot = group;
-        //_sceneRoot = mapNode;
-#endif
-#endif
-    } else {
-        osg::Group *group = new osg::Group();
-        group->addChild(_mapNode.get());
-        _sceneRoot = group;
-        //_sceneRoot = mapNode;
+        _sceneRoot = new osg::Group();
+        _sceneRoot->addChild(_mapNode.get());
+#endif
+#endif
+    } else {
+        _sceneRoot = new osg::Group();
+        _sceneRoot->addChild(_mapNode.get());
     }
 

trunk/packages/vizservers/geovis/Renderer.h

@@ -150 +150 @@
     typedef std::string ColorMapId;
 
+    enum GraticuleType {
+        GRATICULE_UTM,
+        GRATICULE_MGRS,
+        GRATICULE_GEODETIC
+    };
+
     Renderer();
     virtual ~Renderer();
@@ -172 +178 @@
 
     // Map options
+
+    void setGraticule(bool enable, GraticuleType type = GRATICULE_GEODETIC);
 
     void setViewerLightType(osg::View::LightingMode mode);
@@ -379 +387 @@
     std::string _baseURI;
 
-    osg::ref_ptr<osg::Node> _sceneRoot;
+    osg::ref_ptr<osg::Group> _sceneRoot;
+    osg::ref_ptr<osg::Group> _graticule;
     osg::ref_ptr<osgEarth::MapNode> _mapNode;
     osg::ref_ptr<osgEarth::Map> _map;

trunk/packages/vizservers/geovis/RendererCmd.cpp

@@ -531 +531 @@
     }
     return (*proc) (clientData, interp, objc, objv);
+}
+
+static int
+MapGraticuleOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+               Tcl_Obj *const *objv)
+{
+    bool state;
+    if (GetBooleanFromObj(interp, objv[2], &state) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc > 3) {
+        Renderer::GraticuleType type;
+        char *typeStr = Tcl_GetString(objv[3]);
+        if (typeStr[0] == 'g' && strcmp(typeStr, "geodetic") == 0) {
+            type = Renderer::GRATICULE_GEODETIC;
+        } else if (typeStr[0] == 'u' && strcmp(typeStr, "utm") == 0) {
+            type = Renderer::GRATICULE_UTM;
+        } else if (typeStr[0] == 'm' && strcmp(typeStr, "mgrs") == 0) {
+            type = Renderer::GRATICULE_MGRS;
+        } else {
+            return TCL_ERROR;
+        }
+        g_renderer->setGraticule(state, type);
+    } else {
+        g_renderer->setGraticule(state);
+    }
+    return TCL_OK;
 }
 
@@ -1059 +1086 @@
 
 static CmdSpec mapOps[] = {
+    {"grid",     1, MapGraticuleOp,   3, 4, "bool ?type?"},
     {"layer",    2, MapLayerOp,       3, 0, "op ?params...?"},
     {"load",     2, MapLoadOp,        4, 5, "options"},