X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fparameterplotter.cpp;h=5550ba658e60882db2d30869bb4cdef0fe2018dc;hb=c3302003093710ee247ad84c0fe2ef3c579d417f;hp=f78cc2e63583b39aae75217a1c2687364e903174;hpb=9472299b931b35891fb78bc18ec06d921bf59a33;p=kdenlive

diff --git a/src/parameterplotter.cpp b/src/parameterplotter.cpp
index f78cc2e6..5550ba65 100644
--- a/src/parameterplotter.cpp
+++ b/src/parameterplotter.cpp
@@ -38,6 +38,8 @@ ParameterPlotter::ParameterPlotter(QWidget *parent) :
     m_moveTimeline = true;
     m_newPoints = false;
     m_activeIndexPlot = -1;
+    m_max_y = 0;
+    m_min_y = 0;
 }
 /*
     <name>Lines</name>
@@ -74,32 +76,31 @@ void ParameterPlotter::setPointLists(const QDomElement& d, const QString& paramN
     kDebug() << dat;
     int i = 0;
     while (!namenode.item(i).isNull() && namenode.item(i).toElement().attribute("name") != m_paramName)
-        i++;
-    if (namenode.count()) {
-
+        ++i;
 
+    if (namenode.count()) {
         QDomElement pa = namenode.item(i).toElement();
-        QDomNode na = pa.firstChildElement("name");
+        //QDomNode na = pa.firstChildElement("name");
 
-        m_parameterNameList << pa.attribute("namedesc").split(";");
+        m_parameterNameList << pa.attribute("namedesc").split(';');
         emit parameterList(m_parameterNameList);
 
         //max_y=pa.attributes().namedItem("max").nodeValue().toInt();
         //int val=pa.attributes().namedItem("value").nodeValue().toInt();
         QStringList defaults;
-        if (pa.attribute("start").contains(";"))
-            defaults = pa.attribute("start").split(";");
-        else if (pa.attribute("value").contains(";"))
-            defaults = pa.attribute("value").split(";");
-        else if (pa.attribute("default").contains(";"))
-            defaults = pa.attribute("default").split(";");
-        QStringList maxv = pa.attribute("max").split(";");
-        QStringList minv = pa.attribute("min").split(";");
-        for (int i = 0;i < maxv.size() && i < minv.size();i++) {
+        if (pa.attribute("start").contains(';'))
+            defaults = pa.attribute("start").split(';');
+        else if (pa.attribute("value").contains(';'))
+            defaults = pa.attribute("value").split(';');
+        else if (pa.attribute("default").contains(';'))
+            defaults = pa.attribute("default").split(';');
+        QStringList maxv = pa.attribute("max").split(';');
+        QStringList minv = pa.attribute("min").split(';');
+        for (int i = 0; i < maxv.size() && i < minv.size(); ++i) {
             if (m_max_y < maxv[i].toInt()) m_max_y = maxv[i].toInt();
             if (m_min_y > minv[i].toInt()) m_min_y = minv[i].toInt();
         }
-        for (int i = 0;i < m_parameterNameList.count();i++) {
+        for (int i = 0; i < m_parameterNameList.count(); ++i) {
             KPlotObject *plot = new KPlotObject(m_colors[m_plotobjects.size()%m_colors.size()]);
             plot->setShowLines(true);
             if (!m_stretchFactors.contains(i) && i < maxv.size()) {
@@ -148,9 +149,9 @@ void ParameterPlotter::createParametersNew()
     QString paramlist;
     QTextStream txtstr(&paramlist);
     QDomNode pa = namenode.item(0);
-    if (namenode.count() > 0) {
-        for (int i = 0;i < plotobjs.count();i++) {
-            QList<KPlotPoint*> points = plotobjs[i]->points();
+    if (!namenode.isEmpty()) {
+        for (int i = 0; i < plotobjs.count(); ++i) {
+            QList<KPlotPoint*> points = plotobjs.at(i)->points();
             foreach(const KPlotPoint *o, points) {
                 txtstr << (int)o->y() ;
                 break;//first no keyframes
@@ -174,7 +175,7 @@ void ParameterPlotter::mouseMoveEvent(QMouseEvent * event)
         int i = 0;
         foreach(KPlotObject *o, plotObjects()) {
             QList<KPlotPoint*> points = o->points();
-            for (int p = 0;p < points.size();p++) {
+            for (int p = 0; p < points.size(); p++) {
                 if (points[p] == m_movepoint && (m_activeIndexPlot == -1 || m_activeIndexPlot == i)) {
                     QPoint delta = event->pos() - m_oldmousepoint;
                     double newy = m_movepoint->y() - delta.y() * dataRect().height() / pixRect().height();
@@ -191,7 +192,7 @@ void ParameterPlotter::mouseMoveEvent(QMouseEvent * event)
                     m_oldmousepoint = event->pos();
                 }
             }
-            i++;
+            ++i;
         }
         createParametersNew();
     }
@@ -217,7 +218,7 @@ void ParameterPlotter::replot(const QString & name)
         p->setLabelPen(pen);
         if (selectedName == name)
             m_activeIndexPlot = i;
-        replacePlotObject(i++, p);
+        replacePlotObject(++i, p);
     }
 }
 
@@ -248,7 +249,7 @@ void ParameterPlotter::mousePressEvent(QMouseEvent * event)
                     newpoints.append(QPointF(pt->x(), pt->y()));
                 }
                 p->clearPoints();
-                foreach(const QPointF qf, newpoints) {
+                foreach(const QPointF &qf, newpoints) {
                     p->addPoint(qf);
                 }
                 replacePlotObject(m_activeIndexPlot, p);
@@ -280,22 +281,24 @@ void ParameterPlotter::setNewPoints(bool b)
     m_newPoints = b;
 }
 
-bool ParameterPlotter::isMoveX()
+bool ParameterPlotter::isMoveX() const
 {
     return m_moveX;
 }
 
-bool ParameterPlotter::isMoveY()
+bool ParameterPlotter::isMoveY() const
 {
     return m_moveY;
 }
 
-bool ParameterPlotter::isMoveTimeline()
+bool ParameterPlotter::isMoveTimeline() const
 {
     return m_moveTimeline;
 }
 
-bool ParameterPlotter::isNewPoints()
+bool ParameterPlotter::isNewPoints() const
 {
     return m_newPoints;
 }
+
+#include "parameterplotter.moc"