Changeset 8805

Timestamp:

08/28/08 18:15:57

Author:

robert

Message:

Introduce the concept of layer set name, using the osg::Object::s/getName() to store
the setname, and using a compound string (set:setname:filename) in place of standard filename when reading and writing
files.

Files:

• OpenSceneGraph/trunk/include/osgTerrain/Layer (modified) (6 diffs)
• OpenSceneGraph/trunk/src/osgPlugins/ive/CompositeLayer.cpp (modified) (1 diff)
• OpenSceneGraph/trunk/src/osgPlugins/ive/SwitchLayer.cpp (modified) (3 diffs)
• OpenSceneGraph/trunk/src/osgPlugins/osgTerrain/CompositeLayer.cpp (modified) (3 diffs)
• OpenSceneGraph/trunk/src/osgPlugins/osgTerrain/HeightFieldLayer.cpp (modified) (2 diffs)
• OpenSceneGraph/trunk/src/osgPlugins/osgTerrain/ImageLayer.cpp (modified) (2 diffs)
• OpenSceneGraph/trunk/src/osgPlugins/osgTerrain/SwitchLayer.cpp (modified) (3 diffs)
• OpenSceneGraph/trunk/src/osgTerrain/Layer.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/include/osgTerrain/Layer

@@ -27 +27 @@
-#define MAXIMUM_NUMBER_OF_LEVELS 30
-
+/** Extact the setname and filename from a compound string in the from set:setname:filename".
+  * Returns a setname of "" when non set:setname: entry is present.*/
+void extractSetNameAndFileName(const std::string& compoundstring, std::string& setname, std::string& filename);
+
+/** Create a compound string in the form set:setname:filename, or just filename if setname is "".*/
+std::string createCompondSetNameAndFileName(const std::string& setname, const std::string& filename);
+
-class OSGTERRAIN_EXPORT Layer : public osg::Object
-{
@@ -43 +50 @@
-        /** Get the file name of the layer. */
-        virtual const std::string& getFileName() const { return _filename; }
-
+
+
+
-
-        void setLocator(Locator* locator) { _locator = locator; }
@@ -332 +341 @@
-
-
-class OSGTERRAIN_EXPORT CompositeLayer : public Layer
-{
-    public:
-
-        CompositeLayer();
-
-        /** Copy constructor using CopyOp to manage deep vs shallow copy.*/
-        CompositeLayer(const CompositeLayer& compositeLayer,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
-        
-        META_Object(osgTerrain, CompositeLayer);
-
-        void clear();
-
-        void setFileName(unsigned int i, const std::string& filename) { _layers[i].first = filename; if (_layers[i].second.valid()) _layers[i].second->setFileName(filename); }
-        const std::string& getFileName(unsigned int i) const { return _layers[i].second.valid() ? _layers[i].second->getFileName() : _layers[i].first; }
-
-        void setLayer(unsigned int i, Layer* layer) { _layers[i].second = layer; }
-        Layer* getLayer(unsigned int i) { return _layers[i].second.get(); }
-        const Layer* getLayer(unsigned int i) const { return _layers[i].second.get(); }
-
-        void addLayer(const std::string& filename) { _layers.push_back(FileNameLayerPair(filename,0)); }
-        
-        void addLayer(Layer* layer) { _layers.push_back(FileNameLayerPair(layer->getFileName(),layer)); }
-
-        void removeLayer(unsigned int i) { _layers.erase(_layers.begin()+i); }
-        
-        unsigned int getNumLayers() const { return _layers.size(); }
-
-    protected:
-
-        virtual ~CompositeLayer() {}
-        
-        typedef std::pair< std::string, osg::ref_ptr<Layer> > FileNameLayerPair;
-        
-        typedef std::vector< FileNameLayerPair > Layers;
-        
-        Layers _layers;
-};
-
-class OSGTERRAIN_EXPORT ProxyLayer : public Layer
-{
@@ -419 +389 @@
-};
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-    public:
@@ -434 +476 @@
-        void clear();
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-    protected:
@@ -456 +483 @@
-        virtual ~SwitchLayer() {}
-        
-
-
-
-
-
-
-
+
+
+
+
-
-}

OpenSceneGraph/trunk/src/osgPlugins/ive/CompositeLayer.cpp

@@ -43 +43 @@
-        {
-            out->writeBool(false);
-File
+Compound
-        }
-    }

OpenSceneGraph/trunk/src/osgPlugins/ive/SwitchLayer.cpp

@@ -14 +14 @@
-#include "Exception.h"
-#include "SwitchLayer.h"
-
+Composite
-
-using namespace ive;
@@ -24 +24 @@
-
-    // If the osg class is inherited by any other class we should also write this to file.
-Layer*  layer = dynamic_cast<osgTerrain::
+CompositeLayer*  layer = dynamic_cast<osgTerrain::Composite
-    if  (layer)
-
+Composite
-    else
-        throw Exception("SwitchLayer::write(): Could not cast this osgLayer::SwitchLayer to an osgTerrain::Layer.");
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-}
-
@@ -62 +45 @@
-
-    // If the osg class is inherited by any other class we should also read this from file.
-Layer*  layer = dynamic_cast<osgTerrain::
+CompositeLayer*  layer = dynamic_cast<osgTerrain::Composite
-    if (layer)
-
+Composite
-    else
-        throw Exception("SwitchLayer::read(): Could not cast this osgLayer::Layer to an osg::Group.");
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-}

OpenSceneGraph/trunk/src/osgPlugins/osgTerrain/CompositeLayer.cpp

@@ -76 +76 @@
-        else if (fr.matchSequence("ProxyLayer %s") || fr.matchSequence("ProxyLayer %w"))
-        {
-
-
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-            fr += 2;
-
@@ -146 +154 @@
-                    } 
-                
-File
+Compound
-                }
-            }
@@ -156 +164 @@
-        else if (!layer.getFileName(i).empty())
-        {
-File
+Compound
-        }
-    }

OpenSceneGraph/trunk/src/osgPlugins/osgTerrain/HeightFieldLayer.cpp

@@ -34 +34 @@
-    if (fr.matchSequence("file %w") || fr.matchSequence("file %s"))
-    {
-
-
+
+
+
+
-        {
-
+
+
+
+
+
+
+
-        }
-
-        fr += 2;
-        itrAdvanced = true;
@@ -62 +69 @@
-    if (!layer.getFileName().empty())
-    {
-
+
+
-    }
-    else

OpenSceneGraph/trunk/src/osgPlugins/osgTerrain/ImageLayer.cpp

@@ -34 +34 @@
-    if (fr.matchSequence("file %w") || fr.matchSequence("file %s"))
-    {
-
-
+
+
+
+
-        {
-
+
+
+
+
+
+
+
-        }
-
+
-        fr += 2;
-        itrAdvanced = true;
@@ -54 +62 @@
-    if (!layer.getFileName().empty())
-    {
-
+
+
-    }
-

OpenSceneGraph/trunk/src/osgPlugins/osgTerrain/SwitchLayer.cpp

@@ -34 +34 @@
-    new osgTerrain::SwitchLayer,
-    "SwitchLayer",
-
+CompositeLayer 
-    SwitchLayer_readLocalData,
-    SwitchLayer_writeLocalData
@@ -44 +44 @@
-
-    bool itrAdvanced = false;
-    
-    osg::ref_ptr<osgTerrain::Locator> locator = 0;
-
-
-
-
-
+
+
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-    return itrAdvanced;
@@ -126 +61 @@
-    fw.indent()<<"ActiveLayer "<<layer.getActiveLayer()<<std::endl;
-
-    for(unsigned int i=0; i<layer.getNumLayers();++i)
-    {
-        if (layer.getLayer(i))
-        {
-            const osgTerrain::ProxyLayer* proxyLayer = dynamic_cast<const osgTerrain::ProxyLayer*>(layer.getLayer(i));
-            if (proxyLayer)
-            {
-                if (!proxyLayer->getFileName().empty())
-                {
-                    const osgTerrain::Locator* locator = proxyLayer->getLocator();
-                    if (locator && !locator->getDefinedInFile())
-                    {
-                        fw.writeObject(*locator);
-                    }
-                    
-                    if (proxyLayer->getMinLevel()!=0)
-                    {
-                        fw.indent()<<"MinLevel "<<proxyLayer->getMinLevel()<<std::endl;
-                    } 
-
-                    if (proxyLayer->getMaxLevel()!=MAXIMUM_NUMBER_OF_LEVELS)
-                    {
-                        fw.indent()<<"MaxLevel "<<proxyLayer->getMaxLevel()<<std::endl;
-                    } 
-                
-                    fw.indent()<<"ProxyLayer "<<proxyLayer->getFileName()<<std::endl;
-                }
-            }
-            else
-            {     
-                fw.writeObject(*(layer.getLayer(i)));
-            }
-        }
-        else if (!layer.getFileName(i).empty())
-        {
-            fw.indent()<<"file "<<layer.getFileName(i)<<std::endl;
-        }
-    }
-
-
-
-    return true;
-}

OpenSceneGraph/trunk/src/osgTerrain/Layer.cpp

@@ -16 +16 @@
-
-using namespace osgTerrain;
+
+void osgTerrain::extractSetNameAndFileName(const std::string& compoundstring, std::string& setname, std::string& filename)
+{
+    std::string::size_type setcolonpos = compoundstring.find("set:");
+    if (setcolonpos==std::string::npos)
+    {
+        setname = "";
+        filename = compoundstring;
+        return;
+    }
+    
+    if (compoundstring.size()==4)
+    {
+        setname = "";
+        filename = "";
+        return;
+    }
+    
+    std::string::size_type secondcolonpos = compoundstring.find_first_of(':', setcolonpos+4);
+    if (secondcolonpos==std::string::npos)
+    {
+        setname = compoundstring.substr(setcolonpos+4,std::string::npos);
+        filename = "";
+        return;
+    }
+
+    setname = compoundstring.substr(setcolonpos+4,secondcolonpos-setcolonpos-4);
+    filename = compoundstring.substr(secondcolonpos+1, std::string::npos);
+}
+
+std::string osgTerrain::createCompondSetNameAndFileName(const std::string& setname, const std::string& filename)
+{
+    if (setname.empty()) return filename;
+    return std::string("set:")+setname+std::string(":")+filename;
+}
+
-
-Layer::Layer():
@@ -457 +493 @@
-}
-
+/////////////////////////////////////////////////////////////////////////////
+//
+// ProxyLayer
+//
+ProxyLayer::ProxyLayer()
+{
+}
+
+ProxyLayer::ProxyLayer(const ProxyLayer& proxyLayer,const osg::CopyOp& copyop):
+    Layer(proxyLayer,copyop)
+{
+}
+
+ProxyLayer::~ProxyLayer()
+{
+}
+
+void ProxyLayer::setFileName(const std::string& filename)
+{
+    _filename = filename;
+    if (_implementation.valid())
+    {
+        _implementation->setFileName(_filename);
+    }
+}
+
+unsigned int ProxyLayer::getNumColumns() const
+{
+    if (_implementation.valid()) return _implementation->getNumColumns();
+    else return 0;
+}
+
+unsigned int ProxyLayer::getNumRows() const
+{
+    if (_implementation.valid()) return _implementation->getNumRows();
+    else return 0;
+}
+
+bool ProxyLayer::transform(float offset, float scale)
+{
+    if (_implementation.valid()) return _implementation->transform(offset,scale);
+    else return false;
+}
+
+bool ProxyLayer::getValue(unsigned int i, unsigned int j, float& value) const
+{
+    if (_implementation.valid()) return _implementation->getValue(i,j,value);
+    else return false;
+}
+
+bool ProxyLayer::getValue(unsigned int i, unsigned int j, osg::Vec2& value) const
+{
+    if (_implementation.valid()) return _implementation->getValue(i,j,value);
+    else return false;
+}
+
+bool ProxyLayer::getValue(unsigned int i, unsigned int j, osg::Vec3& value) const
+{
+    if (_implementation.valid()) return _implementation->getValue(i,j,value);
+    else return false;
+}
+
+bool ProxyLayer::getValue(unsigned int i, unsigned int j, osg::Vec4& value) const
+{
+    if (_implementation.valid()) return _implementation->getValue(i,j,value);
+    else return false;
+}
+
+void ProxyLayer::dirty()
+{
+    if (_implementation.valid()) _implementation->dirty();
+}
+
+void ProxyLayer::setModifiedCount(unsigned int value)
+{
+    if (_implementation.valid()) _implementation->setModifiedCount(value);
+};
+
+unsigned int ProxyLayer::getModifiedCount() const
+{
+    return _implementation.valid() ? _implementation->getModifiedCount() : 0;
+}
+
+
+osg::BoundingSphere ProxyLayer::computeBound(bool treatAsElevationLayer) const
+{
+    if (_implementation.valid()) return _implementation->computeBound(treatAsElevationLayer);
+    else return osg::BoundingSphere();
+}
+
+
-
-/////////////////////////////////////////////////////////////////////////////
@@ -477 +604 @@
-}
-
+void CompositeLayer::setCompoundName(unsigned int i, const std::string& compoundname)
+{
+    std::string setname;
+    std::string filename;
+    extractSetNameAndFileName(compoundname, setname, filename);
+    
+    _layers[i].setname = setname;
+    _layers[i].filename = filename;
+}
+
+std::string CompositeLayer::getCompoundName(unsigned int i) const
+{
+    return createCompondSetNameAndFileName(_layers[i].setname, _layers[i].filename);
+}
+
+void CompositeLayer::addLayer(const std::string& compoundname)
+{
+    std::string setname;
+    std::string filename;
+    extractSetNameAndFileName(compoundname, setname, filename);
+
+    _layers.push_back(CompoundNameLayer(setname,filename,0));
+}
+
-/////////////////////////////////////////////////////////////////////////////
-//
-// ProxyLayer
-//
-ProxyLayer::ProxyLayer()
-{
-}
-
-ProxyLayer::ProxyLayer(const ProxyLayer& proxyLayer,const osg::CopyOp& copyop):
-    Layer(proxyLayer,copyop)
-{
-}
-
-ProxyLayer::~ProxyLayer()
-{
-}
-
-void ProxyLayer::setFileName(const std::string& filename)
-{
-    _filename = filename;
-    if (_implementation.valid())
-    {
-        _implementation->setFileName(_filename);
-    }
-}
-
-unsigned int ProxyLayer::getNumColumns() const
-{
-    if (_implementation.valid()) return _implementation->getNumColumns();
-    else return 0;
-}
-
-unsigned int ProxyLayer::getNumRows() const
-{
-    if (_implementation.valid()) return _implementation->getNumRows();
-    else return 0;
-}
-
-bool ProxyLayer::transform(float offset, float scale)
-{
-    if (_implementation.valid()) return _implementation->transform(offset,scale);
-    else return false;
-}
-
-bool ProxyLayer::getValue(unsigned int i, unsigned int j, float& value) const
-{
-    if (_implementation.valid()) return _implementation->getValue(i,j,value);
-    else return false;
-}
-
-bool ProxyLayer::getValue(unsigned int i, unsigned int j, osg::Vec2& value) const
-{
-    if (_implementation.valid()) return _implementation->getValue(i,j,value);
-    else return false;
-}
-
-bool ProxyLayer::getValue(unsigned int i, unsigned int j, osg::Vec3& value) const
-{
-    if (_implementation.valid()) return _implementation->getValue(i,j,value);
-    else return false;
-}
-
-bool ProxyLayer::getValue(unsigned int i, unsigned int j, osg::Vec4& value) const
-{
-    if (_implementation.valid()) return _implementation->getValue(i,j,value);
-    else return false;
-}
-
-void ProxyLayer::dirty()
-{
-    if (_implementation.valid()) _implementation->dirty();
-}
-
-void ProxyLayer::setModifiedCount(unsigned int value)
-{
-    if (_implementation.valid()) _implementation->setModifiedCount(value);
-};
-
-unsigned int ProxyLayer::getModifiedCount() const
-{
-    return _implementation.valid() ? _implementation->getModifiedCount() : 0;
-}
-
-
-osg::BoundingSphere ProxyLayer::computeBound(bool treatAsElevationLayer) const
-{
-    if (_implementation.valid()) return _implementation->computeBound(treatAsElevationLayer);
-    else return osg::BoundingSphere();
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// SwitchLayer
-//
-SwitchLayer::SwitchLayer():
-0
+-1
-{
-}
-
-SwitchLayer::SwitchLayer(const SwitchLayer& switchLayer,const osg::CopyOp& copyop):
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+