diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-09-30 11:06:58 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-10-01 09:03:24 +0300 |
commit | 822a19d3e2650c7a9326b69ff4621ccd556e16cc (patch) | |
tree | 064fba99ba0e4ec7a3113c5fb051d3cd50972360 /src/datavisualization/data/qsurfacedataproxy.h | |
parent | 52fcca463e63500bea81b0ac3615d4779bc7682c (diff) |
Refactor surface data item to have X, Y, and Z values.
Task-number: QTRD-2332
Change-Id: I086d3a422ff444cbcede1aa238107ebcbce68729
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src/datavisualization/data/qsurfacedataproxy.h')
-rw-r--r-- | src/datavisualization/data/qsurfacedataproxy.h | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/src/datavisualization/data/qsurfacedataproxy.h b/src/datavisualization/data/qsurfacedataproxy.h index de31f188..2aeda80e 100644 --- a/src/datavisualization/data/qsurfacedataproxy.h +++ b/src/datavisualization/data/qsurfacedataproxy.h @@ -19,12 +19,11 @@ #ifndef QSURFACEDATAPROXY_H #define QSURFACEDATAPROXY_H -#include <QtDataVisualization/qdatavisualizationglobal.h> #include <QtDataVisualization/qabstractdataproxy.h> +#include <QtDataVisualization/qsurfacedataitem.h> QT_DATAVISUALIZATION_BEGIN_NAMESPACE -typedef qreal QSurfaceDataItem; // Let's stick to this for now, expand if needed typedef QVector<QSurfaceDataItem> QSurfaceDataRow; typedef QList<QSurfaceDataRow *> QSurfaceDataArray; @@ -36,10 +35,6 @@ class QT_DATAVISUALIZATION_EXPORT QSurfaceDataProxy : public QAbstractDataProxy Q_PROPERTY(int rowCount READ rowCount) Q_PROPERTY(int columnCount READ columnCount) - Q_PROPERTY(qreal minValueRows READ minValueRows WRITE setMinValueRows NOTIFY valueRangeRowsChanged) - Q_PROPERTY(qreal maxValueRows READ maxValueRows WRITE setMaxValueRows NOTIFY valueRangeRowsChanged) - Q_PROPERTY(qreal minValueColumns READ minValueColumns WRITE setMinValueColumns NOTIFY valueRangeColumnsChanged) - Q_PROPERTY(qreal maxValueColumns READ maxValueColumns WRITE setMaxValueColumns NOTIFY valueRangeColumnsChanged) public: explicit QSurfaceDataProxy(QObject *parent = 0); @@ -50,20 +45,7 @@ public: const QSurfaceDataArray *array() const; const QSurfaceDataItem *itemAt(int index) const; - void setValueRangeRows(qreal min, qreal max); - void setValueRangeColumns(qreal min, qreal max); - void setMinValueRows(qreal min); - qreal minValueRows() const; - void setMaxValueRows(qreal max); - qreal maxValueRows() const; - void setMinValueColumns(qreal min); - qreal minValueColumns() const; - void setMaxValueColumns(qreal max); - qreal maxValueColumns() const; - void resetArray(QSurfaceDataArray *newArray); - void resetArray(QSurfaceDataArray *newArray, qreal minValueRows, qreal maxValueRows, - qreal minValueColumns, qreal maxValueColumns); signals: void arrayReset(); |