changeset 66:e9eac9368e29

* basics of selectable vertical scale in time value layer
* clear selection when closing session

--- a/layer/NoteLayer.cpp	Mon Mar 27 15:03:02 2006 +0000
+++ b/layer/NoteLayer.cpp	Mon Mar 27 16:44:12 2006 +0000
@@ -408,6 +408,8 @@
 float
 NoteLayer::getValueForY(View *v, int y) const
 {
+    //!!!
+
     float min = m_model->getValueMinimum();
     float max = m_model->getValueMaximum();
     if (max == min) max = min + 1.0;

--- a/layer/TimeValueLayer.cpp	Mon Mar 27 15:03:02 2006 +0000
+++ b/layer/TimeValueLayer.cpp	Mon Mar 27 16:44:12 2006 +0000
@@ -22,6 +22,8 @@
 
 #include "model/SparseTimeValueModel.h"
 
+#include "SpectrogramLayer.h" // for optional frequency alignment
+
 #include <QPainter>
 #include <QPainterPath>
 #include <QMouseEvent>
@@ -37,7 +39,8 @@
     m_editingPoint(0, 0.0, tr("New Point")),
     m_editingCommand(0),
     m_colour(Qt::black),
-    m_plotStyle(PlotConnectedPoints)
+    m_plotStyle(PlotConnectedPoints),
+    m_verticalScale(LinearScale)
 {
     
 }
@@ -66,6 +69,7 @@
     PropertyList list;
     list.push_back(tr("Colour"));
     list.push_back(tr("Plot Type"));
+    list.push_back(tr("Vertical Scale"));
     return list;
 }
 
@@ -102,6 +106,13 @@
 	
 	deft = int(m_plotStyle);
 
+    } else if (name == tr("Vertical Scale")) {
+	
+	if (min) *min = 0;
+	if (max) *max = 3;
+	
+	deft = int(m_verticalScale);
+
     } else {
 	
 	deft = Layer::getPropertyRangeAndValue(name, min, max);
@@ -134,6 +145,14 @@
 	case 4: return tr("Curve");
 	case 5: return tr("Segmentation");
 	}
+    } else if (name == tr("Vertical Scale")) {
+	switch (value) {
+	default:
+	case 0: return tr("Linear Scale");
+	case 1: return tr("Log Scale");
+	case 2: return tr("+/-1 Scale");
+	case 3: return tr("Frequency Scale");
+	}
     }
     return tr("<unknown>");
 }
@@ -153,6 +172,8 @@
 	}
     } else if (name == tr("Plot Type")) {
 	setPlotStyle(PlotStyle(value));
+    } else if (name == tr("Vertical Scale")) {
+	setVerticalScale(VerticalScale(value));
     }
 }
 
@@ -172,6 +193,14 @@
     emit layerParametersChanged();
 }
 
+void
+TimeValueLayer::setVerticalScale(VerticalScale scale)
+{
+    if (m_verticalScale == scale) return;
+    m_verticalScale = scale;
+    emit layerParametersChanged();
+}
+
 bool
 TimeValueLayer::isLayerScrollable(const View *v) const
 {
@@ -340,7 +369,7 @@
 }
 
 int
-TimeValueLayer::getYForValue(View *v, float value) const
+TimeValueLayer::getYForValue(View *v, float val) const
 {
     float min = m_model->getValueMinimum();
     float max = m_model->getValueMaximum();
@@ -348,12 +377,37 @@
 
     int h = v->height();
 
-    return int(h - ((value - min) * h) / (max - min));
+    if (m_verticalScale == FrequencyScale || m_verticalScale == LogScale) {
+        
+        if (m_verticalScale == FrequencyScale) {
+            // If we have a spectrogram layer on the same view as us, align
+            // ourselves with it...
+            for (int i = 0; i < v->getLayerCount(); ++i) {
+                SpectrogramLayer *spectrogram = dynamic_cast<SpectrogramLayer *>
+                    (v->getLayer(i));
+                if (spectrogram) {
+                    return spectrogram->getYForFrequency(v, val);
+                }
+            }
+        }
+
+        min = (min < 0.0) ? -log10(-min) : (min == 0.0) ? 0.0 : log10(min);
+        max = (max < 0.0) ? -log10(-max) : (max == 0.0) ? 0.0 : log10(max);
+        val = (val < 0.0) ? -log10(-val) : (val == 0.0) ? 0.0 : log10(val);
+
+    } else if (m_verticalScale == PlusMinusOneScale) {
+        min = -1.0;
+        max = 1.0;
+    }
+
+    return int(h - ((val - min) * h) / (max - min));
 }
 
 float
 TimeValueLayer::getValueForY(View *v, int y) const
 {
+    //!!!
+
     float min = m_model->getValueMinimum();
     float max = m_model->getValueMaximum();
     if (max == min) max = min + 1.0;

--- a/layer/TimeValueLayer.h	Mon Mar 27 15:03:02 2006 +0000
+++ b/layer/TimeValueLayer.h	Mon Mar 27 16:44:12 2006 +0000
@@ -80,6 +80,16 @@
     void setPlotStyle(PlotStyle style);
     PlotStyle getPlotStyle() const { return m_plotStyle; }
 
+    enum VerticalScale {
+        LinearScale,
+        LogScale,
+        PlusMinusOneScale,
+        FrequencyScale
+    };
+    
+    void setVerticalScale(VerticalScale scale);
+    VerticalScale getVerticalScale() const { return m_verticalScale; }
+
     virtual bool isLayerScrollable(const View *v) const;
 
     virtual bool isLayerEditable() const { return true; }
@@ -104,6 +114,7 @@
     SparseTimeValueModel::EditCommand *m_editingCommand;
     QColor m_colour;
     PlotStyle m_plotStyle;
+    VerticalScale m_verticalScale;
 };
 
 #endif