changeset 1365:a1393b4384a5

Minor tidying
author Chris Cannam
date Tue, 30 Oct 2018 15:32:05 +0000
parents 7d28e7522dbd
children c2a3ac0a6688
files layer/Colour3DPlotLayer.cpp layer/TimeValueLayer.cpp
diffstat 2 files changed, 18 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/layer/Colour3DPlotLayer.cpp	Tue Oct 30 15:32:01 2018 +0000
+++ b/layer/Colour3DPlotLayer.cpp	Tue Oct 30 15:32:05 2018 +0000
@@ -303,12 +303,18 @@
 {
     if (name == "Normalization" ||
         name == "Colour Scale" ||
-        name == "Gain") return tr("Scale");
+        name == "Gain") {
+        return tr("Scale");
+    }
     if (name == "Bin Scale" ||
-        name == "Invert Vertical Scale") return tr("Bins");
+        name == "Invert Vertical Scale") {
+        return tr("Bins");
+    }
     if (name == "Opaque" ||
         name == "Smooth" ||
-        name == "Colour") return tr("Colour");
+        name == "Colour") {
+        return tr("Colour");
+    }
     return QString();
 }
 
@@ -362,7 +368,9 @@
         val = convertFromColumnNorm(m_normalization, m_normalizeVisibleArea);
 
     } else if (name == "Invert Vertical Scale") {
-        
+
+        *min = 0;
+        *max = 1;
         *deflt = 0;
         val = (m_invertVertical ? 1 : 0);
 
@@ -375,11 +383,15 @@
 
     } else if (name == "Opaque") {
         
+        *min = 0;
+        *max = 1;
         *deflt = 0;
         val = (m_opaque ? 1 : 0);
         
     } else if (name == "Smooth") {
         
+        *min = 0;
+        *max = 1;
         *deflt = 0;
         val = (m_smooth ? 1 : 0);
         
--- a/layer/TimeValueLayer.cpp	Tue Oct 30 15:32:01 2018 +0000
+++ b/layer/TimeValueLayer.cpp	Tue Oct 30 15:32:05 2018 +0000
@@ -200,14 +200,14 @@
     } else if (name == "Draw Segment Division Lines") {
 
         if (min) *min = 0;
-        if (max) *max = 0;
+        if (max) *max = 1;
         if (deflt) *deflt = 1;
         val = (m_drawSegmentDivisions ? 1.0 : 0.0);
 
     } else if (name == "Show Derivative") {
 
         if (min) *min = 0;
-        if (max) *max = 0;
+        if (max) *max = 1;
         if (deflt) *deflt = 0;
         val = (m_derivative ? 1.0 : 0.0);