X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fgeometryval.cpp;h=7fa246e65c99893f9003940ea58f35efe66ccfea;hb=56aee6aedeeed3efd10ada8fe3c229eddc01ef05;hp=037b4ebdb54f3164267219e21810f2883c19c4d7;hpb=3764c86b800e4bda12a212d1ec3765e0aa95812a;p=kdenlive diff --git a/src/geometryval.cpp b/src/geometryval.cpp index 037b4ebd..7fa246e6 100644 --- a/src/geometryval.cpp +++ b/src/geometryval.cpp @@ -26,20 +26,24 @@ #include #include #include +#include -Geometryval::Geometryval(const MltVideoProfile profile, Timecode t, QPoint frame_size, int startPoint, QWidget* parent) : +Geometryval::Geometryval(const MltVideoProfile &profile, const Timecode &t, const QPoint &frame_size, int startPoint, QWidget* parent) : QWidget(parent), m_profile(profile), - m_timecode(t), m_paramRect(NULL), m_geom(NULL), m_path(NULL), m_fixedMode(false), m_frameSize(frame_size), - m_startPoint(startPoint) + m_startPoint(startPoint), + m_timePos(t) { setupUi(this); + toolbarlayout->addWidget(&m_timePos); + toolbarlayout->insertStretch(-1); + QVBoxLayout* vbox = new QVBoxLayout(widget); m_sceneview = new QGraphicsView(this); m_sceneview->setBackgroundBrush(QBrush(Qt::black)); @@ -61,7 +65,7 @@ Geometryval::Geometryval(const MltVideoProfile profile, Timecode t, QPoint frame m_sceneview->setScene(m_scene); m_dar = (m_profile.height * m_profile.display_aspect_num / (double) m_profile.display_aspect_den) / (double) m_profile.width; - m_realWidth = (int)(profile.height * profile.display_aspect_num / (double) profile.display_aspect_den); + m_realWidth = (int)(profile.height * profile.display_aspect_num / (double) profile.display_aspect_den + 0.5); QGraphicsRectItem *frameBorder = new QGraphicsRectItem(QRectF(0, 0, m_realWidth, profile.height)); frameBorder->setZValue(-1100); frameBorder->setBrush(QColor(255, 255, 0, 30)); @@ -106,9 +110,6 @@ Geometryval::Geometryval(const MltVideoProfile profile, Timecode t, QPoint frame connect(buttonDelete , SIGNAL(clicked()) , this , SLOT(slotDeleteFrame())); connect(buttonAdd , SIGNAL(clicked()) , this , SLOT(slotAddFrame())); connect(m_scene, SIGNAL(actionFinished()), this, SLOT(slotUpdateTransitionProperties())); - connect(m_scene, SIGNAL(doubleClickEvent()), this, SLOT(slotGeometry())); - connect(pos_up, SIGNAL(clicked()), this, SLOT(slotPosUp())); - connect(pos_down, SIGNAL(clicked()), this, SLOT(slotPosDown())); buttonhcenter->setIcon(KIcon("kdenlive-align-hor")); buttonhcenter->setToolTip(i18n("Align item horizontally")); @@ -224,9 +225,7 @@ void Geometryval::slotResizeCustom() void Geometryval::slotTransparencyChanged(int transp) { - int pos; - if (KdenliveSettings::frametimecode()) pos = timePos->text().toInt(); - else pos = m_timecode.getFrameCount(timePos->text()); + int pos = m_timePos.getValue(); Mlt::GeometryItem item; int error = m_geom->fetch(&item, pos); if (error || item.key() == false) { @@ -246,59 +245,20 @@ void Geometryval::slotSyncCursor() void Geometryval::updateTimecodeFormat() { - timePos->setInputMask(""); - if (KdenliveSettings::frametimecode()) { - int frames = m_timecode.getFrameCount(timePos->text()); - QIntValidator *valid = new QIntValidator(this); - valid->setBottom(0); - timePos->setValidator(valid); - timePos->setText(QString::number(frames)); - } else { - int pos = timePos->text().toInt(); - timePos->setValidator(m_timecode.validator()); - timePos->setText(m_timecode.getTimecodeFromFrames(pos)); - } -} - -void Geometryval::slotPosUp() -{ - int pos; - if (KdenliveSettings::frametimecode()) pos = timePos->text().toInt(); - else pos = m_timecode.getFrameCount(timePos->text()); - pos ++; - if (pos > m_helper->frameLength) pos = m_helper->frameLength; - if (KdenliveSettings::frametimecode()) { - timePos->setText(QString::number(pos)); - } else timePos->setText(m_timecode.getTimecodeFromFrames(pos)); - slotPositionChanged(); -} - -void Geometryval::slotPosDown() -{ - int pos; - if (KdenliveSettings::frametimecode()) pos = timePos->text().toInt(); - else pos = m_timecode.getFrameCount(timePos->text()); - pos --; - if (pos < 0) pos = 0; - if (KdenliveSettings::frametimecode()) { - timePos->setText(QString::number(pos)); - } else timePos->setText(m_timecode.getTimecodeFromFrames(pos)); - slotPositionChanged(); + m_timePos.slotUpdateTimeCodeFormat(); } void Geometryval::slotPositionChanged(int pos, bool seek) { if (pos == -1) { - if (KdenliveSettings::frametimecode()) pos = timePos->text().toInt(); - else pos = m_timecode.getFrameCount(timePos->text()); + pos = m_timePos.getValue(); } if (seek && KdenliveSettings::transitionfollowcursor()) emit seekToPos(pos + m_startPoint); - if (KdenliveSettings::frametimecode()) { - timePos->setText(QString::number(pos)); - } else timePos->setText(m_timecode.getTimecodeFromFrames(pos)); - + m_timePos.setValue(pos); //spinPos->setValue(pos); + m_helper->blockSignals(true); m_helper->setValue(pos); + m_helper->blockSignals(false); Mlt::GeometryItem item; int error = m_geom->fetch(&item, pos); if (error || item.key() == false) { @@ -329,9 +289,7 @@ void Geometryval::slotDeleteFrame(int pos) { // check there is more than one keyframe Mlt::GeometryItem item; - int frame; - if (KdenliveSettings::frametimecode()) frame = timePos->text().toInt(); - else frame = m_timecode.getFrameCount(timePos->text()); + int frame = m_timePos.getValue(); if (pos == -1) pos = frame; int error = m_geom->next_key(&item, pos + 1); @@ -355,9 +313,7 @@ void Geometryval::slotDeleteFrame(int pos) void Geometryval::slotAddFrame(int pos) { - int frame; - if (KdenliveSettings::frametimecode()) frame = timePos->text().toInt(); - else frame = m_timecode.getFrameCount(timePos->text()); + int frame = m_timePos.getValue(); if (pos == -1) pos = frame; Mlt::GeometryItem item; item.frame(pos); @@ -389,10 +345,7 @@ void Geometryval::slotNextFrame() // Go to end pos = m_helper->frameLength; } else pos = item.frame(); - - if (KdenliveSettings::frametimecode()) { - timePos->setText(QString::number(pos)); - } else timePos->setText(m_timecode.getTimecodeFromFrames(pos)); + m_timePos.setValue(pos); slotPositionChanged(); } @@ -403,9 +356,7 @@ void Geometryval::slotPreviousFrame() kDebug() << "// SEEK TO NEXT KFR: " << error; if (error) return; int pos = item.frame(); - if (KdenliveSettings::frametimecode()) { - timePos->setText(QString::number(pos)); - } else timePos->setText(m_timecode.getTimecodeFromFrames(pos)); + m_timePos.setValue(pos); slotPositionChanged(); } @@ -427,18 +378,16 @@ void Geometryval::setupParam(const QDomElement par, int minFrame, int maxFrame) spinTransp->setMaximum(500); label_pos->setHidden(true); m_helper->setHidden(true); - timePos->setHidden(true); + m_timePos.setHidden(true); } if (par.attribute("opacity") == "false") { label_opacity->setHidden(true); spinTransp->setHidden(true); - } else if (par.attribute("opacity") == "nonzero") { - spinTransp->setMinimum(1); } - char *tmp = (char *) qstrdup(val.toUtf8().data()); - if (m_geom) m_geom->parse(tmp, maxFrame - minFrame, m_profile.width, m_profile.height); - else m_geom = new Mlt::Geometry(tmp, maxFrame - minFrame, m_profile.width, m_profile.height); - delete[] tmp; + if (m_geom) + m_geom->parse(val.toUtf8().data(), maxFrame - minFrame, m_profile.width, m_profile.height); + else + m_geom = new Mlt::Geometry(val.toUtf8().data(), maxFrame - minFrame, m_profile.width, m_profile.height); //kDebug() << " / / UPDATING TRANSITION VALUE: " << m_geom->serialise(); //read param her and set rect @@ -469,11 +418,22 @@ void Geometryval::setupParam(const QDomElement par, int minFrame, int maxFrame) slotPositionChanged(0, false); slotUpdateGeometry(); if (!m_fixedMode) { - connect(timePos, SIGNAL(editingFinished()), this , SLOT(slotPositionChanged())); + m_timePos.setRange(0, maxFrame - minFrame - 1); + connect(&m_timePos, SIGNAL(timeCodeEditingFinished()), this , SLOT(slotPositionChanged())); } connect(spinTransp, SIGNAL(valueChanged(int)), this , SLOT(slotTransparencyChanged(int))); } +void Geometryval::slotSyncPosition(int relTimelinePos) +{ + if (m_timePos.maximum() > 0 && KdenliveSettings::transitionfollowcursor()) { + relTimelinePos = qMax(0, relTimelinePos); + relTimelinePos = qMin(relTimelinePos, m_timePos.maximum()); + if (relTimelinePos != m_timePos.getValue()) + slotPositionChanged(relTimelinePos, false); + } +} + void Geometryval::updateTransitionPath() { if (m_fixedMode) return; @@ -497,9 +457,7 @@ void Geometryval::updateTransitionPath() void Geometryval::slotUpdateTransitionProperties() { - int pos; - if (KdenliveSettings::frametimecode()) pos = timePos->text().toInt(); - else pos = m_timecode.getFrameCount(timePos->text()); + int pos = m_timePos.getValue(); Mlt::GeometryItem item; int error = m_geom->next_key(&item, pos); if (error || item.frame() != pos) { @@ -531,7 +489,7 @@ void Geometryval::slotResetPosition() } } -void Geometryval::setFrameSize(QPoint p) +void Geometryval::setFrameSize(const QPoint &p) { m_frameSize = p; } @@ -541,6 +499,7 @@ void Geometryval::slotKeyframeMoved(int pos) { slotPositionChanged(pos); slotUpdateTransitionProperties(); + QTimer::singleShot(100, this, SIGNAL(parameterChanged())); } void Geometryval::slotSwitchOptions() @@ -613,12 +572,17 @@ void Geometryval::slotUpdateGeometry() bool Geometryval::keyframeSelected() { Mlt::GeometryItem item; - int pos; - if (KdenliveSettings::frametimecode()) pos = timePos->text().toInt(); - else pos = m_timecode.getFrameCount(timePos->text()); + int pos = m_timePos.getValue(); if (m_geom->fetch(&item, pos) || item.key() == false) return false; return true; } +void Geometryval::slotUpdateRange(int inPoint, int outPoint) +{ + m_helper->setKeyGeometry(m_geom, outPoint - inPoint - 1); + m_helper->update(); + m_timePos.setRange(0, outPoint - inPoint - 1); +} +#include "geometryval.moc"