comparison layer/TimeInstantLayer.cpp @ 23:ca57f70b0e48

* Add Zero Crossings output from zc plugin (as well as Zero Crossings Count)
* Use brief friendly names for layers instead of full transform descriptions
* Clearer command names for editing commands
* Some efficiencies in drawing dense points in TimeInstantLayer

 	SparseOneDimensionalModel::PointList localPoints =
 	    getLocalPoints(localPos.x());
 	if (!localPoints.empty()) illuminateFrame = localPoints.begin()->frame;
     }
 	
+    int prevX = -1;
+
     for (SparseOneDimensionalModel::PointList::const_iterator i = points.begin();
 	 i != points.end(); ++i) {
 
 	const SparseOneDimensionalModel::Point &p(*i);
 	SparseOneDimensionalModel::PointList::const_iterator j = i;
 	++j;
 
 	int x = getXForFrame(p.frame);
+	if (x == prevX && p.frame != illuminateFrame) continue;
+
 	int iw = getXForFrame(p.frame + m_model->getResolution()) - x;
 	if (iw < 2) {
 	    if (iw < 1) {
 		iw = 2;
 		if (j != points.end()) {

 	if (p.frame == illuminateFrame) {
 	    paint.setPen(Qt::black); //!!!
 	} else {
 	    paint.setPen(brushColour);
 	}
-	paint.drawRect(x, 0, iw - 1, m_view->height() - 1);
+
+	if (iw > 1) {
+	    paint.drawRect(x, 0, iw - 1, m_view->height() - 1);
+	} else {
+	    paint.drawLine(x, 0, x, m_view->height() - 1);
+	}
 	paint.setPen(m_colour);
 	
 	if (p.label != "") {
 
 	    // only draw if there's enough room from here to the next point

 		paint.drawText(x + iw + 2,
 			       m_view->height() - paint.fontMetrics().height(),
 			       p.label);
 	    }
 	}
+
+	prevX = x;
     }
 }
 
 void
 TimeInstantLayer::drawStart(QMouseEvent *e)

 void
 TimeInstantLayer::drawEnd(QMouseEvent *e)
 {
     std::cerr << "TimeInstantLayer::drawEnd(" << e->x() << ")" << std::endl;
     if (!m_model || !m_editing) return;
+    QString newName = tr("Add Point at %1 s")
+	.arg(RealTime::frame2RealTime(m_editingPoint.frame,
+				      m_model->getSampleRate())
+	     .toText(false).c_str());
+    m_editingCommand->setName(newName);
     m_editingCommand->finish();
     m_editingCommand = 0;
     m_editing = false;
 }
 

 void
 TimeInstantLayer::editEnd(QMouseEvent *e)
 {
     std::cerr << "TimeInstantLayer::editEnd(" << e->x() << ")" << std::endl;
     if (!m_model || !m_editing) return;
-    if (m_editingCommand) m_editingCommand->finish();
+    if (m_editingCommand) {
+	QString newName = tr("Move Point to %1 s")
+	    .arg(RealTime::frame2RealTime(m_editingPoint.frame,
+					  m_model->getSampleRate())
+		 .toText(false).c_str());
+	m_editingCommand->setName(newName);
+	m_editingCommand->finish();
+    }
     m_editingCommand = 0;
     m_editing = false;
 }
 
 QString