# HG changeset patch # User Chris Cannam # Date 1553080725 0 # Node ID 31499c3520ee9f028121e7fc07765082f0062ce9 # Parent 8a7c82282fbc6d152e0ac992c4b4840d36741966 Use overspill to render time-value point line properly at edges diff -r 8a7c82282fbc -r 31499c3520ee layer/RegionLayer.h --- a/layer/RegionLayer.h Tue Mar 19 13:06:35 2019 +0000 +++ b/layer/RegionLayer.h Wed Mar 20 11:18:45 2019 +0000 @@ -48,11 +48,11 @@ QString getLabelPreceding(sv_frame_t) const override; bool snapToFeatureFrame(LayerGeometryProvider *v, sv_frame_t &frame, - int &resolution, - SnapType snap) const override; + int &resolution, + SnapType snap) const override; bool snapToSimilarFeature(LayerGeometryProvider *v, sv_frame_t &frame, - int &resolution, - SnapType snap) const override; + int &resolution, + SnapType snap) const override; void drawStart(LayerGeometryProvider *v, QMouseEvent *) override; void drawDrag(LayerGeometryProvider *v, QMouseEvent *) override; diff -r 8a7c82282fbc -r 31499c3520ee layer/TimeValueLayer.cpp --- a/layer/TimeValueLayer.cpp Tue Mar 19 13:06:35 2019 +0000 +++ b/layer/TimeValueLayer.cpp Wed Mar 20 11:18:45 2019 +0000 @@ -938,7 +938,7 @@ sv_frame_t frame1 = v->getFrameForX(x1); if (m_derivative) --frame0; - EventVector points(m_model->getEventsWithin(frame0, frame1 - frame0)); + EventVector points(m_model->getEventsWithin(frame0, frame1 - frame0, 1)); if (points.empty()) return; paint.setPen(getBaseQColor()); @@ -949,7 +949,7 @@ #ifdef DEBUG_TIME_VALUE_LAYER cerr << "TimeValueLayer::paint: resolution is " - << m_model->getResolution() << " frames" << endl; + << m_model->getResolution() << " frames" << endl; #endif double min = m_model->getValueMinimum(); diff -r 8a7c82282fbc -r 31499c3520ee view/View.cpp --- a/view/View.cpp Tue Mar 19 13:06:35 2019 +0000 +++ b/view/View.cpp Wed Mar 20 11:18:45 2019 +0000 @@ -1796,8 +1796,6 @@ } else { -// cerr << "progress = " << completion << endl; - if (!pb->isVisible()) { i->second.lastCheck = 0; timer->setInterval(2000);