From eb8a020650cc523352b41179e1a78f622e26fa96 2012-05-29 06:31:43
From: Tero Ahola <tero.ahola@digia.com>
Date: 2012-05-29 06:31:43
Subject: [PATCH] Fixed QML pie model mapper API

---

diff --git a/demos/qmlcustommodel/qml/qmlcustommodel/main.qml b/demos/qmlcustommodel/qml/qmlcustommodel/main.qml
index 7609ca8..7306a6e 100644
--- a/demos/qmlcustommodel/qml/qmlcustommodel/main.qml
+++ b/demos/qmlcustommodel/qml/qmlcustommodel/main.qml
@@ -58,20 +58,14 @@ Rectangle {
             size: 0.4
             horizontalPosition: 0.2
             verticalPosition: 0.3
-
-            VPieModelMapper {
-                model: chartModel
-                labelsColumn: 0
-                valuesColumn: 1
-            }
         }
 
-//        VPieModelMapper {
-//            series: pieSeries
-//            model: chartModel
-//            labelsColumn: 1
-//            valuesColumn: 2
-//        }
+        VPieModelMapper {
+            series: pieSeries
+            model: chartModel
+            labelsColumn: 0
+            valuesColumn: 1
+        }
 
 //        AreaSeries {
 //            name: "area"
diff --git a/plugins/declarative/plugin.cpp b/plugins/declarative/plugin.cpp
index fb542ee..a64d25a 100644
--- a/plugins/declarative/plugin.cpp
+++ b/plugins/declarative/plugin.cpp
@@ -59,6 +59,8 @@ public:
         qmlRegisterType<DeclarativeTableModelElement>(uri, 1, 0, "ChartModelElement");
         qmlRegisterType<DeclarativeBarSet>(uri, 1, 0, "BarSet");
 
+        qmlRegisterUncreatableType<QPieSeries>(uri, 1, 0, "QPieSeries",
+                                          QLatin1String("Trying to create uncreatable: QPieSeries."));
         qmlRegisterUncreatableType<QAbstractItemModel>(uri, 1, 0, "AbstractItemModel",
                                           QLatin1String("Trying to create uncreatable: AbstractItemModel."));
         qmlRegisterUncreatableType<QPieModelMapper>(uri, 1, 0, "PieModelMapper",
diff --git a/src/charttablemodel.cpp b/src/charttablemodel.cpp
index 26193b1..258ac18 100644
--- a/src/charttablemodel.cpp
+++ b/src/charttablemodel.cpp
@@ -20,31 +20,16 @@
 
 #include "charttablemodel.h"
 #include <QVector>
-#include <QTime>
 #include <QRect>
 #include <QColor>
 
 QTCOMMERCIALCHART_USE_NAMESPACE
 
 ChartTableModel::ChartTableModel(QObject *parent) :
-    QAbstractTableModel(parent)
+    QAbstractTableModel(parent),
+    m_columnCount(0),
+    m_rowCount(0)
 {
-    qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
-
-    m_columnCount = 2;
-    m_rowCount = 0;
-
-    // m_data
-    for (int i = 0; i < m_rowCount; i++) {
-        QVector<QVariant>* dataVec = new QVector<QVariant>(m_columnCount);
-        for (int k = 0; k < dataVec->size(); k++) {
-            if (k%2 == 0)
-                dataVec->replace(k, i * 50 + qrand()%20);
-            else
-                dataVec->replace(k, qrand()%100);
-        }
-        m_data.append(dataVec);
-    }
 }
 
 int ChartTableModel::rowCount(const QModelIndex & parent) const