HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1165:242d6e21d71f

Commented out some lines in declarative examples as barseries model is for now disabled

Marek Rosa -

r1165:242d6e21d71f

parent child

Context file:

r1165:242d6e21d71f

qmlplugin/declarativeareaseries.cpp +9 -2

             #include "declarativeareaseries.h"
             #include "declarativechart.h"
             #include "qchart.h"
+            #include "qxymodelmapper.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 bool value(false);
                 if (m) {
                     upperSeries()->setModel(m);
-                    upperSeries()->setModelMapping(0, 1, Qt::Vertical);
+                    QXYModelMapper *mapper = new QXYModelMapper;
+                    mapper->setMapX(0);
+                    mapper->setMapY(1);
+                    upperSeries()->setModelMapper(mapper);
                 } else {
                     qWarning("DeclarativeAreaSeries: Illegal model");
                 }
                 bool value(false);
                 if (m) {
                     lowerSeries()->setModel(m);
-                    lowerSeries()->setModelMapping(0, 1, Qt::Vertical);
+                    QXYModelMapper *mapper = new QXYModelMapper;
+                    mapper->setMapX(0);
+                    mapper->setMapY(1);
+                    lowerSeries()->setModelMapper(mapper);
                 } else {
                     qWarning("DeclarativeAreaSeries: Illegal model");
                 }

qmlplugin/declarativebarseries.cpp +4 -4

             void DeclarativeBarSeries::componentComplete()
             {
-                if (model())
+            //    if (model())
-                    setModelMapping(0, 1, 1, Qt::Vertical);
+            //        setModelMapping(0, 1, 1, Qt::Vertical);
             }
             bool DeclarativeBarSeries::setDeclarativeModel(DeclarativeBarModel *model)
                 QAbstractItemModel *m = qobject_cast<QAbstractItemModel *>(model);
                 bool value(false);
                 if (m) {
-                    value = setModel(m);
+                    setModel(m);
                     //setModelMapping(int categories, int bottomBoundary, int topBoundary, Qt::Orientation orientation = Qt::Vertical);
-                    setModelMapping(0, 1, 1, Qt::Vertical);
+            //        setModelMapping(0, 1, 1, Qt::Vertical);
                 } else {
                     qWarning("DeclarativeBarSeries: Illegal model");
                 }

test/auto/qlineseries/tst_qlineseries.cpp +8 -8

             {
                 QSKIP("Model mapping has been rewriten, test case needs update", SkipAll);
-                QFETCH(int, modelX);
+            //    QFETCH(int, modelX);
-                QFETCH(int, modelY);
+            //    QFETCH(int, modelY);
-                QFETCH(Qt::Orientation, orientation);
+            //    QFETCH(Qt::Orientation, orientation);
             //    QLineSeries series;
             {
                 QSKIP("Model mapping has been rewriten, test case needs update", SkipAll);
-                QFETCH(int, first);
+            //    QFETCH(int, first);
-                QFETCH(int, count);
+            //    QFETCH(int, count);
-                QLineSeries series;
+            //    QLineSeries series;
-                QStandardItemModel *model = new QStandardItemModel(0, 2);
+            //    QStandardItemModel *model = new QStandardItemModel(0, 2);
-                series.setModel(model);
+            //    series.setModel(model);
             //    series.setModelMapping(0, 1);
             //    series.setModelMappingRange(first, count);

General Comments 0

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

No TODOs yet

	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