Merge branch 'develop'v1.0.0-beta1

Change-Id: I1c9a255eb8f30a24b665856d3711f0abe77c6ef4

1 files changed, 83 insertions, 19 deletions

diff --git a/src/datavisualization/data/scatteritemmodelhandler.cpp b/src/datavisualization/data/scatteritemmodelhandler.cpp
index a70b35b0..1c936d08 100644
--- a/src/datavisualization/data/scatteritemmodelhandler.cpp
+++ b/src/datavisualization/data/scatteritemmodelhandler.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc
+** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
@@ -19,7 +19,9 @@
 #include "scatteritemmodelhandler_p.h"
 #include <QTimer>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+
+static const int noRoleIndex = -1;
 
 ScatterItemModelHandler::ScatterItemModelHandler(QItemModelScatterDataProxy *proxy, QObject *parent)
     : AbstractItemModelHandler(parent),
@@ -32,6 +34,80 @@ ScatterItemModelHandler::~ScatterItemModelHandler()
 {
 }
 
+void ScatterItemModelHandler::handleDataChanged(const QModelIndex &topLeft,
+                                                const QModelIndex &bottomRight,
+                                                const QVector<int> &roles)
+{
+    // Do nothing if full reset already pending
+    if (!m_fullReset) {
+        if (m_itemModel->columnCount() > 1) {
+            // If the data model is multi-column, do full asynchronous reset to simplify things
+            AbstractItemModelHandler::handleDataChanged(topLeft, bottomRight, roles);
+        } else {
+            int start = qMin(topLeft.row(), bottomRight.row());
+            int end = qMax(topLeft.row(), bottomRight.row());
+
+            QScatterDataArray array(end - start + 1);
+            int count = 0;
+            for (int i = start; i <= end; i++)
+                modelPosToScatterItem(i, 0, array[count++]);
+
+            m_proxy->setItems(start, array);
+        }
+    }
+}
+
+void ScatterItemModelHandler::handleRowsInserted(const QModelIndex &parent, int start, int end)
+{
+    // Do nothing if full reset already pending
+    if (!m_fullReset) {
+        if (!m_proxy->itemCount() || m_itemModel->columnCount() > 1) {
+            // If inserting into an empty array, do full asynchronous reset to avoid multiple
+            // separate inserts when initializing the model.
+            // If the data model is multi-column, do full asynchronous reset to simplify things
+            AbstractItemModelHandler::handleRowsInserted(parent, start, end);
+        } else {
+            QScatterDataArray array(end - start + 1);
+            int count = 0;
+            for (int i = start; i <= end; i++)
+                modelPosToScatterItem(i, 0, array[count++]);
+
+            m_proxy->insertItems(start, array);
+        }
+    }
+}
+
+void ScatterItemModelHandler::handleRowsRemoved(const QModelIndex &parent, int start, int end)
+{
+    Q_UNUSED(parent)
+
+    // Do nothing if full reset already pending
+    if (!m_fullReset) {
+        if (m_itemModel->columnCount() > 1) {
+            // If the data model is multi-column, do full asynchronous reset to simplify things
+            AbstractItemModelHandler::handleRowsRemoved(parent, start, end);
+        } else {
+            m_proxy->removeItems(start, end - start + 1);
+        }
+    }
+}
+
+void ScatterItemModelHandler::modelPosToScatterItem(int modelRow, int modelColumn,
+                                                    QScatterDataItem &item)
+{
+    QModelIndex index = m_itemModel->index(modelRow, modelColumn);
+    float xPos(0.0f);
+    float yPos(0.0f);
+    float zPos(0.0f);
+    if (m_xPosRole != noRoleIndex)
+        xPos = index.data(m_xPosRole).toFloat();
+    if (m_yPosRole != noRoleIndex)
+        yPos = index.data(m_yPosRole).toFloat();
+    if (m_zPosRole != noRoleIndex)
+        zPos = index.data(m_zPosRole).toFloat();
+    item.setPosition(QVector3D(xPos, yPos, zPos));
+}
+
 // Resolve entire item model into QScatterDataArray.
 void ScatterItemModelHandler::resolveModel()
 {
@@ -41,12 +117,10 @@ void ScatterItemModelHandler::resolveModel()
         return;
     }
 
-    static const int noRoleIndex = -1;
-
     QHash<int, QByteArray> roleHash = m_itemModel->roleNames();
-    const int xPosRole = roleHash.key(m_proxy->xPosRole().toLatin1(), noRoleIndex);
-    const int yPosRole = roleHash.key(m_proxy->yPosRole().toLatin1(), noRoleIndex);
-    const int zPosRole = roleHash.key(m_proxy->zPosRole().toLatin1(), noRoleIndex);
+    m_xPosRole = roleHash.key(m_proxy->xPosRole().toLatin1(), noRoleIndex);
+    m_yPosRole = roleHash.key(m_proxy->yPosRole().toLatin1(), noRoleIndex);
+    m_zPosRole = roleHash.key(m_proxy->zPosRole().toLatin1(), noRoleIndex);
     const int columnCount = m_itemModel->columnCount();
     const int rowCount = m_itemModel->rowCount();
     const int totalCount = rowCount * columnCount;
@@ -59,17 +133,7 @@ void ScatterItemModelHandler::resolveModel()
     // Parse data into newProxyArray
     for (int i = 0; i < rowCount; i++) {
         for (int j = 0; j < columnCount; j++) {
-            QModelIndex index = m_itemModel->index(i, j);
-            float xPos(0.0f);
-            float yPos(0.0f);
-            float zPos(0.0f);
-            if (xPosRole != noRoleIndex)
-                xPos = index.data(xPosRole).toFloat();
-            if (yPosRole != noRoleIndex)
-                yPos = index.data(yPosRole).toFloat();
-            if (zPosRole != noRoleIndex)
-                zPos = index.data(zPosRole).toFloat();
-            (*m_proxyArray)[runningCount].setPosition(QVector3D(xPos, yPos, zPos));
+            modelPosToScatterItem(i, j, (*m_proxyArray)[runningCount]);
             runningCount++;
         }
     }
@@ -77,4 +141,4 @@ void ScatterItemModelHandler::resolveModel()
     m_proxy->resetArray(m_proxyArray);
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+QT_END_NAMESPACE_DATAVISUALIZATION