HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1189:88d7235253d9

Removed usage of model in QML pie example

Tero Ahola -

r1189:88d7235253d9

parent child

Context file:

r1189:88d7235253d9

Collapse all files

demos/qmlchart/qml/qmlchart/View1.qml +16 -10

                      // If you have static data, you can simply use the PieSlice API
                      PieSeries {
                          id: pieSeries
-                         PieSlice { label: "Volkswagen"; value: 13.5 }
+                         PieSlice { id: volkswagenSlice; label: "Volkswagen"; value: 13.5 }
                          PieSlice { label: "Toyota"; value: 10.9 }
                          PieSlice { label: "Ford"; value: 8.6 }
                          PieSlice { label: "Skoda"; value: 8.2 }
                          PieSlice { label: "Volvo"; value: 6.8 }
                      }
-                     // For dynamic data you can use the ChartModel API.
+                     // TODO: move ChartModel API into a demo application instead of making it a public API
+             //        // For dynamic data you can use the ChartModel API.
-             //        ChartModel {
              //            id: chartModel
              //            ChartModelRow { values: ["Volkswagen", 13.5] }
              //            ChartModelRow { values: ["Skoda", 8.2] }
              //            ChartModelRow { values: ["Volvo", 6.8] }
              //        }
-                     //  In this case you need to define how the data maps to pie slices with the ModelMapper API of the pie series.
+             //        // In this case you need to define how the data maps to pie slices with the ModelMapper API of the pie series.
              //        PieSeries {
              //            id: pieSeries
              //            model: chartModel
              //            modelMapper.count: -1 // "Undefined" = -1 by default
              //            modelMapper.orientation: PieModelMapper.Vertical
              //        }
+                     // TODO: you could also append to your model, for example:
+             //        pieSeries.model.append(["Others", 52.0]);
                  }
                  Component.onCompleted: {
-                     // You can also add data dynamically
-                     pieSeries.model.append(["Others", 52.0]);
+                     volkswagenSlice.exploded = true;
+                     // You can also add slices dynamically
+                     var newSlice = pieSeries.append("Others", 52.0);
                  }
                  Timer {
                      onTriggered: {
                          // Set all slices as not exploded
                          for (var i = 0; i < pieSeries.count; i++)
-                             pieSeries.slice(i).exploded = false;
+                             pieSeries.at(i).exploded = false;
                          // Explode one of the slices
                          __explodedIndex = (__explodedIndex + 1) % pieSeries.count;
-                         pieSeries.slice(__explodedIndex).exploded = true;
+                         pieSeries.at(__explodedIndex).exploded = true;
+                         // TODO: implement for convenience
+             //            pieSeries.find("Ford").exploded = true;
+             //            pieSeries.removeAll("Ford")
                      }
                  }
                              } else {
                                  pieSeries.modelMapper.count = 5;
                                  buttonText.text = "Show others";
-                                 //pieModel.removeRow(pieModel.count - 1);
-                                 // TODO: removeAll("label") ?
-                             }
                          }
                      }

demos/qmlchart/qml/qmlchart/View3.qml 0 -1

                      title: "NHL All-Star Team Players"
                      anchors.fill: parent
                      theme: ChartView.ChartThemeHighContrast
-                     legend: ChartView.LegendTop
                      axisXLabels: ["0", "2000", "1", "2001", "2", "2002", "3", "2003", "4", "2004", "5", "2005",
                          "6", "2006", "7", "2007", "8", "2008", "9", "2009", "10", "2010", "11", "2011"]

qmlplugin/declarativechart.cpp +1 -1

              DeclarativeChart::DeclarativeChart(QDeclarativeItem *parent)
                  : QDeclarativeItem(parent),
                    m_chart(new QChart(this)),
-                   m_legend(LegendDisabled)
+                   m_legend(LegendTop)
              {
                  setFlag(QGraphicsItem::ItemHasNoContents, false);
                  m_chart->axisX()->setNiceNumbersEnabled(false);

qmlplugin/declarativepieseries.cpp +10 -11

                  QPieSeries(parent)
              {
                  // TODO: set default model on init?
-                 setModel(new DeclarativeTableModel());
+             //    setModel(new DeclarativeTableModel());
-                 // Set default mapper parameters to allow easy to use PieSeries api
+                 // TODO: Set default mapper parameters to allow easy to use PieSeries api?
                  QPieModelMapper *mapper = new QPieModelMapper();
                  mapper->setMapLabels(0);
                  mapper->setMapValues(1);
              void DeclarativePieSeries::componentComplete()
              {
                  foreach(QObject *child, children()) {
-                     qDebug() << "pie child: " << child;
                      if (qobject_cast<QPieSlice *>(child)) {
-                         QPieSlice *slice = qobject_cast<QPieSlice *>(child);
-                         QVariantList values;
-                         values.insert(modelMapper()->mapLabels(), slice->label());
-                         values.insert(modelMapper()->mapValues(), slice->value());
-                         DeclarativeTableModel *m = qobject_cast<DeclarativeTableModel *>(model());
-                         Q_ASSERT(m);
-                         m->append(values);
+                         QPieSeries::append(qobject_cast<QPieSlice *>(child));
                      }
                  }
              }
                  return QDeclarativeListProperty<QPieSlice>(this, 0, &DeclarativePieSeries::appendInitialSlices);
              }
-             QPieSlice *DeclarativePieSeries::slice(int index)
+             QPieSlice *DeclarativePieSeries::at(int index)
              {
                  QList<QPieSlice*> sliceList = slices();
                  if (index < sliceList.count())
                  return 0;
              }
+             QPieSlice* DeclarativePieSeries::append(QString name, qreal value)
+             {
+                 // TODO: parameter order is wrong, switch it:
+                 return QPieSeries::append(value, name);
+             }
              void DeclarativePieSeries::setPieModel(DeclarativeTableModel *model)
              {
                  QAbstractItemModel *m = qobject_cast<QAbstractItemModel *>(model);

qmlplugin/declarativepieseries.h +2 -1

                  QDeclarativeListProperty<QPieSlice> initialSlices();
                  DeclarativeTableModel *pieModel();
                  void setPieModel(DeclarativeTableModel *model);
-                 Q_INVOKABLE QPieSlice *slice(int index);
+                 Q_INVOKABLE QPieSlice *at(int index);
+                 Q_INVOKABLE QPieSlice* append(QString name, qreal value);
              public:
                  void classBegin();

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