From 3ce49858c6859fccc2e4d35839c34685348790d1 Mon Sep 17 00:00:00 2001 From: Samuel Fadel Date: Wed, 2 Mar 2016 15:47:24 -0300 Subject: Improvements related to ColorScale and screenshots. * ColorScale: now a pointer whenever needed. main() takes care of updating extents * New class DivergentColorScale: works specifically for divergent scales, always has 3 colors as input: negative values, 0, positive values * ManipulationHandler: ProjectionHistory no longer needed --- scatterplot.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'scatterplot.h') diff --git a/scatterplot.h b/scatterplot.h index 33c1ba9..7228498 100644 --- a/scatterplot.h +++ b/scatterplot.h @@ -23,7 +23,7 @@ public: Scatterplot(QQuickItem *parent = 0); arma::mat XY() const; - void setColorScale(const ColorScale &colorScale); + void setColorScale(const ColorScale *colorScale); void setAutoScale(bool autoScale); float glyphSize() const { return m_glyphSize; } void setGlyphSize(float glyphSize); @@ -76,15 +76,16 @@ private: // Visuals float m_glyphSize; - ColorScale m_colorScale; + const ColorScale *m_colorScale; void autoScale(); bool m_autoScale; LinearScale m_sx, m_sy; // Internal state - bool interactiveSelection(bool mergeSelection); + void interactiveSelection(bool mergeSelection); std::vector m_selection; + bool m_anySelected; int m_brushedItem; enum State { -- cgit v1.2.3