comparison layer/TimeValueLayer.cpp @ 79:19bf27e4fb29

* Replace crash with warning when a transform could not be automatically
  re-run
* More sensible default paths for Vamp plugin lookup (at least on Linux and
  OS/X)
* A start to making the y coords for time value layers etc align
* Set sensible y coords for text labels in time instant and value layers

 
     QPoint discard;
     return !v->shouldIlluminateLocalFeatures(this, discard);
 }
 
+bool
+TimeValueLayer::getValueExtents(float &min, float &max, QString &unit) const
+{
+    min = m_model->getValueMinimum();
+    max = m_model->getValueMaximum();
+    unit = m_model->getScaleUnits();
+    return true;
+}
+
 SparseTimeValueModel::PointList
 TimeValueLayer::getLocalPoints(View *v, int x) const
 {
     if (!m_model) return SparseTimeValueModel::PointList();
 

 }
 
 int
 TimeValueLayer::getYForValue(View *v, float val) const
 {
+    float min = 0.0, max = 0.0;
+    int h = v->height();
+
+    if (!v->getValueExtents(m_model->getScaleUnits(), min, max)) {
+        min = m_model->getValueMinimum();
+        max = m_model->getValueMaximum();
+    }
+
+    if (max == min) max = min + 1.0;
+
+/*!!!
     float min = m_model->getValueMinimum();
     float max = m_model->getValueMaximum();
     if (max == min) max = min + 1.0;
 
     int h = v->height();

 
     } else if (m_verticalScale == PlusMinusOneScale) {
         min = -1.0;
         max = 1.0;
     }
+*/
 
     return int(h - ((val - min) * h) / (max - min));
 }
 
 float

 
     paint.save();
 
     QPainterPath path;
     int pointCount = 0;
+
+    int textY = 0;
+    if (m_plotStyle == PlotSegmentation) {
+        textY = v->getTextLabelHeight(this, paint);
+    }
     
     for (SparseTimeValueModel::PointList::const_iterator i = points.begin();
 	 i != points.end(); ++i) {
 
 	const SparseTimeValueModel::Point &p(*i);
 
 	int x = v->getXForFrame(p.frame);
 	int y = getYForValue(v, p.value);
+
+        if (m_plotStyle != PlotSegmentation) {
+            textY = y - paint.fontMetrics().height()
+                      + paint.fontMetrics().ascent();
+        }
 
 	bool haveNext = false;
 	int nx = v->getXForFrame(v->getModelsEndFrame());
 // m_model->getEndFrame());
 	int ny = y;

 
 	    if (haveNext) {
 
 		if (m_plotStyle == PlotConnectedPoints) {
 		    
+                    paint.save();
 		    paint.setPen(brushColour);
 		    paint.drawLine(x + w, y, nx, ny);
+                    paint.restore();
 
 		} else if (m_plotStyle == PlotLines) {
 
 		    paint.drawLine(x + w/2, y, nx + w/2, ny);
 

 
 	    paint.drawRect(x, -1, nx - x, v->height() + 1);
 	}
 
 	if (p.label != "") {
-	    paint.drawText(x + 5, y - paint.fontMetrics().height() + paint.fontMetrics().ascent(), p.label);
+            if (!haveNext || nx > x + 6 + paint.fontMetrics().width(p.label)) {
+                paint.drawText(x + 5, textY, p.label);
+            }
 	}
     }
 
     if (m_plotStyle == PlotCurve && !path.isEmpty()) {
 	paint.setRenderHint(QPainter::Antialiasing, pointCount <= v->width());