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 --- voronoisplat.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'voronoisplat.h') diff --git a/voronoisplat.h b/voronoisplat.h index 021e88b..b27f690 100644 --- a/voronoisplat.h +++ b/voronoisplat.h @@ -15,6 +15,8 @@ class VoronoiSplat Q_PROPERTY(float alpha READ alpha WRITE setAlpha NOTIFY alphaChanged) Q_PROPERTY(float beta READ beta WRITE setBeta NOTIFY betaChanged) public: + static const int SAMPLES = 128; + VoronoiSplat(QQuickItem *parent = 0); Renderer *createRenderer() const; @@ -44,7 +46,7 @@ public: signals: void sitesChanged(const arma::mat &sites) const; void valuesChanged(const arma::vec &values) const; - void colorScaleChanged(const ColorScale &scale) const; + void colorScaleChanged(const ColorScale *scale) const; void scaleChanged(const LinearScale &sx, const LinearScale &sy) const; void alphaChanged(float alpha) const; void betaChanged(float alpha) const; @@ -57,7 +59,7 @@ public slots: void setValues(const arma::vec &values); // Set colorScale data based on the given color scale - void setColorScale(const ColorScale &scale); + void setColorScale(const ColorScale *scale); void setScale(const LinearScale &sx, const LinearScale &sy); -- cgit v1.2.3