comparison layer/SliceLayer.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
 SliceLayer::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 = &garbage1;
 
     if (name == "Gain") {
 
 	*min = -50;
 	*max = 50;
+        *deflt = 0;
 
         std::cerr << "gain is " << m_gain << ", mode is " << m_samplingMode << std::endl;
 
-	deft = lrint(log10(m_gain) * 20.0);
-	if (deft < *min) deft = *min;
-	if (deft > *max) deft = *max;
+	val = lrint(log10(m_gain) * 20.0);
+	if (val < *min) val = *min;
+	if (val > *max) val = *max;
 
     } else if (name == "Normalize") {
 	
-	deft = (m_normalize ? 1 : 0);
+	val = (m_normalize ? 1 : 0);
+        *deflt = 0;
 
     } else if (name == "Colour") {
 
         if (m_plotStyle == PlotFilledBlocks) {
             
             *min = 0;
             *max = ColourMapper::getColourMapCount() - 1;
-
-            deft = m_colourMap;
+            *deflt = 0;
+
+            val = m_colourMap;
 
         } else {
 
             *min = 0;
             *max = 5;
-
-            if (m_colour == Qt::black) deft = 0;
-            else if (m_colour == Qt::darkRed) deft = 1;
-            else if (m_colour == Qt::darkBlue) deft = 2;
-            else if (m_colour == Qt::darkGreen) deft = 3;
-            else if (m_colour == QColor(200, 50, 255)) deft = 4;
-            else if (m_colour == QColor(255, 150, 50)) deft = 5;
+            *deflt = 0;
+
+            if (m_colour == Qt::black) val = 0;
+            else if (m_colour == Qt::darkRed) val = 1;
+            else if (m_colour == Qt::darkBlue) val = 2;
+            else if (m_colour == Qt::darkGreen) val = 3;
+            else if (m_colour == QColor(200, 50, 255)) val = 4;
+            else if (m_colour == QColor(255, 150, 50)) val = 5;
         }
 
     } else if (name == "Scale") {
 
 	*min = 0;
 	*max = 2;
-
-	deft = (int)m_energyScale;
+        *deflt = (int)dBScale;
+
+	val = (int)m_energyScale;
 
     } else if (name == "Sampling Mode") {
 
 	*min = 0;
 	*max = 2;
-        
-	deft = (int)m_samplingMode;
+        *deflt = (int)SampleMean;
+        
+	val = (int)m_samplingMode;
 
     } else if (name == "Plot Type") {
         
         *min = 0;
         *max = 3;
-
-        deft = (int)m_plotStyle;
+        *deflt = (int)PlotSteps;
+
+        val = (int)m_plotStyle;
 
     } else if (name == "Bin Scale") {
         
         *min = 0;
         *max = 2;
+        *deflt = (int)LinearBins;
 //        *max = 1; // I don't think we really do want to offer inverted log
 
-        deft = (int)m_binScale;
+        val = (int)m_binScale;
 
     } else {
-	deft = Layer::getPropertyRangeAndValue(name, min, max);
-    }
-
-    return deft;
+	val = Layer::getPropertyRangeAndValue(name, min, max, deflt);
+    }
+
+    return val;
 }
 
 QString
 SliceLayer::getPropertyValueLabel(const PropertyName &name,
 				    int value) const