diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-11-28 08:19:37 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-11-29 09:53:48 +0200 |
| commit | 527113321ff103835b89543c5d6f670f55b5b0d5 (patch) | |
| tree | 01b242ef7b1f30a414b718f99f155f19235951bd /src/datavisualizationqml2/declarativescatter_p.h | |
| parent | 85dda87df2d420dc53959e549d24c4b09ce93d57 (diff) | |
Move series specific visual elements to series, part 1
Meshes moved to series.
Task-number: QTRD-2557
Change-Id: I80050e413faf3bc942eb5a5627a66747de5805d8
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualizationqml2/declarativescatter_p.h')
| -rw-r--r-- | src/datavisualizationqml2/declarativescatter_p.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/datavisualizationqml2/declarativescatter_p.h b/src/datavisualizationqml2/declarativescatter_p.h index d42c3b23..7490deda 100644 --- a/src/datavisualizationqml2/declarativescatter_p.h +++ b/src/datavisualizationqml2/declarativescatter_p.h @@ -49,9 +49,6 @@ class DeclarativeScatter : public AbstractDeclarative Q_PROPERTY(Q3DValueAxis *axisX READ axisX WRITE setAxisX) Q_PROPERTY(Q3DValueAxis *axisY READ axisY WRITE setAxisY) Q_PROPERTY(Q3DValueAxis *axisZ READ axisZ WRITE setAxisZ) - Q_PROPERTY(QtDataVisualization::QDataVis::MeshStyle objectType READ objectType WRITE setObjectType NOTIFY meshFileNameChanged) - Q_PROPERTY(bool objectSmoothingEnabled READ isObjectSmoothingEnabled WRITE setObjectSmoothingEnabled NOTIFY meshFileNameChanged) - Q_PROPERTY(QString meshFileName READ meshFileName WRITE setMeshFileName NOTIFY meshFileNameChanged) Q_PROPERTY(QQmlListProperty<QScatter3DSeries> seriesList READ seriesList) Q_CLASSINFO("DefaultProperty", "seriesList") @@ -59,8 +56,6 @@ public: explicit DeclarativeScatter(QQuickItem *parent = 0); ~DeclarativeScatter(); - Q_INVOKABLE void setObjectColor(const QColor &baseColor); // TODO property (or more likely as part of data set) - Q3DValueAxis *axisX() const; void setAxisX(Q3DValueAxis *axis); Q3DValueAxis *axisY() const; @@ -68,15 +63,6 @@ public: Q3DValueAxis *axisZ() const; void setAxisZ(Q3DValueAxis *axis); - void setObjectType(QDataVis::MeshStyle style); - QDataVis::MeshStyle objectType() const; - - void setObjectSmoothingEnabled(bool enabled); - bool isObjectSmoothingEnabled() const; - - void setMeshFileName(const QString &objFileName); - QString meshFileName() const; - QQmlListProperty<QScatter3DSeries> seriesList(); static void appendSeriesFunc(QQmlListProperty<QScatter3DSeries> *list, QScatter3DSeries *series); static int countSeriesFunc(QQmlListProperty<QScatter3DSeries> *list); |