X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftransition.cpp;h=cd3a4d7818c802ee84535c59d7f2d1aa8b6be077;hb=6d5fb455eb4d6d89c24f5f4e77addcc86b491c4d;hp=7f358c02bba2aac48dc162f7efc7c697ec9010f9;hpb=cbf95aa7ff95f2221b928538a15849bb1912df8f;p=kdenlive diff --git a/src/transition.cpp b/src/transition.cpp index 7f358c02..cd3a4d78 100644 --- a/src/transition.cpp +++ b/src/transition.cpp @@ -15,186 +15,324 @@ * * ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include +#include "transition.h" +#include "clipitem.h" +#include "kdenlivesettings.h" +#include "customtrackscene.h" +#include "mainwindow.h" #include #include #include -#include "transition.h" -#include "clipitem.h" -#include "kdenlivesettings.h" +#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), + m_secondClip(NULL), + m_transitionTrack(transitiontrack) +{ + 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)); -Transition::Transition(const ItemInfo info, int transitiontrack, double scale, double fps, QDomElement params) : AbstractClipItem(info, QRectF(info.startPos.frames(fps) *scale , info.track * KdenliveSettings::trackheight() + KdenliveSettings::trackheight() / 2, (info.endPos - info.startPos).frames(fps) * scale , KdenliveSettings::trackheight() - 1)) { - m_singleClip = true; - m_transitionTrack = transitiontrack; - m_secondClip = NULL; m_cropStart = GenTime(); - m_fps = fps; - m_maxDuration = GenTime(10000, fps); + 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()) { - QDomDocument doc; - doc.setContent(QString("LumaLuma TransitionsReverse")); - m_parameters = doc.documentElement(); + m_parameters = MainWindow::transitions.getEffectByTag("luma", "dissolve").cloneNode().toElement(); } else { m_parameters = params; } - + 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 = 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() +{ + 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"); } -void Transition::setTransitionParameters(const QDomElement params) { +bool Transition::isAutomatic() const +{ + return m_automaticTransition; +} + +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()); m_name = m_parameters.elementsByTagName("name").item(0).toElement().text(); + update(); } -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") { + if (tag == "luma") { if (invertedTransition()) icon = KIcon("kdenlive_trans_up"); else icon = KIcon("kdenlive_trans_down"); - } else if ( tag == "composite") { + } else if (tag == "composite") { icon = KIcon("kdenlive_trans_wiper"); - } else if ( tag == "lumafile") { + } 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) { +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) +{ + if (!m_forceTransitionTrack) m_transitionTrack = newtrack; +} + +void Transition::setForcedTrack(bool force, int track) +{ + m_forceTransitionTrack = force; + m_transitionTrack = track; +} + +bool Transition::forcedTrack() const +{ + return m_forceTransitionTrack; +} + void Transition::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget) { - QRect rectInView = visibleRect();//this is the rect that is visible by the user - - if (rectInView.isNull()) - return; - QPainterPath clippath; - clippath.addRect(rectInView); + QWidget */*widget*/) +{ + const double scale = option->matrix.m11(); + QRectF exposed = option->exposedRect; + painter->setClipRect(exposed); QRectF br = rect(); - QPainterPath roundRectPathUpper = upperRectPart(br), roundRectPathLower = lowerRectPart(br); - - QPainterPath resultClipPath = roundRectPathUpper.united(roundRectPathLower); - - painter->setClipPath(resultClipPath.intersected(clippath), Qt::IntersectClip); -#if 0 - QRadialGradient radialGrad(QPointF(br.x() + 50, br.y() + 20), 70); - radialGrad.setColorAt(0, QColor(200, 200, 0, 100)); - radialGrad.setColorAt(0.5, QColor(150, 150, 0, 100)); - radialGrad.setColorAt(1, QColor(100, 100, 0, 100)); - painter->fillRect(br.intersected(rectInView), QBrush(radialGrad)/*,Qt::Dense4Pattern*/); -#else - painter->fillRect(br.intersected(rectInView), QBrush(QColor(200, 200, 0, 160)/*,Qt::Dense4Pattern*/)); -#endif - painter->setClipRect(option->exposedRect); - painter->drawPixmap((int)(br.x() + 10), (int)(br.y() + 10), transitionPixmap()); - painter->drawPath(resultClipPath.intersected(clippath)); - painter->setPen(QColor(0, 0, 0, 180)); - painter->drawText((int)br.x() + 31, (int)br.y() + 21, transitionName()); - painter->setPen(QColor(255, 255, 255, 180)); - painter->drawText((int)br.x() + 30, (int)br.y() + 20, transitionName()); + QRectF mapped = painter->matrix().mapRect(br); + + 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 (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)); + painter->drawText(txtBounding, Qt::AlignCenter, text); + + /* 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); + //pen.setWidth(2); } else { pen.setColor(Qt::black); - pen.setWidth(1); + //pen.setWidth(1); } + // expand clip rect to allow correct painting of clip border + exposed.setRight(exposed.right() + 1 / scale + 0.5); + exposed.setBottom(exposed.bottom() + 1); + painter->setClipRect(exposed); painter->setPen(pen); - painter->setClipRect(option->exposedRect); - painter->drawPath(resultClipPath.intersected(clippath)); + painter->drawRect(br); } -int Transition::type() const { +int Transition::type() const +{ return TRANSITIONWIDGET; } -OPERATIONTYPE Transition::operationMode(QPointF pos, double scale) { - if (abs((int)(pos.x() - rect().x())) < 6) return RESIZESTART; - else if (abs((int)(pos.x() - (rect().x() + rect().width()))) < 6) return RESIZEEND; +//virtual +QVariant Transition::itemChange(GraphicsItemChange change, const QVariant &value) +{ + if (change == ItemPositionChange && scene()) { + // calculate new position. + QPointF newPos = value.toPointF(); + int xpos = projectScene()->getSnapPointForPos((int) newPos.x(), KdenliveSettings::snaptopoints()); + xpos = qMax(xpos, 0); + newPos.setX(xpos); + int newTrack = newPos.y() / KdenliveSettings::trackheight(); + newTrack = qMin(newTrack, projectScene()->tracksCount() - 1); + newTrack = qMax(newTrack, 0); + newPos.setY((int)(newTrack * KdenliveSettings::trackheight() + KdenliveSettings::trackheight() / 3 * 2)); + // Only one clip is moving + QRectF sceneShape = rect(); + sceneShape.translate(newPos); + QList items = scene()->items(sceneShape, Qt::IntersectsItemShape); + items.removeAll(this); + + if (!items.isEmpty()) { + for (int i = 0; i < items.count(); i++) { + if (items.at(i)->type() == type()) { + // Collision! Don't move. + //kDebug()<<"/// COLLISION WITH ITEM: "<boundingRect()<<", POS: "<pos()<<", ME: "<pos(); + if ((int) otherPos.y() != (int) pos().y()) return pos(); + //kDebug()<<"//// CURRENT Y: "<(items.at(i))->startPos() - m_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; + //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; } -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; } +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; +} +