Changeset 929

Timestamp:

08/29/08 16:47:23

Author:

robert

Message:

Added support for specifying the optional layer sets that should be used and the
policy of how layers should be output.

Files:

• trunk/include/vpb/BuildOptions (modified) (2 diffs)
• trunk/include/vpb/Serializer (modified) (1 diff)
• trunk/src/vpb/BuildOptions.cpp (modified) (2 diffs)
• trunk/src/vpb/BuildOptionsIO.cpp (modified) (6 diffs)
• trunk/src/vpb/Commandline.cpp (modified) (3 diffs)

trunk/include/vpb/BuildOptions

@@ -267 +267 @@
-        bool getAbortRunOnError() const { return _abortRunOnError; }
-        
+        enum LayerOutputPolicy
+        {
+            INLINE,
+            EXTERNAL_LOCAL_DIRECTORY,
+            EXTERNAL_SET_DIRECTORY
+        };
+        
+        void setDefaultImageLayerOutputPolicy(LayerOutputPolicy policy) { _defaultImageLayerOutputPolicy = policy; }
+        LayerOutputPolicy getDefaultImageLayerOutputPolicy() const { return _defaultImageLayerOutputPolicy; }
+        
+        void setDefaultElevationLayerOutputPolicy(LayerOutputPolicy policy) { _defaultElevationLayerOutputPolicy = policy; }
+        LayerOutputPolicy getDefaultElevationLayerOutputPolicy() const { return _defaultElevationLayerOutputPolicy; }
+        
+        void setOptionalImageLayerOutputPolicy(LayerOutputPolicy policy) { _optionalImageLayerOutputPolicy = policy; }
+        LayerOutputPolicy getOptionalImageLayerOutputPolicy() const { return _optionalImageLayerOutputPolicy; }
+        
+        void setOptionalElevationLayerOutputPolicy(LayerOutputPolicy policy) { _optionalElevationLayerOutputPolicy = policy; }
+        LayerOutputPolicy getOptionalElevationLayerOutputPolicy() const { return _optionalElevationLayerOutputPolicy; }
+
+        void clearOptionalLayerSet() { _optionalLayerSet.clear(); }
+        void addOptionalLayerSet(const std::string& setname) { _optionalLayerSet.insert(setname); }
+        void removeOptionalLayerSet(const std::string& setname) { _optionalLayerSet.erase(setname); }
+        
+        bool isOptionalLayerSet(const std::string& setname) const { return _optionalLayerSet.count(setname)!=0; }
+        
+        typedef std::set<std::string> OptionalLayerSet;
+        void setOptionalLayerSet(const OptionalLayerSet& ols) { _optionalLayerSet = ols; }
+        const OptionalLayerSet& getOptionalLayerSet() const { return _optionalLayerSet; }
+
-    protected:
-
@@ -331 +360 @@
-        bool                                        _abortTaskOnError;
-        bool                                        _abortRunOnError;
+        
+        LayerOutputPolicy                           _defaultImageLayerOutputPolicy;
+        LayerOutputPolicy                           _defaultElevationLayerOutputPolicy;        
+        LayerOutputPolicy                           _optionalImageLayerOutputPolicy;        
+        LayerOutputPolicy                           _optionalElevationLayerOutputPolicy;
+        
+        OptionalLayerSet                            _optionalLayerSet;
-};
-

trunk/include/vpb/Serializer

@@ -104 +104 @@
-    {
-        const C& object = static_cast<const C&>(obj);
+
-        if (fw.getWriteOutDefaultValues() ||
-            _default != (object.*_getter)())

trunk/src/vpb/BuildOptions.cpp

@@ -77 +77 @@
-    _abortTaskOnError = true;
-    _abortRunOnError = false;
+    
+    _defaultImageLayerOutputPolicy = INLINE;
+    _defaultElevationLayerOutputPolicy = INLINE;
+    _optionalImageLayerOutputPolicy = EXTERNAL_SET_DIRECTORY;
+    _optionalElevationLayerOutputPolicy = EXTERNAL_SET_DIRECTORY;
-}
-
@@ -154 +159 @@
-    _abortTaskOnError = rhs._abortTaskOnError;
-    _abortRunOnError = rhs._abortRunOnError;
+    
+    _defaultImageLayerOutputPolicy = rhs._defaultImageLayerOutputPolicy;
+    _defaultElevationLayerOutputPolicy = rhs._defaultElevationLayerOutputPolicy;
+    _optionalImageLayerOutputPolicy = rhs._optionalImageLayerOutputPolicy;
+    _optionalElevationLayerOutputPolicy = rhs._optionalElevationLayerOutputPolicy;
+    
+    _optionalLayerSet = rhs._optionalLayerSet;
-}
-

trunk/src/vpb/BuildOptionsIO.cpp

@@ -18 +18 @@
-#include <string>
-#include <map>
+#include <set>
-
-#include <osg/Vec3>
@@ -77 +78 @@
-
-
+template<typename C, typename T, typename Itr>
+class SetSerializer : public osgDB::Serializer
+{
+public:
+
+     typedef const T& (C::*GetterFunctionType)() const;
+     typedef void (C::*SetterFunctionType)(const T&);
+
+     SetSerializer(const char* fieldName, const T& defaultValue, GetterFunctionType getter, SetterFunctionType setter):
+        _fieldName(fieldName),
+        _default(defaultValue),
+        _getter(getter),
+        _setter(setter) {}
+     
+     bool write(osgDB::Output& fw, const osg::Object& obj)
+     {
+        const C& object = static_cast<const C&>(obj);
+        if (fw.getWriteOutDefaultValues() ||
+            _default != (object.*_getter)())
+        {
+            const T& value = (object.*_getter)();
+            if (!value.empty())
+            {
+                fw.indent()<<_fieldName<<" {"<<std::endl;
+                fw.moveIn();
+
+                for(Itr itr = value.begin();
+                    itr != value.end();
+                    ++itr)
+                {
+                    fw.indent()<<*itr<<std::endl;
+                }
+                fw.moveOut();
+                fw.indent()<<"}"<<std::endl;
+            }
+        }
+        
+        return true;
+     }
+
+    bool read(osgDB::Input& fr, osg::Object& obj, bool& itrAdvanced)
+    {
+        C& object = static_cast<C&>(obj);
+        if (fr[0].matchWord(_fieldName.c_str()) && fr[1].isOpenBracket())
+        {
+            T value;
+
+            int entry = fr[0].getNoNestedBrackets();
+
+            fr += 2;
+
+            while (!fr.eof() && fr[0].getNoNestedBrackets()>entry)
+            {
+                if (fr[0].isWord()) value.insert(fr[0].getStr());
+                ++fr;
+            }
+
+            ++fr;
+            
+            (object.*_setter)(value);
+            itrAdvanced = true;
+        }
+        
+        return true;
+     }
+     
+     std::string        _fieldName;
+     T                  _default;
+     GetterFunctionType _getter;
+     SetterFunctionType _setter;
+};
+
+
-#define CREATE_ENUM_SERIALIZER(CLASS,PROPERTY,PROTOTYPE) \
-    typedef osgDB::EnumSerializer<CLASS, CLASS::PROPERTY> MySerializer;\
@@ -86 +160 @@
-    )
-
+
+#define CREATE_ENUM_SERIALIZER2(CLASS,NAME, PROPERTY,PROTOTYPE) \
+    typedef osgDB::EnumSerializer<CLASS, CLASS::PROPERTY> MySerializer;\
+    osg::ref_ptr<MySerializer> serializer = new MySerializer(\
+        #NAME,\
+        PROTOTYPE.get##NAME(),\
+        &CLASS::get##NAME,\
+        &CLASS::set##NAME\
+    )
+
-    
-#define ADD_ENUM_PROPERTY(PROPERTY) \
-    CREATE_ENUM_SERIALIZER(BuildOptions, PROPERTY, prototype); \
+    _serializerList.push_back(serializer.get())
+
+#define ADD_ENUM_PROPERTY2(NAME, PROPERTY) \
+    CREATE_ENUM_SERIALIZER2(BuildOptions, NAME, PROPERTY, prototype); \
-    _serializerList.push_back(serializer.get())
-
@@ -138 +226 @@
-#define AEV ADD_ENUM_VALUE
-#define AEP ADD_ENUM_PROPERTY
+#define AEP2 ADD_ENUM_PROPERTY2
+
-
-class BuildOptionsLookUps
@@ -223 +313 @@
-        ADD_BOOL_PROPERTY(AbortTaskOnError);
-        ADD_BOOL_PROPERTY(AbortRunOnError);
+        
+        { AEP2(DefaultImageLayerOutputPolicy, LayerOutputPolicy); AEV(INLINE); AEV(EXTERNAL_LOCAL_DIRECTORY); AEV(EXTERNAL_SET_DIRECTORY); }
+        { AEP2(DefaultElevationLayerOutputPolicy, LayerOutputPolicy); AEV(INLINE); AEV(EXTERNAL_LOCAL_DIRECTORY); AEV(EXTERNAL_SET_DIRECTORY); }
+        
+        { AEP2(OptionalImageLayerOutputPolicy, LayerOutputPolicy); AEV(INLINE); AEV(EXTERNAL_LOCAL_DIRECTORY); AEV(EXTERNAL_SET_DIRECTORY); }
+        { AEP2(OptionalElevationLayerOutputPolicy, LayerOutputPolicy); AEV(INLINE); AEV(EXTERNAL_LOCAL_DIRECTORY); AEV(EXTERNAL_SET_DIRECTORY); }
+
+        _serializerList.push_back(new SetSerializer<BuildOptions, BuildOptions::OptionalLayerSet, BuildOptions::OptionalLayerSet::const_iterator>(
+                "OptionalLayerSet", 
+                prototype.getOptionalLayerSet(), 
+                &BuildOptions::getOptionalLayerSet,
+                &BuildOptions::setOptionalLayerSet));
+
-    }
-    
@@ -233 +336 @@
-            (*itr)->read(fr,db, itrAdvanced);
-        }
+        
+        
-        return true;
-    }

trunk/src/vpb/Commandline.cpp

@@ -506 +506 @@
-    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.");
+    usage.addCommandLineOption("--optional-set <setname>","Add setname to the list of optional layers.");
+    usage.addCommandLineOption("--remove-optional-set <setname>","Remove setname to the list of optional layers.");
-}
-
@@ -813 +815 @@
-    double xMin, xMax, yMin, yMax;
-    
+    std::string optionalsetname;
+    while(arguments.read("--optional-set",optionalsetname)) { buildOptions->addOptionalLayerSet(optionalsetname); }
+    while(arguments.read("--remove-optional-set",optionalsetname)) { buildOptions->removeOptionalLayerSet(optionalsetname); }
+
+
-    int pos = 1;
-    while(pos<arguments.argc())
@@ -1053 +1060 @@
-        }
-    }
+
-    return 0;    
-}