X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fbeziercurve%2Fcubicbezierspline.cpp;h=45cca94ce1649da2f04b0dfd7a1c036438a853ca;hb=c3302003093710ee247ad84c0fe2ef3c579d417f;hp=db5ff6fd8b74ff2603e9bf4bb9a58e384555d05b;hpb=4228e3960b5e6d5ecda34529e7c34df86b0a7750;p=kdenlive

diff --git a/src/beziercurve/cubicbezierspline.cpp b/src/beziercurve/cubicbezierspline.cpp
index db5ff6fd..45cca94c 100644
--- a/src/beziercurve/cubicbezierspline.cpp
+++ b/src/beziercurve/cubicbezierspline.cpp
@@ -17,7 +17,7 @@
  ***************************************************************************/
 
 #include "cubicbezierspline.h"
-
+#include <KDebug>
 
 /** @brief For sorting a Bezier spline. Whether a is before b. */
 static bool pointLessThan(const BPoint &a, const BPoint &b)
@@ -26,9 +26,7 @@ static bool pointLessThan(const BPoint &a, const BPoint &b)
 }
 
 CubicBezierSpline::CubicBezierSpline(QObject* parent) :
-        QObject(parent),
-        m_validSpline(false),
-        m_precision(100)
+        QObject(parent)
 {
     m_points.append(BPoint(QPointF(0, 0), QPointF(0, 0), QPointF(.1, .1)));
     m_points.append(BPoint(QPointF(.9, .9), QPointF(1, 1), QPointF(1, 1)));
@@ -37,30 +35,25 @@ CubicBezierSpline::CubicBezierSpline(QObject* parent) :
 CubicBezierSpline::CubicBezierSpline(const CubicBezierSpline& spline, QObject* parent) :
         QObject(parent)
 {
-    m_precision = spline.m_precision;
     m_points = spline.m_points;
-    m_validSpline = false;
 }
 
 CubicBezierSpline& CubicBezierSpline::operator=(const CubicBezierSpline& spline)
 {
-    m_precision = spline.m_precision;
     m_points = spline.m_points;
-    m_validSpline = false;
     return *this;
 }
 
 void CubicBezierSpline::fromString(const QString& spline)
 {
     m_points.clear();
-    m_validSpline = false;
 
-    QStringList bpoints = spline.split('|');
+    const QStringList bpoints = spline.split(QLatin1Char('|'));
     foreach(const QString &bpoint, bpoints) {
-        QStringList points = bpoint.split('#');
+        const QStringList points = bpoint.split(QLatin1Char('#'));
         QList <QPointF> values;
         foreach(const QString &point, points) {
-            QStringList xy = point.split(';');
+            QStringList xy = point.split(QLatin1Char(';'));
             if (xy.count() == 2)
                 values.append(QPointF(xy.at(0).toDouble(), xy.at(1).toDouble()));
         }
@@ -76,10 +69,11 @@ void CubicBezierSpline::fromString(const QString& spline)
 QString CubicBezierSpline::toString() const
 {
     QStringList spline;
+    QLocale locale;
     foreach(const BPoint &p, m_points) {
-        spline << (QString::number(p.h1.x()) + ";" + QString::number(p.h1.y())
-                        + "#" + QString::number(p.p.x())  + ";" + QString::number(p.p.y())
-                        + "#" + QString::number(p.h2.x()) + ";" + QString::number(p.h2.y()));
+        spline << QString("%1;%2#%3;%4#%5;%6").arg(locale.toString(p.h1.x())).arg(locale.toString(p.h1.y()))
+                                              .arg(locale.toString(p.p.x())).arg(locale.toString(p.p.y()))
+                                              .arg(locale.toString(p.h2.x())).arg(locale.toString(p.h2.y()));
     }
     return spline.join("|");
 }
@@ -89,11 +83,10 @@ int CubicBezierSpline::setPoint(int ix, const BPoint& point)
     m_points[ix] = point;
     keepSorted();
     validatePoints();
-    m_validSpline = false;
     return indexOf(point); // in case it changed
 }
 
-QList <BPoint> CubicBezierSpline::points()
+QList <BPoint> CubicBezierSpline::points() const
 {
     return m_points;
 }
@@ -101,7 +94,6 @@ QList <BPoint> CubicBezierSpline::points()
 void CubicBezierSpline::removePoint(int ix)
 {
     m_points.removeAt(ix);
-    m_validSpline = false;
 }
 
 int CubicBezierSpline::addPoint(const BPoint& point)
@@ -109,43 +101,19 @@ int CubicBezierSpline::addPoint(const BPoint& point)
     m_points.append(point);
     keepSorted();
     validatePoints();
-    m_validSpline = false;
     return indexOf(point);
 }
 
-void CubicBezierSpline::setPrecision(int pre)
-{
-    if (pre != m_precision) {
-        m_precision = pre;
-        m_validSpline = false;
-    }
-}
-
-int CubicBezierSpline::getPrecision()
+BPoint CubicBezierSpline::getPoint(int ix, int normalisedWidth, int normalisedHeight, bool invertHeight)
 {
-    return m_precision;
-}
-
-qreal CubicBezierSpline::value(qreal x, bool cont)
-{
-    update();
-
-    if (!cont)
-        m_i = m_spline.constBegin();
-    if (m_i != m_spline.constBegin())
-        --m_i;
-
-    double diff = qAbs(x - m_i.key());
-    double y = m_i.value();
-    while (m_i != m_spline.constEnd()) {
-        if (qAbs(x - m_i.key()) > diff)
-            break;
-
-        diff = qAbs(x - m_i.key());
-        y = m_i.value();
-        ++m_i;
+    BPoint p = m_points.at(ix);
+    for (int i = 0; i < 3; ++i) {
+        p[i].rx() *= normalisedWidth;
+        p[i].ry() *= normalisedHeight;
+        if (invertHeight)
+            p[i].ry() = normalisedHeight - p[i].y();
     }
-    return qBound((qreal)0.0, y, (qreal)1.0);
+    return p;
 }
 
 void CubicBezierSpline::validatePoints()
@@ -166,48 +134,6 @@ void CubicBezierSpline::keepSorted()
     qSort(m_points.begin(), m_points.end(), pointLessThan);
 }
 
-QPointF CubicBezierSpline::point(double t, const QList< QPointF >& points)
-{
-    // coefficients from Bernstein basis polynomial of degree 3
-    double c1 = (1-t) * (1-t) * (1-t);
-    double c2 = 3 * t * (1-t) * (1-t);
-    double c3 = 3 * t * t * (1-t);
-    double c4 = t * t * t;
-    
-    return QPointF(points[0].x()*c1 + points[1].x()*c2 + points[2].x()*c3 + points[3].x()*c4,
-                   points[0].y()*c1 + points[1].y()*c2 + points[2].y()*c3 + points[3].y()*c4);
-}
-
-void CubicBezierSpline::update()
-{
-    if (m_validSpline)
-        return;
-
-    m_validSpline = true;
-    m_spline.clear();
-
-    QList <QPointF> points;
-    QPointF p;
-    for (int i = 0; i < m_points.count() - 1; ++i) {
-        points.clear();
-        points << m_points.at(i).p
-                << m_points.at(i).h2
-                << m_points.at(i+1).h1
-                << m_points.at(i+1).p;
-
-        int numberOfValues = (int)((points[3].x() - points[0].x()) * m_precision * 5);
-        if (numberOfValues == 0)
-            numberOfValues = 1;
-        double step = 1 / (double)numberOfValues;
-        double t = 0;
-        while (t <= 1) {
-            p = point(t, points);
-            m_spline.insert(p.x(), p.y());
-            t += step;
-        }
-    }
-}
-
 int CubicBezierSpline::indexOf(const BPoint& p)
 {
     if (m_points.indexOf(p) == -1) {