X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fgeometryval.cpp;h=7fa246e65c99893f9003940ea58f35efe66ccfea;hb=56aee6aedeeed3efd10ada8fe3c229eddc01ef05;hp=b87c3a1ccf60116e4faa83cf91013cd7a4e7bf0d;hpb=d1ae9c451b613cf4597433ffe315e64dd8c0144d;p=kdenlive diff --git a/src/geometryval.cpp b/src/geometryval.cpp index b87c3a1c..7fa246e6 100644 --- a/src/geometryval.cpp +++ b/src/geometryval.cpp @@ -26,9 +26,10 @@ #include #include #include +#include -Geometryval::Geometryval(const MltVideoProfile profile, 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_paramRect(NULL), @@ -36,9 +37,13 @@ Geometryval::Geometryval(const MltVideoProfile profile, QPoint frame_size, int s 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)); @@ -60,7 +65,7 @@ Geometryval::Geometryval(const MltVideoProfile profile, QPoint frame_size, int s 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)); @@ -105,7 +110,6 @@ Geometryval::Geometryval(const MltVideoProfile profile, QPoint frame_size, int s 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())); buttonhcenter->setIcon(KIcon("kdenlive-align-hor")); buttonhcenter->setToolTip(i18n("Align item horizontally")); @@ -130,7 +134,7 @@ Geometryval::Geometryval(const MltVideoProfile profile, QPoint frame_size, int s connect(spinY, SIGNAL(valueChanged(int)), this, SLOT(slotGeometryY(int))); connect(spinWidth, SIGNAL(valueChanged(int)), this, SLOT(slotGeometryWidth(int))); connect(spinHeight, SIGNAL(valueChanged(int)), this, SLOT(slotGeometryHeight(int))); - connect(spinResize, SIGNAL(valueChanged(int)), this, SLOT(slotResizeCustom(int))); + connect(spinResize, SIGNAL(editingFinished()), this, SLOT(slotResizeCustom())); connect(buttonResize, SIGNAL(clicked()), this, SLOT(slotResizeOriginal())); connect(this, SIGNAL(parameterChanged()), this, SLOT(slotUpdateGeometry())); @@ -210,17 +214,18 @@ void Geometryval::slotResizeOriginal() slotUpdateTransitionProperties(); } -void Geometryval::slotResizeCustom(int value) +void Geometryval::slotResizeCustom() { if (!keyframeSelected()) return; + int value = spinResize->value(); m_paramRect->setRect(0, 0, m_realWidth * value / 100, m_profile.height * value / 100); slotUpdateTransitionProperties(); } void Geometryval::slotTransparencyChanged(int transp) { - int pos = spinPos->value(); + int pos = m_timePos.getValue(); Mlt::GeometryItem item; int error = m_geom->fetch(&item, pos); if (error || item.key() == false) { @@ -238,11 +243,22 @@ void Geometryval::slotSyncCursor() KdenliveSettings::setTransitionfollowcursor(m_syncAction->isChecked()); } +void Geometryval::updateTimecodeFormat() +{ + m_timePos.slotUpdateTimeCodeFormat(); +} + void Geometryval::slotPositionChanged(int pos, bool seek) { + if (pos == -1) { + pos = m_timePos.getValue(); + } if (seek && KdenliveSettings::transitionfollowcursor()) emit seekToPos(pos + m_startPoint); - spinPos->setValue(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) { @@ -273,14 +289,16 @@ void Geometryval::slotDeleteFrame(int pos) { // check there is more than one keyframe Mlt::GeometryItem item; - if (pos == -1) pos = spinPos->value(); + int frame = m_timePos.getValue(); + + if (pos == -1) pos = frame; int error = m_geom->next_key(&item, pos + 1); if (error) { error = m_geom->prev_key(&item, pos - 1); if (error || item.frame() == pos) return; } - m_geom->remove(spinPos->value()); + m_geom->remove(frame); buttonAdd->setEnabled(true); buttonDelete->setEnabled(false); widget->setEnabled(false); @@ -295,7 +313,8 @@ void Geometryval::slotDeleteFrame(int pos) void Geometryval::slotAddFrame(int pos) { - if (pos == -1) pos = spinPos->value(); + int frame = m_timePos.getValue(); + if (pos == -1) pos = frame; Mlt::GeometryItem item; item.frame(pos); QRectF r = m_paramRect->rect().normalized(); @@ -320,14 +339,14 @@ void Geometryval::slotNextFrame() { Mlt::GeometryItem item; int error = m_geom->next_key(&item, m_helper->value() + 1); + int pos; kDebug() << "// SEEK TO NEXT KFR: " << error; if (error) { // Go to end - spinPos->setValue(spinPos->maximum()); - return; - } - int pos = item.frame(); - spinPos->setValue(pos); + pos = m_helper->frameLength; + } else pos = item.frame(); + m_timePos.setValue(pos); + slotPositionChanged(); } void Geometryval::slotPreviousFrame() @@ -337,7 +356,8 @@ void Geometryval::slotPreviousFrame() kDebug() << "// SEEK TO NEXT KFR: " << error; if (error) return; int pos = item.frame(); - spinPos->setValue(pos); + m_timePos.setValue(pos); + slotPositionChanged(); } @@ -358,18 +378,16 @@ void Geometryval::setupParam(const QDomElement par, int minFrame, int maxFrame) spinTransp->setMaximum(500); label_pos->setHidden(true); m_helper->setHidden(true); - spinPos->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 @@ -379,7 +397,6 @@ void Geometryval::setupParam(const QDomElement par, int minFrame, int maxFrame) /*QDomDocument doc; doc.appendChild(doc.importNode(par, true)); kDebug() << "IMPORTED TRANS: " << doc.toString();*/ - spinPos->setMaximum(maxFrame - minFrame - 1); if (m_path == NULL) { m_path = new QGraphicsPathItem(); m_path->setPen(QPen(Qt::red)); @@ -401,11 +418,22 @@ void Geometryval::setupParam(const QDomElement par, int minFrame, int maxFrame) slotPositionChanged(0, false); slotUpdateGeometry(); if (!m_fixedMode) { - connect(spinPos, SIGNAL(valueChanged(int)), this , SLOT(slotPositionChanged(int))); + 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; @@ -429,7 +457,7 @@ void Geometryval::updateTransitionPath() void Geometryval::slotUpdateTransitionProperties() { - int pos = spinPos->value(); + int pos = m_timePos.getValue(); Mlt::GeometryItem item; int error = m_geom->next_key(&item, pos); if (error || item.frame() != pos) { @@ -461,7 +489,7 @@ void Geometryval::slotResetPosition() } } -void Geometryval::setFrameSize(QPoint p) +void Geometryval::setFrameSize(const QPoint &p) { m_frameSize = p; } @@ -471,6 +499,7 @@ void Geometryval::slotKeyframeMoved(int pos) { slotPositionChanged(pos); slotUpdateTransitionProperties(); + QTimer::singleShot(100, this, SIGNAL(parameterChanged())); } void Geometryval::slotSwitchOptions() @@ -482,7 +511,7 @@ void Geometryval::slotSwitchOptions() frameOptions->setHidden(true); m_editOptions->setChecked(false); } - adjustSize(); + //adjustSize(); } void Geometryval::slotGeometryX(int value) @@ -543,9 +572,17 @@ void Geometryval::slotUpdateGeometry() bool Geometryval::keyframeSelected() { Mlt::GeometryItem item; - if (m_geom->fetch(&item, spinPos->value()) || item.key() == false) return false; + 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"