comparison layer/TimeInstantLayer.cpp @ 20:1deb5f87a18c

* Add getXForFrame / getFrameForX in preference to using the zoom level everywhere

     list.push_back(tr("Colour"));
     return list;
 }
 
 Layer::PropertyType
-TimeInstantLayer::getPropertyType(const PropertyName &name) const
+TimeInstantLayer::getPropertyType(const PropertyName &) const
 {
     return ValueProperty;
 }
 
 int

 SparseOneDimensionalModel::PointList
 TimeInstantLayer::getLocalPoints(int x) const
 {
     if (!m_model) return SparseOneDimensionalModel::PointList();
 
-    long startFrame = m_view->getStartFrame();
-    long endFrame = m_view->getEndFrame();
-    int zoomLevel = m_view->getZoomLevel();
-    long frame = startFrame + x * zoomLevel;
+    long frame = getFrameForX(x);
 
     SparseOneDimensionalModel::PointList onPoints =
 	m_model->getPoints(frame);
 
     if (!onPoints.empty()) {

 
     SparseOneDimensionalModel::PointList usePoints = prevPoints;
 
     if (prevPoints.empty()) {
 	usePoints = nextPoints;
-    } else if (prevPoints.begin()->frame < startFrame &&
-	       !(nextPoints.begin()->frame > endFrame)) {
+    } else if (prevPoints.begin()->frame < m_view->getStartFrame() &&
+	       !(nextPoints.begin()->frame > m_view->getEndFrame())) {
 	usePoints = nextPoints;
     } else if (nextPoints.begin()->frame - frame <
 	       frame - prevPoints.begin()->frame) {
 	usePoints = nextPoints;
     }

 {
     if (!m_model || !m_model->isOK()) return;
 
 //    Profiler profiler("TimeInstantLayer::paint", true);
 
-    long startFrame = m_view->getStartFrame();
-    int zoomLevel = m_view->getZoomLevel();
-
     int x0 = rect.left(), x1 = rect.right();
-    long frame0 = startFrame + x0 * zoomLevel;
-    long frame1 = startFrame + x1 * zoomLevel;
+
+    long frame0 = getFrameForX(x0);
+    long frame1 = getFrameForX(x1);
 
     SparseOneDimensionalModel::PointList points(m_model->getPoints
 						(frame0, frame1));
 
     paint.setPen(m_colour);

 
 	const SparseOneDimensionalModel::Point &p(*i);
 	SparseOneDimensionalModel::PointList::const_iterator j = i;
 	++j;
 
-	int x = (p.frame - startFrame) / zoomLevel;
-	float w = float(m_model->getResolution()) / zoomLevel;
-	int iw = w;
+	int x = getXForFrame(p.frame);
+	int iw = getXForFrame(p.frame + m_model->getResolution()) - x;
 	if (iw < 2) {
 	    if (iw < 1) {
 		iw = 2;
 		if (j != points.end()) {
-		    int nx = ((*j).frame - startFrame) / zoomLevel;
+		    int nx = getXForFrame(j->frame);
 		    if (nx < x + 3) iw = 1;
 		}
 	    } else {
 		iw = 2;
 	    }
 	}
-
+		
 	if (p.frame == illuminateFrame) {
 	    paint.setPen(Qt::black); //!!!
 	} else {
 	    paint.setPen(brushColour);
 	}

 
 	    int lw = paint.fontMetrics().width(p.label);
 	    bool good = true;
 
 	    if (j != points.end()) {
-		int nx = (j->frame - startFrame) / zoomLevel;
-		if (nx >= x && nx - x - w - 3 <= lw) good = false;
+		int nx = getXForFrame(j->frame);
+		if (nx >= x && nx - x - iw - 3 <= lw) good = false;
 	    }
 
 	    if (good) {
-		paint.drawText(x + w + 2,
+		paint.drawText(x + iw + 2,
 			       m_view->height() - paint.fontMetrics().height(),
 			       p.label);
 	    }
 	}
     }

 {
     std::cerr << "TimeInstantLayer::drawStart(" << e->x() << ")" << std::endl;
 
     if (!m_model) return;
 
-    long frame = e->x() * m_view->getZoomLevel() + m_view->getStartFrame();
+    long frame = getFrameForX(e->x());
     if (frame < 0) frame = 0;
     m_editingPoint = SparseOneDimensionalModel::Point(frame, tr("New Point"));
     m_model->addPoint(m_editingPoint);
     m_editing = true;
 }

 {
     std::cerr << "TimeInstantLayer::drawDrag(" << e->x() << ")" << std::endl;
 
     if (!m_model || !m_editing) return;
 
-    long frame = e->x() * m_view->getZoomLevel() + m_view->getStartFrame();
+    long frame = getFrameForX(e->x());
     if (frame < 0) frame = 0;
     m_model->deletePoint(m_editingPoint);
     m_editingPoint.frame = frame;
     m_model->addPoint(m_editingPoint);
 }

 {
     std::cerr << "TimeInstantLayer::editDrag(" << e->x() << ")" << std::endl;
 
     if (!m_model || !m_editing) return;
 
-    long frame = e->x() * m_view->getZoomLevel() + m_view->getStartFrame();
+    long frame = getFrameForX(e->x());
     if (frame < 0) frame = 0;
     m_model->deletePoint(m_editingPoint);
     m_editingPoint.frame = frame;
     m_model->addPoint(m_editingPoint);
 }