X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftransition.cpp;h=fe3aa518e7c265bbb993e780ea97f5adebadcdb6;hb=020035a721ab682e4171443afaf10b5efa189586;hp=fc2bb37a8a75fc5283bb7b8e17d9a628bf8fcf60;hpb=2b1c40908368fff4b20912551c266e45c89f6607;p=kdenlive diff --git a/src/transition.cpp b/src/transition.cpp index fc2bb37a..fe3aa518 100644 --- a/src/transition.cpp +++ b/src/transition.cpp @@ -31,7 +31,7 @@ #include -Transition::Transition(const ItemInfo info, int transitiontrack, double fps, QDomElement params, bool automaticTransition) : +Transition::Transition(const ItemInfo &info, int transitiontrack, double fps, QDomElement params, bool automaticTransition) : AbstractClipItem(info, QRectF(), fps), m_forceTransitionTrack(false), m_automaticTransition(automaticTransition), @@ -39,14 +39,27 @@ Transition::Transition(const ItemInfo info, int transitiontrack, double fps, QDo m_transitionTrack(transitiontrack) { setZValue(3); - 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_info.cropDuration = info.endPos - info.startPos; + setPos(info.startPos.frames(fps), (int)(info.track * KdenliveSettings::trackheight() + itemOffset() + 1)); + +#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, (qreal) itemHeight() / 2); + QRectF r2(0, 0, m_info.cropDuration.frames(fps) - 0.02, (qreal)itemHeight()); + 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) itemHeight()); +#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)); + if (m_automaticTransition) setBrush(QColor(200, 200, 50, 180)); + else setBrush(QColor(200, 100, 50, 180)); //m_referenceClip = clipa; if (params.isNull()) { @@ -57,7 +70,7 @@ Transition::Transition(const ItemInfo info, int transitiontrack, double fps, QDo 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_name = i18n(m_parameters.firstChildElement("name").text().toUtf8().data()); m_secondClip = 0; //m_referenceClip->addTransition(this); @@ -65,6 +78,11 @@ Transition::Transition(const ItemInfo info, int transitiontrack, double fps, QDo Transition::~Transition() { + blockSignals(true); +#if QT_VERSION >= 0x040600 + delete m_startAnimation; +#endif + if (scene()) scene()->removeItem(this); } Transition *Transition::clone() @@ -74,14 +92,16 @@ Transition *Transition::clone() return tr; } -QString Transition::transitionName() const +QString Transition::transitionTag() const { - return m_name; + return m_parameters.attribute("tag"); } -QString Transition::transitionTag() const +QStringList Transition::transitionInfo() const { - return m_parameters.attribute("tag"); + QStringList info; + info << m_name << m_parameters.attribute("tag") << m_parameters.attribute("id"); + return info; } bool Transition::isAutomatic() const @@ -94,10 +114,10 @@ void Transition::setAutomatic(bool automatic) m_automaticTransition = automatic; if (automatic) { m_parameters.setAttribute("automatic", 1); - setBrush(QColor(200, 200, 50, 150)); + setBrush(QColor(200, 200, 50, 180)); } else { m_parameters.removeAttribute("automatic"); - setBrush(QColor(200, 50, 50, 150)); + setBrush(QColor(200, 100, 50, 180)); } update(); } @@ -107,7 +127,7 @@ 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(); + m_name = i18n(m_parameters.firstChildElement("name").text().toUtf8().data()); update(); } @@ -150,26 +170,26 @@ void Transition::paint(QPainter *painter, const QRectF exposed = option->exposedRect; painter->setClipRect(exposed); const QRectF br = rect(); - const QRectF mapped = painter->matrix().mapRect(br); + QPen framePen; + const QRectF mapped = painter->worldTransform().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()); + painter->setWorldMatrixEnabled(false); 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); + framePen.setColor(Qt::red); + framePen.setWidthF(2.0); + } + else { + framePen.setColor(brush().color().darker()); } - frameColor.setAlpha(160); const QRectF txtBounding = painter->boundingRect(mapped, Qt::AlignHCenter | Qt::AlignVCenter, ' ' + text + ' '); - //painter->fillRect(txtBounding2, frameColor); - painter->setBrush(frameColor); + painter->setBrush(framePen.color()); painter->setPen(Qt::NoPen); painter->drawRoundedRect(txtBounding, 3, 3); painter->setBrush(QBrush(Qt::NoBrush)); @@ -178,11 +198,9 @@ void Transition::paint(QPainter *painter, painter->drawText(txtBounding, Qt::AlignCenter, text); // Draw frame - QPen pen = painter->pen(); - pen.setColor(frameColor); - painter->setPen(pen); + painter->setPen(framePen); painter->setClipping(false); - painter->drawRect(painter->matrix().mapRect(rect())); + painter->drawRect(mapped.adjusted(0, 0, -0.5, -0.5)); } int Transition::type() const @@ -193,6 +211,10 @@ int Transition::type() const //virtual 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(); @@ -202,36 +224,61 @@ QVariant Transition::itemChange(GraphicsItemChange change, const QVariant &value 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)); + newPos.setY((int)(newTrack * KdenliveSettings::trackheight() + itemOffset() + 1)); // Only one clip is moving QRectF sceneShape = rect(); sceneShape.translate(newPos); - QList items = scene()->items(sceneShape, Qt::IntersectsItemShape); + QList items; + // TODO: manage transitions in OVERWRITE MODE + //if (projectScene()->editMode() == NORMALEDIT) + items = scene()->items(sceneShape, Qt::IntersectsItemShape); items.removeAll(this); + bool forwardMove = newPos.x() > pos().x(); + int offset = 0; 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: "<pos(); - if ((int) otherPos.y() != (int) pos().y()) return pos(); - //kDebug()<<"//// CURRENT Y: "<(items.at(i))->startPos() - m_info.cropDuration).frames(m_fps); - newPos.setX(npos); + if ((int) otherPos.y() != (int) pos().y()) { + return pos(); + } + if (forwardMove) { + offset = qMax(offset, (int)(newPos.x() - (static_cast < AbstractClipItem* >(items.at(i))->startPos() - cropDuration()).frames(m_fps))); } else { - // get pos just after colliding clip - int npos = static_cast < AbstractClipItem* >(items.at(i))->endPos().frames(m_fps); - newPos.setX(npos); + offset = qMax(offset, (int)((static_cast < AbstractClipItem* >(items.at(i))->endPos().frames(m_fps)) - newPos.x())); } + + if (offset > 0) { + if (forwardMove) { + sceneShape.translate(QPointF(-offset, 0)); + newPos.setX(newPos.x() - offset); + } else { + sceneShape.translate(QPointF(offset, 0)); + newPos.setX(newPos.x() + offset); + } + QList subitems = scene()->items(sceneShape, Qt::IntersectsItemShape); + subitems.removeAll(this); + for (int j = 0; j < subitems.count(); j++) { + if (!subitems.at(j)->isEnabled()) continue; + if (subitems.at(j)->type() == type()) { + // move was not successful, revert to previous pos + m_info.startPos = GenTime((int) pos().x(), m_fps); + return pos(); + } + } + } + m_info.track = newTrack; - //kDebug()<<"// ITEM NEW POS: "<startPos().frames(m_referenceClip->fps())); @@ -313,3 +371,69 @@ bool Transition::hasGeometry() return false; } +int Transition::defaultZValue() const +{ + return 3; +} + +bool Transition::updateKeyframes() +{ + QString keyframes; + QDomElement pa; + bool modified = false; + QDomNodeList namenode = m_parameters.elementsByTagName("parameter"); + for (int i = 0; i < namenode.count() ; i++) { + pa = namenode.item(i).toElement(); + if (pa.attribute("type") == "geometry") { + keyframes = pa.attribute("value"); + break; + } + } + if (keyframes.isEmpty()) return false; + int duration = cropDuration().frames(m_fps) - 1; + QStringList values = keyframes.split(";"); + int frame; + int i = 0; + foreach(const QString &pos, values) { + if (!pos.contains('=')) { + i++; + continue; + } + frame = pos.section('=', 0, 0).toInt(); + if (frame > duration) { + modified = true; + break; + } + i++; + } + if (modified) { + if (i > 0) { + // Check if there is a keyframe at transition end + QString prev = values.at(i-1); + bool done = false; + if (prev.contains('=')) { + int previousKeyframe = prev.section('=', 0, 0).toInt(); + if (previousKeyframe == duration) { + // Remove the last keyframes + while (values.count() > i) { + values.removeLast(); + } + done = true; + } + } + if (!done) { + // Add new keyframe at end and remove last keyframes + QString last = values.at(i); + last = QString::number(duration) + '=' + last.section('=', 1); + values[i] = last; + while (values.count() > (i + 1)) { + values.removeLast(); + } + } + } + pa.setAttribute("value", values.join(";")); + } + + return true; +} +