Changeset 928

Timestamp:

08/28/08 18:57:41

Author:

robert

Message:

Added support for Layer setname definition using --set <setname>

Files:

• trunk/include/vpb/Commandline (modified) (1 diff)
• trunk/src/vpb/Commandline.cpp (modified) (7 diffs)

trunk/include/vpb/Commandline

@@ -52 +52 @@
-        osg::ref_ptr<BuildOptions>              buildOptions; 
-    
+        std::string                             setname;
+    
-        vpb::SpatialProperties::DataType        dataType;
-        std::string                             currentCS;

trunk/src/vpb/Commandline.cpp

@@ -45 +45 @@
-void Commandline::reset()
-{
+    setname = "";
+
-    dataType = vpb::SpatialProperties::RASTER;
-
@@ -111 +113 @@
-        if (!compositeLayer)
-        {
+            compositeLayer = new osgTerrain::CompositeLayer;            
+            if (existingLayer) compositeLayer->addLayer(existingLayer);
+
+            terrainTile->setColorLayer(layerNum, compositeLayer);
+        }
+    }
+    else if (type==vpb::Source::HEIGHT_FIELD)
+    {
+        existingLayer = terrainTile->getElevationLayer();
+        compositeLayer = dynamic_cast<osgTerrain::CompositeLayer*>(existingLayer);
+
+        if (!compositeLayer)
+        {
-            compositeLayer = new osgTerrain::CompositeLayer;
-            if (existingLayer) compositeLayer->addLayer(existingLayer);
-
-            terrainTile->setColorLayer(layerNum, compositeLayer);
-        }
-    }
-    else if (type==vpb::Source::HEIGHT_FIELD)
-    {
-        existingLayer = terrainTile->getElevationLayer();
-        compositeLayer = dynamic_cast<osgTerrain::CompositeLayer*>(existingLayer);
-
-        if (!compositeLayer)
-        {
-            compositeLayer = new osgTerrain::CompositeLayer;
-            if (existingLayer) compositeLayer->addLayer(existingLayer);
-
-            terrainTile->setElevationLayer(compositeLayer);
-        }
@@ -134 +136 @@
-    {
-        osg::ref_ptr<osgTerrain::ProxyLayer> loadedLayer = new osgTerrain::ProxyLayer;
+        loadedLayer->setName(setname);
-        loadedLayer->setFileName(filename);
-
@@ -180 +183 @@
-        {
-            osgTerrain::ProxyLayer* layer = new osgTerrain::ProxyLayer;
+            layer->setName(setname);
-            layer->setFileName(filename);
-
@@ -192 +196 @@
-        else
-        {
-
+setname, 
-        }
-    }
@@ -501 +505 @@
-    usage.addCommandLineOption("--abort-run-on-error","Hint to vpbmaster to abort the run when any errors occur/tasks fail.");
-    usage.addCommandLineOption("--no-abort-run-on-error","Hint to vpbmaster to disable abort of the run when any errors occur (default.)");
+    usage.addCommandLineOption("--set <setname>","Assign the set name of imagery/dem data.");
-}
-
@@ -986 +991 @@
-        }
-
+        else if (arguments.read(pos, "--set",setname))
+        {
+            fout<<"--set "<<setname<<std::endl;
+        }
+
-        else if (arguments.read(pos, "-d",filename))
-        {