X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomruler.cpp;h=4e4421e5ae848452052169ef874eb62eb80961d6;hb=189ef7e1a7e40e299e1b78cacc64a1d00e36f525;hp=1a10f32cb8899120f97ffac15851299de4ff6941;hpb=4720701ac49d3dcadbb4a32a9f7af263d79f2090;p=kdenlive diff --git a/src/customruler.cpp b/src/customruler.cpp index 1a10f32c..4e4421e5 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); @@ -45,23 +44,23 @@ static const int LABEL_SIZE = 9; static const int END_LABEL_X = 4; static const int END_LABEL_Y = (END_LABEL_X + LABEL_SIZE - 2); +static int littleMarkDistance; +static int mediumMarkDistance; +static int bigMarkDistance; + #include "definitions.h" 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) { + : QWidget(parent), m_timecode(tc), m_view(parent), m_duration(0), m_offset(0) { setFont(KGlobalSettings::toolBarFont()); - slotNewOffset(0); - setRulerMetricStyle(KRuler::Pixel); - setLength(1024); - setMaximum(1024); - setPixelPerMark(3); - setLittleMarkDistance(FRAME_SIZE); - 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_scale = 3; + littleMarkDistance = FRAME_SIZE; + mediumMarkDistance = FRAME_SIZE * m_timecode.fps(); + bigMarkDistance = FRAME_SIZE * m_timecode.fps() * 60; + m_zoneStart = 0; + m_zoneEnd = 100; m_contextMenu = new QMenu(this); QAction *addGuide = m_contextMenu->addAction(KIcon("document-new"), i18n("Add Guide")); connect(addGuide, SIGNAL(triggered()), m_view, SLOT(slotAddGuide())); @@ -72,6 +71,15 @@ 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())); setMouseTracking(true); + setMinimumHeight(20); +} + +void CustomRuler::setZone(QPoint p) { + int min = qMin(m_zoneStart, p.x()); + int max = qMax(m_zoneEnd, p.y()); + m_zoneStart = p.x(); + m_zoneEnd = p.y(); + update(min * m_factor - 2, 0, (max - min) * m_factor + 4, height()); } // virtual @@ -84,36 +92,46 @@ void CustomRuler::mousePressEvent(QMouseEvent * event) { int pos = (int)((event->x() + offset())); m_moveCursor = RULER_CURSOR; if (event->y() > 10) { - 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 (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; } if (m_moveCursor == RULER_CURSOR) - m_view->setCursorPos((int) pos / pixelPerMark() / FRAME_SIZE); + m_view->setCursorPos((int) pos / m_factor); } // virtual void CustomRuler::mouseMoveEvent(QMouseEvent * event) { if (event->buttons() == Qt::LeftButton) { - int pos = (int)((event->x() + offset()) / pixelPerMark() / FRAME_SIZE); + int pos = (int)((event->x() + offset()) / m_factor); + int zoneStart = m_zoneStart; + int zoneEnd = m_zoneEnd; if (pos < 0) pos = 0; if (m_moveCursor == RULER_CURSOR) { m_view->setCursorPos(pos); + m_view->slotCheckPositionScrolling(); return; } else if (m_moveCursor == RULER_START) m_zoneStart = pos; else if (m_moveCursor == RULER_END) m_zoneEnd = pos; else if (m_moveCursor == RULER_MIDDLE) { int move = pos - (m_zoneStart + (m_zoneEnd - m_zoneStart) / 2); + if (move + m_zoneStart < 0) move = - m_zoneStart; m_zoneStart += move; m_zoneEnd += move; } - update(); + emit zoneMoved(m_zoneStart, m_zoneEnd); + m_view->setDocumentModified(); + + 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()); + } else { int pos = (int)((event->x() + offset())); if (event->y() <= 10) setCursor(Qt::ArrowCursor); - else if (qAbs(pos - m_zoneStart * pixelPerMark() * FRAME_SIZE) < 4) setCursor(KCursor("left_side", Qt::SizeHorCursor)); - else if (qAbs(pos - m_zoneEnd * pixelPerMark() * FRAME_SIZE) < 4) setCursor(KCursor("right_side", Qt::SizeHorCursor)); - else if (qAbs(pos - (m_zoneStart + (m_zoneEnd - m_zoneStart) / 2) * pixelPerMark() * FRAME_SIZE) < 4) setCursor(Qt::SizeHorCursor); + else if (qAbs(pos - m_zoneStart * m_factor) < 4) setCursor(KCursor("left_side", Qt::SizeHorCursor)); + else if (qAbs(pos - m_zoneEnd * m_factor) < 4) setCursor(KCursor("right_side", Qt::SizeHorCursor)); + else if (qAbs(pos - (m_zoneStart + (m_zoneEnd - m_zoneStart) / 2) * m_factor) < 4) setCursor(Qt::SizeHorCursor); else setCursor(Qt::ArrowCursor); } } @@ -136,18 +154,26 @@ int CustomRuler::outPoint() const { } void CustomRuler::slotMoveRuler(int newPos) { - KRuler::slotNewOffset(newPos); + m_offset = newPos; + update(); +} + +int CustomRuler::offset() const { + return m_offset; } void CustomRuler::slotCursorMoved(int oldpos, int newpos) { - update(oldpos - offset() - 6, 2, 17, 16); - update(newpos - offset() - 6, 2, 17, 16); + 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::setPixelPerMark(double rate) { int scale = comboScale[(int) rate]; - KRuler::setPixelPerMark(1.0 / scale); - double fend = pixelPerMark() * littleMarkDistance(); + m_factor = 1.0 / (double) scale * FRAME_SIZE; + m_scale = 1.0 / (double) scale; + double fend = m_scale * littleMarkDistance; switch ((int) rate) { case 0: m_textSpacing = fend; @@ -182,106 +208,69 @@ void CustomRuler::setPixelPerMark(double rate) { m_textSpacing = fend * m_timecode.fps() * 600; break; } + update(); } void CustomRuler::setDuration(int d) { + int oldduration = m_duration; m_duration = d; - update(); + update(qMin(oldduration, m_duration) * m_factor - 1, 0, qAbs(oldduration - m_duration) * m_factor + 2, height()); } // virtual void CustomRuler::paintEvent(QPaintEvent *e) { - // debug ("KRuler::drawContents, %s",(horizontal==dir)?"horizontal":"vertical"); - QStylePainter p(this); p.setClipRect(e->rect()); - //p.fillRect(e->rect(), QBrush(QColor(200, 200, 200))); - //kDebug()<<"RULER ZONE: "<rect().y(), projectEnd, e->rect().height()), QBrush(QColor(245, 245, 245))); - + const int projectEnd = (int)(m_duration * m_factor); + p.fillRect(QRect(0, 0, projectEnd - m_offset, height()), QBrush(QColor(245, 245, 245))); - int zoneStart = (int)(m_zoneStart * pixelPerMark() * FRAME_SIZE); - int zoneEnd = (int)(m_zoneEnd * pixelPerMark() * FRAME_SIZE); + const int zoneStart = (int)(m_zoneStart * m_factor); + const int zoneEnd = (int)(m_zoneEnd * m_factor); - p.fillRect(QRect(zoneStart - offset(), e->rect().y() + e->rect().height() / 2, zoneEnd - zoneStart, e->rect().height() / 2), QBrush(QColor(133, 255, 143))); + p.fillRect(QRect(zoneStart - offset(), height() / 2, zoneEnd - zoneStart, height() / 2), QBrush(QColor(133, 255, 143))); - int value = m_view->cursorPos() - offset(); - int minval = minimum(); - int maxval = maximum() + offset() - endOffset(); + const int value = m_view->cursorPos() * m_factor - 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; - //ioffsetval = value-offset; - // pixelpm = (int)ppm; - // left = clip.left(), - // right = clip.right(); - double f, fend, - offsetmin = (double)(minval - offset()), - offsetmax = (double)(maxval - offset()), - fontOffset = (((double)minval) > offsetmin) ? (double)minval : offsetmin; - QRect bg = QRect((int)offsetmin, 0, (int)offsetmax, height()); + double f, fend; + const int offsetmax = maxval * FRAME_SIZE; QPalette palette; - //p.fillRect(bg, palette.light()); - // draw labels p.setPen(palette.dark().color()); - // draw littlemarklabel - - // draw mediummarklabel - - // draw bigmarklabel - - // draw endlabel - /*if (d->showEndL) { - if (d->dir == Qt::Horizontal) { - p.translate( fontOffset, 0 ); - p.drawText( END_LABEL_X, END_LABEL_Y, d->endlabel ); - }*/ - - // draw the tiny marks - //if (showTinyMarks()) - /*{ - fend = pixelPerMark()*tinyMarkDistance(); - if (fend > 5) for ( f=offsetmin; frect().left() + m_offset) / m_textSpacing; + offsetmin = offsetmin * m_textSpacing; 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); + QString lab = m_timecode.getTimecodeFromFrames((int)((f) / m_factor + 0.5)); + p.drawText((int)f - m_offset + 2, LABEL_SIZE, lab); } - if (showLittleMarks()) { + if (true) { + offsetmin = (e->rect().left() + m_offset) / littleMarkDistance; + offsetmin = offsetmin * littleMarkDistance; // draw the little marks - fend = pixelPerMark() * littleMarkDistance(); - if (fend > 5) for (f = offsetmin; f < offsetmax; f += fend) + 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 (showMediumMarks()) { + if (true) { + offsetmin = (e->rect().left() + m_offset) / mediumMarkDistance; + offsetmin = offsetmin * mediumMarkDistance; // draw medium marks - fend = pixelPerMark() * mediumMarkDistance(); - if (fend > 5) for (f = offsetmin; f < offsetmax; f += fend) + 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 (showBigMarks()) { + if (true) { + offsetmin = (e->rect().left() + m_offset) / bigMarkDistance; + offsetmin = offsetmin * bigMarkDistance; // draw big marks - fend = pixelPerMark() * bigMarkDistance(); - if (fend > 5) for (f = offsetmin; f < offsetmax; f += fend) + 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 (d->showem) { - // draw end marks - if (d->dir == Qt::Horizontal) { - p.drawLine(minval-d->offset, END_MARK_X1, minval-d->offset, END_MARK_X2); - p.drawLine(maxval-d->offset, END_MARK_X1, maxval-d->offset, END_MARK_X2); - } - else { - p.drawLine(END_MARK_X1, minval-d->offset, END_MARK_X2, minval-d->offset); - p.drawLine(END_MARK_X1, maxval-d->offset, END_MARK_X2, maxval-d->offset); - } - }*/ - // draw zone cursors int off = offset(); @@ -302,15 +291,10 @@ void CustomRuler::paintEvent(QPaintEvent *e) { } // draw pointer - if (showPointer() && value >= 0) { - QPolygon pa(3); - pa.setPoints(3, value - 6, 7, value + 6, 7, value, 16); - p.setBrush(QBrush(Qt::yellow)); - p.drawPolygon(pa); - } - - - + QPolygon pa(3); + pa.setPoints(3, value - 6, 7, value + 6, 7, value, 16); + p.setBrush(QBrush(Qt::yellow)); + p.drawPolygon(pa); } #include "customruler.moc"