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>

2 files changed, 0 insertions, 36 deletions

diff --git a/src/datavisualizationqml2/declarativebars.cpp b/src/datavisualizationqml2/declarativebars.cpp
index 010409e8..dd575d35 100644
--- a/src/datavisualizationqml2/declarativebars.cpp
+++ b/src/datavisualizationqml2/declarativebars.cpp
@@ -82,11 +82,6 @@ QSGNode *DeclarativeBars::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData
     return node;
 }
 
-void DeclarativeBars::setDataWindow(int rowCount, int columnCount)
-{
-    m_shared->setDataWindow(rowCount, columnCount);
-}
-
 void DeclarativeBars::setBarColor(const QColor &baseColor, bool uniform)
 {
     m_shared->setObjectColor(baseColor, uniform);
@@ -299,26 +294,6 @@ QDataVis::ShadowQuality DeclarativeBars::shadowQuality()
     return m_shared->shadowQuality();
 }
 
-int DeclarativeBars::rows() const
-{
-    return m_shared->rowCount();
-}
-
-void DeclarativeBars::setRows(int rows)
-{
-    setDataWindow(rows, columns());
-}
-
-int DeclarativeBars::columns() const
-{
-    return m_shared->columnCount();
-}
-
-void DeclarativeBars::setColumns(int columns)
-{
-    setDataWindow(rows(), columns);
-}
-
 void DeclarativeBars::setItemLabelFormat(const QString &format)
 {
     m_shared->activeDataProxy()->setItemLabelFormat(format);
diff --git a/src/datavisualizationqml2/declarativebars_p.h b/src/datavisualizationqml2/declarativebars_p.h
index ebf565fe..b2e64eae 100644
--- a/src/datavisualizationqml2/declarativebars_p.h
+++ b/src/datavisualizationqml2/declarativebars_p.h
@@ -64,8 +64,6 @@ class DeclarativeBars : public QQuickItem
     Q_PROPERTY(QFont font READ font WRITE setFont)
     Q_PROPERTY(bool gridVisible READ isGridVisible WRITE setGridVisible)
     Q_PROPERTY(bool backgroundVisible READ isBackgroundVisible WRITE setBackgroundVisible)
-    Q_PROPERTY(int rows READ rows WRITE setRows)
-    Q_PROPERTY(int columns READ columns WRITE setColumns)
     Q_PROPERTY(QString itemLabelFormat READ itemLabelFormat WRITE setItemLabelFormat)
     Q_PROPERTY(QPointF selectedBarPos READ selectedBarPos WRITE setSelectedBarPos NOTIFY selectedBarPosChanged)
     Q_ENUMS(QtDataVisualization::QDataVis::SelectionMode)
@@ -79,9 +77,6 @@ public:
     explicit DeclarativeBars(QQuickItem *parent = 0);
     ~DeclarativeBars();
 
-    // how many samples per row and column
-    Q_INVOKABLE void setDataWindow(int rowCount, int columnCount);
-
     // Set color if you don't want to use themes. Set uniform to false if you want the (height)
     // color to change from bottom to top
     Q_INVOKABLE void setBarColor(const QColor &baseColor, bool uniform = true);
@@ -159,12 +154,6 @@ public:
     void setShadowQuality(QDataVis::ShadowQuality quality);
     QDataVis::ShadowQuality shadowQuality();
 
-    int rows() const;
-    void setRows(int rows);
-
-    int columns() const;
-    void setColumns(int columns);
-
     void setItemLabelFormat(const QString &format);
     QString itemLabelFormat();