X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomruler.cpp;h=045a2be04fee07d61579ae024bd47b9425bf1cbf;hb=39415684f9836d4011e244abdae68c470c802727;hp=23241b92ae6893aefc1bef57a723ca9c79d15f51;hpb=9cebbfefb3320c9ff001ac3005b6ad33d1e4fcfd;p=kdenlive diff --git a/src/customruler.cpp b/src/customruler.cpp index 23241b92..045a2be0 100644 --- a/src/customruler.cpp +++ b/src/customruler.cpp @@ -17,16 +17,15 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include -#include +#include "customruler.h" #include #include #include #include -#include "customruler.h" - +#include +#include static const int FIX_WIDTH = 24; /* widget width in pixel */ static const int LINE_END = (FIX_WIDTH - 3); @@ -51,12 +50,18 @@ static int bigMarkDistance; #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, 750, 1500, 3000, 6000, 12000}; -CustomRuler::CustomRuler(Timecode tc, CustomTrackView *parent) - : QWidget(parent), m_timecode(tc), m_view(parent), m_duration(0), m_offset(0) { +CustomRuler::CustomRuler(Timecode tc, CustomTrackView *parent) : + QWidget(parent), + m_timecode(tc), + m_view(parent), + m_duration(0), + m_offset(0) +{ setFont(KGlobalSettings::toolBarFont()); 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; @@ -75,7 +80,8 @@ CustomRuler::CustomRuler(Timecode tc, CustomTrackView *parent) setMinimumHeight(20); } -void CustomRuler::setZone(QPoint p) { +void CustomRuler::setZone(QPoint p) +{ int min = qMin(m_zoneStart, p.x()); int max = qMax(m_zoneEnd, p.y()); m_zoneStart = p.x(); @@ -84,7 +90,8 @@ void CustomRuler::setZone(QPoint p) { } // virtual -void CustomRuler::mousePressEvent(QMouseEvent * event) { +void CustomRuler::mousePressEvent(QMouseEvent * event) +{ if (event->button() == Qt::RightButton) { m_contextMenu->exec(event->globalPos()); return; @@ -102,7 +109,8 @@ void CustomRuler::mousePressEvent(QMouseEvent * event) { } // virtual -void CustomRuler::mouseMoveEvent(QMouseEvent * event) { +void CustomRuler::mouseMoveEvent(QMouseEvent * event) +{ if (event->buttons() == Qt::LeftButton) { int pos = (int)((event->x() + offset()) / m_factor); int zoneStart = m_zoneStart; @@ -139,42 +147,65 @@ void CustomRuler::mouseMoveEvent(QMouseEvent * event) { // virtual -void CustomRuler::wheelEvent(QWheelEvent * e) { +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 { +int CustomRuler::inPoint() const +{ return m_zoneStart; } -int CustomRuler::outPoint() const { +int CustomRuler::outPoint() const +{ return m_zoneEnd; } -void CustomRuler::slotMoveRuler(int newPos) { +void CustomRuler::slotMoveRuler(int newPos) +{ m_offset = newPos; update(); } -int CustomRuler::offset() const { +int CustomRuler::offset() const +{ return m_offset; } -void CustomRuler::slotCursorMoved(int oldpos, int newpos) { - if (qAbs(oldpos - newpos) * m_factor > 40) { - update(oldpos * m_factor - offset() - 6, 7, 17, 16); - update(newpos * m_factor - offset() - 6, 7, 17, 16); - } else update(qMin(oldpos, newpos) * m_factor - offset() - 6, 7, qAbs(oldpos - newpos) * m_factor + 17, 16); +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()); } -void CustomRuler::setPixelPerMark(double rate) { +void CustomRuler::setPixelPerMark(double rate) +{ int scale = comboScale[(int) rate]; m_factor = 1.0 / (double) scale * FRAME_SIZE; m_scale = 1.0 / (double) scale; double fend = m_scale * littleMarkDistance; + if (rate > 8) { + mediumMarkDistance = (double) FRAME_SIZE * m_timecode.fps() * 60; + bigMarkDistance = (double) FRAME_SIZE * m_timecode.fps() * 300; + } + else if (rate > 6) { + mediumMarkDistance = (double) FRAME_SIZE * m_timecode.fps() * 10; + bigMarkDistance = (double) FRAME_SIZE * m_timecode.fps() * 30; + } + else if (rate > 3) { + mediumMarkDistance = (double) FRAME_SIZE * m_timecode.fps(); + bigMarkDistance = (double) FRAME_SIZE * m_timecode.fps() * 5; + } + else { + mediumMarkDistance = (double) FRAME_SIZE * m_timecode.fps(); + bigMarkDistance = (double) FRAME_SIZE * m_timecode.fps() * 60; + } switch ((int) rate) { case 0: m_textSpacing = fend; @@ -198,40 +229,44 @@ void CustomRuler::setPixelPerMark(double rate) { break; case 8: case 9: + m_textSpacing = fend * m_timecode.fps() * 40; + break; case 10: - m_textSpacing = fend * m_timecode.fps() * 60; + m_textSpacing = fend * m_timecode.fps() * 80; break; case 11: case 12: - m_textSpacing = fend * m_timecode.fps() * 300; + m_textSpacing = fend * m_timecode.fps() * 400; break; case 13: - m_textSpacing = fend * m_timecode.fps() * 600; + m_textSpacing = fend * m_timecode.fps() * 800; break; } update(); } -void CustomRuler::setDuration(int d) { +void CustomRuler::setDuration(int d) +{ int oldduration = m_duration; m_duration = d; - update(qMin(oldduration, m_duration) * m_factor - 1, 0, qAbs(oldduration - m_duration) * m_factor + 2, height()); + update(qMin(oldduration, m_duration) * m_factor - 1 - offset(), 0, qAbs(oldduration - m_duration) * m_factor + 2, height()); } // virtual -void CustomRuler::paintEvent(QPaintEvent *e) { +void CustomRuler::paintEvent(QPaintEvent *e) +{ QStylePainter p(this); p.setClipRect(e->rect()); - const int projectEnd = (int)(m_duration * m_factor); - p.fillRect(QRect(0, 0, projectEnd - m_offset, height()), QBrush(QColor(245, 245, 245))); + p.fillRect(0, 0, projectEnd - m_offset, height(), palette().alternateBase().color()); const int zoneStart = (int)(m_zoneStart * m_factor); const int zoneEnd = (int)(m_zoneEnd * m_factor); + const QRect zoneRect(); - p.fillRect(QRect(zoneStart - offset(), height() / 2, zoneEnd - zoneStart, height() / 2), QBrush(QColor(133, 255, 143))); + p.fillRect(zoneStart - m_offset, height() / 2, zoneEnd - zoneStart, height() / 2, m_zoneColor); - const int value = m_view->cursorPos() * m_factor - offset(); + 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; if (minval < 0) minval = 0; @@ -239,40 +274,38 @@ void CustomRuler::paintEvent(QPaintEvent *e) { double f, fend; const int offsetmax = maxval * FRAME_SIZE; - QPalette palette; - p.setPen(palette.dark().color()); + p.setPen(palette().dark().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((int)f - m_offset + 2, LABEL_SIZE, lab); - } + QString lab = m_timecode.getTimecodeFromFrames((int)(f / m_factor + 0.5)); - if (true) { - 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 (true) { - 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 (true) { - 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); + 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); + + 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); + + 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); + // draw zone cursors int off = offset(); if (zoneStart > 0) { @@ -293,8 +326,8 @@ void CustomRuler::paintEvent(QPaintEvent *e) { // draw pointer QPolygon pa(3); - pa.setPoints(3, value - 6, 7, value + 6, 7, value, 16); - p.setBrush(QBrush(Qt::yellow)); + pa.setPoints(3, value - 6, 8, value + 6, 8, value, 16); + p.setBrush(palette().highlight()); p.drawPolygon(pa); }