diff options
author | Mika Salmela <mika.salmela@digia.com> | 2013-09-17 11:48:54 +0300 |
---|---|---|
committer | Mika Salmela <mika.salmela@digia.com> | 2013-09-17 12:04:49 +0300 |
commit | ab8343a2df664545575b5233b74ea0329647c7df (patch) | |
tree | be72d823cbfb9fa22d1d2c9ff90229252e02d74e /src/datavisualization/engine/selectionpointer_p.h | |
parent | dbc876fa0f9c5c87d0ee250efa4d7a211bde3ddf (diff) |
Misc bug fixes
- Enabled zooming on Surface C++ api
- User modified gradient takes effect
- Scene pointer is updated to selection pointer
- Font changing is listened on selection pointer and label's are generated
using selected font
- Selection label format copied from scatter. Looks to be very handy.
- Check for OpenGL 1.5 version and block coarse surface if below
- Added some theme handling. Not sure if the bug is fully fixed. Probably
requires shadow fixes to be fully similar to others.
- HAHAA. Now even single rows and columns supported. Even one value will
produce surface
Task-number: QTRD-2279
Task-number: QTRD-2265
Task-number: QTRD-2261
Task-number: QTRD-2269
Task-number: QTRD-2268
Task-number: QTRD-2272
Change-Id: Id34d843b2898e4cf1e4dde10ce23e0eaab4738a7
Signed-off-by: Mika Salmela <mika.salmela@digia.com>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/engine/selectionpointer_p.h')
-rw-r--r-- | src/datavisualization/engine/selectionpointer_p.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/datavisualization/engine/selectionpointer_p.h b/src/datavisualization/engine/selectionpointer_p.h index 67867232..d13dffaa 100644 --- a/src/datavisualization/engine/selectionpointer_p.h +++ b/src/datavisualization/engine/selectionpointer_p.h @@ -56,7 +56,7 @@ class QT_DATAVISUALIZATION_EXPORT SelectionPointer : public QObject, protected Q Q_OBJECT public: - explicit SelectionPointer(Surface3DController *controller); + explicit SelectionPointer(Surface3DController *controller, Drawer *drawer); ~SelectionPointer(); void initializeOpenGL(); @@ -64,6 +64,7 @@ public: void setPosition(QVector3D position); void setScaling(QVector3D scaling); void setLabel(QString label); + void updateLabel(); void updateTheme(Theme theme); void updateBoundingRect(QRect rect); void updateScene(Q3DScene *scene); @@ -81,7 +82,6 @@ private: ObjectHelper *m_pointObj; TextureHelper *m_textureHelper; bool m_isInitialized; - QFont m_font; Theme m_cachedTheme; QDataVis::LabelTransparency m_labelTransparency; LabelItem m_labelItem; @@ -90,6 +90,7 @@ private: QVector3D m_position; QVector3D m_scale; Q3DScene *m_cachedScene; + QString m_label; }; QT_DATAVISUALIZATION_END_NAMESPACE |