Changeset 932

Timestamp:

09/05/08 12:48:40

Author:

robert

Message:

Added automatic detected of invalid database build configiurations

Files:

• trunk/applications/osgdem/osgdem.cpp (modified) (3 diffs)
• trunk/applications/vpbmaster/vpbmaster.cpp (modified) (2 diffs)
• trunk/include/vpb/BuildOptions (modified) (1 diff)
• trunk/include/vpb/DataSet (modified) (1 diff)
• trunk/include/vpb/Destination (modified) (4 diffs)
• trunk/include/vpb/Source (modified) (3 diffs)
• trunk/include/vpb/TaskManager (modified) (1 diff)
• trunk/src/vpb/DataSet.cpp (modified) (5 diffs)
• trunk/src/vpb/Destination.cpp (modified) (19 diffs)
• trunk/src/vpb/Source.cpp (modified) (2 diffs)
• trunk/src/vpb/TaskManager.cpp (modified) (4 diffs)

trunk/applications/osgdem/osgdem.cpp

@@ -205 +205 @@
-
-    double duration = 0.0;
-
+
-    // generate the database
-    if (terrain.valid())
@@ -237 +237 @@
-            vpb::sync();
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            
-            if (taskFile.valid())
-            {
-
-
-
-
-
-
-
-
-
-
+
+
+
-            result = 1;
-
@@ -267 +283 @@
-            printf("Caught exception.\n");
-            
-
+
+
+
+
-
-            result = 1;

trunk/applications/vpbmaster/vpbmaster.cpp

@@ -94 +94 @@
-    }
-
-
+
+
+
+
+
-    {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    else
-    {
-
-
-
-
+
+
+
-
-            taskManager->setSourceFileName(sourceFileName);
-            taskManager->generateTasksFromSource();
-
-            taskManager->writeSource(sourceFileName);
-            taskManager->writeTasks(tasksOutputFileName, true);
-            
-            taskManager->log(osg::NOTICE,"Generated tasks file = %s",tasksOutputFileName.c_str());
-        }
-    
-        // make sure the OS writes changes to disk
-        vpb::sync();
-
-        if (taskManager->hasMachines())
-        {
-            taskManager->run();
-        }
-        else
-        {
-            taskManager->log(osg::NOTICE,"Cannot run build without machines assigned, please pass in a machines definiation file via --machines <file>.");
-        }
-    }
-    
-    double duration = osg::Timer::instance()->delta_s(startTick, osg::Timer::instance()->tick());
-
@@ -134 +160 @@
-    vpb::sync();
-
-0
+result
-}
-

trunk/include/vpb/BuildOptions

@@ -28 +28 @@
-namespace vpb
-{
-
-
-class VPB_EXPORT BuildOptions : public osg::Object

trunk/include/vpb/DataSet

@@ -199 +199 @@
-        std::string getTaskName(unsigned int level, unsigned int X, unsigned int Y) const;
-        std::string getSubtileName(unsigned int level, unsigned int X, unsigned int Y) const;
+        
+        /** Check the build validity, return an empty string if everything is OK, on error return the error string.*/
+        std::string checkBuildValidity();
-
-    protected:

trunk/include/vpb/Destination

@@ -125 +125 @@
-    void computeMaximumSourceResolution(CompositeSource* sourceGraph);
-
-
+const std::string& setname, 
-    bool computeTerrainResolution(unsigned int& numColumns, unsigned int& numRows, double& resX, double& resY);
-
@@ -198 +198 @@
-            _image_maxSourceResolutionX(0.0f),
-            _image_maxSourceResolutionY(0.0f) {}
+            
+        bool valid()
+        {
+            for(LayerSetImageDataMap::iterator itr =_layerSetImageDataMap.begin();
+                itr != _layerSetImageDataMap.end();
+                ++itr)
+            {
+                if (itr->second._imageDestination.valid() &&
+                    itr->second._imageDestination->_image.valid()) return true;
+            }
+            return false;
+        }
-
-        typedef std::map<std::string, ImageData> LayerSetImageDataMap;
@@ -208 +220 @@
-    };
-
-    std::vector<ImageData>                      _imagery;
-    std::vector<ImageSet>                       _imageLayerSet;
-
-
-
-ry.size()) _imagery
-ry[layer
+, const std::string& setname
+
+LayerSet.size()) _imageLayerSet
+LayerSet[layer]._layerSetImageDataMap[setname
-    }
-
@@ -222 +233 @@
-        return _imageLayerSet[layer];
-    }
+    
+    inline unsigned int getNumLayers() const { return _imageLayerSet.size(); }
-
-    osg::ref_ptr<DestinationData>               _terrain;

trunk/include/vpb/Source

@@ -25 +25 @@
-namespace vpb
-{
+
+// forward declare
+class BuildOptions;
+
-class VPB_EXPORT Source : public osg::Referenced, public SpatialProperties
-{
@@ -83 +87 @@
-    Type getType() const { return _type; }
-
-
+
+
-    const std::string& getSetName() const { return _setname; }
+
+    void setSwitchSetName(const std::string& setname) { _switchSetName = setname; }
+    const std::string& getSwitchSetName() const { return _switchSetName; }
-
-    void setFileName(const std::string& filename) { _filename = filename; }
@@ -214 +222 @@
-
-    std::string                                 _setname;
+    std::string                                 _switchSetName;
-    std::string                                 _filename;
-    bool                                        _temporaryFile;

trunk/include/vpb/TaskManager

@@ -135 +135 @@
-        void setOutOfDateTasksToPending();
-
+        /** Check the build validity, return an empty string if everything is OK, on error return the error string.*/
+        std::string checkBuildValidity();
+
-    protected:
-

trunk/src/vpb/DataSet.cpp

@@ -1971 +1971 @@
-        // need to read locator.
-        vpb::Source* source = new vpb::Source(type, hfl->getFileName());
-
+, this
-        source->setLayer(layerNum);
-        source->setMinLevel(layer->getMinLevel());
@@ -1998 +1998 @@
-        // need to read locator
-        vpb::Source* source = new vpb::Source(type, iml->getFileName());
-
+, this
-        source->setLayer(layerNum);
-        source->setMinLevel(layer->getMinLevel());
@@ -2027 +2027 @@
-
-        vpb::Source* source = new vpb::Source(type, pl->getFileName());
-
+, this
-        source->setLayer(layerNum);
-        source->setMinLevel(layer->getMinLevel());
@@ -2061 +2061 @@
-            {
-                vpb::Source* source = new vpb::Source(type, compositeLayer->getFileName(i));
-
+, this
-                source->setMinLevel(layer->getMinLevel());
-                source->setMaxLevel(layer->getMaxLevel());
@@ -2948 +2948 @@
-    return 0;
-}
+
+std::string DataSet::checkBuildValidity()
+{
+    bool isTerrain = getGeometryType()==BuildOptions::TERRAIN;
+    bool containsOptionalLayers = !(getOptionalLayerSet().empty());
+
+    if (containsOptionalLayers && !isTerrain) return std::string("Can not mix optional layers with POLYGONAL and HEIGHTFIELD builds, must use --terrain to enable optional layer support.");
+
+
+    return std::string();
+}

trunk/src/vpb/Destination.cpp

@@ -101 +101 @@
-{
-    for(unsigned int layerNum=0;
-_imagery.size
+getNumLayers
-        ++layerNum)
-    {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-    }
@@ -166 +173 @@
-            }
-
+            std::string sourceSetName;
+            if (_dataSet->isOptionalLayerSet(source->getSetName()))
+            {
+                sourceSetName = source->getSetName();
+            }
+
-            switch(source->getType())
-            {
-                case(Source::IMAGE):
-                {
-
+, sourceSetName
-                    if (imageData._image_maxSourceResolutionX==0.0f) imageData._image_maxSourceResolutionX=sourceResolutionX;
-                    else imageData._image_maxSourceResolutionX=osg::minimum(imageData._image_maxSourceResolutionX,sourceResolutionX);
@@ -209 +222 @@
-}
-
-
-
-
+
+
+
+
+
-    if (imageData._image_maxSourceResolutionX!=0.0f && imageData._image_maxSourceResolutionY!=0.0f &&
-        _image_maxNumColumns!=0 && _image_maxNumRows!=0)
@@ -236 +251 @@
-        numColumns = 4;
-        numRows = 4;
-
+
-        // round to nearest power of two above or equal to the required resolution
-        while (numColumns<numColumnsRequired) numColumns *= 2;
-        while (numRows<numRowsRequired) numRows *= 2;
-
+
-        // set up properly for vector and raster (previously always vector)
-        // assume raster if _dataType not set (default for Destination Tile)
@@ -253 +268 @@
-            resY = (_extents.yMax()-_extents.yMin())/(double)numRows;
-        }
-
-
-
-
+
+
+
-}
-
@@ -306 +320 @@
-    double texture_dx, texture_dy;
-    for(unsigned int layerNum=0;
-_imagery.size
+getNumLayers
-        ++layerNum)
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-        }
@@ -462 +482 @@
-
-    for(unsigned int layerNum=0;
-_imagery.size
+getNumLayers
-        ++layerNum)
-    {
@@ -476 +496 @@
-        {
-            TileCornerPair& tcp = *itr;
-
-
-
-
+
+
+
+
+
+
-                {
-
+
+
+
+
+
-                }
-            }
@@ -678 +704 @@
-    
-    for(unsigned int layerNum=0;
-_imagery.size
+getNumLayers
-        ++layerNum)
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-    }
@@ -1064 +1098 @@
-    if (_stateset.valid()) return _stateset.get();
-
-ry
+LayerSet
-
-    unsigned int numValidImagerLayers = 0;
-    unsigned int layerNum;
-    for(layerNum=0;
-_imagery.size
+getNumLayers
-        ++layerNum)
-    {
-
-
+
-        {
-            ++numValidImagerLayers;
@@ -1084 +1117 @@
-
-    for(layerNum=0;
-_imagery.size
+getNumLayers
-        ++layerNum)
-    {
-
+
+
+
+
-        if (!imageData._imageDestination.valid() || !imageData._imageDestination->_image.valid()) continue;
-        
@@ -1496 +1532 @@
-    // assign the imagery
-    for(unsigned int layerNum=0;
-_imagery.size
+getNumLayers
-        ++layerNum)
-    {
-
+
+
+
+
-        if (imageData._imageDestination.valid() && imageData._imageDestination->_image.valid())
-        {        
@@ -1875 +1914 @@
-    {
-        for(unsigned int layerNum=0;
-_imagery.size
+getNumLayers
-            ++layerNum)
-        {
-
+
+
+
+
-            if (imageData._imageDestination.valid() && imageData._imageDestination->_image.valid()) 
-            {
@@ -2282 +2324 @@
-                        {
-                            // copy the base layer 0 into layer 0 and all subsequent layers to provide a backdrop.
-_imagery.size
+getNumLayers
-                            {
-
+
+
+
+
+
-                                {
-_imagery[i]
+imageData
-                                }
-                            }
@@ -2293 +2339 @@
-                        {
-                            // copy specific layer.
-
+
+
+
+
+
-                            {
-_imagery[layerNum]
+imageData
-                            }
-                        }
@@ -2303 +2353 @@
-                    {
-                        // copy the current layer into this and all subsequent layers to provide a backdrop.
-_imagery.size
+getNumLayers
-                        {
-
+
+
+
+
+