X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomruler.cpp;h=029f52c269d5f9f8fea3e083d7a0b0293d99d5ee;hb=f41ee253ade9dfda45752f232ea0ff35e26dce95;hp=b7aaa48135ee640fd46fd0c6b6c3000efaaf00f6;hpb=bb109649bb39246bc2e7bd6d3b59994afb33b3bc;p=kdenlive diff --git a/src/customruler.cpp b/src/customruler.cpp index b7aaa481..029f52c2 100644 --- a/src/customruler.cpp +++ b/src/customruler.cpp @@ -24,27 +24,21 @@ #include #include #include +#include #include #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; @@ -61,16 +55,23 @@ CustomRuler::CustomRuler(Timecode tc, CustomTrackView *parent) : m_duration(0), m_offset(0), m_clickedGuide(-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 = QColor(133, 255, 143); - littleMarkDistance = FRAME_SIZE; - mediumMarkDistance = FRAME_SIZE * m_timecode.fps(); - bigMarkDistance = FRAME_SIZE * m_timecode.fps() * 60; + m_zoneColor = KStatefulBrush(KColorScheme::View, KColorScheme::PositiveBackground, KSharedConfig::openConfig(KdenliveSettings::colortheme())).brush(this).color(); m_zoneStart = 0; m_zoneEnd = 100; m_contextMenu = new QMenu(this); @@ -83,9 +84,13 @@ CustomRuler::CustomRuler(Timecode tc, CustomTrackView *parent) : QAction *delAllGuides = m_contextMenu->addAction(KIcon("edit-delete"), i18n("Delete All Guides")); connect(delAllGuides, SIGNAL(triggered()), m_view, SLOT(slotDeleteAllGuides())); m_goMenu = m_contextMenu->addMenu(i18n("Go To")); - connect(m_goMenu, SIGNAL(triggered( QAction *)), this, SLOT(slotGoToGuide(QAction *))); + 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) @@ -96,6 +101,16 @@ void CustomRuler::updateProjectFps(Timecode t) update(); } +void CustomRuler::updateFrameSize() +{ + FRAME_SIZE = m_view->getFrameWidth(); + littleMarkDistance = FRAME_SIZE; + mediumMarkDistance = FRAME_SIZE * m_timecode.fps(); + bigMarkDistance = FRAME_SIZE * m_timecode.fps() * 60; + updateProjectFps(m_timecode); + if (m_rate > 0) setPixelPerMark(m_rate); +} + void CustomRuler::slotEditGuide() { m_view->slotEditGuide(m_clickedGuide); @@ -108,6 +123,7 @@ void CustomRuler::slotDeleteGuide() void CustomRuler::slotGoToGuide(QAction *act) { + m_view->setCursorPos(act->data().toInt(), true); m_view->initCursorPos(act->data().toInt()); } @@ -120,7 +136,12 @@ void CustomRuler::setZone(QPoint p) void CustomRuler::mouseReleaseEvent(QMouseEvent * /*event*/) { + if (m_moveCursor == RULER_START || m_moveCursor == RULER_END || m_moveCursor == RULER_MIDDLE) { + emit zoneMoved(m_zoneStart, m_zoneEnd); + m_view->setDocumentModified(); + } m_mouseMove = NO_MOVE; + } // virtual @@ -131,7 +152,7 @@ void CustomRuler::mousePressEvent(QMouseEvent * event) m_clickedGuide = m_view->hasGuide((int)(pos / m_factor), (int)(5 / m_factor + 1)); m_editGuide->setEnabled(m_clickedGuide > 0); m_deleteGuide->setEnabled(m_clickedGuide > 0); - m_view->buildGuidesMenu(m_goMenu); + m_view->buildGuidesMenu(m_goMenu); m_contextMenu->exec(event->globalPos()); return; } @@ -142,6 +163,7 @@ void CustomRuler::mousePressEvent(QMouseEvent * event) if (qAbs(pos - m_zoneStart * m_factor) < 4) m_moveCursor = RULER_START; else if (qAbs(pos - (m_zoneStart + (m_zoneEnd - m_zoneStart) / 2) * m_factor) < 4) m_moveCursor = RULER_MIDDLE; else if (qAbs(pos - m_zoneEnd * m_factor) < 4) m_moveCursor = RULER_END; + m_view->updateSnapPoints(NULL); } if (m_moveCursor == RULER_CURSOR) { m_view->setCursorPos((int) pos / m_factor); @@ -154,7 +176,10 @@ void CustomRuler::mousePressEvent(QMouseEvent * event) void CustomRuler::mouseMoveEvent(QMouseEvent * event) { if (event->buttons() == Qt::LeftButton) { - int pos = (int)((event->x() + offset()) / m_factor); + int pos; + if (m_moveCursor == RULER_START || m_moveCursor == RULER_END) { + pos = m_view->getSnapPointForPos((int)((event->x() + offset()) / m_factor)); + } else pos = (int)((event->x() + offset()) / m_factor); int zoneStart = m_zoneStart; int zoneEnd = m_zoneEnd; if (pos < 0) pos = 0; @@ -183,8 +208,6 @@ void CustomRuler::mouseMoveEvent(QMouseEvent * event) m_zoneStart += move; m_zoneEnd += move; } - emit zoneMoved(m_zoneStart, m_zoneEnd); - m_view->setDocumentModified(); int min = qMin(m_zoneStart, zoneStart); int max = qMax(m_zoneEnd, zoneEnd); @@ -247,9 +270,9 @@ 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()); + update(oldpos * m_factor - offset() - 6, BIG_MARK_X, 14, MAX_HEIGHT - BIG_MARK_X); + update(newpos * m_factor - offset() - 6, BIG_MARK_X, 14, MAX_HEIGHT - BIG_MARK_X); + } else update(qMin(oldpos, newpos) * m_factor - offset() - 6, BIG_MARK_X, qAbs(oldpos - newpos) * m_factor + 14, MAX_HEIGHT - BIG_MARK_X); } void CustomRuler::setPixelPerMark(int rate) @@ -323,77 +346,90 @@ 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()); + + // Draw background + //p.fillRect(0, 0, m_duration * m_factor - m_offset, MAX_HEIGHT, palette().alternateBase().color()); + // 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; + p.fillRect(zoneStart - m_offset, LABEL_SIZE + 2, zoneEnd - zoneStart, MAX_HEIGHT - LABEL_SIZE - 2, m_zoneColor); + int minval = (e->rect().left() + m_offset) / FRAME_SIZE - 1; const int maxval = (e->rect().right() + m_offset) / FRAME_SIZE + 1; - if (minval < 0) minval = 0; + if (minval < 0) + minval = 0; double f, fend; const int offsetmax = maxval * FRAME_SIZE; + int offsetmin; - p.setPen(palette().dark().color()); + 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 = m_timecode.getTimecodeFromFrames((int)(f / m_factor + 0.5)); - p.drawText(f - m_offset + 2, LABEL_SIZE, lab); + if (e->rect().y() < LABEL_SIZE) { + 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); + } } offsetmin = (e->rect().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); + if (fend > 5) { + for (f = offsetmin - m_offset; f < offsetmax - m_offset; f += fend) + p.drawLine((int)f, LITTLE_MARK_X, (int)f, MAX_HEIGHT); + } offsetmin = (e->rect().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); + if (fend > 5) { + for (f = offsetmin - m_offset - fend; f < offsetmax - m_offset + fend; f += fend) + p.drawLine((int)f, MIDDLE_MARK_X, (int)f, MAX_HEIGHT); + } offsetmin = (e->rect().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); + if (fend > 5) { + for (f = offsetmin - m_offset; f < offsetmax - m_offset; f += fend) + 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); + pa.setPoints(3, value - 6, BIG_MARK_X, value + 6, BIG_MARK_X, value, MAX_HEIGHT - 1); p.setBrush(palette().highlight()); p.drawPolygon(pa); }