Miscellaneous fixes

- Widget example now uses default QBarDataProxy directly
- Axes store labels in QStringLists instead of vectors
- Axes LabelItems as QList<LabelItem *> instead of QVector<LabelItem>
  This allows better control of when label items are constructed
  and destructed -> easier to keep track of textures.
- Removed label setting from QAbstractDataItem api, it should be
  replaced with label format setter if we want individual items
  to have custom labels.
- Added functionality to QBarDataItem
- Misc bug fixes

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

1 files changed, 4 insertions, 2 deletions

diff --git a/src/datavis3d/engine/bars3dcontroller.cpp b/src/datavis3d/engine/bars3dcontroller.cpp
index 90390149..c3f7aa5f 100644
--- a/src/datavis3d/engine/bars3dcontroller.cpp
+++ b/src/datavis3d/engine/bars3dcontroller.cpp
@@ -76,12 +76,14 @@ Bars3dController::Bars3dController(QRect boundRect)
       m_tickStep(0),
       m_tickMinimum(0.0f),
       m_renderer(0),
-      m_data(new QBarDataProxy)
+      m_data(0)
 {
     // Default axes. Only Y axis can actually be changed by user.
     setAxisX(new QCategoryAxis());
     setAxisY(new QValueAxis());
     setAxisZ(new QCategoryAxis());
+
+    setDataProxy(new QBarDataProxy);
 }
 
 Bars3dController::~Bars3dController()
@@ -406,7 +408,7 @@ void Bars3dController::setMeshFileName(const QString &objFileName)
 }
 
 // TODO: This sets data window. Needs more parameters, now assumes window always starts at 0,0.
-void Bars3dController::setupSampleSpace(int columnCount, int rowCount)
+void Bars3dController::setupSampleSpace(int rowCount, int columnCount)
 {
     // Disable zoom mode if we're in it (causes crash if not, as zoom selection is deleted)
     setSlicingActive(false);