Minor improvements to keyframe widget, allow resetting keyframes

[kdenlive] / src / effectstack / parametercontainer.cpp

diff --git a/src/effectstack/parametercontainer.cpp b/src/effectstack/parametercontainer.cpp
index 9dd041f00ae9a61a88e8fb741aa2bb61761686ce..89256436f738cd21979a075f527a73a23a04a2bd 100644 (file)
--- a/src/effectstack/parametercontainer.cpp
+++ b/src/effectstack/parametercontainer.cpp
@@ -43,6 +43,7 @@
 #include "projectlist.h"
 #include "mainwindow.h"
 #include "parametercontainer.h"
+#include "../customtrackview.h"
 
 #include <KUrlRequester>
 #include <KFileDialog>
@@ -808,18 +809,25 @@ void ParameterContainer::slotStartFilterJobAction()
         QDomElement pa = namenode.item(i).toElement();
         QString type = pa.attribute("type");
         if (type == "filterjob") {
-           QString filtertag = pa.attribute("filtertag");
-           if (filtertag.contains("%geometry")) {
+           QString filterparams = pa.attribute("filterparams");
+           if (filterparams.contains("%params")) {
                // Replace with current geometry
-               if (m_geometryWidget) {
-                   QString data = m_geometryWidget->getValue();
-                   filtertag.replace("%geometry", data);
-                   kDebug()<<"// Setting geometry: "<<data<<", RES: "<<filtertag;
-               }
+               EffectsParameterList parameters;
+               QDomNodeList params = m_effect.elementsByTagName("parameter");
+               CustomTrackView::adjustEffectParameters(parameters, params, m_metaInfo->profile);
+               QString paramData;
+               for (int j = 0; j < parameters.count(); j++)
+                   paramData.append(parameters.at(j).name()+"="+parameters.at(j).value()+" ");
+               filterparams.replace("%params", paramData);
            }
-           QStringList extra = pa.attribute("extraparams").split(' ', QString::SkipEmptyParts);
-            emit startFilterJob(filtertag, pa.attribute("filterparams"), pa.attribute("finalfilter"), pa.attribute("consumer"), pa.attribute("consumerparams"), extra);
-            kDebug()<<" - - -PROPS:\n"<<"filtertag"<<"-"<< pa.attribute("filterparams")<<"-"<< pa.attribute("consumer")<<"-"<< pa.attribute("consumerparams")<<"-"<< pa.attribute("extraparams");
+           QMap <QString, QString> extraParams;
+           QDomNodeList jobparams = pa.elementsByTagName("jobparam");
+           for (int j = 0; j < jobparams.count(); j++) {
+                QDomElement e = jobparams.item(j).toElement();
+               extraParams.insert(e.attribute("name"), e.text().toUtf8());
+           }
+            emit startFilterJob(pa.attribute("filtertag"), filterparams, pa.attribute("consumer"), pa.attribute("consumerparams"), extraParams);
+            kDebug()<<" - - -PROPS:\n"<<pa.attribute("filtertag")<<"-"<< filterparams<<"-"<< pa.attribute("consumer")<<"-"<< pa.attribute("consumerparams")<<"-"<< pa.attribute("extraparams");
             break;
         }
     }
@@ -846,13 +854,13 @@ bool ParameterContainer::needsMonitorEffectScene() const
     return m_needsMonitorEffectScene;
 }
 
-void ParameterContainer::setKeyframes(const QString &data)
+void ParameterContainer::setKeyframes(const QString &data, int maximum)
 {
     if (!m_geometryWidget) {
        kDebug()<<" / / NO GEOMETRY WIDGET FOUND FOR IMPORTING DATA";
        return;
     }
-    m_geometryWidget->importKeyframes(data);
+    m_geometryWidget->importKeyframes(data, maximum);
     
 }