X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftransition.cpp;h=b2d76e7289fe12d405ff30603ef992ff48ae793b;hb=d679fbf19a2511b181570418dc7fa7c815728bcb;hp=a43a8ce8c1beff1c1db562020c4bbc6cc07f61de;hpb=1638e2102044baead0d085bdc9b5b2e7954ce4fb;p=kdenlive diff --git a/src/transition.cpp b/src/transition.cpp index a43a8ce8..b2d76e72 100644 --- a/src/transition.cpp +++ b/src/transition.cpp @@ -29,15 +29,15 @@ #include #include #include +#if QT_VERSION >= 0x040600 #include +#endif - -Transition::Transition(const ItemInfo &info, int transitiontrack, double fps, QDomElement params, bool automaticTransition) : - AbstractClipItem(info, QRectF(), fps), - m_forceTransitionTrack(false), - m_automaticTransition(automaticTransition), - m_secondClip(NULL), - m_transitionTrack(transitiontrack) +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) { setZValue(3); m_info.cropDuration = info.endPos - info.startPos; @@ -51,8 +51,8 @@ Transition::Transition(const ItemInfo &info, int transitiontrack, double fps, QD else { QPropertyAnimation *startAnimation = new QPropertyAnimation(this, "rect"); startAnimation->setDuration(200); - QRectF r(0, 0, m_info.cropDuration.frames(fps) - 0.02, (qreal) itemHeight() / 2); - QRectF r2(0, 0, m_info.cropDuration.frames(fps) - 0.02, (qreal)itemHeight()); + const QRectF r(0, 0, m_info.cropDuration.frames(fps) - 0.02, (qreal) itemHeight() / 2); + const QRectF r2(0, 0, m_info.cropDuration.frames(fps) - 0.02, (qreal)itemHeight()); startAnimation->setStartValue(r); startAnimation->setEndValue(r2); startAnimation->setEasingCurve(QEasingCurve::OutQuad); @@ -78,9 +78,6 @@ Transition::Transition(const ItemInfo &info, int transitiontrack, double fps, QD else if (m_parameters.attribute("automatic") == "1") m_automaticTransition = true; if (m_parameters.attribute("force_track") == "1") m_forceTransitionTrack = true; m_name = i18n(m_parameters.firstChildElement("name").text().toUtf8().data()); - m_secondClip = 0; - - //m_referenceClip->addTransition(this); } Transition::~Transition() @@ -91,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; } @@ -126,24 +123,15 @@ void Transition::setAutomatic(bool automatic) update(); } -void Transition::setTransitionParameters(const QDomElement 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(); -} - - -bool Transition::invertedTransition() const +void Transition::setTransitionParameters(const QDomElement ¶ms) { - return false; //m_parameters.attribute("reverse").toInt(); -} - -void Transition::setTransitionDirection(bool /*inv*/) -{ - //m_parameters.setAttribute("reverse", inv); + 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 @@ -171,22 +159,27 @@ void Transition::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget */*widget*/) { - const QRectF exposed = option->exposedRect; - painter->setClipRect(exposed); + const QRectF exposed = painter->worldTransform().mapRect(option->exposedRect); const QRectF br = rect(); QPen framePen; + framePen.setWidthF(1.2); const QRectF mapped = painter->worldTransform().mapRect(br); - painter->fillRect(exposed, brush()); - QPointF p1(br.x(), br.y() + br.height() / 2 - 7); - painter->setWorldMatrixEnabled(false); + painter->setWorldTransform(QTransform()); + QPainterPath p; + p.addRect(exposed); + + QPainterPath q; + q.addRoundedRect(mapped, 3, 3); + painter->setClipPath(p.intersected(q)); + painter->fillRect(exposed, brush()); const QString text = m_name + (m_forceTransitionTrack ? "|>" : QString()); // Draw clip name if (isSelected() || (parentItem() && parentItem()->isSelected())) { + framePen.setColor(scene()->palette().highlight().color()); framePen.setColor(Qt::red); - framePen.setWidthF(2.0); } else { framePen.setColor(brush().color().darker()); @@ -194,7 +187,7 @@ void Transition::paint(QPainter *painter, const QRectF txtBounding = painter->boundingRect(mapped, Qt::AlignHCenter | Qt::AlignVCenter, ' ' + text + ' '); painter->setBrush(framePen.color()); - painter->setPen(Qt::NoPen); + painter->setPen(framePen.color()); painter->drawRoundedRect(txtBounding, 3, 3); painter->setBrush(QBrush(Qt::NoBrush)); @@ -204,7 +197,8 @@ void Transition::paint(QPainter *painter, // Draw frame painter->setPen(framePen); painter->setClipping(false); - painter->drawRect(mapped.adjusted(0, 0, -0.5, -0.5)); + painter->setRenderHint(QPainter::Antialiasing, true); + painter->drawRoundedRect(mapped.adjusted(0, 0, -0.5, -0.5), 3, 3); } int Transition::type() const @@ -228,6 +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(); + } newPos.setY((int)(newTrack * KdenliveSettings::trackheight() + itemOffset() + 1)); // Only one clip is moving QRectF sceneShape = rect(); @@ -241,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! @@ -282,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: "<startPos()); -}*/ - -bool Transition::isValid() const -{ - return true; //(m_transitionDuration != GenTime()); -} - -const ClipItem *Transition::referencedClip() const -{ - return m_referenceClip; -} QDomElement Transition::toXML() { @@ -357,18 +327,13 @@ QDomElement Transition::toXML() m_parameters.setAttribute("end", endPos().frames(m_fps)); m_parameters.setAttribute("force_track", m_forceTransitionTrack); m_parameters.setAttribute("automatic", m_automaticTransition); - - if (m_secondClip) { - m_parameters.setAttribute("clipb_starttime", m_secondClip->startPos().frames(m_referenceClip->fps())); - m_parameters.setAttribute("clipb_track", transitionEndTrack()); - } return m_parameters.cloneNode().toElement(); } 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; } @@ -380,13 +345,13 @@ int Transition::defaultZValue() const return 3; } -bool Transition::updateKeyframes() +bool Transition::updateKeyframes(int oldEnd) { QString keyframes; 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"); @@ -395,20 +360,41 @@ bool Transition::updateKeyframes() } if (keyframes.isEmpty()) return false; int duration = cropDuration().frames(m_fps) - 1; - QStringList values = keyframes.split(";"); + QStringList values = keyframes.split(';'); int frame; int i = 0; - foreach(const QString &pos, values) { - if (!pos.contains('=')) { - i++; - continue; + 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 + values[i] = QString::number(duration) + '=' + pos.section('=', 1); + pa.setAttribute("value", values.join(";")); + return true; + } + ++i; } - frame = pos.section('=', 0, 0).toInt(); - if (frame > duration) { - modified = true; - break; + 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; } - i++; } if (modified) { if (i > 0) { @@ -441,3 +427,5 @@ bool Transition::updateKeyframes() return true; } + +#include "transition.moc"