From 886ee6a4e8a86f585ff275a65f8b8a1f84fdb34e Mon Sep 17 00:00:00 2001
From: Santiago Soler <santiago.r.soler@gmail.com>
Date: Fri, 2 Feb 2018 11:25:44 -0300
Subject: [PATCH] Added error and density properties setter

---
 interactive.py | 39 +++++++++++++++++----------------------
 moulder.py     |  8 ++++----
 2 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/interactive.py b/interactive.py
index e3c3cee..8c96447 100644
--- a/interactive.py
+++ b/interactive.py
@@ -99,16 +99,29 @@ class Moulder(FigureCanvasQTAgg):
         return self._density
 
     @density.setter
-    def density(self, new_value):
-        self._density = new_value
+    def density(self, value):
+        """
+        Callback when density slider is edited
+        """
+        self._density = value
+        if self._ipoly is not None:
+            self.densities[self._ipoly] = value
+            self.polygons[self._ipoly].set_color(self._density2color(value))
+            # self._update_data()
+            self._update_data_plot()
+            self.canvas.draw()
 
     @property
     def error(self):
         return self._error
 
     @error.setter
-    def error(self, new_value):
-        self._error = new_value
+    def error(self, value):
+        """
+        Callback when error slider is edited
+        """
+        self._error = value
+        self._update_data_plot()
 
     @property
     def predicted(self):
@@ -135,24 +148,6 @@ class Moulder(FigureCanvasQTAgg):
         self.predicted_line, = self.dataax.plot(self.x, self.predicted, '-r')
         self._update_data_plot()
 
-    def set_error(self, value):
-        """
-        Callback when error slider is edited
-        """
-        self.error = value
-        self._update_data_plot()
-
-    def set_density(self, value):
-        """
-        Callback when density slider is edited
-        """
-        if self._ipoly is not None:
-            self.densities[self._ipoly] = value
-            self.polygons[self._ipoly].set_color(self._density2color(value))
-            # self._update_data()
-            self._update_data_plot()
-            self.canvas.draw()
-
     def _figure_setup(self):
         self.dataax, self.modelax = self.fig.subplots(2, 1, sharex=True)
         self.dataax.set_ylabel("Gravity Anomaly [mGal]")
diff --git a/moulder.py b/moulder.py
index 9fb61e9..7c791e5 100644
--- a/moulder.py
+++ b/moulder.py
@@ -154,17 +154,17 @@ class MoulderApp(QMainWindow):
         sender = self.sender()
         if sender == self.density_slider:
             self.density_spinbox.setValue(value)
-            self.moulder.set_density(value)
+            self.moulder.density = value
         elif sender == self.density_spinbox:
             self.density_slider.setValue(value)
-            self.moulder.set_density(value)
+            self.moulder.density = value
         elif sender == self.error_slider:
             value = self.error_slider.int_2_float(value)
             self.error_spinbox.setValue(value)
-            self.moulder.set_error(value)
+            self.moulder.error = value
         elif sender == self.error_spinbox:
             self.error_slider.setValue(self.error_slider.float_2_int(value))
-            self.moulder.set_error(value)
+            self.moulder.error = value
 
     def _quit_callback(self):
         answer = QMessageBox.question(self, "Quit",