diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-11-22 07:56:04 +0200 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-11-22 08:30:09 +0200 |
| commit | 3ce4ae10e54e9c5d73826f4d6f8c5e442ac2d525 (patch) | |
| tree | 6ae0bb7c1ff8720f6340453b39d481ffcf526127 /src/datavisualization/engine/q3dbars.h | |
| parent | d12f993ca802ff02091d6a5141d2847641bc65a8 (diff) | |
User-modifiable themes, part 1
Task-number: QTRD-2120
+ old functionality remade
- new functionality to be added
+ fixed a compilation error in qbarseries for mingw
Change-Id: I710c97b5d4023861be8e8cc5cc61c05bb4644964
Signed-off-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/engine/q3dbars.h')
| -rw-r--r-- | src/datavisualization/engine/q3dbars.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/datavisualization/engine/q3dbars.h b/src/datavisualization/engine/q3dbars.h index 86a02b5d..eb35f02d 100644 --- a/src/datavisualization/engine/q3dbars.h +++ b/src/datavisualization/engine/q3dbars.h @@ -32,6 +32,7 @@ class Q3DCategoryAxis; class Q3DValueAxis; class Q3DScene; class QBar3DSeries; +class Q3DTheme; class QT_DATAVISUALIZATION_EXPORT Q3DBars : public Q3DWindow { @@ -44,7 +45,7 @@ class QT_DATAVISUALIZATION_EXPORT Q3DBars : public Q3DWindow Q_PROPERTY(bool barSpacingRelative READ isBarSpacingRelative WRITE setBarSpacingRelative NOTIFY barSpacingRelativeChanged) Q_PROPERTY(QString meshFileName READ meshFileName WRITE setMeshFileName NOTIFY meshFileNameChanged) Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged) - Q_PROPERTY(QtDataVisualization::QDataVis::Theme theme READ theme WRITE setTheme NOTIFY themeChanged) + Q_PROPERTY(Q3DTheme* theme READ theme WRITE setTheme NOTIFY themeChanged) Q_PROPERTY(bool gridVisible READ isGridVisible WRITE setGridVisible NOTIFY gridVisibleChanged) Q_PROPERTY(bool backgroundVisible READ isBackgroundVisible WRITE setBackgroundVisible NOTIFY backgroundVisibleChanged) Q_PROPERTY(Q3DScene* scene READ scene) @@ -67,8 +68,8 @@ public: // TODO: Move to dataset object once that is done QTRD-2121 void setBarType(QDataVis::MeshStyle style, bool smooth = false); - void setTheme(QDataVis::Theme theme); - QDataVis::Theme theme() const; + void setTheme(Q3DTheme *theme); + Q3DTheme *theme() const; void setBarThickness(qreal thicknessRatio); qreal barThickness(); @@ -141,7 +142,7 @@ signals: void barSpacingRelativeChanged(bool relative); void meshFileNameChanged(QString filename); void fontChanged(QFont font); - void themeChanged(QDataVis::Theme theme); + void themeChanged(Q3DTheme *theme); void gridVisibleChanged(bool visible); void backgroundVisibleChanged(bool visible); void colorStyleChanged(QDataVis::ColorStyle style); |