Changeset 857

Timestamp:

01/23/08 17:56:10

Author:

robert

Message:

Introduce ValidValueOperator? to help catch no data values on DEMs that don't assign the non data value.

Added commandline and BuildOption? controls for toggle on/off the interpolation of source imagery and dems.

Files:

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

trunk/include/vpb/BuildOptions

@@ -101 +101 @@
-        void setDefaultColor(const osg::Vec4& defaultColor) { _defaultColor = defaultColor; }
-        const osg::Vec4& getDefaultColor() const { return _defaultColor; }
+
+        void setUseInterpolatedImagerySampling(bool flag) { _useInterpolatedImagerySampling = flag; }
+        bool getUseInterpolatedImagerySampling() const { return _useInterpolatedImagerySampling; }
+
+        void setUseInterpolatedTerrainSampling(bool flag) { _useInterpolatedTerrainSampling = flag; }
+        bool getUseInterpolatedTerrainSampling() const { return _useInterpolatedTerrainSampling; }
-
-        void setBuildOverlays(bool flag) { _buildOverlays = flag; }
@@ -263 +269 @@
-        MipMappingMode                              _mipMappingMode;
-        osg::ref_ptr<osg::CoordinateSystemNode>     _destinationCoordinateSystem;
+
-        osg::Vec4                                   _defaultColor;
+        bool                                        _useInterpolatedImagerySampling;
+        bool                                        _useInterpolatedTerrainSampling;
+
-        std::string                                 _archiveName;
-        std::string                                 _comment;
@@ -279 +289 @@
-        unsigned int                                _maximumTileTerrainSize;
-        
+        
-        unsigned int                                _distributedBuildSplitLevel;
-        unsigned int                                _distributedBuildSecondarySplitLevel;

trunk/src/vpb/BuildOptions.cpp

@@ -31 +31 @@
-    _decorateWithMultiTextureControl = true;
-    _defaultColor.set(0.5f,0.5f,1.0f,1.0f);
+    _useInterpolatedImagerySampling = false;
+    _useInterpolatedTerrainSampling = false;
-    _destinationCoordinateSystemString = "";
-    _destinationCoordinateSystem = new osg::CoordinateSystemNode; 
@@ -99 +101 @@
-    _decorateWithMultiTextureControl = rhs._decorateWithMultiTextureControl;
-    _defaultColor = rhs._defaultColor;
+    _useInterpolatedImagerySampling = rhs._useInterpolatedImagerySampling;
+    _useInterpolatedTerrainSampling = rhs._useInterpolatedTerrainSampling;
-    _destinationCoordinateSystemString = rhs._destinationCoordinateSystemString;
-    _destinationCoordinateSystem = rhs._destinationCoordinateSystem;

trunk/src/vpb/BuildOptionsIO.cpp

@@ -187 +187 @@
-        ADD_VEC4_PROPERTY(DefaultColor);
-        
+        ADD_BOOL_PROPERTY(UseInterpolatedImagerySampling);
+        ADD_BOOL_PROPERTY(UseInterpolatedTerrainSampling);
+        
-        ADD_STRING_PROPERTY(DestinationCoordinateSystem);
-

trunk/src/vpb/Commandline.cpp

@@ -484 +484 @@
-    usage.addCommandLineOption("--write-threads-ratio <ratio>","Set the ratio number of write threads relative to number of cores to use.");
-    usage.addCommandLineOption("--build-options <string>","Set build options string.");
+    usage.addCommandLineOption("--interpolate-terrain","Enable the use of interpolation when sampling data from source DEMs.");
+    usage.addCommandLineOption("--no-interpolate-terrain","Disable the use of interpolation when sampling data from source DEMs.");
+    usage.addCommandLineOption("--interpolate-imagery","Enable the use of interpolation when sampling data from source imagery.");
+    usage.addCommandLineOption("--no-interpolate-imagery","Disable the use of interpolation when sampling data from source imagery.");
-}
-
@@ -560 +564 @@
-    {
-        buildOptions->setDisableWrites(true);
+    }
+
+    while(arguments.read("--interpolate-terrain"))
+    {
+        buildOptions->setUseInterpolatedTerrainSampling(true);
+    }
+
+    while(arguments.read("--interpolate-imagery"))
+    {
+        buildOptions->setUseInterpolatedImagerySampling(true);
+    }
+
+    while(arguments.read("--no-interpolate-terrain"))
+    {
+        buildOptions->setUseInterpolatedTerrainSampling(false);
+    }
+
+    while(arguments.read("--no-interpolate-imagery"))
+    {
+        buildOptions->setUseInterpolatedImagerySampling(false);
-    }
-

trunk/src/vpb/SourceData.cpp

@@ -27 +27 @@
-using namespace vpb;
-
+
+struct ValidValueOperator
+{
+    ValidValueOperator(GDALRasterBand *band):
+        defaultValue(0.0f),
+        noDataValue(-32767.0f),
+        minValue(-32000.0f),
+        maxValue(FLT_MAX)
+    {
+        if (band)
+        {
+            int success = 0;
+            float value = band->GetNoDataValue(&success);
+            if (success)
+            {
+                noDataValue = value;
+            }
+        }
+    }
+
+    inline bool isNoDataValue(float value)
+    {
+        if (noDataValue==value) return true;
+        if (value<minValue) return true;
+        return (value>maxValue);
+    }
+    
+    inline float getValidValue(float value)
+    {
+        if (isNoDataValue(value)) return value;
+        else return defaultValue;
+    }
+    
+    float defaultValue;
+    float noDataValue;
+    float minValue;
+    float maxValue;
+};
+
+
-SourceData::~SourceData()
-{
@@ -102 +142 @@
-    band->RasterIO(GF_Read, colMax, rowMax, 1, 1, &urHeight, 1, 1, GDT_Float32, 0, 0);
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-    double x_rem = c - (int)c;
@@ -465 +502 @@
-            const float resizeTolerance = 1.1;
-
-
+
+
+
-            if (interpolateSourceImagery && 
-                (destWindowWidthRatio>resizeTolerance || destWindowHeightRatio>resizeTolerance) &&
@@ -767 +806 @@
-}
-
+
+
-void SourceData::readHeightField(DestinationData& destination)
-{
@@ -872 +913 @@
-
-
+                ValidValueOperator validValueOperator(bandSelected);
+
-                int success = 0;
-                float noDataValue = bandSelected->GetNoDataValue(&success);
-                if (success)
-                {
-                    log(osg::INFO,"We have NoDataValue = %f",noDataValue);
-                }
-                else
-                {
-                    log(osg::INFO,"We have no NoDataValue");
-                    noDataValue = 0.0f;
-                }
-
-                float offset = bandSelected->GetOffset(&success);
-                if (success)
@@ -915 +947 @@
-                bool ignoreNoDataValue = true;
-
-
+
+
-
-                if (interpolateTerrain)
@@ -935 +968 @@
-                            double geoY = orig_Y + (delta_Y * (double)r);
-                            float h = getInterpolatedValue(bandSelected, geoX-xoffset, geoY);
-h!=noDataValue
+!validValueOperator.isNoDataValue(h)
-                            else if (!ignoreNoDataValue) hf->setHeight(c,r,noDataValueFill);
-                        }
@@ -964 +997 @@
-                        {
-                            float h = *heightPtr++;
-h!=noDataValue
+!validValueOperator.isNoDataValue(h)
-                            else if (!ignoreNoDataValue) hf->setHeight(c,r,noDataValueFill);
-