HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r455:49ff5e3c0df2

Some spline fixes

Marek Rosa -

r455:49ff5e3c0df2

parent child

Context file:

r455:49ff5e3c0df2

Collapse all files

src/splinechart/splinepresenter.cpp +1 0

             {
                 if(points.size()==0) return;
+                qDebug() << "Kueku";
                 QPainterPath splinePath;
                 const QPointF& point = points.at(0);
                 splinePath.moveTo(point);

src/splinechart/splinepresenter_p.h +1 -6

                 QPointF calculateGeometryControlPoint(int index) const;
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
-            signals:
-            public slots:
             };
             QTCOMMERCIALCHART_END_NAMESPACE

test/chartwidgettest/mainwidget.cpp +18 -3

             #include "qpieseries.h"
             #include "qscatterseries.h"
             #include <qlineseries.h>
+            #include "qsplineseries.h"
             #include <qbarset.h>
             #include <qbarseries.h>
             #include <qstackedbarseries.h>
                 QList<RealList> data = generateTestData(columnCount, rowCount, dataCharacteristics);
                 // Line series and scatter series use similar data
-                if (seriesName.contains("line", Qt::CaseInsensitive)) {
+                if (seriesName.contains("qline", Qt::CaseInsensitive)) {
                     for (int j(0); j < data.count(); j ++) {
                         QList<qreal> column = data.at(j);
                         QLineSeries *series = new QLineSeries();
                         QList<qreal> column = data.at(j);
                         QScatterSeries *series = new QScatterSeries();
                         for (int i(0); i < column.count(); i++) {
-                           (*series) << QPointF(i, column.at(i));
+                            (*series) << QPointF(i, column.at(i));
                         }
                         m_chartView->addSeries(series);
                         setCurrentSeries(series);
                         }
                         series->addBarSet(set);
                     }
                     // TODO: new implementation of setFloatingValuesEnabled with signals
                     //series->setFloatingValuesEnabled(true);
                     series->setToolTipEnabled(true);
                     m_chartView->addSeries(series);
                     setCurrentSeries(series);
                 }
+                else if (seriesName.contains("spline", Qt::CaseInsensitive)) {
+                    for (int j(0); j < data.count(); j ++) {
+                        QList<qreal> column = data.at(j);
+                        QSplineSeries *series = new QSplineSeries();
+                        for (int i(0); i < column.count(); i++) {
+                            series->add(i, column.at(i));
+                        }
+                        m_chartView->addSeries(series);
+                        setCurrentSeries(series);
+                    }
-                // TODO: spline and area
+                    // TODO: area
+                }
             }
             void MainWidget::setCurrentSeries(QSeries *series)
                     case QSeries::SeriesTypePercentBar:
                         qDebug() << "setCurrentSeries (Percentbar)";
                         break;
+                    case QSeries::SeriesTypeSpline:
+                        break;
                     default:
                         Q_ASSERT(false);
                         break;

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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