diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-12-09 10:49:49 +0200 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-12-10 09:01:45 +0200 |
| commit | 3573055abe42ff283d011d8550bc8495156338a1 (patch) | |
| tree | bb45d4f7e32a0c63329d9f52639081162b34e17e /src/datavisualizationqml2/declarativesurface_p.h | |
| parent | 22557b312570cbefde584466a28f2b9bfcc570ba (diff) | |
Move series specific visual elements to series, part 4
Colors to series
- Multiselection labels in bar slices still buggy
- Selection in bars doesn't work correctly if not all
series have items in that grid
Task-number: QTRD-2557
Change-Id: Icd38428e5337a26b8410476104bb1f1f784cdc7f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualizationqml2/declarativesurface_p.h')
| -rw-r--r-- | src/datavisualizationqml2/declarativesurface_p.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/datavisualizationqml2/declarativesurface_p.h b/src/datavisualizationqml2/declarativesurface_p.h index 70963c4d..2c9c2803 100644 --- a/src/datavisualizationqml2/declarativesurface_p.h +++ b/src/datavisualizationqml2/declarativesurface_p.h @@ -35,7 +35,6 @@ #include "declarativesurface_p.h" #include "q3dvalueaxis.h" #include "qsurfacedataproxy.h" -#include "colorgradient_p.h" #include "qsurface3dseries.h" #include <QAbstractItemModel> @@ -51,7 +50,6 @@ class DeclarativeSurface : public AbstractDeclarative Q_PROPERTY(Q3DValueAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged) Q_PROPERTY(Q3DValueAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged) Q_PROPERTY(Q3DValueAxis *axisZ READ axisZ WRITE setAxisZ NOTIFY axisZChanged) - Q_PROPERTY(ColorGradient *gradient READ gradient WRITE setGradient) Q_PROPERTY(QQmlListProperty<QSurface3DSeries> seriesList READ seriesList) Q_CLASSINFO("DefaultProperty", "seriesList") @@ -66,9 +64,6 @@ public: Q3DValueAxis *axisZ() const; void setAxisZ(Q3DValueAxis *axis); - void setGradient(ColorGradient *gradient); - ColorGradient *gradient() const; - QQmlListProperty<QSurface3DSeries> seriesList(); static void appendSeriesFunc(QQmlListProperty<QSurface3DSeries> *list, QSurface3DSeries *series); static int countSeriesFunc(QQmlListProperty<QSurface3DSeries> *list); @@ -82,14 +77,8 @@ signals: void axisYChanged(Q3DValueAxis *axis); void axisZChanged(Q3DValueAxis *axis); -protected: - void handleGradientUpdate(); - private: - void setControllerGradient(const ColorGradient &gradient); - Surface3DController *m_surfaceController; - ColorGradient *m_gradient; // Not owned }; QT_DATAVISUALIZATION_END_NAMESPACE |