X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomruler.cpp;h=461a58034cf4a09fceeba205971b6dcea24dd04e;hb=95265b50de041c51b5111bc397709fe3ce83b1fc;hp=7a2a96d6e746516b9d23df5f8300593020b3a69e;hpb=ca14ee82a6fd653459e2dcd6f5c406eb65faea00;p=kdenlive diff --git a/src/customruler.cpp b/src/customruler.cpp index 7a2a96d6..461a5803 100644 --- a/src/customruler.cpp +++ b/src/customruler.cpp @@ -21,7 +21,8 @@ #include #include - +#include +#include #include "customruler.h" @@ -46,9 +47,9 @@ #define INIT_LENGTH_FIX true #define INIT_END_OFFSET 0 -#define FIX_WIDTH 20 /* widget width in pixel */ +#define FIX_WIDTH 24 /* widget width in pixel */ #define LINE_END (FIX_WIDTH - 3) -#define END_MARK_LENGTH (FIX_WIDTH - 6) +#define END_MARK_LENGTH (FIX_WIDTH - 8) #define END_MARK_X2 LINE_END #define END_MARK_X1 (END_MARK_X2 - END_MARK_LENGTH) #define BIG_MARK_LENGTH (END_MARK_LENGTH*3/4) @@ -64,47 +65,58 @@ #define BASE_MARK_X2 LINE_END #define BASE_MARK_X1 (BASE_MARK_X2 - 3) //BASE_MARK_LENGTH -#define LABEL_SIZE 8 +#define LABEL_SIZE 9 #define END_LABEL_X 4 #define END_LABEL_Y (END_LABEL_X + LABEL_SIZE - 2) #include "definitions.h" -const int CustomRuler::comboScale[] = { 1, 2, 5, 10, 25, 50, 125, 250, 500, 725, 1500, 3000, 6000, - 12000 - }; +const int CustomRuler::comboScale[] = { 1, 2, 5, 10, 25, 50, 125, 250, 500, 725, 1500, 3000, 6000, 12000}; CustomRuler::CustomRuler(Timecode tc, CustomTrackView *parent) : KRuler(parent), m_timecode(tc), m_view(parent), m_duration(0) { + setFont(KGlobalSettings::toolBarFont()); slotNewOffset(0); setRulerMetricStyle(KRuler::Pixel); setLength(1024); setMaximum(1024); setPixelPerMark(3); setLittleMarkDistance(FRAME_SIZE); - setMediumMarkDistance(FRAME_SIZE * 25); - setBigMarkDistance(FRAME_SIZE * 25 * 60); - m_zoneStart = 50; - m_zoneEnd = 250; + setMediumMarkDistance(FRAME_SIZE * m_timecode.fps()); + setBigMarkDistance(FRAME_SIZE * m_timecode.fps() * 60); + m_zoneStart = 2 * m_timecode.fps(); + m_zoneEnd = 10 * m_timecode.fps(); + m_contextMenu = new QMenu(this); + QAction *addGuide = m_contextMenu->addAction(KIcon("document-new"), i18n("Add Guide")); + connect(addGuide, SIGNAL(triggered()), m_view, SLOT(slotAddGuide())); + QAction *delGuide = m_contextMenu->addAction(KIcon("document-new"), i18n("Delete Guide")); + connect(delGuide, SIGNAL(triggered()), m_view, SLOT(slotDeleteGuide())); + QAction *editGuide = m_contextMenu->addAction(KIcon("document-new"), i18n("Edit Guide")); + connect(editGuide, SIGNAL(triggered()), m_view, SLOT(slotEditGuide())); } // virtual void CustomRuler::mousePressEvent(QMouseEvent * event) { + if (event->button() == Qt::RightButton) { + m_contextMenu->exec(event->globalPos()); + return; + } m_view->activateMonitor(); - int pos = (int)((event->x() + offset()) / pixelPerMark() / FRAME_SIZE); + int pos = (int)((event->x() + offset())); m_moveCursor = RULER_CURSOR; if (event->y() > 10) { - if (abs(pos - m_zoneStart) < 4) m_moveCursor = RULER_START; - else if (abs(pos - (m_zoneStart + (m_zoneEnd - m_zoneStart) / 2)) < 4) m_moveCursor = RULER_MIDDLE; - else if (abs(pos - m_zoneEnd) < 4) m_moveCursor = RULER_END; + if (qAbs(pos - m_zoneStart * pixelPerMark() * FRAME_SIZE) < 4) m_moveCursor = RULER_START; + else if (qAbs(pos - (m_zoneStart + (m_zoneEnd - m_zoneStart) / 2) * pixelPerMark() * FRAME_SIZE) < 4) m_moveCursor = RULER_MIDDLE; + else if (qAbs(pos - m_zoneEnd * pixelPerMark() * FRAME_SIZE) < 4) m_moveCursor = RULER_END; } if (m_moveCursor == RULER_CURSOR) - m_view->setCursorPos(pos); + m_view->setCursorPos((int) pos / pixelPerMark() / FRAME_SIZE); } // virtual void CustomRuler::mouseMoveEvent(QMouseEvent * event) { int pos = (int)((event->x() + offset()) / pixelPerMark() / FRAME_SIZE); + if (pos < 0) pos = 0; if (m_moveCursor == RULER_CURSOR) { m_view->setCursorPos(pos); return; @@ -118,6 +130,15 @@ void CustomRuler::mouseMoveEvent(QMouseEvent * event) { update(); } + +// virtual +void CustomRuler::wheelEvent(QWheelEvent * e) { + int delta = 1; + if (e->modifiers() == Qt::ControlModifier) delta = m_timecode.fps(); + if (e->delta() < 0) delta = 0 - delta; + m_view->moveCursorPos(delta); +} + int CustomRuler::inPoint() const { return m_zoneStart; } @@ -131,13 +152,48 @@ void CustomRuler::slotMoveRuler(int newPos) { } void CustomRuler::slotCursorMoved(int oldpos, int newpos) { - //TODO: optimize (redraw only around cursor positions - update(); + update(oldpos - offset() - 6, 2, 17, 16); + update(newpos - offset() - 6, 2, 17, 16); } void CustomRuler::setPixelPerMark(double rate) { int scale = comboScale[(int) rate]; KRuler::setPixelPerMark(1.0 / scale); + double fend = pixelPerMark() * littleMarkDistance(); + switch ((int) rate) { + case 0: + m_textSpacing = fend; + break; + case 1: + m_textSpacing = fend * 5; + break; + case 2: + case 3: + case 4: + m_textSpacing = fend * m_timecode.fps(); + break; + case 5: + m_textSpacing = fend * m_timecode.fps() * 5; + break; + case 6: + m_textSpacing = fend * m_timecode.fps() * 10; + break; + case 7: + m_textSpacing = fend * m_timecode.fps() * 30; + break; + case 8: + case 9: + case 10: + m_textSpacing = fend * m_timecode.fps() * 60; + break; + case 11: + case 12: + m_textSpacing = fend * m_timecode.fps() * 300; + break; + case 13: + m_textSpacing = fend * m_timecode.fps() * 600; + break; + } } void CustomRuler::setDuration(int d) { @@ -163,7 +219,7 @@ void CustomRuler::paintEvent(QPaintEvent *e) { p.fillRect(QRect(zoneStart - offset(), e->rect().y() + e->rect().height() / 2, zoneEnd - zoneStart, e->rect().height() / 2), QBrush(QColor(133, 255, 143))); - int value = m_view->cursorPos() - offset() + 4; + int value = m_view->cursorPos() - offset(); int minval = minimum(); int maxval = maximum() + offset() - endOffset(); @@ -180,9 +236,6 @@ void CustomRuler::paintEvent(QPaintEvent *e) { QPalette palette; //p.fillRect(bg, palette.light()); // draw labels - QFont font = p.font(); - font.setPointSize(LABEL_SIZE); - p.setFont(font); p.setPen(palette.dark().color()); // draw littlemarklabel @@ -205,41 +258,29 @@ void CustomRuler::paintEvent(QPaintEvent *e) { p.drawLine((int)f, BASE_MARK_X1, (int)f, BASE_MARK_X2); } }*/ + + for (f = offsetmin; f < offsetmax; f += m_textSpacing) { + QString lab = m_timecode.getTimecodeFromFrames((int)((f - offsetmin) / pixelPerMark() / FRAME_SIZE + 0.5)); + p.drawText((int)f + 2, LABEL_SIZE, lab); + } + if (showLittleMarks()) { // draw the little marks fend = pixelPerMark() * littleMarkDistance(); - if (fend > 5) for (f = offsetmin; f < offsetmax; f += fend) { + if (fend > 5) for (f = offsetmin; f < offsetmax; f += fend) p.drawLine((int)f, LITTLE_MARK_X1, (int)f, LITTLE_MARK_X2); - if (fend > 60) { - QString lab = m_timecode.getTimecodeFromFrames((int)((f - offsetmin) / pixelPerMark() / FRAME_SIZE + 0.5)); - p.drawText((int)f + 2, LABEL_SIZE, lab); - } - } } if (showMediumMarks()) { // draw medium marks fend = pixelPerMark() * mediumMarkDistance(); - if (fend > 5) for (f = offsetmin; f < offsetmax; f += fend) { + if (fend > 5) for (f = offsetmin; f < offsetmax; f += fend) p.drawLine((int)f, MIDDLE_MARK_X1, (int)f, MIDDLE_MARK_X2); - if (fend > 60) { - QString lab = m_timecode.getTimecodeFromFrames((int)((f - offsetmin) / pixelPerMark() / FRAME_SIZE + 0.5)); - p.drawText((int)f + 2, LABEL_SIZE, lab); - } - } } if (showBigMarks()) { // draw big marks fend = pixelPerMark() * bigMarkDistance(); - if (fend > 5) for (f = offsetmin; f < offsetmax; f += fend) { + if (fend > 5) for (f = offsetmin; f < offsetmax; f += fend) p.drawLine((int)f, BIG_MARK_X1, (int)f, BIG_MARK_X2); - if (fend > 60) { - QString lab = m_timecode.getTimecodeFromFrames((int)((f - offsetmin) / pixelPerMark() / FRAME_SIZE + 0.5)); - p.drawText((int)f + 2, LABEL_SIZE, lab); - } else if (((int)(f - offsetmin)) % ((int)(fend * 5)) == 0) { - QString lab = m_timecode.getTimecodeFromFrames((int)((f - offsetmin) / pixelPerMark() / FRAME_SIZE + 0.5)); - p.drawText((int)f + 2, LABEL_SIZE, lab); - } - } } /* if (d->showem) { // draw end marks @@ -273,7 +314,7 @@ void CustomRuler::paintEvent(QPaintEvent *e) { } // draw pointer - if (showPointer() && value > 0) { + if (showPointer() && value >= 0) { QPolygon pa(3); pa.setPoints(3, value - 6, 7, value + 6, 7, value, 16); p.setBrush(QBrush(Qt::yellow));