X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftransition.cpp;h=95c0b8380149b045001d36d9484b18bd712804a9;hb=021064a054d354dbffd9784537783cc06869d3be;hp=e633817d581f6b798be04b4f6dcf9b7899223fa7;hpb=46ca2c1b3894086692998f7de91ebb8cf77439d3;p=kdenlive diff --git a/src/transition.cpp b/src/transition.cpp index e633817d..95c0b838 100644 --- a/src/transition.cpp +++ b/src/transition.cpp @@ -15,27 +15,30 @@ * * ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - #include "transition.h" #include "clipitem.h" #include "kdenlivesettings.h" #include "customtrackscene.h" #include "mainwindow.h" -Transition::Transition(const ItemInfo info, int transitiontrack, double fps, QDomElement params, bool automaticTransition) : AbstractClipItem(info, QRectF(), fps), m_gradient(QLinearGradient(0, 0, 0, 0)), m_automaticTransition(automaticTransition), m_forceTransitionTrack(false) { - setRect(0, 0, (qreal)(info.endPos - info.startPos).frames(fps) - 0.02, (qreal)(KdenliveSettings::trackheight() / 3 * 2 - 1)); - setPos((qreal) info.startPos.frames(fps), (qreal)(info.track * KdenliveSettings::trackheight() + KdenliveSettings::trackheight() / 3 * 2)); +#include +#include +#include + +#include +#include +#include +#include + + +Transition::Transition(const ItemInfo info, int transitiontrack, double fps, QDomElement params, bool automaticTransition) : + AbstractClipItem(info, QRectF(), fps), + m_forceTransitionTrack(false), + m_automaticTransition(automaticTransition) +{ + setZValue(2); + setRect(0, 0, (info.endPos - info.startPos).frames(fps) - 0.02, (qreal)(KdenliveSettings::trackheight() / 3 * 2 - 1)); + setPos(info.startPos.frames(fps), (qreal)(info.track * KdenliveSettings::trackheight() + KdenliveSettings::trackheight() / 3 * 2)); m_singleClip = true; m_transitionTrack = transitiontrack; @@ -43,12 +46,12 @@ Transition::Transition(const ItemInfo info, int transitiontrack, double fps, QDo m_cropStart = GenTime(); m_maxDuration = GenTime(10000, fps); - m_gradient.setColorAt(0, QColor(200, 200, 0, 150)); - m_gradient.setColorAt(1, QColor(200, 200, 200, 120)); + if (m_automaticTransition) setBrush(QColor(200, 200, 50, 100)); + else setBrush(QColor(200, 100, 50, 100)); //m_referenceClip = clipa; if (params.isNull()) { - m_parameters = MainWindow::transitions.getEffectByName("Luma"); + m_parameters = MainWindow::transitions.getEffectByName("Luma").cloneNode().toElement(); } else { m_parameters = params; } @@ -58,33 +61,51 @@ Transition::Transition(const ItemInfo info, int transitiontrack, double fps, QDo m_name = m_parameters.elementsByTagName("name").item(0).toElement().text(); m_secondClip = 0; setFlags(QGraphicsItem::ItemClipsToShape | QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); - setZValue(2); //m_referenceClip->addTransition(this); } -Transition::~Transition() { +Transition::~Transition() +{ } -Transition *Transition::clone() { +Transition *Transition::clone() +{ QDomElement xml = toXML().cloneNode().toElement(); Transition *tr = new Transition(info(), transitionEndTrack(), m_fps, xml); return tr; } -QString Transition::transitionName() const { +QString Transition::transitionName() const +{ return m_name; } -QString Transition::transitionTag() const { +QString Transition::transitionTag() const +{ return m_parameters.attribute("tag"); } -bool Transition::isAutomatic() const { +bool Transition::isAutomatic() const +{ return m_automaticTransition; } -void Transition::setTransitionParameters(const QDomElement params) { +void Transition::setAutomatic(bool automatic) +{ + m_automaticTransition = automatic; + if (automatic) { + m_parameters.setAttribute("automatic", 1); + setBrush(QColor(200, 200, 50, 150)); + } else { + m_parameters.removeAttribute("automatic"); + setBrush(QColor(200, 50, 50, 150)); + } + 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()); @@ -93,11 +114,13 @@ void Transition::setTransitionParameters(const QDomElement params) { } -bool Transition::invertedTransition() const { +bool Transition::invertedTransition() const +{ return false; //m_parameters.attribute("reverse").toInt(); } -QPixmap Transition::transitionPixmap() const { +QPixmap Transition::transitionPixmap() const +{ KIcon icon; QString tag = transitionTag(); if (tag == "luma") { @@ -112,46 +135,51 @@ QPixmap Transition::transitionPixmap() const { } -void Transition::setTransitionDirection(bool inv) { +void Transition::setTransitionDirection(bool /*inv*/) +{ //m_parameters.setAttribute("reverse", inv); } -int Transition::transitionEndTrack() const { +int Transition::transitionEndTrack() const +{ return m_transitionTrack; } -void Transition::updateTransitionEndTrack(int newtrack) { +void Transition::updateTransitionEndTrack(int newtrack) +{ if (!m_forceTransitionTrack) m_transitionTrack = newtrack; } -void Transition::setForcedTrack(bool force, int track) { +void Transition::setForcedTrack(bool force, int track) +{ m_forceTransitionTrack = force; m_transitionTrack = track; } -bool Transition::forcedTrack() const { +bool Transition::forcedTrack() const +{ return m_forceTransitionTrack; } void Transition::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget) { + QWidget */*widget*/) +{ const double scale = option->matrix.m11(); QRectF exposed = option->exposedRect; painter->setClipRect(exposed); QRectF br = rect(); QRectF mapped = painter->matrix().mapRect(br); - m_gradient.setStart(0, br.y()); - m_gradient.setFinalStop(0, br.bottom()); - painter->fillRect(br, m_gradient); - int top = (int)(br.y() + br.height() / 2 - 7); + painter->fillRect(exposed, brush()); + + //int top = (int)(br.y() + br.height() / 2 - 7); QPointF p1(br.x(), br.y() + br.height() / 2 - 7); painter->setMatrixEnabled(false); //painter->drawPixmap(painter->matrix().map(p1) + QPointF(5, 0), transitionPixmap()); QString text = transitionName(); - if (forcedTrack()) text.append("|>"); - QRectF txtBounding = painter->boundingRect(mapped, Qt::AlignHCenter | Qt::AlignVCenter, " " + text + " "); + if (m_forceTransitionTrack) text.append("|>"); + QRectF txtBounding = painter->boundingRect(mapped, Qt::AlignHCenter | Qt::AlignVCenter, ' ' + text + ' '); painter->fillRect(txtBounding, QBrush(QColor(50, 50, 0, 150))); txtBounding.translate(QPointF(1, 1)); painter->setPen(QColor(255, 255, 255, 255)); @@ -181,12 +209,14 @@ void Transition::paint(QPainter *painter, painter->drawRect(br); } -int Transition::type() const { +int Transition::type() const +{ return TRANSITIONWIDGET; } //virtual -QVariant Transition::itemChange(GraphicsItemChange change, const QVariant &value) { +QVariant Transition::itemChange(GraphicsItemChange change, const QVariant &value) +{ if (change == ItemPositionChange && scene()) { // calculate new position. QPointF newPos = value.toPointF(); @@ -235,7 +265,10 @@ QVariant Transition::itemChange(GraphicsItemChange change, const QVariant &value } -OPERATIONTYPE Transition::operationMode(QPointF pos) { +OPERATIONTYPE Transition::operationMode(QPointF pos) +{ + if (isItemLocked()) return NONE; + const double scale = projectScene()->scale(); double maximumOffset = 6 / scale; @@ -245,35 +278,40 @@ OPERATIONTYPE Transition::operationMode(QPointF pos) { return MOVE; } -bool Transition::hasClip(const ClipItem * clip) const { +bool Transition::hasClip(const ClipItem * clip) const +{ if (clip == m_secondClip) return true; return false; } -bool Transition::belongsToClip(const ClipItem * clip) const { +bool Transition::belongsToClip(const ClipItem * clip) const +{ if (clip == m_referenceClip) return true; return false; } /* Transition *Transition::clone() { - return new Transition::Transition(rect(), m_referenceClip, this->toXML() , m_fps); + return new Transition::Transition(rect(), m_referenceClip, toXML() , m_fps); }*/ /* Transition *Transition::reparent(ClipItem * clip) { - return new Transition::Transition(rect(), clip, this->toXML(), m_fps, m_referenceClip->startPos()); + return new Transition::Transition(rect(), clip, toXML(), m_fps, m_referenceClip->startPos()); }*/ -bool Transition::isValid() const { +bool Transition::isValid() const +{ return true; //(m_transitionDuration != GenTime()); } -const ClipItem *Transition::referencedClip() const { +const ClipItem *Transition::referencedClip() const +{ return m_referenceClip; } -QDomElement Transition::toXML() { +QDomElement Transition::toXML() +{ m_parameters.setAttribute("type", transitionTag()); //m_transitionParameters.setAttribute("inverted", invertTransition()); m_parameters.setAttribute("transition_atrack", track()); @@ -290,3 +328,13 @@ QDomElement Transition::toXML() { return m_parameters; } +bool Transition::hasGeometry() +{ + QDomNodeList namenode = m_parameters.elementsByTagName("parameter"); + for (int i = 0;i < namenode.count() ;i++) { + QDomElement pa = namenode.item(i).toElement(); + if (pa.attribute("type") == "geometry") return true; + } + return false; +} +