From d3d3526bab2ab051656a1b80b4e0f1337037b5de Mon Sep 17 00:00:00 2001 From: Samuel Fadel Date: Sun, 28 Feb 2016 21:46:31 -0300 Subject: Added colormap orientation & improved UI. * Colormap: orientation now enables vertical & horizontal colormap display * Two colormap components, one for each type of point (regular, control) * Improved controls grouping and cohesion --- colormap.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'colormap.h') diff --git a/colormap.h b/colormap.h index 806624a..eda4492 100644 --- a/colormap.h +++ b/colormap.h @@ -14,14 +14,25 @@ class Colormap : public QQuickItem { Q_OBJECT + Q_ENUMS(Orientation) + Q_PROPERTY(Orientation orientation READ orientation WRITE setOrientation NOTIFY orientationChanged) public: static const int SAMPLES = 128; + enum Orientation { + Horizontal, + Vertical + }; + Colormap(QQuickItem *parent = 0); ~Colormap(); + void setOrientation(Orientation orientation); + Orientation orientation() const { return m_orientation; } + signals: void colorScaleChanged(const ColorScale &scale) const; + void orientationChanged(Orientation orientation) const; public slots: void setColorScale(const ColorScale &scale); @@ -33,7 +44,8 @@ private: QSGNode *newSceneGraph(); QSGDynamicTexture *m_texture; - bool m_shouldUpdateTexture; + bool m_shouldUpdateTexture, m_shouldUpdateOrientation; + Orientation m_orientation; std::vector m_cmap; }; -- cgit v1.2.3