X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftransition.cpp;h=ea43261b7e2be33254058e4a9c4c857509075450;hb=7bdee3646c2dfbd8366093c8c9c6b8d675fa5bf1;hp=05a3a09bcbe9b046e4e62a3168a9993252f3822c;hpb=ca14ee82a6fd653459e2dcd6f5c406eb65faea00;p=kdenlive diff --git a/src/transition.cpp b/src/transition.cpp index 05a3a09b..ea43261b 100644 --- a/src/transition.cpp +++ b/src/transition.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include -#include +#include #include #include #include @@ -30,220 +30,219 @@ #include "transition.h" #include "clipitem.h" #include "kdenlivesettings.h" +#include "customtrackscene.h" +#include "mainwindow.h" - -Transition::Transition(const QRectF& rect , ClipItem * clipa, const QString & type, const GenTime &startTime, const GenTime &endTime, double fps, bool inverted) : AbstractClipItem(rect) { - m_invertTransition = inverted; - m_singleClip = true; - m_transitionTrack = clipa->track(); - m_secondClip = NULL; - m_transitionName = type; - m_fps = fps; - m_cropDuration = endTime - startTime; - m_startPos = startTime; - m_maxDuration = GenTime(1000000); - // Default duration = 2.5 seconds - GenTime defaultTransitionDuration = GenTime(2.5); - - m_referenceClip = clipa; - - if (startTime < m_referenceClip->startPos()) m_transitionStart = GenTime(0.0); - else if (startTime > m_referenceClip->endPos()) m_transitionStart = m_referenceClip->duration() - defaultTransitionDuration; - else m_transitionStart = startTime - m_referenceClip->startPos(); - - if (m_transitionStart + m_cropDuration > m_referenceClip->duration()) - m_transitionDuration = m_referenceClip->duration() - m_transitionStart; - else m_transitionDuration = m_cropDuration; - m_secondClip = 0; - setFlags(QGraphicsItem::ItemClipsToShape | QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); +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) { setZValue(2); - m_referenceClip->addTransition(this); -} + 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)); -// create a transition from XML -Transition::Transition(const QRectF& rect , ClipItem * clip, QDomElement transitionElement, double fps, GenTime offset) : AbstractClipItem(rect) { - if (offset == GenTime()) offset = clip->startPos(); - m_referenceClip = clip; m_singleClip = true; + m_transitionTrack = transitiontrack; m_secondClip = NULL; - m_transitionStart = GenTime(transitionElement.attribute("start", QString::null).toInt(), m_referenceClip->fps()); - m_transitionDuration = GenTime(transitionElement.attribute("end", QString::null).toInt(), m_referenceClip->fps()) - m_transitionStart; - m_transitionTrack = transitionElement.attribute("transition_track", "0").toInt(); - m_transitionStart = m_transitionStart - offset; - - m_invertTransition = transitionElement.attribute("inverted", "0").toInt(); - m_transitionName = transitionElement.attribute("type" , "luma"); - - // load transition parameters - typedef QMap ParamMap; - ParamMap params; - for (QDomNode n = transitionElement.firstChild(); !n.isNull(); n = n.nextSibling()) { - QDomElement paramElement = n.toElement(); - params[paramElement.tagName()] = paramElement.attribute("value", QString::null); - } - if (m_invertTransition) params["reverse"] = "1"; - if (!params.isEmpty()) setTransitionParameters(params); + 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)); - // Check if transition is valid (not outside of clip) - if (m_transitionStart > clip->duration()) - m_transitionDuration = GenTime(); + //m_referenceClip = clipa; + if (params.isNull()) { + m_parameters = MainWindow::transitions.getEffectByName("Luma").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); + //m_referenceClip->addTransition(this); } 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 { - return m_transitionName; + return m_name; } -void Transition::setTransitionParameters(const QMap < QString, QString > parameters) { - m_transitionParameters = parameters; +QString Transition::transitionTag() const { + return m_parameters.attribute("tag"); } -const QMap < QString, QString > Transition::transitionParameters() const { - return m_transitionParameters; +bool Transition::isAutomatic() const { + return m_automaticTransition; } -bool Transition::invertTransition() const { - if (!m_singleClip) { - if (m_referenceClip->startPos() < m_secondClip->startPos()) return true; - else return false; - } - return m_invertTransition; +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 { + return false; //m_parameters.attribute("reverse").toInt(); } QPixmap Transition::transitionPixmap() const { KIcon icon; - if (m_transitionName == "luma") { - if (invertTransition()) icon = KIcon("kdenlive_trans_up"); + QString tag = transitionTag(); + if (tag == "luma") { + if (invertedTransition()) icon = KIcon("kdenlive_trans_up"); else icon = KIcon("kdenlive_trans_down"); - } else if (m_transitionName == "composite") { + } else if (tag == "composite") { icon = KIcon("kdenlive_trans_wiper"); - } else if (m_transitionName == "lumafile") { + } else if (tag == "lumafile") { icon = KIcon("kdenlive_trans_luma"); } else icon = KIcon("kdenlive_trans_pip"); return icon.pixmap(QSize(15, 15)); } -int Transition::transitionTrack() const { - return m_transitionTrack; -} - -void Transition::setTransitionTrack(int track) { - m_transitionTrack = track; -} void Transition::setTransitionDirection(bool inv) { - m_invertTransition = inv; -} - -int Transition::transitionStartTrack() const { - return m_referenceClip->track(); + //m_parameters.setAttribute("reverse", inv); } int Transition::transitionEndTrack() const { - if (!m_singleClip) return m_secondClip->track(); - return m_referenceClip->track() + 1; - //TODO: calculate next video track + return m_transitionTrack; } -GenTime Transition::transitionDuration() const { - return transitionEndTime() - transitionStartTime(); +void Transition::updateTransitionEndTrack(int newtrack) { + if (!m_forceTransitionTrack) m_transitionTrack = newtrack; } -GenTime Transition::transitionStartTime() const { - if (!m_singleClip) { - GenTime startb = m_secondClip->startPos(); - GenTime starta = m_referenceClip->startPos(); - if (startb > m_referenceClip->endPos()) return m_referenceClip->endPos() - GenTime(0.12); - if (startb > starta) - return startb; - return starta; - } else return m_referenceClip->startPos() + m_transitionStart; +void Transition::setForcedTrack(bool force, int track) { + m_forceTransitionTrack = force; + m_transitionTrack = track; } - -GenTime Transition::transitionEndTime() const { - if (!m_singleClip) { - GenTime endb = m_secondClip->endPos(); - GenTime enda = m_referenceClip->endPos(); - if (m_secondClip->startPos() > enda) return enda; - if (endb < m_referenceClip->startPos()) return m_referenceClip->startPos() + GenTime(0.12); - else if (endb > enda) return enda; - else return endb; - } else { - if (m_transitionStart + m_transitionDuration > m_referenceClip->duration()) - return m_referenceClip->endPos(); - return m_referenceClip->startPos() + m_transitionStart + m_transitionDuration; - } +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); + 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); - //painter->fillPath(roundRectPath, brush()); //, QBrush(QColor(Qt::red))); - painter->fillRect(br.intersected(rectInView), QBrush(QColor(200, 200, 0, 160)/*,Qt::Dense4Pattern*/)); - painter->setClipRect(option->exposedRect); - painter->drawPixmap((int)(br.x() + 10), (int)(br.y() + 10), transitionPixmap()); - painter->drawPath(resultClipPath.intersected(clippath)); - + 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); + 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 + " "); + 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 { 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; - return MOVE; -} -void Transition::resizeTransitionStart(GenTime time) { - if (!m_singleClip) return; //cannot resize automatic transitions - if (time < m_referenceClip->startPos()) time = m_referenceClip->startPos(); - // Transitions shouldn't be shorter than 3 frames, about 0.12 seconds - if (transitionEndTime().ms() - time.ms() < 120.0) time = transitionEndTime() - GenTime(0.12); - m_transitionDuration = m_transitionDuration - (time - m_referenceClip->startPos() - m_transitionStart); - m_transitionStart = time - m_referenceClip->startPos(); -} -void Transition::resizeTransitionEnd(GenTime time) { - if (!m_singleClip) return; //cannot resize automatic transitions - if (time > m_referenceClip->endPos()) time = m_referenceClip->endPos(); - // Transitions shouldn't be shorter than 3 frames, about 0.12 seconds - if (time.ms() - transitionStartTime().ms() < 120.0) time = transitionStartTime() + GenTime(0.12); - m_transitionDuration = time - (m_referenceClip->startPos() + m_transitionStart); +//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: "< m_referenceClip->duration() - m_transitionDuration) - m_transitionStart = m_referenceClip->duration() - m_transitionDuration; - else m_transitionStart = m_transitionStart + time; - if (m_transitionStart < GenTime(0.0)) m_transitionStart = GenTime(0.0); + +OPERATIONTYPE Transition::operationMode(QPointF pos) { + const double scale = projectScene()->scale(); + 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 { @@ -256,22 +255,18 @@ bool Transition::belongsToClip(const ClipItem * clip) const { return false; } +/* Transition *Transition::clone() { return new Transition::Transition(rect(), m_referenceClip, this->toXML() , m_fps); - /*if (m_singleClip || m_secondClip == 0) - return new Transition::Transition(m_referenceClip); - else - //return new Transition::Transition(m_referenceClip, m_secondClip); - return new Transition::Transition(m_referenceClip, this->toXML()); - */ -} +}*/ +/* Transition *Transition::reparent(ClipItem * clip) { return new Transition::Transition(rect(), clip, this->toXML(), m_fps, m_referenceClip->startPos()); -} +}*/ bool Transition::isValid() const { - return (m_transitionDuration != GenTime()); + return true; //(m_transitionDuration != GenTime()); } const ClipItem *Transition::referencedClip() const { @@ -279,27 +274,19 @@ const ClipItem *Transition::referencedClip() const { } QDomElement Transition::toXML() { - QDomDocument doc; - QDomElement effect = doc.createElement("ktransition"); - effect.setAttribute("type", m_transitionName); - effect.setAttribute("inverted", invertTransition()); - effect.setAttribute("transition_track", m_transitionTrack); - effect.setAttribute("start", transitionStartTime().frames(m_referenceClip->fps())); - effect.setAttribute("end", transitionEndTime().frames(m_referenceClip->fps())); + 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) { - effect.setAttribute("clipb_starttime", m_secondClip->startPos().frames(m_referenceClip->fps())); - effect.setAttribute("clipb_track", transitionEndTrack()); - } - - - QMap::Iterator it; - for (it = m_transitionParameters.begin(); it != m_transitionParameters.end(); ++it) { - QDomElement param = doc.createElement(it.key()); - param.setAttribute("value", it.value()); - effect.appendChild(param); + m_parameters.setAttribute("clipb_starttime", m_secondClip->startPos().frames(m_referenceClip->fps())); + m_parameters.setAttribute("clipb_track", transitionEndTrack()); } - return effect; + return m_parameters; }