From 85af9a3daf3a9197a21dbf7d7bd4285755d3d037 Mon Sep 17 00:00:00 2001
From: Samuel Fadel <samuelfadel@gmail.com>
Date: Tue, 15 Mar 2016 16:35:30 -0300
Subject: VoronoiSplat: initializing previously uninitialized values.

Also renamed some methods/variables for better consistency.
---
 voronoisplat.h | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'voronoisplat.h')

diff --git a/voronoisplat.h b/voronoisplat.h
index b27f690..30f3be0 100644
--- a/voronoisplat.h
+++ b/voronoisplat.h
@@ -31,7 +31,7 @@ public:
 
     bool sitesChanged() const      { return m_sitesChanged; }
     bool valuesChanged() const     { return m_valuesChanged; }
-    bool colormapChanged() const { return m_colormapChanged; }
+    bool colorScaleChanged() const { return m_colorScaleChanged; }
 
     void setSitesChanged(bool sitesChanged) {
         m_sitesChanged = sitesChanged;
@@ -39,15 +39,16 @@ public:
     void setValuesChanged(bool valuesChanged) {
         m_valuesChanged = valuesChanged;
     }
-    void setColormapChanged(bool colormapChanged) {
-        m_colormapChanged = colormapChanged;
+    void setColorScaleChanged(bool colorScaleChanged) {
+        m_colorScaleChanged = colorScaleChanged;
     }
 
 signals:
     void sitesChanged(const arma::mat &sites) const;
     void valuesChanged(const arma::vec &values) const;
     void colorScaleChanged(const ColorScale *scale) const;
-    void scaleChanged(const LinearScale<float> &sx, const LinearScale<float> &sy) const;
+    void scaleChanged(const LinearScale<float> &sx,
+                      const LinearScale<float> &sy) const;
     void alphaChanged(float alpha) const;
     void betaChanged(float alpha) const;
 
@@ -61,7 +62,8 @@ public slots:
     // Set colorScale data based on the given color scale
     void setColorScale(const ColorScale *scale);
 
-    void setScale(const LinearScale<float> &sx, const LinearScale<float> &sy);
+    void setScale(const LinearScale<float> &sx,
+                  const LinearScale<float> &sy);
 
     // Shepard blur radius
     void setAlpha(float alpha);
@@ -73,7 +75,7 @@ private:
     std::vector<float> m_sites, m_values, m_cmap;
     LinearScale<float> m_sx, m_sy;
     float m_alpha, m_beta;
-    bool m_sitesChanged, m_valuesChanged, m_colormapChanged;
+    bool m_sitesChanged, m_valuesChanged, m_colorScaleChanged;
 };
 
 #endif // VORONOISPLAT_H
-- 
cgit v1.2.3