comparison layer/Colour3DPlotLayer.cpp @ 531:0bd0b517e795

* Make a start on logarithmic vertical scale in colour 3d plot

     m_cacheValidStart(0),
     m_cacheValidEnd(0),
     m_colourScale(LinearScale),
     m_colourScaleSet(false),
     m_colourMap(0),
+    m_binScale(LinearBinScale),
     m_normalizeColumns(false),
     m_normalizeVisibleArea(false),
     m_invertVertical(false),
     m_opaque(false),
     m_miny(0),

     PropertyList list;
     list.push_back("Colour");
     list.push_back("Colour Scale");
     list.push_back("Normalize Columns");
     list.push_back("Normalize Visible Area");
+    list.push_back("Bin Scale");
     list.push_back("Invert Vertical Scale");
     list.push_back("Opaque");
     return list;
 }
 

     if (name == "Colour Scale") return tr("Scale");
     if (name == "Normalize Columns") return tr("Normalize Columns");
     if (name == "Normalize Visible Area") return tr("Normalize Visible Area");
     if (name == "Invert Vertical Scale") return tr("Invert Vertical Scale");
     if (name == "Opaque") return tr("Always Opaque");
+    if (name == "Bin Scale") return tr("Bin Scale");
     return "";
 }
 
 QString
 Colour3DPlotLayer::getPropertyIconName(const PropertyName &name) const

 QString
 Colour3DPlotLayer::getPropertyGroupName(const PropertyName &name) const
 {
     if (name == "Normalize Columns" ||
         name == "Normalize Visible Area" ||
-        name == "Invert Vertical Scale" ||
 	name == "Colour Scale") return tr("Scale");
+    if (name == "Bin Scale" ||
+        name == "Invert Vertical Scale") return tr("Bins");
     if (name == "Opaque" ||
         name == "Colour") return tr("Colour");
     return QString();
 }
 

 
     } else if (name == "Invert Vertical Scale") {
 	
         *deflt = 0;
 	val = (m_invertVertical ? 1 : 0);
+
+    } else if (name == "Bin Scale") {
+
+	*min = 0;
+	*max = 1;
+        *deflt = int(LinearBinScale);
+	val = (int)m_binScale;
 
     } else if (name == "Opaque") {
 	
         *deflt = 0;
 	val = (m_opaque ? 1 : 0);

 	default:
 	case 0: return tr("Linear");
 	case 1: return tr("Log");
 	case 2: return tr("+/-1");
 	case 3: return tr("Absolute");
+	}
+    }
+    if (name == "Bin Scale") {
+	switch (value) {
+	default:
+	case 0: return tr("Linear");
+	case 1: return tr("Log");
 	}
     }
     return tr("<unknown>");
 }
 

 	setNormalizeVisibleArea(value ? true : false);
     } else if (name == "Invert Vertical Scale") {
 	setInvertVertical(value ? true : false);
     } else if (name == "Opaque") {
 	setOpaque(value ? true : false);
+    } else if (name == "Bin Scale") {
+	switch (value) {
+	default:
+	case 0: setBinScale(LinearBinScale); break;
+	case 1: setBinScale(LogBinScale); break;
+	}
     }
 }
 
 void
 Colour3DPlotLayer::setColourScale(ColourScale scale)

 {
     if (m_colourMap == map) return;
     m_colourMap = map;
     cacheInvalid();
     emit layerParametersChanged();
+}
+
+void
+Colour3DPlotLayer::setBinScale(BinScale binScale)
+{
+    if (m_binScale == binScale) return;
+    m_binScale = binScale;
+    cacheInvalid();
+    emit layerParametersChanged();
+}
+
+Colour3DPlotLayer::BinScale
+Colour3DPlotLayer::getBinScale() const
+{
+    return m_binScale;
 }
 
 void
 Colour3DPlotLayer::setNormalizeColumns(bool n)
 {

         sxa[x*2 + 1] = sx1i;
     }
 
     for (int y = 0; y < h; ++y) {
 
-        float sy0 = symin + (float(h - y - 1) * (symax - symin)) / h;
-        float sy1 = symin + (float(h - y) * (symax - symin)) / h;
+        float sy0, sy1;
+
+        if (m_binScale == LinearBinScale) {
+            sy0 = symin + (float(h - y - 1) * (symax - symin)) / h;
+            sy1 = symin + (float(h - y) * (symax - symin)) / h;
+        } else {
+            float logmin = LogRange::map(symin);
+            float logmax = LogRange::map(symax);
+            sy0 = logmin + (float(h - y - 1) * (logmax - logmin)) / h;
+            sy1 = logmin + (float(h - y) * (logmax - logmin)) / h;
+            sy0 = pow10f(sy0);
+            sy1 = pow10f(sy1);
+        }
             
         int sy0i = int(sy0 + 0.001);
         int sy1i = int(sy1);
 
         uchar *targetLine = img.scanLine(y);