Bar graph data window controlled by category axes ranges

Task-number: QTRD-2183
Task-number: QTRD-2254

Change-Id: I09808c3980a4fa60b7584839e834ee3a734b3e9a
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

1 files changed, 3 insertions, 13 deletions

diff --git a/src/datavisualization/engine/bars3dcontroller_p.h b/src/datavisualization/engine/bars3dcontroller_p.h
index 6dbaf742..8398dd81 100644
--- a/src/datavisualization/engine/bars3dcontroller_p.h
+++ b/src/datavisualization/engine/bars3dcontroller_p.h
@@ -41,13 +41,11 @@ class QBarDataProxy;
 
 struct Bars3DChangeBitField {
     bool slicingActiveChanged     : 1;
-    bool sampleSpaceChanged       : 1;
     bool barSpecsChanged          : 1;
     bool selectedBarPosChanged    : 1;
 
     Bars3DChangeBitField() :
         slicingActiveChanged(true),
-        sampleSpaceChanged(true),
         barSpecsChanged(true),
         selectedBarPosChanged(true)
     {
@@ -61,10 +59,6 @@ class QT_DATAVISUALIZATION_EXPORT Bars3DController : public Abstract3DController
 private:
     Bars3DChangeBitField m_changeTracker;
 
-    // Data
-    int m_rowCount;
-    int m_columnCount;
-
     // Interaction
     QPoint m_selectedBarPos;     // Points to row & column in data window.
 
@@ -83,9 +77,6 @@ public:
     void initializeOpenGL();
     virtual void synchDataToRenderer();
 
-    int columnCount();
-    int rowCount();
-
     // bar thickness, spacing between bars, and is spacing relative to thickness or absolute
     // y -component sets the thickness/spacing of z -direction
     // With relative 0.0f means side-to-side, 1.0f = one thickness in between
@@ -99,9 +90,6 @@ public:
     // bar type; bars (=cubes), pyramids, cones, cylinders, etc.
     void setBarType(QDataVis::MeshStyle style, bool smooth = false);
 
-    // how many samples per row and column, and names for axes
-    void setDataWindow(int samplesRow, int samplesColumn);
-
     // Change selection mode; single bar, bar and row, bar and column, or all
     void setSelectionMode(QDataVis::SelectionMode mode);
 
@@ -117,6 +105,8 @@ public:
     virtual void setAxisX(Q3DAbstractAxis *axis);
     virtual void setAxisZ(Q3DAbstractAxis *axis);
 
+    virtual void handleAxisRangeChangedBySender(QObject *sender);
+
 public slots:
     void handleArrayReset();
     void handleRowsAdded(int startIndex, int count);
@@ -136,7 +126,7 @@ protected:
     virtual Q3DAbstractAxis *createDefaultAxis(Q3DAbstractAxis::AxisOrientation orientation);
 
 private:
-    void adjustValueAxisRange();
+    void adjustAxisRanges();
 
     Q_DISABLE_COPY(Bars3DController)