diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-26 12:53:01 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-26 12:53:01 +0100 |
| commit | a78f8d6bef57dd4283094a52551705ee02909970 (patch) | |
| tree | a4d42899d2b745a0c3b9d3baa6573c870f8d5328 /src/datavisualization/data/qsurfacedataproxy_p.h | |
| parent | 3f5c27908314074f177454ddcb1c18fce123fa6c (diff) | |
| parent | 0bf42b29a9fa926e0ec63a33eb496c660960d617 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8v5.8.0-rc1v5.8.0
Change-Id: I42fd801107912d52c3e1bcd52d98d4362e2c27ef
Diffstat (limited to 'src/datavisualization/data/qsurfacedataproxy_p.h')
| -rw-r--r-- | src/datavisualization/data/qsurfacedataproxy_p.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/datavisualization/data/qsurfacedataproxy_p.h b/src/datavisualization/data/qsurfacedataproxy_p.h index 808e27df..80443aec 100644 --- a/src/datavisualization/data/qsurfacedataproxy_p.h +++ b/src/datavisualization/data/qsurfacedataproxy_p.h @@ -45,6 +45,8 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION +class QAbstract3DAxis; + class QSurfaceDataProxyPrivate : public QAbstractDataProxyPrivate { Q_OBJECT @@ -61,7 +63,9 @@ public: void insertRow(int rowIndex, QSurfaceDataRow *row); void insertRows(int rowIndex, const QSurfaceDataArray &rows); void removeRows(int rowIndex, int removeCount); - void limitValues(QVector3D &minValues, QVector3D &maxValues) const; + void limitValues(QVector3D &minValues, QVector3D &maxValues, QAbstract3DAxis *axisX, + QAbstract3DAxis *axisY, QAbstract3DAxis *axisZ) const; + bool isValidValue(float value, QAbstract3DAxis *axis) const; virtual void setSeries(QAbstract3DSeries *series); |