Small fix to transition change

[kdenlive] / src / transition.cpp

diff --git a/src/transition.cpp b/src/transition.cpp
index 7f358c02bba2aac48dc162f7efc7c697ec9010f9..79659598f028cd447522f6aa15c0e48d7320a628 100644 (file)
--- a/src/transition.cpp
+++ b/src/transition.cpp
@@ -30,20 +30,21 @@
 #include "transition.h"
 #include "clipitem.h"
 #include "kdenlivesettings.h"
+#include "mainwindow.h"
 
-
-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)) {
+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() / 3 * 2, (info.endPos - info.startPos).frames(fps) * scale , KdenliveSettings::trackheight() / 3 * 2 - 1), fps) {
     m_singleClip = true;
     m_transitionTrack = transitiontrack;
     m_secondClip = NULL;
     m_cropStart = GenTime();
-    m_fps = fps;
     m_maxDuration = GenTime(10000, fps);
+
+    m_gradient.setColorAt(0, QColor(200, 200, 0, 150));
+    m_gradient.setColorAt(1, QColor(200, 200, 200, 120));
+
     //m_referenceClip = clipa;
     if (params.isNull()) {
-       QDomDocument doc;
-       doc.setContent(QString("<ktransition tag=\"luma\"><name>Luma</name><description>Luma Transitions</description><properties id=\"luma\" tag=\"luma\" /><parameter type=\"bool\" name=\"reverse\" max=\"1\" min=\"0\" default=\"1\" factor=\"1\"><name>Reverse</name></parameter></ktransition>"));
-       m_parameters = doc.documentElement();
+        m_parameters = MainWindow::transitions.getEffectByName("Luma");
     } else {
         m_parameters = params;
     }
@@ -70,6 +71,7 @@ QString Transition::transitionTag() const {
 void Transition::setTransitionParameters(const QDomElement params) {
     m_parameters = params;
     m_name = m_parameters.elementsByTagName("name").item(0).toElement().text();
+    update();
 }
 
 
@@ -80,12 +82,12 @@ bool Transition::invertedTransition() 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));
@@ -100,21 +102,20 @@ int Transition::transitionEndTrack() const {
     return m_transitionTrack;
 }
 
+void Transition::updateTransitionEndTrack(int newtrack) {
+    m_transitionTrack = newtrack;
+}
+
 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);
+    painter->setClipRect(option->exposedRect);
     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));
@@ -122,26 +123,28 @@ void Transition::paint(QPainter *painter,
     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*/));
+    m_gradient.setStart(0, br.y());
+    m_gradient.setFinalStop(0, br.bottom());
+    painter->fillPath(resultClipPath, m_gradient);
 #endif
-    painter->setClipRect(option->exposedRect);
-    painter->drawPixmap((int)(br.x() + 10), (int)(br.y() + 10), transitionPixmap());
-    painter->drawPath(resultClipPath.intersected(clippath));
+
+    int top = (int)(br.y() + br.height() / 2 - 7);
+    painter->drawPixmap((int)(br.x() + 10), top, transitionPixmap());
     painter->setPen(QColor(0, 0, 0, 180));
-    painter->drawText((int)br.x() + 31, (int)br.y() + 21, transitionName());
+    top += painter->fontInfo().pixelSize();
+    painter->drawText((int)br.x() + 31, top + 1, transitionName());
     painter->setPen(QColor(255, 255, 255, 180));
-    painter->drawText((int)br.x() + 30, (int)br.y() + 20, transitionName());
+    painter->drawText((int)br.x() + 30, top, transitionName());
     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);
     }
     painter->setPen(pen);
-    painter->setClipRect(option->exposedRect);
-    painter->drawPath(resultClipPath.intersected(clippath));
+    painter->drawPath(resultClipPath);
 }
 
 int Transition::type() const {
@@ -149,8 +152,8 @@ int Transition::type() const {
 }
 
 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;
+    if (qAbs((int)(pos.x() - rect().x())) < 6) return RESIZESTART;
+    else if (qAbs((int)(pos.x() - (rect().x() + rect().width()))) < 6) return RESIZEEND;
     return MOVE;
 }