Fix issue 0000237: Unable to open Kdenlive 0.5 project (http://www.kdenlive.org/manti...

[kdenlive] / src / transition.cpp

diff --git a/src/transition.cpp b/src/transition.cpp
index 2ed6523a36a25859415590d0329a89a4c26a5fbb..c54ce3bd9f136c8b1f0e70d96f51f887b67c0b15 100644 (file)
--- a/src/transition.cpp
+++ b/src/transition.cpp
@@ -33,9 +33,10 @@
 #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) {
-    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));
+Transition::Transition(const ItemInfo info, int transitiontrack, double fps, QDomElement params, bool automaticTransition) : AbstractClipItem(info, QRectF(), fps), m_automaticTransition(automaticTransition), m_forceTransitionTrack(false) {
+    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,21 +44,21 @@ 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;
     }
     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);
 }
@@ -83,8 +84,22 @@ 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();
 }
@@ -118,32 +133,48 @@ int Transition::transitionEndTrack() const {
 }
 
 void Transition::updateTransitionEndTrack(int newtrack) {
-    m_transitionTrack = 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) {
+    const double scale = option->matrix.m11();
     QRectF exposed = option->exposedRect;
-    exposed.setRight(exposed.right() + 1);
-    exposed.setBottom(exposed.bottom() + 1);
     painter->setClipRect(exposed);
     QRectF br = rect();
-    m_gradient.setStart(0, br.y());
-    m_gradient.setFinalStop(0, br.bottom());
-    painter->fillRect(br, m_gradient);
+    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());
-    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->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()) {
@@ -153,6 +184,10 @@ void Transition::paint(QPainter *painter,
         pen.setColor(Qt::black);
         //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->drawRect(br);
 }
@@ -256,6 +291,7 @@ QDomElement Transition::toXML() {
     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()));