X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomruler.cpp;h=1a32d778cd223dbd84a25a155b0d7b3a2729ed98;hb=91bbd7aab80b69fff349cbfa3828a3e0b94a38ea;hp=00b469d8fd3b70fa417d02e03614ed2ebdd5483e;hpb=60cb9e1f3092575415ba61139071296c33b902ed;p=kdenlive diff --git a/src/customruler.cpp b/src/customruler.cpp index 00b469d8..1a32d778 100644 --- a/src/customruler.cpp +++ b/src/customruler.cpp @@ -30,28 +30,22 @@ #include #include -static const int FIX_WIDTH = 24; /* widget width in pixel */ -static const int LINE_END = (FIX_WIDTH - 3); -static const int END_MARK_LENGTH = (FIX_WIDTH - 8); -static const int BIG_MARK_LENGTH = (END_MARK_LENGTH * 3 / 4); -static const int BIG_MARK_X2 = LINE_END; -static const int BIG_MARK_X1 = (BIG_MARK_X2 - BIG_MARK_LENGTH); -static const int MIDDLE_MARK_LENGTH = (END_MARK_LENGTH / 2); -static const int MIDDLE_MARK_X2 = LINE_END; -static const int MIDDLE_MARK_X1 = (MIDDLE_MARK_X2 - MIDDLE_MARK_LENGTH); -static const int LITTLE_MARK_LENGTH = (MIDDLE_MARK_LENGTH / 2); -static const int LITTLE_MARK_X2 = LINE_END; -static const int LITTLE_MARK_X1 = (LITTLE_MARK_X2 - LITTLE_MARK_LENGTH); - +static int MAX_HEIGHT; +// Width of a frame in pixels static int FRAME_SIZE; +// Height of the timecode text static int LABEL_SIZE; -static const int END_LABEL_X = 4; -static const int END_LABEL_Y = (END_LABEL_X + LABEL_SIZE - 2); + +static int BIG_MARK_X; +static int MIDDLE_MARK_X; +static int LITTLE_MARK_X; static int littleMarkDistance; static int mediumMarkDistance; static int bigMarkDistance; +#define SEEK_INACTIVE (-1) + #include "definitions.h" const int CustomRuler::comboScale[] = { 1, 2, 5, 10, 25, 50, 125, 250, 500, 750, 1500, 3000, 6000, 12000}; @@ -62,13 +56,22 @@ CustomRuler::CustomRuler(Timecode tc, CustomTrackView *parent) : m_view(parent), m_duration(0), m_offset(0), + m_lastSeekPosition(SEEK_INACTIVE), m_clickedGuide(-1), - m_mouseMove(NO_MOVE), - m_rate(-1) + m_rate(-1), + m_mouseMove(NO_MOVE) { setFont(KGlobalSettings::toolBarFont()); QFontMetricsF fontMetrics(font()); - LABEL_SIZE = fontMetrics.ascent() - 2; + // Define size variables + LABEL_SIZE = fontMetrics.ascent(); + setMinimumHeight(LABEL_SIZE * 2); + setMaximumHeight(LABEL_SIZE * 2); + MAX_HEIGHT = height(); + BIG_MARK_X = LABEL_SIZE + 1; + int mark_length = MAX_HEIGHT - BIG_MARK_X; + MIDDLE_MARK_X = BIG_MARK_X + mark_length / 2; + LITTLE_MARK_X = BIG_MARK_X + mark_length / 3; updateFrameSize(); m_scale = 3; m_zoneColor = KStatefulBrush(KColorScheme::View, KColorScheme::PositiveBackground, KSharedConfig::openConfig(KdenliveSettings::colortheme())).brush(this).color(); @@ -86,7 +89,11 @@ CustomRuler::CustomRuler(Timecode tc, CustomTrackView *parent) : m_goMenu = m_contextMenu->addMenu(i18n("Go To")); connect(m_goMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotGoToGuide(QAction *))); setMouseTracking(true); - setMinimumHeight(20); +} + +void CustomRuler::updatePalette() +{ + m_zoneColor = KStatefulBrush(KColorScheme::View, KColorScheme::PositiveBackground, KSharedConfig::openConfig(KdenliveSettings::colortheme())).brush(this).color(); } void CustomRuler::updateProjectFps(Timecode t) @@ -100,7 +107,6 @@ void CustomRuler::updateProjectFps(Timecode t) void CustomRuler::updateFrameSize() { FRAME_SIZE = m_view->getFrameWidth(); - kDebug()<<"// GOT FRM SZ: "<setCursorPos(act->data().toInt(), true); + m_view->seekCursorPos(act->data().toInt()); m_view->initCursorPos(act->data().toInt()); } @@ -163,7 +169,7 @@ void CustomRuler::mousePressEvent(QMouseEvent * event) m_view->updateSnapPoints(NULL); } if (m_moveCursor == RULER_CURSOR) { - m_view->setCursorPos((int) pos / m_factor); + m_view->seekCursorPos((int) pos / m_factor); m_clickPoint = event->pos(); m_startRate = m_rate; } @@ -190,7 +196,7 @@ void CustomRuler::mouseMoveEvent(QMouseEvent * event) } else return; } if (m_mouseMove == HORIZONTAL_MOVE) { - m_view->setCursorPos(pos); + m_view->seekCursorPos(pos); m_view->slotCheckPositionScrolling(); } else { int verticalDiff = m_startRate - (diff.y()) / 7; @@ -205,7 +211,6 @@ void CustomRuler::mouseMoveEvent(QMouseEvent * event) m_zoneStart += move; m_zoneEnd += move; } - int min = qMin(m_zoneStart, zoneStart); int max = qMax(m_zoneEnd, zoneEnd); update(min * m_factor - m_offset - 2, 0, (max - min) * m_factor + 4, height()); @@ -266,10 +271,41 @@ int CustomRuler::offset() const void CustomRuler::slotCursorMoved(int oldpos, int newpos) { - if (qAbs(oldpos - newpos) * m_factor > m_textSpacing) { - update(oldpos * m_factor - offset() - 6, 0, 17, height()); - update(newpos * m_factor - offset() - 6, 0, 17, height()); - } else update(qMin(oldpos, newpos) * m_factor - offset() - 6, 0, qAbs(oldpos - newpos) * m_factor + 17, height()); + int min = qMin(oldpos, newpos); + int max = qMax(oldpos, newpos); + if (m_lastSeekPosition != SEEK_INACTIVE) { + if (m_lastSeekPosition == newpos) { + m_lastSeekPosition = SEEK_INACTIVE; + } + else { + min = qMin(min, m_lastSeekPosition); + max = qMax(max, m_lastSeekPosition); + } + } + update(min * m_factor - offset() - 6, BIG_MARK_X, (max - min) * m_factor + 14, MAX_HEIGHT - BIG_MARK_X); +} + +void CustomRuler::updateRuler() +{ + // Update requested seek position + int min = SEEK_INACTIVE; + int max = SEEK_INACTIVE; + if (m_lastSeekPosition != SEEK_INACTIVE) { + min = max = m_lastSeekPosition; + } + m_lastSeekPosition = m_view->seekPosition(); + if (m_lastSeekPosition != SEEK_INACTIVE) { + if (min == SEEK_INACTIVE) { + min = max = m_lastSeekPosition; + } + else { + min = qMin(min, m_lastSeekPosition); + max = qMax(max, m_lastSeekPosition); + } + } + if (min != SEEK_INACTIVE) { + update(min * m_factor - offset() - 3, BIG_MARK_X, (max - min) * m_factor + 6, MAX_HEIGHT - BIG_MARK_X); + } } void CustomRuler::setPixelPerMark(int rate) @@ -342,91 +378,97 @@ void CustomRuler::setDuration(int d) void CustomRuler::paintEvent(QPaintEvent *e) { QStylePainter p(this); - p.setClipRect(e->rect()); - const int projectEnd = (int)(m_duration * m_factor); - p.fillRect(0, 0, projectEnd - m_offset, height(), palette().alternateBase().color()); + const QRect &paintRect = e->rect(); + p.setClipRect(paintRect); + // Draw zone background const int zoneStart = (int)(m_zoneStart * m_factor); const int zoneEnd = (int)(m_zoneEnd * m_factor); - const QRect zoneRect(); - - p.fillRect(zoneStart - m_offset, height() / 2, zoneEnd - zoneStart, height() / 2, m_zoneColor); - - const int value = m_view->cursorPos() * m_factor - m_offset; - int minval = (e->rect().left() + m_offset) / FRAME_SIZE - 1; - const int maxval = (e->rect().right() + m_offset) / FRAME_SIZE + 1; + p.fillRect(zoneStart - m_offset, LABEL_SIZE + 2, zoneEnd - zoneStart, MAX_HEIGHT - LABEL_SIZE - 2, m_zoneColor); + + int minval = (paintRect.left() + m_offset) / FRAME_SIZE - 1; + const int maxval = (paintRect.right() + m_offset) / FRAME_SIZE + 1; if (minval < 0) minval = 0; double f, fend; const int offsetmax = maxval * FRAME_SIZE; + int offsetmin; p.setPen(palette().text().color()); // draw time labels - int offsetmin = (e->rect().left() + m_offset) / m_textSpacing; - offsetmin = offsetmin * m_textSpacing; - for (f = offsetmin; f < offsetmax; f += m_textSpacing) { - QString lab; - if (KdenliveSettings::frametimecode()) - lab = QString::number((int)(f / m_factor + 0.5)); - else - lab = m_timecode.getTimecodeFromFrames((int)(f / m_factor + 0.5)); - p.drawText(f - m_offset + 2, LABEL_SIZE, lab); + if (paintRect.y() < LABEL_SIZE) { + offsetmin = (paintRect.left() + m_offset) / m_textSpacing; + offsetmin = offsetmin * m_textSpacing; + for (f = offsetmin; f < offsetmax; f += m_textSpacing) { + QString lab; + if (KdenliveSettings::frametimecode()) + lab = QString::number((int)(f / m_factor + 0.5)); + else + lab = m_timecode.getTimecodeFromFrames((int)(f / m_factor + 0.5)); + p.drawText(f - m_offset + 2, LABEL_SIZE, lab); + } } - offsetmin = (e->rect().left() + m_offset) / littleMarkDistance; + offsetmin = (paintRect.left() + m_offset) / littleMarkDistance; offsetmin = offsetmin * littleMarkDistance; // draw the little marks fend = m_scale * littleMarkDistance; if (fend > 5) { for (f = offsetmin - m_offset; f < offsetmax - m_offset; f += fend) - p.drawLine((int)f, LITTLE_MARK_X1, (int)f, LITTLE_MARK_X2); + p.drawLine((int)f, LITTLE_MARK_X, (int)f, MAX_HEIGHT); } - offsetmin = (e->rect().left() + m_offset) / mediumMarkDistance; + offsetmin = (paintRect.left() + m_offset) / mediumMarkDistance; offsetmin = offsetmin * mediumMarkDistance; // draw medium marks fend = m_scale * mediumMarkDistance; if (fend > 5) { for (f = offsetmin - m_offset - fend; f < offsetmax - m_offset + fend; f += fend) - p.drawLine((int)f, MIDDLE_MARK_X1, (int)f, MIDDLE_MARK_X2); + p.drawLine((int)f, MIDDLE_MARK_X, (int)f, MAX_HEIGHT); } - offsetmin = (e->rect().left() + m_offset) / bigMarkDistance; + offsetmin = (paintRect.left() + m_offset) / bigMarkDistance; offsetmin = offsetmin * bigMarkDistance; // draw big marks fend = m_scale * bigMarkDistance; if (fend > 5) { for (f = offsetmin - m_offset; f < offsetmax - m_offset; f += fend) - p.drawLine((int)f, BIG_MARK_X1, (int)f, BIG_MARK_X2); + p.drawLine((int)f, BIG_MARK_X, (int)f, MAX_HEIGHT); } // draw zone cursors - int off = offset(); if (zoneStart > 0) { QPolygon pa(4); - pa.setPoints(4, zoneStart - off + 3, 9, zoneStart - off, 9, zoneStart - off, 18, zoneStart - off + 3, 18); + pa.setPoints(4, zoneStart - m_offset + 3, LABEL_SIZE + 2, zoneStart - m_offset, LABEL_SIZE + 2, zoneStart - m_offset, MAX_HEIGHT - 1, zoneStart - m_offset + 3, MAX_HEIGHT - 1); p.drawPolyline(pa); } if (zoneEnd > 0) { QColor center(Qt::white); center.setAlpha(150); - QRect rec(zoneStart - off + (zoneEnd - zoneStart) / 2 - 4, 9, 8, 9); + QRect rec(zoneStart - m_offset + (zoneEnd - zoneStart) / 2 - 4, LABEL_SIZE + 2, 8, MAX_HEIGHT - LABEL_SIZE - 3); p.fillRect(rec, center); p.drawRect(rec); QPolygon pa(4); - pa.setPoints(4, zoneEnd - off - 3, 9, zoneEnd - off, 9, zoneEnd - off, 18, zoneEnd - off - 3, 18); + pa.setPoints(4, zoneEnd - m_offset - 3, LABEL_SIZE + 2, zoneEnd - m_offset, LABEL_SIZE + 2, zoneEnd - m_offset, MAX_HEIGHT - 1, zoneEnd - m_offset - 3, MAX_HEIGHT - 1); p.drawPolyline(pa); } - + // draw pointer + const int value = m_view->cursorPos() * m_factor - m_offset; QPolygon pa(3); - pa.setPoints(3, value - 6, 8, value + 6, 8, value, 16); - p.setBrush(palette().highlight()); + pa.setPoints(3, value - 6, BIG_MARK_X, value + 6, BIG_MARK_X, value, MAX_HEIGHT - 1); + p.setBrush(palette().text()); + p.setPen(Qt::NoPen); p.drawPolygon(pa); + + if (m_lastSeekPosition != SEEK_INACTIVE && m_lastSeekPosition != m_view->cursorPos()) { + p.fillRect(m_lastSeekPosition * m_factor - m_offset - 1, BIG_MARK_X, 3, MAX_HEIGHT - 1, palette().highlight()); + } + } #include "customruler.moc"