Changeset 6354

Timestamp:

May 22, 2016 1:34:59 PM (8 years ago)

Author:

ldelgass

Message:

Add layer position index param to add*Layer methods. Add option to transform
selection box coords to another SRS.

Location:

geovis/trunk

Files:

• Renderer.cpp (modified) (8 diffs)
• Renderer.h (modified) (4 diffs)
• RendererCmd.cpp (modified) (16 diffs)

geovis/trunk/Renderer.cpp

@@ -1312 +1312 @@
 bool Renderer::addImageLayer(const char *name,
                              osgEarth::TileSourceOptions& opts,
+                             unsigned int pos,
                              bool enableCache,
                              bool coverage,
@@ -1344 +1345 @@
     layerOpts.maxLevel() = maxLOD;
     osg::ref_ptr<osgEarth::ImageLayer> layer = new osgEarth::ImageLayer(layerOpts);
-    _map->addImageLayer(layer.get());
+    if (pos < (unsigned int)_map->getNumImageLayers()) {
+        _map->insertImageLayer(layer.get(), pos);
+    } else {
+        _map->addImageLayer(layer.get());
+    }
     if (layer->getTileSource() == NULL || !layer->getTileSource()->isOK()) {
         ERROR("Failed to add image layer: %s", name);
@@ -1472 +1477 @@
 void Renderer::addElevationLayer(const char *name,
                                  osgEarth::TileSourceOptions& opts,
+                                 unsigned int pos,
                                  bool enableCache,
                                  bool visible,
@@ -1496 +1502 @@
     // Common options: geodetic (default), egm96, egm84, egm2008
     //layerOpts.verticalDatum() = "egm96";
-    _map->addElevationLayer(new osgEarth::ElevationLayer(layerOpts));
+    osgEarth::ElevationLayer *layer = new osgEarth::ElevationLayer(layerOpts);
+    _map->addElevationLayer(layer);
+    // Map API lacks an insertElevationLayer method, so need to move it
+    if (pos < (unsigned int)_map->getNumElevationLayers()) {
+        _map->moveElevationLayer(layer, pos);
+    }
     _needsRedraw = true;
 }
@@ -1843 +1854 @@
 }
 
-void Renderer::getBoxSelection(double *latMin, double *latMax, double *longMin, double *longMax)
+void Renderer::getBoxSelection(double *latMin, double *latMax,
+                               double *longMin, double *longMax,
+                               const osgEarth::SpatialReference *outSRS)
 {
     osgEarth::Annotation::FeatureNode *node = _selectionBox.get();
@@ -1855 +1868 @@
     *longMin = (*geom)[1].x();
     *longMax = (*geom)[0].x();
+    if (outSRS == NULL)
+        return;
+
+    const osgEarth::SpatialReference* fromSRS = _mapNode->getMapSRS()->getGeographicSRS();
+    osgEarth::GeoPoint pt1(fromSRS, *longMin, *latMin);
+    osgEarth::GeoPoint pt2(fromSRS, *longMax, *latMax);
+    pt1.transform(outSRS);
+    pt2.transform(outSRS);
+    *latMin = pt1.y();
+    *latMax = pt2.y();
+    *longMin = pt1.x();
+    *longMax = pt2.x();
 }
 
@@ -2169 +2194 @@
 void Renderer::addModelLayer(const char *name,
                              osgEarth::ModelSourceOptions& opts,
+                             unsigned int pos,
                              bool enableCache,
                              bool lighting,
@@ -2187 +2213 @@
     }
     layerOpts.lightingEnabled() = lighting;
-    _map->addModelLayer(new osgEarth::ModelLayer(layerOpts));
+    osgEarth::ModelLayer *layer = new osgEarth::ModelLayer(layerOpts);
+    if (pos < (unsigned int)_map->getNumModelLayers()) {
+        _map->insertModelLayer(layer, pos);
+    } else {
+        _map->addModelLayer(layer);
+    }
     _needsRedraw = true;
 }

geovis/trunk/Renderer.h

@@ -262 +262 @@
     }
 
-    bool addImageLayer(const char *name, osgEarth::TileSourceOptions& opts,
+    bool addImageLayer(const char *name,
+                       osgEarth::TileSourceOptions& opts,
+                       unsigned int pos = UINT_MAX,
                        bool enableCache = true,
                        bool coverage = false,
@@ -308 +310 @@
     }
 
-    void addElevationLayer(const char *name, osgEarth::TileSourceOptions& opts,
+    void addElevationLayer(const char *name,
+                           osgEarth::TileSourceOptions& opts,
+                           unsigned int pos = UINT_MAX,
                            bool enableCache = true,
                            bool visible = true,
@@ -344 +348 @@
     }
 
-    void addModelLayer(const char *name, osgEarth::ModelSourceOptions& opts,
+    void addModelLayer(const char *name,
+                       osgEarth::ModelSourceOptions& opts,
+                       unsigned int pos = UINT_MAX,
                        bool enableCache = true,
                        bool lighting = true,
@@ -549 +555 @@
     void initBoxSelection(int x, int y);
     void updateBoxSelection(int x, int y);
-    void getBoxSelection(double *latMin, double *latMax, double *longMin, double *longMax);
+    void getBoxSelection(double *latMin, double *latMax,
+                         double *longMin, double *longMax,
+                         const osgEarth::SpatialReference *outSRS = NULL);
     void clearBoxSelection();
 

geovis/trunk/RendererCmd.cpp

@@ -1372 +1372 @@
     char *name = Tcl_GetString(objv[3]);
     char *type = Tcl_GetString(objv[4]);
+    unsigned int pos = UINT_MAX;
     bool cache = true;
     bool visible = true;
@@ -1561 +1562 @@
                 return TCL_ERROR;
             }
-            ret = g_renderer->addImageLayer(name, aggOpts, cache, coverage, shared, visible, minLOD, maxLOD);
+            ret = g_renderer->addImageLayer(name, aggOpts, pos, cache, coverage, shared, visible, minLOD, maxLOD);
         } else if (driver[0] == 'c' && strcmp(driver, "colorramp") == 0) {
             osgEarth::Drivers::ColorRampOptions colorRampOpts;
@@ -1604 +1605 @@
             }
             colorRampOpts.ramp() = g_renderer->getColorMapFilePath(colormap);
-            ret = g_renderer->addImageLayer(name, colorRampOpts, cache, coverage, shared, visible, minLOD, maxLOD);
+            ret = g_renderer->addImageLayer(name, colorRampOpts, pos, cache, coverage, shared, visible, minLOD, maxLOD);
         } else if (driver[0] == 'd' && strcmp(driver, "debug") == 0) {
             osgEarth::Drivers::DebugOptions opts;
-            ret = g_renderer->addImageLayer(name, opts, cache, coverage, shared, visible, minLOD, maxLOD);
+            ret = g_renderer->addImageLayer(name, opts, pos, cache, coverage, shared, visible, minLOD, maxLOD);
         } else if (driver[0] == 'a' && strcmp(driver, "arcgis") == 0) {
             osgEarth::Drivers::ArcGISOptions opts;
@@ -1618 +1619 @@
             }
             //opts.format() = Tcl_GetString(objv[11]);
-            ret = g_renderer->addImageLayer(name, opts, cache, coverage, shared, visible, minLOD, maxLOD);
+            ret = g_renderer->addImageLayer(name, opts, pos, cache, coverage, shared, visible, minLOD, maxLOD);
             g_renderer->setImageLayerVisibleRange(name, minRange, maxRange);
         } else if (driver[0] == 'g' && strcmp(driver, "gdal") == 0) {
             osgEarth::Drivers::GDALOptions opts;
             opts.url() = url;
-            ret = g_renderer->addImageLayer(name, opts, cache, coverage, shared, visible, minLOD, maxLOD);
+            ret = g_renderer->addImageLayer(name, opts, pos, cache, coverage, shared, visible, minLOD, maxLOD);
             g_renderer->setImageLayerVisibleRange(name, minRange, maxRange);
         } else if (driver[0] == 't' && strcmp(driver, "tms") == 0) {
@@ -1630 +1631 @@
             //opts.tmsType() = Tcl_GetString(objv[9]);
             //opts.format() = Tcl_GetString(objv[10]);
-            ret = g_renderer->addImageLayer(name, opts, cache, coverage, shared, visible, minLOD, maxLOD);
+            ret = g_renderer->addImageLayer(name, opts, pos, cache, coverage, shared, visible, minLOD, maxLOD);
             g_renderer->setImageLayerVisibleRange(name, minRange, maxRange);
         } else if (driver[0] == 'w' && strcmp(driver, "wms") == 0) {
@@ -1645 +1646 @@
             opts.transparent() = transparent;
 
-            ret = g_renderer->addImageLayer(name, opts, cache, coverage, shared, visible, minLOD, maxLOD);
+            ret = g_renderer->addImageLayer(name, opts, pos, cache, coverage, shared, visible, minLOD, maxLOD);
             g_renderer->setImageLayerVisibleRange(name, minRange, maxRange);
         } else if (driver[0] == 'x' && strcmp(driver, "xyz") == 0) {
@@ -1654 +1655 @@
             //opts.invertY() = invertY;
             //opts.format() = Tcl_GetString(objv[9]);
-            ret = g_renderer->addImageLayer(name, opts, cache, coverage, shared, visible, minLOD, maxLOD);
+            ret = g_renderer->addImageLayer(name, opts, pos, cache, coverage, shared, visible, minLOD, maxLOD);
             g_renderer->setImageLayerVisibleRange(name, minRange, maxRange);
         } else {
@@ -1684 +1685 @@
             osgEarth::Drivers::GDALOptions opts;
             opts.url() = url;
-            g_renderer->addElevationLayer(name, opts, cache, visible, minLOD, maxLOD);
+            g_renderer->addElevationLayer(name, opts, pos, cache, visible, minLOD, maxLOD);
         } else if (driver[0] == 't' && strcmp(driver, "tms") == 0) {
             osgEarth::Drivers::TMSOptions opts;
@@ -1690 +1691 @@
             //opts.tmsType() = Tcl_GetString(objv[8]);
             //opts.format() = Tcl_GetString(objv[9]);
-            g_renderer->addElevationLayer(name, opts, cache, visible, minLOD, maxLOD);
+            g_renderer->addElevationLayer(name, opts, pos, cache, visible, minLOD, maxLOD);
         } else if (driver[0] == 'w' && strcmp(driver, "wcs") == 0) {
             osgEarth::Drivers::WCSOptions opts;
@@ -1707 +1708 @@
             //opts.srs() = Tcl_GetString(objv[11]);
             //opts.rangeSubset() = Tcl_GetString(objv[12]);
-            g_renderer->addElevationLayer(name, opts, cache, visible, minLOD, maxLOD);
+            g_renderer->addElevationLayer(name, opts, pos, cache, visible, minLOD, maxLOD);
         } else {
             Tcl_AppendResult(interp, "unknown elevation driver \"", driver,
@@ -1943 +1944 @@
             return TCL_ERROR;
         }
-        g_renderer->addModelLayer(name, geomOpts, cache, lighting, visible);
+        g_renderer->addModelLayer(name, geomOpts, pos, cache, lighting, visible);
     } else if (type[0] == 'i' && strcmp(type, "icon") == 0) {
         char *driver = Tcl_GetString(objv[5]);
@@ -2055 +2056 @@
             return TCL_ERROR;
         }
-        g_renderer->addModelLayer(name, geomOpts, cache, lighting, visible);
+        g_renderer->addModelLayer(name, geomOpts, pos, cache, lighting, visible);
     } else if (type[0] == 'p' && strcmp(type, "point") == 0) {
         char *driver = Tcl_GetString(objv[5]);
@@ -2156 +2157 @@
             return TCL_ERROR;
         }
-        g_renderer->addModelLayer(name, geomOpts, cache, lighting, visible);
+        g_renderer->addModelLayer(name, geomOpts, pos, cache, lighting, visible);
     } else if (type[0] == 'p' && strcmp(type, "polygon") == 0) {
         char *driver = Tcl_GetString(objv[5]);
@@ -2276 +2277 @@
             return TCL_ERROR;
         }
-        g_renderer->addModelLayer(name, geomOpts, cache, lighting, visible);
+        g_renderer->addModelLayer(name, geomOpts, pos, cache, lighting, visible);
     } else if (type[0] == 'l' && strcmp(type, "line") == 0) {
         char *driver = Tcl_GetString(objv[5]);
@@ -2407 +2408 @@
             return TCL_ERROR;
         }
-        g_renderer->addModelLayer(name, geomOpts, cache, lighting, visible);
+        g_renderer->addModelLayer(name, geomOpts, pos, cache, lighting, visible);
    } else if (type[0] == 't' && strcmp(type, "text") == 0) {
         char *driver = Tcl_GetString(objv[5]);
@@ -2521 +2522 @@
             return TCL_ERROR;
         }
-        g_renderer->addModelLayer(name, geomOpts, cache, lighting, visible);
+        g_renderer->addModelLayer(name, geomOpts, pos, cache, lighting, visible);
     } else {
         Tcl_AppendResult(interp, "unknown map layer type \"", type,