comparison layer/TimeInstantLayer.cpp @ 1552:045063dcd2bc

Merge

     auto model = ModelById::getAs<SparseOneDimensionalModel>(m_model);
     if (!model || !model->isOK()) return;
 
 //    Profiler profiler("TimeInstantLayer::paint", true);
 
-    int x0 = rect.left(), x1 = rect.right();
-
-    sv_frame_t frame0 = v->getFrameForX(x0);
+    int x0 = rect.left();
+    int x1 = x0 + rect.width();
+
+    sv_frame_t resolution = model->getResolution();
+    
+    sv_frame_t frame0 = v->getFrameForX(x0) - resolution;
     sv_frame_t frame1 = v->getFrameForX(x1);
 
+#ifdef DEBUG_TIME_INSTANT_LAYER
+    SVCERR << "TimeInstantLayer[" << this << "]::paint: x0 = "
+           << x0 << ", x1 = " << x1 << ", frame0 = " << frame0
+           << ", frame1 = " << frame1 << endl;
+#endif
+    
     int overspill = 0;
     if (m_plotStyle == PlotSegmentation) {
         // We need to start painting at the prior point, so we can
         // fill in the visible part of its segmentation area
         overspill = 1;
     }
     
     EventVector points(model->getEventsWithin(frame0, frame1 - frame0,
-                                                overspill));
+                                              overspill));
+
+#ifdef DEBUG_TIME_INSTANT_LAYER
+    SVCERR << "TimeInstantLayer[" << this << "]::paint: have " << points.size()
+           << " point(s) with overspill = " << overspill << " from model "
+           << getModel() << endl;
+#endif
 
     bool odd = false;
     if (m_plotStyle == PlotSegmentation && !points.empty()) {
         int index = model->getRowForFrame(points.begin()->getFrame());
         odd = ((index % 2) == 1);

             oddBrushColour = oddBrushColour.lighter(150);
         }
         oddBrushColour.setAlpha(100);
     }
 
-//    SVDEBUG << "TimeInstantLayer::paint: resolution is "
-//              << model->getResolution() << " frames" << endl;
-
     QPoint localPos;
     sv_frame_t illuminateFrame = -1;
 
     if (v->shouldIlluminateLocalFeatures(this, localPos)) {
         EventVector localPoints = getLocalPoints(v, localPos.x());

         Event p(*i);
         EventVector::const_iterator j = i;
         ++j;
 
         int x = v->getXForFrame(p.getFrame());
+
+#ifdef DEBUG_TIME_INSTANT_LAYER
+        SVCERR << "point frame = " << p.getFrame() << " -> x = " << x << endl;
+#endif
+        
         if (x == prevX && m_plotStyle == PlotInstants &&
-            p.getFrame() != illuminateFrame) continue;
+            p.getFrame() != illuminateFrame) {
+#ifdef DEBUG_TIME_INSTANT_LAYER
+            SVCERR << "(skipping)" << endl;
+#endif
+            continue;
+        }
 
         int iw = v->getXForFrame(p.getFrame() + model->getResolution()) - x;
         if (iw < 2) {
             if (iw < 1) {
                 iw = 2;

             paint.setPen(getForegroundQColor(v->getView()));
         } else {
             paint.setPen(brushColour);
         }
 
+#ifdef DEBUG_TIME_INSTANT_LAYER
+        SVCERR << "m_plotStyle = " << m_plotStyle << ", iw = " << iw << endl;
+#endif
+        
         if (m_plotStyle == PlotInstants) {
             if (iw > 1) {
                 paint.drawRect(x, 0, iw - 1, v->getPaintHeight() - 1);
             } else {
                 paint.drawLine(x, 0, x, v->getPaintHeight() - 1);

     m_editingPoint = m_editingPoint.withFrame(frame);
     m_editingCommand->add(m_editingPoint);
 }
 
 void
-TimeInstantLayer::drawEnd(LayerGeometryProvider *, QMouseEvent *)
+TimeInstantLayer::drawEnd(LayerGeometryProvider *, QMouseEvent *
+#ifdef DEBUG_TIME_INSTANT_LAYER
+                          e
+#endif
+    )
 {
 #ifdef DEBUG_TIME_INSTANT_LAYER
     cerr << "TimeInstantLayer::drawEnd(" << e->x() << ")" << endl;
 #endif
     auto model = ModelById::getAs<SparseOneDimensionalModel>(m_model);

     m_editingPoint = m_editingPoint.withFrame(frame);
     m_editingCommand->add(m_editingPoint);
 }
 
 void
-TimeInstantLayer::editEnd(LayerGeometryProvider *, QMouseEvent *)
+TimeInstantLayer::editEnd(LayerGeometryProvider *, QMouseEvent *
+#ifdef DEBUG_TIME_INSTANT_LAYER
+                          e
+#endif
+    )
 {
 #ifdef DEBUG_TIME_INSTANT_LAYER
     cerr << "TimeInstantLayer::editEnd(" << e->x() << ")" << endl;
 #endif
     auto model = ModelById::getAs<SparseOneDimensionalModel>(m_model);