comparison layer/TimeValueLayer.cpp @ 26:94381052a6c9

* Add natty segmentation display to time-value layer.  Need to do the same
  for time-instants layer.

* Make sure dense 3D model bin names are saved and restored properly.

* Fix to chromagram normalization

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

 	case 0: return tr("Points");
 	case 1: return tr("Stems");
 	case 2: return tr("Connected Points");
 	case 3: return tr("Lines");
 	case 4: return tr("Curve");
+	case 5: return tr("Segmentation");
 	}
     }
     return tr("<unknown>");
 }
 

 
 	int x = getXForFrame(p.frame);
 	int y = getYForValue(p.value);
 
 	if (w < 1) w = 1;
-
-	if (m_plotStyle == PlotLines ||
-	    m_plotStyle == PlotCurve) {
-	    paint.setPen(m_colour);
+	paint.setPen(m_colour);
+
+	if (m_plotStyle == PlotSegmentation) {
+	    int value = ((p.value - min) / (max - min)) * 255.999;
+	    QColor colour = QColor::fromHsv(256 - value, value / 2 + 128, value);
+	    paint.setBrush(QColor(colour.red(), colour.green(), colour.blue(),
+				  120));
+	} else if (m_plotStyle == PlotLines ||
+		   m_plotStyle == PlotCurve) {
 	    paint.setBrush(Qt::NoBrush);
 	} else {
-	    paint.setPen(m_colour);
 	    paint.setBrush(brushColour);
 	}	    
 
 	if (m_plotStyle == PlotStems) {
 	    paint.setPen(brushColour);

 	    //or curve mode
 
 	    if (m_plotStyle != PlotCurve &&
 		m_plotStyle != PlotLines) {
 		paint.setPen(Qt::black);//!!!
-		paint.setBrush(Qt::black);//!!!
+		if (m_plotStyle != PlotSegmentation) {
+		    paint.setBrush(Qt::black);//!!!
+		}
 	    }	    
 	}
 
 	if (m_plotStyle != PlotLines &&
-	    m_plotStyle != PlotCurve) {
+	    m_plotStyle != PlotCurve &&
+	    m_plotStyle != PlotSegmentation) {
 	    paint.drawRect(x, y - 1, w, 2);
 	}
 
 	if (m_plotStyle == PlotConnectedPoints ||
 	    m_plotStyle == PlotLines ||

 			path.cubicTo(x + w, y, nx, ny, nx + w/2, ny);
 		    } else {
 			path.lineTo(nx + w/2, ny);
 		    }
 		}
+	    }
+	}
+
+	if (m_plotStyle == PlotSegmentation) {
+	    
+	    SparseTimeValueModel::PointList::const_iterator j = i;
+	    ++j;
+
+	    if (j != points.end()) {
+		
+		const SparseTimeValueModel::Point &q(*j);
+		int nx = getXForFrame(q.frame);
+
+		if (nx == x) continue;
+
+		if (nx < x + 5 && illuminateFrame != p.frame) {
+		    paint.setPen(Qt::NoPen);
+		}
+
+		paint.drawRect(x, -1, nx - x, m_view->height() + 1);
+
+	    } else {
+
+		paint.drawLine(x, 0, x, m_view->height());
 	    }
 	}
 
 ///	if (p.label != "") {
 ///	    paint.drawText(x + 5, y - paint.fontMetrics().height() + paint.fontMetrics().ascent(), p.label);