Added bar label drawing in zoom selection view

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

1 files changed, 20 insertions, 3 deletions

diff --git a/src/datavis3d/engine/qdataset_p.h b/src/datavis3d/engine/qdataset_p.h
index 873b292f..2e7a5bdb 100644
--- a/src/datavis3d/engine/qdataset_p.h
+++ b/src/datavis3d/engine/qdataset_p.h
@@ -54,26 +54,37 @@
 
 #include "qdatavis3dglobal.h"
 #include "qdataset.h"
+#include "drawer_p.h"
+#include "labelitem_p.h"
 #include <QVector>
 #include <QString>
 
 QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE
 
-class QDataSetPrivate
+class QDataSetPrivate : public QObject
 {
-    public:
+    Q_OBJECT
+
+public:
     explicit QDataSetPrivate(QDataSet *q);
     ~QDataSetPrivate();
 
+    void setDrawer(Drawer *drawer);
     QVector<QDataRow*> set();
     QDataRow *getRow(int rowIndex);
     QVector<QString> rowLabels();
     QVector<QString> columnLabels();
+    QVector<LabelItem> rowLabelItems();
+    QVector<LabelItem> columnLabelItems();
     void axisLabels(QString *xAxis, QString *zAxis, QString *yAxis);
+    void axisLabelItems(LabelItem *xAxisItem, LabelItem *zAxisItem, LabelItem *yAxisItem);
     void verifySize(int colSize, int rowSize = 0); // If rowSize is 0, don't verify rows
     float highestValue();
 
-    private:
+public Q_SLOTS:
+    void updateTextures();
+
+private:
     QDataSet *q_ptr;
     QVector<QDataRow*> m_set;
     QString m_xAxis;
@@ -81,6 +92,12 @@ class QDataSetPrivate
     QString m_yAxis;
     QVector<QString> m_labelsRow;
     QVector<QString> m_labelsColumn;
+    LabelItem m_xAxisItem;
+    LabelItem m_zAxisItem;
+    LabelItem m_yAxisItem;
+    QVector<LabelItem> m_labelItemsRow;
+    QVector<LabelItem> m_labelItemsColumn;
+    Drawer *m_drawer;
     friend class QDataSet;
 };