Bring new data proxies to maps

Maps now has the basic QMapDataProxy and the specialized
QItemModelMapDataProxy to choose from.

Removed the last vestiges of old QDataSet and related classes.

Bunch of misc fixes also included.

Change-Id: I3993ac2a669b818f89bd771ea9dc8b7e458c4b8c
Reviewed-by: Mika Salmela <mika.salmela@digia.com>

1 files changed, 5 insertions, 0 deletions

diff --git a/src/datavis3d/engine/bars3dcontroller.cpp b/src/datavis3d/engine/bars3dcontroller.cpp
index a633999e..536fd443 100644
--- a/src/datavis3d/engine/bars3dcontroller.cpp
+++ b/src/datavis3d/engine/bars3dcontroller.cpp
@@ -114,10 +114,15 @@ void Bars3dController::render(const GLuint defaultFboHandle)
         return;
 
     // TODO do not give the entire data array, just the data window
+    // TODO Would it be enough to just mutex cache update in renderer?
+    // TODO --> Only if there is no need to store m_dataProxy for later, e.g. for string formatting
+    // TODO Also, m_valuesDirty flag setting needs to be under same mutex
+    QMutexLocker(m_data->mutex());
     m_renderer->render(m_data, m_valuesDirty, m_cameraHelper, m_axisX->d_ptr->titleItem(),
                        m_axisY->d_ptr->titleItem(), m_axisZ->d_ptr->titleItem(), defaultFboHandle);
 
     m_valuesDirty = false;
+
 }
 
 QMatrix4x4 Bars3dController::calculateViewMatrix(int zoom, int viewPortWidth, int viewPortHeight, bool showUnder)