Don't send several seek requests for same frame when seeking with monitor ruler

[kdenlive] / src / smallruler.cpp

diff --git a/src/smallruler.cpp b/src/smallruler.cpp
index a00d388bdd7094bb204125cd8d9ca27c607f3ead..3673cbb191fb2d451fe2d7fe86795a467d2caf94 100644 (file)
--- a/src/smallruler.cpp
+++ b/src/smallruler.cpp
@@ -34,11 +34,11 @@
 SmallRuler::SmallRuler(MonitorManager *manager, Render *render, QWidget *parent) :
         QWidget(parent)
         ,m_cursorFramePosition(0)
-        ,m_scale(1)
-        ,m_maxval(25)
+        ,m_maxval(2)
         ,m_manager(manager)
        ,m_render(render)
-        ,m_overCursor(false)
+       ,m_lastSeekPosition(SEEK_INACTIVE)
+       ,m_cursorColor(palette().text())
 {
     m_zoneStart = 10;
     m_zoneEnd = 60;
@@ -47,6 +47,7 @@ SmallRuler::SmallRuler(MonitorManager *manager, Render *render, QWidget *parent)
 
     setMouseTracking(true);
     setMinimumHeight(10);
+    adjustScale(m_maxval);
 }
 
 
@@ -73,14 +74,14 @@ void SmallRuler::setZoneStart()
 {
     int pos = m_render->requestedSeekPosition;
     if (pos == SEEK_INACTIVE) pos = m_render->seekFramePosition();
-    m_zoneStart = pos;
+    setZone(pos, -1);
 }
 
 void SmallRuler::setZoneEnd()
 {
     int pos = m_render->requestedSeekPosition;
     if (pos == SEEK_INACTIVE) pos = m_render->seekFramePosition();
-    m_zoneEnd = pos;
+    setZone(-1, pos);
 }
 
 void SmallRuler::setZone(int start, int end)
@@ -106,7 +107,7 @@ void SmallRuler::setZone(int start, int end)
     updatePixmap();
 }
 
-void SmallRuler::setMarkers(QList < int > list)
+void SmallRuler::setMarkers(QList < CommentedTime > list)
 {
     m_markers = list;
     updatePixmap();
@@ -128,17 +129,28 @@ void SmallRuler::mousePressEvent(QMouseEvent * event)
         emit zoneChanged(QPoint(m_zoneStart, m_zoneEnd));
         updatePixmap();
 
-    } else {
-       emit seekRenderer((int) pos);
+    } else if (pos != m_lastSeekPosition && pos != m_cursorFramePosition) {
+       m_render->seekToFrame(pos);
+       m_lastSeekPosition = pos;
+       update();
     }
+    event->accept();
 }
 
-void SmallRuler::leaveEvent( QEvent * event )
+// virtual
+void SmallRuler::mouseReleaseEvent(QMouseEvent * event)
 {
-    Q_UNUSED(event);
-    if (m_overCursor) {
-        m_overCursor = false;
-        update();
+    event->accept();
+}
+
+
+// virtual
+void SmallRuler::leaveEvent(QEvent * event)
+{
+    QWidget::leaveEvent(event);
+    if (m_cursorColor == palette().highlight()) {
+       m_cursorColor = palette().text();
+       update();
     }
 }
 
@@ -146,24 +158,23 @@ void SmallRuler::leaveEvent( QEvent * event )
 void SmallRuler::mouseMoveEvent(QMouseEvent * event)
 {
     const int pos = event->x() / m_scale;
-    if (event->button() == Qt::NoButton) {
-        if (qAbs(pos * m_scale - m_render->seekFramePosition()) < 6) {
-            if (!m_overCursor) {
-                m_overCursor = true;
-                update();
-            }
-        }
-        else if (m_overCursor) {
-            m_overCursor = false;
-            update();
-        }
-    }
     if (event->buttons() & Qt::LeftButton) {
-        m_overCursor = true;
-        emit seekRenderer((int) pos);
-       update();
+       if (pos != m_lastSeekPosition && pos != m_cursorFramePosition) {
+           m_render->seekToFrame(pos);
+           m_lastSeekPosition = pos;
+           update();
+       }
     }
     else {
+       if (m_cursorColor == palette().text() && qAbs(pos - m_cursorFramePosition) * m_scale < 7) {
+           // Mouse is over cursor
+           m_cursorColor = palette().highlight();
+           update();
+       }
+       else if (m_cursorColor == palette().highlight() && qAbs(pos - m_cursorFramePosition) * m_scale >= 7) {
+           m_cursorColor = palette().text();
+           update();
+       }
         if (qAbs((pos - m_zoneStart) * m_scale) < 4) {
             setToolTip(i18n("Zone start: %1", m_manager->timecode().getTimecodeFromFrames(m_zoneStart)));
         } else if (qAbs((pos - m_zoneEnd) * m_scale) < 4) {
@@ -172,13 +183,21 @@ void SmallRuler::mouseMoveEvent(QMouseEvent * event)
             setToolTip(i18n("Zone duration: %1", m_manager->timecode().getTimecodeFromFrames(m_zoneEnd - m_zoneStart)));
         } else setToolTip(i18n("Position: %1", m_manager->timecode().getTimecodeFromFrames(pos)));
     }
+    event->accept();
+}
+
+void SmallRuler::refreshRuler()
+{
+    m_lastSeekPosition = SEEK_INACTIVE;
+    update();
 }
 
 bool SmallRuler::slotNewValue(int value)
 {
-    /*if (value == m_cursorFramePosition) return false;
+    if (value == m_cursorFramePosition) return false;
+    if (value == m_lastSeekPosition) m_lastSeekPosition = SEEK_INACTIVE;
     m_cursorFramePosition = value;
-    int oldPos = m_cursorPosition;
+    /*int oldPos = m_cursorPosition;
     m_cursorPosition = value * m_scale;
     const int offset = 6;
     const int x = qMin(oldPos, m_cursorPosition);
@@ -199,6 +218,7 @@ void SmallRuler::updatePixmap()
 {
     m_pixmap = QPixmap(width(), height());
     m_pixmap.fill(palette().window().color());
+    m_lastSeekPosition = SEEK_INACTIVE;
     QPainter p(&m_pixmap);
     double f, fend;
 
@@ -223,9 +243,10 @@ void SmallRuler::updatePixmap()
     }
     // draw markers
     if (!m_markers.isEmpty()) {
-        p.setPen(Qt::red);
         for (int i = 0; i < m_markers.count(); i++) {
-            p.drawLine(m_markers.at(i) * m_scale, 0, m_markers.at(i) * m_scale, 9);
+           int pos = m_markers.at(i).time().frames(m_manager->timecode().fps()) * m_scale;
+           p.setPen(CommentedTime::markerColor(m_markers.at(i).markerType()));
+            p.drawLine(pos, 0, pos, 9);
         }
     }
     p.end();
@@ -241,23 +262,18 @@ void SmallRuler::paintEvent(QPaintEvent *e)
     p.setClipRect(r);
     p.drawPixmap(QPointF(), m_pixmap);
 
-    int seekPos;
-    int cursorPos = m_render->seekFramePosition() * m_scale;
-    if (m_render->requestedSeekPosition != SEEK_INACTIVE) {
-       seekPos = m_render->requestedSeekPosition * m_scale - 1;
-    }
-    else seekPos =  cursorPos - 1;
-
-    // Draw seeking pointer
-    p.fillRect(seekPos, 0, 3, height(), palette().text());
-
+    int cursorPos = m_cursorFramePosition * m_scale;
     // draw pointer
     QPolygon pa(3);
     pa.setPoints(3, cursorPos - 6, 10, cursorPos + 6, 10, cursorPos/*+0*/, 4);
-    if (m_overCursor) p.setBrush(palette().highlight());
-    else p.setBrush(palette().text().color());
+    p.setBrush(m_cursorColor);
     p.setPen(Qt::NoPen);
     p.drawPolygon(pa);
+
+    // Draw seeking pointer
+    if (m_lastSeekPosition != SEEK_INACTIVE && m_lastSeekPosition != m_cursorFramePosition) {
+       p.fillRect(m_lastSeekPosition * m_scale - 1, 0, 3, height(), palette().highlight());
+    }
 }
 
 void SmallRuler::updatePalette()