comparison layer/Colour3DPlotLayer.cpp @ 743:a352fb986e7b tony_integration

Merge from branch tonioni

     m_colourMap(0),
     m_gain(1.0),
     m_binScale(LinearBinScale),
     m_normalizeColumns(false),
     m_normalizeVisibleArea(false),
+    m_normalizeHybrid(false),
     m_invertVertical(false),
     m_opaque(false),
     m_smooth(false),
     m_miny(0),
     m_maxy(0)

 {
     return m_normalizeColumns;
 }
 
 void
+Colour3DPlotLayer::setNormalizeHybrid(bool n)
+{
+    if (m_normalizeHybrid == n) return;
+    m_normalizeHybrid = n;
+    cacheInvalid();
+    emit layerParametersChanged();
+}
+
+bool
+Colour3DPlotLayer::getNormalizeHybrid() const
+{
+    return m_normalizeHybrid;
+}
+
+void
 Colour3DPlotLayer::setNormalizeVisibleArea(bool n)
 {
     if (m_normalizeVisibleArea == n) return;
     m_normalizeVisibleArea = n;
     cacheInvalid();

 DenseThreeDimensionalModel::Column
 Colour3DPlotLayer::getColumn(size_t col) const
 {
     DenseThreeDimensionalModel::Column values = m_model->getColumn(col);
     while (values.size() < m_model->getHeight()) values.push_back(0.f);
-    if (!m_normalizeColumns) return values;
+    if (!m_normalizeColumns && !m_normalizeHybrid) return values;
 
     float colMax = 0.f, colMin = 0.f;
     float min = 0.f, max = 0.f;
 
     min = m_model->getMinimumLevel();

         float value = values.at(y);
         float norm = (value - colMin) / (colMax - colMin);
         float newvalue = min + (max - min) * norm;
 
         if (value != newvalue) values[y] = newvalue;
+    }
+
+    if (m_normalizeHybrid && (colMax > 0.0)) {
+        float logmax = log10(colMax);
+        for (size_t y = 0; y < values.size(); ++y) {
+            values[y] *= logmax;
+        }
     }
 
     return values;
 }