Bezier Spline:

- draw background indicating changes caused by modifying the curve, can be turned off
- store number of grid lines in kdenlivesettings

svn path=/trunk/kdenlive/; revision=5239

diff --git a/src/beziercurve/beziersplineeditor.cpp b/src/beziercurve/beziersplineeditor.cpp
index af5b26ab17de8314d4138189e4c46631d77911b1..3c35a66ed5c5a82dd73a82fecd3239350b709409 100644 (file)
--- a/src/beziercurve/beziersplineeditor.cpp
+++ b/src/beziercurve/beziersplineeditor.cpp
@@ -24,9 +24,11 @@
 
 BezierSplineEditor::BezierSplineEditor(QWidget* parent) :
         QWidget(parent),
+        m_mode(ModeNormal),
         m_zoomLevel(0),
         m_gridLines(3),
-        m_mode(ModeNormal),
+        m_pixmapCache(NULL),
+        m_pixmapIsDirty(true),
         m_currentPointIndex(-1)
 {
     setMouseTracking(true);
@@ -36,6 +38,12 @@ BezierSplineEditor::BezierSplineEditor(QWidget* parent) :
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 }
 
+BezierSplineEditor::~BezierSplineEditor()
+{
+    if (m_pixmapCache)
+        delete m_pixmapCache;
+}
+
 CubicBezierSpline BezierSplineEditor::spline()
 {
     return m_spline;
@@ -65,21 +73,35 @@ void BezierSplineEditor::updateCurrentPoint(const BPoint& p)
     }
 }
 
+void BezierSplineEditor::setPixmap(const QPixmap& pixmap)
+{
+    m_pixmap = pixmap;
+    m_pixmapIsDirty = true;
+    update();
+}
+
 void BezierSplineEditor::slotZoomIn()
 {
     m_zoomLevel = qMax(m_zoomLevel-1, 0);
+    m_pixmapIsDirty = true;
     update();
 }
 
 void BezierSplineEditor::slotZoomOut()
 {
     m_zoomLevel = qMin(m_zoomLevel+1, 3);
+    m_pixmapIsDirty = true;
     update();
 }
 
-void BezierSplineEditor::slotGridChange()
+int BezierSplineEditor::gridLines()
+{
+    return m_gridLines;
+}
+
+void BezierSplineEditor::setGridLines(int lines)
 {
-    m_gridLines = (m_gridLines + 1) % 9;
+    m_gridLines = qBound(0, lines, 8);
     update();
 }
 
@@ -89,14 +111,30 @@ void BezierSplineEditor::paintEvent(QPaintEvent* event)
 
     QPainter p(this);
 
-    p.fillRect(rect(), palette().background());
-
     int wWidth = width() - 1;
     int wHeight = height() - 1;
     int offset = 1/8. * m_zoomLevel * (wWidth > wHeight ? wWidth : wHeight);
     wWidth -= 2 * offset;
     wHeight -= 2 * offset;
 
+    /*
+     * Background
+     */
+    p.fillRect(rect(), palette().background());
+    if (!m_pixmap.isNull()) {
+        if (m_pixmapIsDirty || !m_pixmapCache) {
+            if (m_pixmapCache)
+                delete m_pixmapCache;
+            m_pixmapCache = new QPixmap(wWidth + 1, wHeight + 1);
+            QPainter cachePainter(m_pixmapCache);
+
+            cachePainter.scale(1.0*(wWidth+1) / m_pixmap.width(), 1.0*(wHeight+1) / m_pixmap.height());
+            cachePainter.drawPixmap(0, 0, m_pixmap);
+            m_pixmapIsDirty = false;
+        }
+        p.drawPixmap(offset, offset, *m_pixmapCache);
+    }
+
     /*
      * Standard line
      */
@@ -188,6 +226,7 @@ void BezierSplineEditor::paintEvent(QPaintEvent* event)
 void BezierSplineEditor::resizeEvent(QResizeEvent* event)
 {
     m_spline.setPrecision(width());
+    m_pixmapIsDirty = true;
     QWidget::resizeEvent(event);
 }
 

diff --git a/src/beziercurve/beziersplineeditor.h b/src/beziercurve/beziersplineeditor.h
index b4dfe7aeafafdef0fcd8d37212032abc3790f7d8..604969ba28ba5bfa383677bde1412d6a17a56e5f 100644 (file)
--- a/src/beziercurve/beziersplineeditor.h
+++ b/src/beziercurve/beziersplineeditor.h
@@ -30,6 +30,7 @@ class BezierSplineEditor : public QWidget
 
 public:
     BezierSplineEditor(QWidget* parent = 0);
+    virtual ~BezierSplineEditor();
 
     CubicBezierSpline spline();
     void setSpline(const CubicBezierSpline &spline);
@@ -37,10 +38,14 @@ public:
     BPoint getCurrentPoint();
     void updateCurrentPoint(const BPoint &p);
 
+    int gridLines();
+    void setGridLines(int lines);
+
+    void setPixmap(const QPixmap &pixmap);
+
 public slots:
     void slotZoomIn();
     void slotZoomOut();
-    void slotGridChange();
 
 protected:
     //void keyPressEvent(QKeyEvent *event);
@@ -58,6 +63,10 @@ private:
     modes m_mode;
     int m_zoomLevel;
     int m_gridLines;
+    QPixmap m_pixmap;
+    QPixmap *m_pixmapCache;
+    bool m_pixmapIsDirty;
+
     int m_currentPointIndex;
     point_types m_currentPointType;
     double m_grabOffsetX;

diff --git a/src/beziercurve/beziersplinewidget.cpp b/src/beziercurve/beziersplinewidget.cpp
index 36eb6cc70fa73e4a0fd4c7f615a30b8983c0ee14..d6469c71fbe38607c5058efe74937389419ece78 100644 (file)
--- a/src/beziercurve/beziersplinewidget.cpp
+++ b/src/beziercurve/beziersplinewidget.cpp
@@ -17,13 +17,16 @@
  ***************************************************************************/
 
 #include "beziersplinewidget.h"
+#include "colortools.h"
+#include "kdenlivesettings.h"
 
 #include <QVBoxLayout>
 
 #include <KIcon>
 
 BezierSplineWidget::BezierSplineWidget(const QString& spline, QWidget* parent) :
-        QWidget(parent)
+        QWidget(parent),
+        m_mode(ModeRed)
 {
     QVBoxLayout *layout = new QVBoxLayout(this);
     layout->addWidget(&m_edit);
@@ -36,6 +39,7 @@ BezierSplineWidget::BezierSplineWidget(const QString& spline, QWidget* parent) :
     m_ui.buttonZoomIn->setIcon(KIcon("zoom-in"));
     m_ui.buttonZoomOut->setIcon(KIcon("zoom-out"));
     m_ui.buttonGridChange->setIcon(KIcon("view-grid"));
+    m_ui.buttonShowPixmap->setIcon(QIcon(QPixmap::fromImage(ColorTools::rgbCurvePlane(QSize(16, 16), ColorTools::COL_Luma, 0.8))));
     m_ui.widgetPoint->setEnabled(false);
 
     CubicBezierSpline s;
@@ -54,7 +58,11 @@ BezierSplineWidget::BezierSplineWidget(const QString& spline, QWidget* parent) :
 
     connect(m_ui.buttonZoomIn, SIGNAL(clicked()), &m_edit, SLOT(slotZoomIn()));
     connect(m_ui.buttonZoomOut, SIGNAL(clicked()), &m_edit, SLOT(slotZoomOut()));
-    connect(m_ui.buttonGridChange, SIGNAL(clicked()), &m_edit, SLOT(slotGridChange()));
+    connect(m_ui.buttonGridChange, SIGNAL(clicked()), this, SLOT(slotGridChange()));
+    connect(m_ui.buttonShowPixmap, SIGNAL(toggled(bool)), this, SLOT(slotShowPixmap(bool)));
+
+    m_edit.setGridLines(KdenliveSettings::bezier_gridlines());
+    m_ui.buttonShowPixmap->setChecked(KdenliveSettings::bezier_showpixmap());
 }
 
 QString BezierSplineWidget::spline()
@@ -62,6 +70,31 @@ QString BezierSplineWidget::spline()
     return m_edit.spline().toString();
 }
 
+void BezierSplineWidget::setMode(BezierSplineWidget::CurveModes mode)
+{
+    if (m_mode != mode) {
+        m_mode = mode;
+        if (m_showPixmap)
+            slotShowPixmap();
+    }
+}
+
+void BezierSplineWidget::slotGridChange()
+{
+    m_edit.setGridLines((m_edit.gridLines() + 1) % 9);
+    KdenliveSettings::setBezier_gridlines(m_edit.gridLines());
+}
+
+void BezierSplineWidget::slotShowPixmap(bool show)
+{
+    m_showPixmap = show;
+    KdenliveSettings::setBezier_showpixmap(show);
+    if (show)
+        m_edit.setPixmap(QPixmap::fromImage(ColorTools::rgbCurvePlane(m_edit.size(), (ColorTools::ColorsRGB)((int)m_mode), 0.8)));
+    else
+        m_edit.setPixmap(QPixmap());
+}
+
 void BezierSplineWidget::slotUpdatePoint(const BPoint &p)
 {
     blockSignals(true);

diff --git a/src/beziercurve/beziersplinewidget.h b/src/beziercurve/beziersplinewidget.h
index 5c4ba0de22dc7f6f3c24ee70f7b65d9eee6aef89..cec30f7362d1fb9b71b9fa861c834def7729bc82 100644 (file)
--- a/src/beziercurve/beziersplinewidget.h
+++ b/src/beziercurve/beziersplinewidget.h
@@ -35,13 +35,20 @@ public:
 
     QString spline();
 
+    enum CurveModes { ModeRed, ModeGreen, ModeBlue, ModeLuma };
+    void setMode(CurveModes mode);
+
 private slots:
     void slotUpdatePoint(const BPoint &p);
     void slotUpdateSpline();
+    void slotGridChange();
+    void slotShowPixmap(bool show = true);
 
 private:
     Ui::BezierSpline_UI m_ui;
     BezierSplineEditor m_edit;
+    CurveModes m_mode;
+    bool m_showPixmap;
 
 signals:
     void modified();

diff --git a/src/effectstackedit.cpp b/src/effectstackedit.cpp
index 458f53c2ad5591f8d2845c727fe78fb2b5fe8e7c..d344e32fe759744c650a5cd7828727dd9efcf3f0 100644 (file)
--- a/src/effectstackedit.cpp
+++ b/src/effectstackedit.cpp
@@ -149,6 +149,11 @@ void EffectStackEdit::meetDependency(const QString& name, QString type, QString
             int color = value.toInt();
             curve->setPixmap(QPixmap::fromImage(ColorTools::rgbCurvePlane(curve->size(), (ColorTools::ColorsRGB)color, 0.8)));
         }
+    } else if (type == "bezier_spline") {
+        BezierSplineWidget *widget = (BezierSplineWidget*)m_valueItems[name];
+        if (widget) {
+            widget->setMode((BezierSplineWidget::CurveModes)value.toInt());
+        }
     }
 }
 
@@ -388,6 +393,9 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in
             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)));
@@ -672,6 +680,9 @@ void EffectStackEdit::collectAllParameters()
         } else if (type == "bezier_spline") {
             BezierSplineWidget *widget = (BezierSplineWidget*)m_valueItems.value(paramName);
             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();

diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
index 35c0dd837da8468a613d88a30ed61c83a3a13b66..2688ed73d0a27be78725d7e0841ce62fa4e10a35 100644 (file)
--- a/src/kdenlivesettings.kcfg
+++ b/src/kdenlivesettings.kcfg
@@ -488,6 +488,18 @@
       <default></default>
     </entry>
   </group>
+  
+  <group name="bezier_spline">
+    <entry name="bezier_gridlines" type="Int">
+      <label>Number of lines to use for the grid.</label>
+      <default>3</default>
+    </entry>
+
+    <entry name="bezier_showpixmap" type="Bool">
+      <label>Should a background indicating the changes caused by curve manipulation be shown.</label>
+      <default>true</default>
+    </entry>
+  </group>
 
 
   <group name="unmanaged">

diff --git a/src/widgets/bezierspline_ui.ui b/src/widgets/bezierspline_ui.ui
index 53c6e909b4ab38f517696c571340ab4e8b2d07a0..3ef39ca34dd78df89c0a525351acf3aee2ac4352 100644 (file)
--- a/src/widgets/bezierspline_ui.ui
+++ b/src/widgets/bezierspline_ui.ui
@@ -6,17 +6,20 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>336</width>
-    <height>94</height>
+    <width>315</width>
+    <height>83</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="1" column="5" colspan="4">
+   <item row="1" column="0" colspan="6">
     <widget class="QWidget" name="widgetPoint" native="true">
      <layout class="QGridLayout" name="gridLayout_2">
+      <property name="margin">
+       <number>0</number>
+      </property>
       <item row="0" column="0" colspan="9">
        <widget class="QWidget" name="widget" native="true">
         <layout class="QHBoxLayout" name="horizontalLayout">
@@ -199,18 +202,24 @@
      </layout>
     </widget>
    </item>
-   <item row="2" column="6">
-    <widget class="QToolButton" name="buttonZoomIn">
+   <item row="2" column="0">
+    <widget class="QToolButton" name="buttonShowPixmap">
+     <property name="toolTip">
+      <string>Show background indicating changes caused by modifying the curve.</string>
+     </property>
      <property name="text">
       <string>...</string>
      </property>
+     <property name="checkable">
+      <bool>true</bool>
+     </property>
      <property name="autoRaise">
       <bool>true</bool>
      </property>
     </widget>
    </item>
-   <item row="2" column="7">
-    <widget class="QToolButton" name="buttonZoomOut">
+   <item row="2" column="3">
+    <widget class="QToolButton" name="buttonZoomIn">
      <property name="text">
       <string>...</string>
      </property>
@@ -219,20 +228,17 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="8">
-    <spacer name="spacer">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+   <item row="2" column="4">
+    <widget class="QToolButton" name="buttonZoomOut">
+     <property name="text">
+      <string>...</string>
      </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
+     <property name="autoRaise">
+      <bool>true</bool>
      </property>
-    </spacer>
+    </widget>
    </item>
-   <item row="2" column="5">
+   <item row="2" column="1">
     <widget class="QToolButton" name="buttonGridChange">
      <property name="toolTip">
       <string>Increases the number of lines in the grid.&lt;br /&gt;After 8 lines it will begin from 0 again.</string>
@@ -245,6 +251,19 @@
      </property>
     </widget>
    </item>
+   <item row="2" column="5">
+    <spacer name="spacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <resources/>