comparison layer/TimeValueLayer.cpp @ 6:02aaea1ffaf7

* Beginnings of session save code
* Add spline curve mode to time value layer

 #include "base/View.h"
 
 #include "model/SparseTimeValueModel.h"
 
 #include <QPainter>
+#include <QPainterPath>
 
 #include <iostream>
 #include <cmath>
 
 TimeValueLayer::TimeValueLayer(View *w) :
     Layer(w),
     m_model(0),
     m_colour(Qt::black),
-    m_plotStyle(PlotLines)
+    m_plotStyle(PlotConnectedPoints)
 {
     m_view->addLayer(this);
 }
 
 void

 	else if (m_colour == QColor(255, 150, 50)) deft = 5;
 
     } else if (name == tr("Plot Type")) {
 	
 	*min = 0;
-	*max = 3;
+	*max = 4;
 	
 	deft = int(m_plotStyle);
 
     } else {
 	

     } else if (name == tr("Plot Type")) {
 	switch (value) {
 	default:
 	case 0: return tr("Points");
 	case 1: return tr("Stems");
-	case 2: return tr("Lines");
-	case 3: return tr("Curve");
+	case 2: return tr("Connected Points");
+	case 3: return tr("Lines");
+	case 4: return tr("Curve");
 	}
     }
     return tr("<unknown>");
 }
 

 }
 
 bool
 TimeValueLayer::isLayerScrollable() const
 {
+    // We don't illuminate sections in the line or curve modes, so
+    // they're always scrollable
+
+    if (m_plotStyle == PlotLines ||
+	m_plotStyle == PlotCurve) return true;
+
     QPoint discard;
     return !m_view->shouldIlluminateLocalFeatures(this, discard);
 }
 
 QRect

     if (m_view->shouldIlluminateLocalFeatures(this, localPos)) {
 	SparseTimeValueModel::PointList localPoints =
 	    getLocalPoints(localPos.x());
 	if (!localPoints.empty()) illuminateFrame = localPoints.begin()->frame;
     }
-	
+
+    paint.save();
+
+    if (m_plotStyle == PlotLines ||
+	m_plotStyle == PlotCurve) {
+	paint.setRenderHint(QPainter::Antialiasing, true);
+    }
+    QPainterPath path;
+    
     for (SparseTimeValueModel::PointList::const_iterator i = points.begin();
 	 i != points.end(); ++i) {
 
 	const SparseTimeValueModel::Point &p(*i);
 

 			      (max - min)));
 	int w = m_model->getResolution() / zoomLevel;
 
 	if (w < 1) w = 1;
 
-	if (m_plotStyle == PlotCurve) {
-	    paint.setPen(QPen(QBrush(m_colour), 2));
+	if (m_plotStyle == PlotLines ||
+	    m_plotStyle == PlotCurve) {
+	    paint.setPen(m_colour);
+	    paint.setBrush(Qt::NoBrush);
 	} else {
 	    paint.setPen(m_colour);
+	    paint.setBrush(brushColour);
 	}	    
-	paint.setBrush(brushColour);
 
 	if (m_plotStyle == PlotStems) {
 	    paint.setPen(brushColour);
 	    if (y < origin - 1) {
 		paint.drawRect(x + w/2, y + 1, 1, origin - y);

 	    }
 	    paint.setPen(m_colour);
 	}
 
 	if (illuminateFrame == p.frame) {
+
 	    //!!! aside from the problem of choosing a colour, it'd be
 	    //better to save the highlighted rects and draw them at
 	    //the end perhaps
-	    paint.setPen(Qt::black);//!!!
-	    paint.setBrush(Qt::black);//!!!
-	}
-
-	if (m_plotStyle != PlotCurve) {
+
+	    //!!! not equipped to illuminate the right section in line
+	    //or curve mode
+
+	    if (m_plotStyle != PlotCurve &&
+		m_plotStyle != PlotLines) {
+		paint.setPen(Qt::black);//!!!
+		paint.setBrush(Qt::black);//!!!
+	    }	    
+	}
+
+	if (m_plotStyle != PlotLines &&
+	    m_plotStyle != PlotCurve) {
 	    paint.drawRect(x, y - 1, w, 2);
 	}
 
-	if (m_plotStyle == PlotLines || m_plotStyle == PlotCurve) {
+	if (m_plotStyle == PlotConnectedPoints ||
+	    m_plotStyle == PlotLines ||
+	    m_plotStyle == PlotCurve) {
 
 	    SparseTimeValueModel::PointList::const_iterator j = i;
 	    ++j;
 
 	    if (j != points.end()) {

 		int nx = (q.frame - startFrame) / zoomLevel;
 		int ny = int(nearbyint(m_view->height() -
 				       ((q.value - min) * m_view->height()) /
 				       (max - min)));
 
-		if (m_plotStyle == PlotLines) {
+		if (m_plotStyle == PlotConnectedPoints) {
+
 		    paint.setPen(brushColour);
 		    paint.drawLine(x + w, y, nx, ny);
+
+		} else if (m_plotStyle == PlotLines) {
+
+		    paint.drawLine(x + w/2, y, nx + w/2, ny);
+
 		} else {
-		    paint.drawLine(x, y, nx, ny);
+
+		    if (path.isEmpty()) {
+			path.moveTo(x + w/2, y);
+		    }
+
+		    if (nx - x > 5) {
+			path.cubicTo(x + w, y, nx, ny, nx + w/2, ny);
+		    } else {
+			path.lineTo(nx + w/2, ny);
+		    }
 		}
 	    }
 	}
 
-	
 ///	if (p.label != "") {
 ///	    paint.drawText(x + 5, y - paint.fontMetrics().height() + paint.fontMetrics().ascent(), p.label);
 ///	}
     }
-	
-	
+
+    if (m_plotStyle == PlotCurve && !path.isEmpty()) {
+	paint.drawPath(path);
+    }
+
+    paint.restore();
+
+    // looks like save/restore doesn't deal with this:
+    paint.setRenderHint(QPainter::Antialiasing, false);
+}
+
+QString
+TimeValueLayer::toXmlString(QString indent, QString extraAttributes) const
+{
+    return Layer::toXmlString(indent, extraAttributes +
+			      QString(" colour=\"%1\" plotStyle=\"%2\"")
+			      .arg(encodeColour(m_colour)).arg(m_plotStyle));
 }
 
 
 #ifdef INCLUDE_MOCFILES
 #include "TimeValueLayer.moc.cpp"