Bezier Spline: add backgrounds for modes rgb and alpha

[kdenlive] / src / effectstackedit.cpp

diff --git a/src/effectstackedit.cpp b/src/effectstackedit.cpp
index f2ce5b1ed32c904bbfab0200ccb9862672da29d4..360c62f1d03c172ffd07a8d54539ca2b650091c9 100644 (file)
--- a/src/effectstackedit.cpp
+++ b/src/effectstackedit.cpp
@@ -35,7 +35,6 @@
 #include "doubleparameterwidget.h"
 #include "cornerswidget.h"
 #include "beziercurve/beziersplinewidget.h"
-#include "beziercurve/cubicbezierspline.h"
 
 #include <KDebug>
 #include <KLocale>
@@ -148,7 +147,12 @@ void EffectStackEdit::meetDependency(const QString& name, QString type, QString
         KisCurveWidget *curve = (KisCurveWidget*)m_valueItems[name];
         if (curve) {
             int color = value.toInt();
-            curve->setPixmap(QPixmap::fromImage(ColorTools::rgbCurvePlane(curve->size(), (ColorTools::ColorsRGB)color, 0.8)));
+            curve->setPixmap(QPixmap::fromImage(ColorTools::rgbCurvePlane(curve->size(), (ColorTools::ColorsRGB)(color == 3 ? 4 : color), 0.8)));
+        }
+    } else if (type == "bezier_spline") {
+        BezierSplineWidget *widget = (BezierSplineWidget*)m_valueItems[name];
+        if (widget) {
+            widget->setMode((BezierSplineWidget::CurveModes)((int)(value.toDouble() * 10)));
         }
     }
 }
@@ -205,6 +209,8 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in
     bool disable = d.attribute("disable") == "1" && KdenliveSettings::disable_effect_parameters();
     setEnabled(!disable);
 
+    bool stretch = true;
+
 
     for (int i = 0; i < namenode.count() ; i++) {
         QDomElement pa = namenode.item(i).toElement();
@@ -382,13 +388,14 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in
             if (!depends.isEmpty())
                 meetDependency(paramName, type, EffectsList::parameter(e, depends));
         } else if (type == "bezier_spline") {
-            BezierSplineWidget *widget = new BezierSplineWidget(this);
-            CubicBezierSpline spline;
-            spline.fromString(value);
-            widget->setSpline(spline);
+            BezierSplineWidget *widget = new BezierSplineWidget(value, this);
+            stretch = false;
             m_vbox->addWidget(widget);
             m_valueItems[paramName] = widget;
             connect(widget, SIGNAL(modified()), this, SLOT(collectAllParameters()));
+            QString depends = pa.attribute("depends");
+            if (!depends.isEmpty())
+                meetDependency(paramName, type, EffectsList::parameter(e, depends));
         } else if (type == "corners") {
             CornersWidget *corners = new CornersWidget(m_monitor, pos, isEffect, pa.attribute("factor").toInt(), this);
             connect(corners, SIGNAL(checkMonitorPosition(int)), this, SIGNAL(checkMonitorPosition(int)));
@@ -484,7 +491,9 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in
         if (toFillin)
             m_vbox->addWidget(toFillin);
     }
-    m_vbox->addStretch();
+
+    if (stretch)
+        m_vbox->addStretch();
 
     if (m_keyframeEditor)
         m_keyframeEditor->checkVisibleParam();
@@ -670,7 +679,10 @@ void EffectStackEdit::collectAllParameters()
                 meetDependency(paramName, type, EffectsList::parameter(newparam, depends));
         } else if (type == "bezier_spline") {
             BezierSplineWidget *widget = (BezierSplineWidget*)m_valueItems.value(paramName);
-            setValue = widget->spline().toString();
+            setValue = widget->spline();
+            QString depends = pa.attributes().namedItem("depends").nodeValue();
+            if (!depends.isEmpty())
+                meetDependency(paramName, type, EffectsList::parameter(newparam, depends));
         } else if (type == "corners") {
             CornersWidget *corners = ((CornersWidget*)m_valueItems.value(paramName));
             QString xName = pa.attributes().namedItem("xpoints").nodeValue();