X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftransition.cpp;h=f29c7744a30b9cd1559d78255c66abd013931e7a;hb=56aee6aedeeed3efd10ada8fe3c229eddc01ef05;hp=e8bfbd41011531d68f3a958a8cf968c91a5ef6c9;hpb=f0867739c9a788a250a37174e0952e0e96e318b3;p=kdenlive diff --git a/src/transition.cpp b/src/transition.cpp index e8bfbd41..f29c7744 100644 --- a/src/transition.cpp +++ b/src/transition.cpp @@ -34,10 +34,10 @@ #endif Transition::Transition(const ItemInfo &info, int transitiontrack, double fps, const QDomElement ¶ms, bool automaticTransition) : - AbstractClipItem(info, QRectF(), fps), - m_forceTransitionTrack(false), - m_automaticTransition(automaticTransition), - m_transitionTrack(transitiontrack) + AbstractClipItem(info, QRectF(), fps), + m_forceTransitionTrack(false), + m_automaticTransition(automaticTransition), + m_transitionTrack(transitiontrack) { setZValue(3); m_info.cropDuration = info.endPos - info.startPos; @@ -88,7 +88,7 @@ Transition::~Transition() Transition *Transition::clone() { - QDomElement xml = toXML().cloneNode().toElement(); + const QDomElement xml = toXML().cloneNode().toElement(); Transition *tr = new Transition(info(), transitionEndTrack(), m_fps, xml); return tr; } @@ -123,13 +123,15 @@ void Transition::setAutomatic(bool automatic) update(); } -void Transition::setTransitionParameters(const QDomElement params) +void Transition::setTransitionParameters(const QDomElement ¶ms) { - m_parameters = params; - if (m_parameters.attribute("force_track") == "1") setForcedTrack(true, m_parameters.attribute("transition_btrack").toInt()); - else if (m_parameters.attribute("force_track") == "0") setForcedTrack(false, m_parameters.attribute("transition_btrack").toInt()); - m_name = i18n(m_parameters.firstChildElement("name").text().toUtf8().data()); - update(); + if (m_parameters != params) { + m_parameters = params; + if (m_parameters.attribute("force_track") == "1") setForcedTrack(true, m_parameters.attribute("transition_btrack").toInt()); + else if (m_parameters.attribute("force_track") == "0") setForcedTrack(false, m_parameters.attribute("transition_btrack").toInt()); + m_name = i18n(m_parameters.firstChildElement("name").text().toUtf8().data()); + update(); + } } int Transition::transitionEndTrack() const @@ -177,7 +179,7 @@ void Transition::paint(QPainter *painter, // Draw clip name if (isSelected() || (parentItem() && parentItem()->isSelected())) { framePen.setColor(scene()->palette().highlight().color()); - framePen.setColor(Qt::red); + framePen.setColor(Qt::red); } else { framePen.setColor(brush().color().darker()); @@ -201,7 +203,7 @@ void Transition::paint(QPainter *painter, int Transition::type() const { - return TRANSITIONWIDGET; + return TransitionWidget; } //virtual @@ -220,11 +222,11 @@ QVariant Transition::itemChange(GraphicsItemChange change, const QVariant &value int newTrack = newPos.y() / KdenliveSettings::trackheight(); newTrack = qMin(newTrack, projectScene()->tracksCount() - 1); newTrack = qMax(newTrack, 0); - QStringList lockedTracks = property("locked_tracks").toStringList(); - if (lockedTracks.contains(QString::number(newTrack))) { - // Trying to move to a locked track - return pos(); - } + QStringList lockedTracks = property("locked_tracks").toStringList(); + if (lockedTracks.contains(QString::number(newTrack))) { + // Trying to move to a locked track + return pos(); + } newPos.setY((int)(newTrack * KdenliveSettings::trackheight() + itemOffset() + 1)); // Only one clip is moving QRectF sceneShape = rect(); @@ -238,7 +240,7 @@ QVariant Transition::itemChange(GraphicsItemChange change, const QVariant &value bool forwardMove = newPos.x() > pos().x(); int offset = 0; if (!items.isEmpty()) { - for (int i = 0; i < items.count(); i++) { + for (int i = 0; i < items.count(); ++i) { if (!items.at(i)->isEnabled()) continue; if (items.at(i)->type() == type()) { // Collision! @@ -279,7 +281,7 @@ QVariant Transition::itemChange(GraphicsItemChange change, const QVariant &value } } } - + m_info.track = newTrack; m_info.startPos = GenTime((int) newPos.x(), m_fps); //kDebug()<<"// ITEM NEW POS: "<scale().x(); double maximumOffset = 6 / scale; QRectF rect = sceneBoundingRect(); - if (qAbs((int)(pos.x() - rect.x())) < maximumOffset) return RESIZESTART; - else if (qAbs((int)(pos.x() - (rect.right()))) < maximumOffset) return RESIZEEND; - return MOVE; + if (qAbs((int)(pos.x() - rect.x())) < maximumOffset) return ResizeStart; + else if (qAbs((int)(pos.x() - (rect.right()))) < maximumOffset) return ResizeEnd; + return MoveOperation; } //static @@ -331,7 +333,7 @@ QDomElement Transition::toXML() bool Transition::hasGeometry() { QDomNodeList namenode = m_parameters.elementsByTagName("parameter"); - for (int i = 0; i < namenode.count() ; i++) { + for (int i = 0; i < namenode.count() ; ++i) { QDomElement pa = namenode.item(i).toElement(); if (pa.attribute("type") == "geometry") return true; } @@ -349,7 +351,7 @@ bool Transition::updateKeyframes(int oldEnd) QDomElement pa; bool modified = false; QDomNodeList namenode = m_parameters.elementsByTagName("parameter"); - for (int i = 0; i < namenode.count() ; i++) { + for (int i = 0; i < namenode.count() ; ++i) { pa = namenode.item(i).toElement(); if (pa.attribute("type") == "geometry") { keyframes = pa.attribute("value"); @@ -362,37 +364,37 @@ bool Transition::updateKeyframes(int oldEnd) int frame; int i = 0; if (oldEnd < duration) { - // Transition was expanded, check if we had a keyframe at end position - foreach(QString pos, values) { - if (!pos.contains('=')) { - i++; - continue; - } - frame = pos.section('=', 0, 0).toInt(); - if (frame == oldEnd) { - // Move that keyframe to new end + // Transition was expanded, check if we had a keyframe at end position + foreach(QString pos, values) { + if (!pos.contains('=')) { + ++i; + continue; + } + frame = pos.section('=', 0, 0).toInt(); + if (frame == oldEnd) { + // Move that keyframe to new end values[i] = QString::number(duration) + '=' + pos.section('=', 1); - pa.setAttribute("value", values.join(";")); - return true; - } - i++; - } - return false; + pa.setAttribute("value", values.join(";")); + return true; + } + ++i; + } + return false; } else { - // Transition was shortened, check for out of bounds keyframes - foreach(const QString &pos, values) { - if (!pos.contains('=')) { - i++; - continue; - } - frame = pos.section('=', 0, 0).toInt(); - if (frame > duration) { - modified = true; - break; - } - i++; - } + // Transition was shortened, check for out of bounds keyframes + foreach(const QString &pos, values) { + if (!pos.contains('=')) { + ++i; + continue; + } + frame = pos.section('=', 0, 0).toInt(); + if (frame > duration) { + modified = true; + break; + } + ++i; + } } if (modified) { if (i > 0) { @@ -425,3 +427,5 @@ bool Transition::updateKeyframes(int oldEnd) return true; } + +#include "transition.moc"