Giving the user the option to choose the n steps to whitaker alg

Thiago Franco de Moraes
1 parent aa28a9ba
Showing 2 changed files with 9 additions and 1 deletions Show diff stats
invesalius/data/surface.py
invesalius/gui/dialogs.py
@@ -469,7 +469,7 @@ class SurfaceManager():
         q_out = multiprocessing.Queue()
         if algorithm == 'Whitaker':
-            iteractions = 10
+            iteractions = options['steps']
             bsize = 4
             mask_tfile = tempfile.mktemp()
@@ -1356,6 +1356,12 @@ class SurfaceMethodPanel(wx.Panel):
     def _set_cb_types(self, evt):
         if self.alg_types[evt.GetString()] == 'ca_smoothing':
             self.ca_options.Enable()
+        elif self.alg_types[evt.GetString()] == 'Whitaker':
+            self.ca_options.Enable()
+            self.ca_options.angle.Disable()
+            self.ca_options.max_distance.Disable()
+            self.ca_options.min_weight.Disable()
+            self.ca_options.steps.Enable()
         else:
             self.ca_options.Disable()
         evt.Skip()
@@ -1372,6 +1378,8 @@ class SurfaceMethodPanel(wx.Panel):
                        'max distance': self.ca_options.max_distance.GetValue(),
                        'min weight': self.ca_options.min_weight.GetValue(),
                        'steps': self.ca_options.steps.GetValue()}
+        elif self.GetAlgorithmSelected() == 'Whitaker':
+            options = {'steps': self.ca_options.steps.GetValue()}
         else:
             options = {}
         return options
	@@ -469,7 +469,7 @@ class SurfaceManager():		@@ -469,7 +469,7 @@ class SurfaceManager():
469	q_out = multiprocessing.Queue()	469	q_out = multiprocessing.Queue()
470		470
471	if algorithm == 'Whitaker':	471	if algorithm == 'Whitaker':
472	- iteractions = 10	472	+ iteractions = options['steps']
473	bsize = 4	473	bsize = 4
474	mask_tfile = tempfile.mktemp()	474	mask_tfile = tempfile.mktemp()
475		475