comparison layer/Colour3DPlotLayer.cpp @ 216:34bbbcb3c01f sv1-1.0pre1

* Make getPropertyRangeAndValue return the default separately from the current
  value.  Previously some contexts were incorrectly treating the current value
  as a default.

     return QString();
 }
 
 int
 Colour3DPlotLayer::getPropertyRangeAndValue(const PropertyName &name,
-                                        int *min, int *max) const
-{
-    int deft = 0;
-
-    int garbage0, garbage1;
+                                            int *min, int *max, int *deflt) const
+{
+    int val = 0;
+
+    int garbage0, garbage1, garbage2;
     if (!min) min = &garbage0;
     if (!max) max = &garbage1;
+    if (!deflt) deflt = &garbage2;
 
     if (name == "Colour Scale") {
 
 	*min = 0;
 	*max = 2;
-
-	deft = (int)m_colourScale;
+        *deflt = (int)LinearScale;
+
+	val = (int)m_colourScale;
 
     } else if (name == "Colour") {
 
 	*min = 0;
 	*max = ColourMapper::getColourMapCount() - 1;
-
-	deft = m_colourMap;
+        *deflt = 0;
+
+	val = m_colourMap;
 
     } else if (name == "Normalize Columns") {
 	
-	deft = (m_normalizeColumns ? 1 : 0);
+        *deflt = 0;
+	val = (m_normalizeColumns ? 1 : 0);
 
     } else if (name == "Normalize Visible Area") {
 	
-	deft = (m_normalizeVisibleArea ? 1 : 0);
+        *deflt = 0;
+	val = (m_normalizeVisibleArea ? 1 : 0);
 
     } else {
-	deft = Layer::getPropertyRangeAndValue(name, min, max);
-    }
-
-    return deft;
+	val = Layer::getPropertyRangeAndValue(name, min, max, deflt);
+    }
+
+    return val;
 }
 
 QString
 Colour3DPlotLayer::getPropertyValueLabel(const PropertyName &name,
 				    int value) const