HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1049:4e3b4d910737

README +15 -22

             Commercial Charts Add-on Preview
             --------------------------------
             Whats in Qt Commercial Charts
             =============================
                 combine several chart types and implement interaction in charts
             doc/
                 Documentation
-            Licensing/
+            licenses/
                 Licensing infromation
             Building
             ========
-            qmake
+            Configure project with qmake:
-            make (linux), mingw32-make (Windows with MinGw) or nmake (Visual Studio)
+                qmake CONFIG+=release
+            Build poject with make:
+                (Linux) make
+                (Windows with MinGw) mingw32-make
+                (Visual Studio) namke
             If you want to install the libraries to your Qt library directory use:
                 make install
+            If you want to uninstall the libraries
+                make uninstall
             Documentation
             =============
             KNOWN ISSUES
             ============
-            - General
              * The preview version of Qt Commercial Charts is still under development
                   and thus should not be used in e.g. product development
              * The Charts API might change between the Preview and first official release
              * Some areas will be refactored before the first official release
              * Qt Designer plugin is missing
              * Enable/disable tooltip is missing from the API
+             * Mutliple axis are not suported at the moment.
-            - QML API
+             * Logartmic, polar axis are not supported at the moment.
-                * The QML Bindings are still under development and to be considered as early preview
+             * Getting data from QAbstractItemModel is not feature complete.
+             * Interlnal layout hadnling is not working properly.
+             * The QML Bindings are still under development and to be considered as early draft
              * All the current QML APIs are shown in qmlchart demo app
              No newline at end of file
-                * If doing a developer build (not installing into your Qt instance) you
-            	  need to copy qmldir file to the qmlplugin installation folder; it is not
-            	  copied during build.
-            - Model based
-            - Bar Chart
-                * Modifying bar categories is not possible
-            - Pie Chart
-                * Slice labels drawn on top of the label arm
-            - Line Chart

licenses/LICENSE-ALLOS ~~Licenses/LICENSE-ALLOS~~ renamed 0 0

NO CONTENT: file renamed from Licenses/LICENSE-ALLOS to licenses/LICENSE-ALLOS

licenses/LICENSE-ALLOS-US ~~Licenses/LICENSE-ALLOS-US~~ renamed 0 0

NO CONTENT: file renamed from Licenses/LICENSE-ALLOS-US to licenses/LICENSE-ALLOS-US

licenses/LICENSE-DESKTOP ~~Licenses/LICENSE-DESKTOP~~ renamed 0 0

NO CONTENT: file renamed from Licenses/LICENSE-DESKTOP to licenses/LICENSE-DESKTOP

licenses/LICENSE-DESKTOP-US ~~Licenses/LICENSE-DESKTOP-US~~ renamed 0 0

NO CONTENT: file renamed from Licenses/LICENSE-DESKTOP-US to licenses/LICENSE-DESKTOP-US

licenses/LICENSE-EVALUATION ~~Licenses/LICENSE-EVALUATION~~ renamed 0 0

NO CONTENT: file renamed from Licenses/LICENSE-EVALUATION to licenses/LICENSE-EVALUATION

licenses/LICENSE-EVALUATION-US ~~Licenses/LICENSE-EVALUATION-US~~ renamed 0 0

NO CONTENT: file renamed from Licenses/LICENSE-EVALUATION-US to licenses/LICENSE-EVALUATION-US

licenses/LICENSE.COMMERCIAL.FI ~~Licenses/LICENSE.COMMERCIAL.FI~~ renamed 0 0

NO CONTENT: file renamed from Licenses/LICENSE.COMMERCIAL.FI to licenses/LICENSE.COMMERCIAL.FI

licenses/LICENSE.COMMERCIAL.US ~~Licenses/LICENSE.COMMERCIAL.US~~ renamed 0 0

NO CONTENT: file renamed from Licenses/LICENSE.COMMERCIAL.US to licenses/LICENSE.COMMERCIAL.US

src/scroller.cpp +2 -2

                             m_state = Idle;
                         }
                         else {
-                            m_speed /= 4;
+                            m_speed /= 3.75;
                             m_state = Scroll;
-                            m_ticker.start(20);
+                            m_ticker.start(25);
                         }
                         event->accept();
                         break;

src/splinechart/qsplineseries.cpp +32 -42

             };
             /*!
-              \internal
               Calculates control points which are needed by QPainterPath.cubicTo function to draw the cubic Bezier cureve between two points.
               */
             void QSplineSeriesPrivate::calculateControlPoints()
             {
                 Q_Q(QSplineSeries);
-                // Based on http://www.codeproject.com/Articles/31859/Draw-a-Smooth-Curve-through-a-Set-of-2D-Points-wit
-                // CPOL License
                 int n = q->count() - 1;
                 if (n == 1)
-                { // Special case: Bezier curve should be a straight line.
-                    //            firstControlPoints = new Point[1];
+                    //for n==1
-                    // 3P1 = 2P0 + P3
                     m_controlPoints.append(QPointF((2 * q->x(0) + q->x(1)) / 3, (2 * q->y(0) + q->y(1)) / 3));
-                    // P2 = 2P1  P0
                     m_controlPoints.append(QPointF(2 * m_controlPoints[0].x() - q->x(0), 2 * m_controlPoints[0].y() - q->y(0)));
                     return;
                 }
                 //  |   0   0   0   0   0   0   0   0   ... 1   4   1   |   |   P1_(n-1)|   |   4 * P(n-2) + 2 * P(n-1) |
                 //  |   0   0   0   0   0   0   0   0   ... 0   2   7   |   |   P1_n    |   |   8 * P(n-1) + Pn         |
                 //
-                QList<qreal> rhs;
+                QList<qreal> points;
-                rhs.append(q->x(0) + 2 * q->x(1));
-                // Set right hand side X values
+                points.append(q->x(0) + 2 * q->x(1));
-                for (int i = 1; i < n - 1; ++i)
-                    rhs.append(4 * q->x(i) + 2 * q->x(i + 1));
-                rhs.append((8 * q->x(n - 1) + q->x(n)) / 2.0);
-                // Get first control points X-values
-                QList<qreal> xControl = getFirstControlPoints(rhs);
-                rhs[0] = q->y(0) + 2 * q->y(1);
-                // Set right hand side Y values
                 for (int i = 1; i < n - 1; ++i)
-                    rhs[i] = 4 * q->y(i) + 2 * q->y(i + 1);
+                    points.append(4 * q->x(i) + 2 * q->x(i + 1));
-                rhs[n - 1] = (8 * q->y(n - 1) + q->y(n)) / 2.0;
+                points.append((8 * q->x(n - 1) + q->x(n)) / 2.0);
-                // Get first control points Y-values
-                QList<qreal> yControl = getFirstControlPoints(rhs);
+                QList<qreal> xControl = firstControlPoints(points);
+                points[0] = q->y(0) + 2 * q->y(1);
+                for (int i = 1; i < n - 1; ++i) {
+                    points[i] = 4 * q->y(i) + 2 * q->y(i + 1);
+                }
+                points[n - 1] = (8 * q->y(n - 1) + q->y(n)) / 2.0;
+                QList<qreal> yControl = firstControlPoints(points);
-                // Fill output arrays.
                 for (int i = 0; i < n; ++i) {
-                    // First control point
                     m_controlPoints.append(QPointF(xControl[i], yControl[i]));
-                    // Second control point
                     if (i < n - 1)
                         m_controlPoints.append(QPointF(2 * q->x(i + 1) - xControl[i + 1], 2 * q->y(i + 1) - yControl[i + 1]));
                     else
                 }
             }
-            /*!
+            QList<qreal> QSplineSeriesPrivate::firstControlPoints(QList<qreal> list)
-              \internal
-              */
-            QList<qreal> QSplineSeriesPrivate::getFirstControlPoints(QList<qreal> rhs)
             {
-                QList<qreal> x; // Solution vector.
+                QList<qreal> result;
-                QList<qreal> tmp; // Temp workspace.
+                QList<qreal> temp;
                 qreal b = 2.0;
-                x.append(rhs[0] / b);
+                result.append(list[0] / b);
-                tmp.append(0);
+                temp.append(0);
-                for (int i = 1; i < rhs.size(); i++) {
+                for (int i = 1; i < list.size(); i++) {
-                    // Decomposition and forward substitution.
+                    temp.append(1 / b);
-                    tmp.append(1 / b);
+                    b = (i < list.size() - 1 ? 4.0 : 3.5) - temp[i];
-                    b = (i < rhs.size() - 1 ? 4.0 : 3.5) - tmp[i];
+                    result.append((list[i] - result[i - 1]) / b);
-                    x.append((rhs[i] - x[i - 1]) / b);
                 }
-                for (int i = 1; i < rhs.size(); i++)
+                for (int i = 1; i < list.size(); i++)
-                    x[rhs.size() - i - 1] -= tmp[rhs.size() - i] * x[rhs.size() - i]; // Backsubstitution.
+                    result[list.size() - i - 1] -= temp[list.size() - i] * result[list.size() - i];
-                return x;
+                return result;
             }
             /*!
-              \internal
               Updates the control points, besed on currently avaiable knots.
               */
             void QSplineSeriesPrivate::updateControlPoints()

src/splinechart/qsplineseries_p.h +1 -1

                 Chart* createGraphics(ChartPresenter* presenter);
                 QSplineSeriesPrivate(QSplineSeries* q);
                 void calculateControlPoints();
-                QList<qreal> getFirstControlPoints(QList<qreal> rhs);
+                QList<qreal> firstControlPoints(QList<qreal> rhs);
             public Q_SLOTS:
                 void updateControlPoints();

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages