X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fparameterplotter.cpp;h=f298bd79ca3084500332de9b93ae3bfe371ef496;hb=1feb9c1eff4911301cb3e04bfdeb50a270c95b0c;hp=21bf09b715922d195448d28eacf20b7a38152943;hpb=ca8cd6607f6277a27b5654dafe3780235b0bc7a0;p=kdenlive diff --git a/src/parameterplotter.cpp b/src/parameterplotter.cpp index 21bf09b7..f298bd79 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; } /* Lines @@ -74,32 +76,32 @@ 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++; + ++i; if (namenode.count()) { QDomElement pa = namenode.item(i).toElement(); 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()) { @@ -149,7 +151,7 @@ void ParameterPlotter::createParametersNew() QTextStream txtstr(¶mlist); QDomNode pa = namenode.item(0); if (namenode.count() > 0) { - for (int i = 0; i < plotobjs.count(); i++) { + for (int i = 0; i < plotobjs.count(); ++i) { QList points = plotobjs[i]->points(); foreach(const KPlotPoint *o, points) { txtstr << (int)o->y() ; @@ -191,7 +193,7 @@ void ParameterPlotter::mouseMoveEvent(QMouseEvent * event) m_oldmousepoint = event->pos(); } } - i++; + ++i; } createParametersNew(); } @@ -217,7 +219,7 @@ void ParameterPlotter::replot(const QString & name) p->setLabelPen(pen); if (selectedName == name) m_activeIndexPlot = i; - replacePlotObject(i++, p); + replacePlotObject(++i, p); } } @@ -248,7 +250,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 +282,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"