X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftransition.cpp;h=f3af57beedc0f0c49fd68f917d084e6657f2f754;hb=7448dd52292cc53cd97ce3fdba5c26246faba3f1;hp=b4d71c7d810cac83c4909450ef27548c89a4c899;hpb=d5e2d9e691b22dab741ed689df6d87478ba24c9f;p=kdenlive diff --git a/src/transition.cpp b/src/transition.cpp index b4d71c7d..f3af57be 100644 --- a/src/transition.cpp +++ b/src/transition.cpp @@ -15,149 +15,208 @@ * * ***************************************************************************/ -#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) : AbstractClipItem(info, QRectF(), fps), m_gradient(QLinearGradient(0, 0, 0, 0)) { - 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 - m_singleClip = true; - m_transitionTrack = transitiontrack; - m_secondClip = NULL; - m_cropStart = GenTime(); - m_maxDuration = GenTime(10000, fps); +#include +#include +#include +#include - m_gradient.setColorAt(0, QColor(200, 200, 0, 150)); - m_gradient.setColorAt(1, QColor(200, 200, 200, 120)); + +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) +{ + setZValue(3); + m_info.cropDuration = info.endPos - info.startPos; + setPos(info.startPos.frames(fps), (qreal)(info.track * KdenliveSettings::trackheight() + KdenliveSettings::trackheight() / 3 * 2)); + +#if QT_VERSION >= 0x040600 + m_startAnimation = new QPropertyAnimation(this, "rect"); + m_startAnimation->setDuration(200); + QRectF r(0, 0, m_info.cropDuration.frames(fps) - 0.02, 1); + QRectF r2(0, 0, m_info.cropDuration.frames(fps) - 0.02, (qreal)(KdenliveSettings::trackheight() / 3 * 2 - 1)); + m_startAnimation->setStartValue(r); + m_startAnimation->setEndValue(r2); + m_startAnimation->setEasingCurve(QEasingCurve::OutQuad); + m_startAnimation->start(); +#else + setRect(0, 0, m_info.cropDuration.frames(fps) - 0.02, (qreal)(KdenliveSettings::trackheight() / 3 * 2 - 1)); +#endif + + m_info.cropStart = GenTime(); + m_maxDuration = GenTime(600); + + 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.getEffectByTag("luma", "dissolve").cloneNode().toElement(); } else { m_parameters = params; } - - m_name = m_parameters.elementsByTagName("name").item(0).toElement().text(); + if (m_automaticTransition) m_parameters.setAttribute("automatic", 1); + 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.elementsByTagName("name").item(0).toElement().text().toUtf8().data()); m_secondClip = 0; - setFlags(QGraphicsItem::ItemClipsToShape | QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); - setZValue(2); //m_referenceClip->addTransition(this); } -Transition::~Transition() { +Transition::~Transition() +{ + blockSignals(true); +#if QT_VERSION >= 0x040600 + delete m_startAnimation; +#endif + if (scene()) scene()->removeItem(this); } -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 { - return m_name; +QString Transition::transitionTag() const +{ + return m_parameters.attribute("tag"); } -QString Transition::transitionTag() const { - return m_parameters.attribute("tag"); +QStringList Transition::transitionInfo() const +{ + QStringList info; + info << m_name << m_parameters.attribute("tag") << m_parameters.attribute("id"); + return info; +} + +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; - m_name = m_parameters.elementsByTagName("name").item(0).toElement().text(); + 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.elementsByTagName("name").item(0).toElement().text().toUtf8().data()); update(); } -bool Transition::invertedTransition() const { +bool Transition::invertedTransition() const +{ return false; //m_parameters.attribute("reverse").toInt(); } -QPixmap Transition::transitionPixmap() const { - KIcon icon; - QString tag = transitionTag(); - if (tag == "luma") { - if (invertedTransition()) icon = KIcon("kdenlive_trans_up"); - else icon = KIcon("kdenlive_trans_down"); - } else if (tag == "composite") { - icon = KIcon("kdenlive_trans_wiper"); - } else if (tag == "lumafile") { - icon = KIcon("kdenlive_trans_luma"); - } else icon = KIcon("kdenlive_trans_pip"); - return icon.pixmap(QSize(15, 15)); +void Transition::setTransitionDirection(bool /*inv*/) +{ + //m_parameters.setAttribute("reverse", inv); } +int Transition::transitionEndTrack() const +{ + return m_transitionTrack; +} -void Transition::setTransitionDirection(bool inv) { - //m_parameters.setAttribute("reverse", inv); +void Transition::updateTransitionEndTrack(int newtrack) +{ + if (!m_forceTransitionTrack) m_transitionTrack = newtrack; } -int Transition::transitionEndTrack() const { - return m_transitionTrack; +void Transition::setForcedTrack(bool force, int track) +{ + m_forceTransitionTrack = force; + m_transitionTrack = track; } -void Transition::updateTransitionEndTrack(int newtrack) { - m_transitionTrack = newtrack; +bool Transition::forcedTrack() const +{ + return m_forceTransitionTrack; } void Transition::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget) { - QRectF exposed = option->exposedRect; - exposed.setRight(exposed.right() + 1); - exposed.setBottom(exposed.bottom() + 1); + QWidget */*widget*/) +{ + const QRectF exposed = option->exposedRect; painter->setClipRect(exposed); - QRectF br = rect(); - m_gradient.setStart(0, br.y()); - m_gradient.setFinalStop(0, br.bottom()); - painter->fillRect(br, m_gradient); + const QRectF br = rect(); + const QRectF mapped = painter->matrix().mapRect(br); + + painter->fillRect(exposed, brush()); - int top = (int)(br.y() + br.height() / 2 - 7); + //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()); - painter->setPen(QColor(0, 0, 0, 180)); - top += painter->fontInfo().pixelSize(); - QPointF p2(br.x(), top); - painter->drawText(painter->matrix().map(p2) + QPointF(26, 1), transitionName()); - painter->setPen(QColor(255, 255, 255, 180)); - QPointF p3(br.x(), top); - painter->drawText(painter->matrix().map(p3) + QPointF(25, 0), transitionName()); - painter->setMatrixEnabled(true); - QPen pen = painter->pen(); - if (isSelected()) { - pen.setColor(Qt::red); - //pen.setWidth(2); - } else { - pen.setColor(Qt::black); - //pen.setWidth(1); + //painter->drawPixmap(painter->matrix().map(p1) + QPointF(5, 0), transitionPixmap()); + const QString text = m_name + (m_forceTransitionTrack ? "|>" : QString()); + + // Draw clip name + QColor frameColor(brush().color().darker()); + if (isSelected() || (parentItem() && parentItem()->isSelected())) { + frameColor = QColor(Qt::red); } + frameColor.setAlpha(160); + + const QRectF txtBounding = painter->boundingRect(mapped, Qt::AlignHCenter | Qt::AlignVCenter, ' ' + text + ' '); + //painter->fillRect(txtBounding2, frameColor); + painter->setBrush(frameColor); + painter->setPen(Qt::NoPen); + painter->drawRoundedRect(txtBounding, 3, 3); + painter->setBrush(QBrush(Qt::NoBrush)); + + painter->setPen(Qt::white); + painter->drawText(txtBounding, Qt::AlignCenter, text); + + // Draw frame + QPen pen = painter->pen(); + pen.setColor(frameColor); painter->setPen(pen); - painter->drawRect(br); + painter->setClipping(false); + painter->drawRect(painter->matrix().mapRect(rect())); } -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 == QGraphicsItem::ItemSelectedChange) { + if (value.toBool()) setZValue(10); + else setZValue(3); + } if (change == ItemPositionChange && scene()) { // calculate new position. QPointF newPos = value.toPointF(); @@ -171,11 +230,14 @@ QVariant Transition::itemChange(GraphicsItemChange change, const QVariant &value // Only one clip is moving QRectF sceneShape = rect(); sceneShape.translate(newPos); - QList items = scene()->items(sceneShape, Qt::IntersectsItemShape); + QList items; + if (projectScene()->editMode() == NORMALEDIT) + items = scene()->items(sceneShape, Qt::IntersectsItemShape); items.removeAll(this); if (!items.isEmpty()) { for (int i = 0; i < items.count(); i++) { + if (!items.at(i)->isEnabled()) continue; if (items.at(i)->type() == type()) { // Collision! Don't move. //kDebug()<<"/// COLLISION WITH ITEM: "<boundingRect()<<", POS: "<pos()<<", ME: "<(items.at(i))->startPos() - m_cropDuration).frames(m_fps); + int npos = (static_cast < AbstractClipItem* >(items.at(i))->startPos() - m_info.cropDuration).frames(m_fps); newPos.setX(npos); } else { // get pos just after colliding clip int npos = static_cast < AbstractClipItem* >(items.at(i))->endPos().frames(m_fps); newPos.setX(npos); } - m_track = newTrack; + m_info.track = newTrack; //kDebug()<<"// ITEM NEW POS: "<scale().x(); + double maximumOffset = 6 / scale; + QRectF rect = sceneBoundingRect(); - if (qAbs((int)(pos.x() - rect.x())) < 6) return RESIZESTART; - else if (qAbs((int)(pos.x() - (rect.right()))) < 6) return RESIZEEND; + if (qAbs((int)(pos.x() - rect.x())) < maximumOffset) return RESIZESTART; + else if (qAbs((int)(pos.x() - (rect.right()))) < maximumOffset) return RESIZEEND; 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()); m_parameters.setAttribute("transition_btrack", m_transitionTrack); m_parameters.setAttribute("start", startPos().frames(m_fps)); m_parameters.setAttribute("end", endPos().frames(m_fps)); + m_parameters.setAttribute("force_track", m_forceTransitionTrack); 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++) { + QDomElement pa = namenode.item(i).toElement(); + if (pa.attribute("type") == "geometry") return true; + } + return false; +} - return m_parameters; +int Transition::defaultZValue() const +{ + return 3; }