From d3be9244993da832bb66ff728220b3abe666452e Mon Sep 17 00:00:00 2001
From: Samuel Fadel <samuelfadel@gmail.com>
Date: Sat, 16 Jan 2016 21:20:25 +0100
Subject: VoronoiSplat: Changed "colormap" methods to "colorScale".

---
 voronoisplat.h | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

(limited to 'voronoisplat.h')

diff --git a/voronoisplat.h b/voronoisplat.h
index 6061ef3..f334261 100644
--- a/voronoisplat.h
+++ b/voronoisplat.h
@@ -18,34 +18,40 @@ public:
 
     const std::vector<float> &sites() const    { return m_sites; }
     const std::vector<float> &values() const   { return m_values; }
-    const std::vector<float> &colormap() const { return m_cmap; }
+    const std::vector<float> &colorScale() const { return m_cmap; }
 
     bool sitesChanged() const    { return m_sitesChanged; }
     bool valuesChanged() const   { return m_valuesChanged; }
-    bool colormapChanged() const { return m_colormapChanged; }
-
-    void setSitesChanged(bool sitesChanged)       { m_sitesChanged = sitesChanged; }
-    void setValuesChanged(bool valuesChanged)     { m_valuesChanged = valuesChanged; }
-    void setColormapChanged(bool colormapChanged) { m_colormapChanged = colormapChanged; }
+    bool colorScaleChanged() const { return m_colorScaleChanged; }
+
+    void setSitesChanged(bool sitesChanged) {
+        m_sitesChanged = sitesChanged;
+    }
+    void setValuesChanged(bool valuesChanged) {
+        m_valuesChanged = valuesChanged;
+    }
+    void setColorScaleChanged(bool colorScaleChanged) {
+        m_colorScaleChanged = colorScaleChanged;
+    }
 
 signals:
-    void sitesChanged(const arma::mat &sites);
-    void valuesChanged(const arma::vec &values);
-    void colormapChanged(const ColorScale &scale);
+    void sitesChanged(const arma::mat &sites) const;
+    void valuesChanged(const arma::vec &values) const;
+    void colorScaleChanged(const ColorScale &scale) const;
 
 public slots:
     // 'points' should be a 2D points matrix (each point in a row)
     void setSites(const arma::mat &points);
 
-    // Set the value to be colormapped in each site
+    // Set the value to be colorScaleped in each site
     void setValues(const arma::vec &values);
 
-    // Set colormap data based on the given color scale
-    void setColormap(const ColorScale &scale);
+    // Set colorScale data based on the given color scale
+    void setColorScale(const ColorScale &scale);
 
 private:
     std::vector<float> m_sites, m_values, m_cmap;
-    bool m_sitesChanged, m_valuesChanged, m_colormapChanged;
+    bool m_sitesChanged, m_valuesChanged, m_colorScaleChanged;
 };
 
 #endif // VORONOISPLAT_H
-- 
cgit v1.2.3