Commit 379c002ab05e5bde3d4f7955a54b6cb3639511f8
1 parent
498a3e77
Exists in
master
and in
55 other branches
FIX: it was not possible to set 0 as threshold value
Showing
1 changed file
with
9 additions
and
8 deletions
Show diff stats
invesalius/gui/widgets/gradient.py
@@ -353,15 +353,15 @@ class GradientCtrl(wx.Panel): | @@ -353,15 +353,15 @@ class GradientCtrl(wx.Panel): | ||
353 | self.gradient_slider.Bind(EVT_SLIDER_CHANGED, self.OnSlider) | 353 | self.gradient_slider.Bind(EVT_SLIDER_CHANGED, self.OnSlider) |
354 | 354 | ||
355 | # self.spin_min.Bind(wx.lib.intctrl.EVT_INT, self.ChangeMinValue) | 355 | # self.spin_min.Bind(wx.lib.intctrl.EVT_INT, self.ChangeMinValue) |
356 | - self.spin_min.Bind(wx.EVT_LEAVE_WINDOW, self._FireSpinMinChanged) | ||
357 | - self.spin_min.Bind(wx.EVT_KILL_FOCUS, self._FireSpinMinChanged) | ||
358 | - self.spin_min.Bind(wx.EVT_KEY_DOWN, self._FireSpinMinChange) | 356 | + self.spin_min.Bind(wx.EVT_LEAVE_WINDOW, self._FireSpinMinChange) |
357 | + self.spin_min.Bind(wx.EVT_KILL_FOCUS, self._FireSpinMinChange) | ||
358 | + #self.spin_min.Bind(wx.EVT_KEY_DOWN, self._FireSpinMinChange) | ||
359 | self.spin_min.Bind(wx.EVT_MOUSEWHEEL, self.OnMinMouseWheel) | 359 | self.spin_min.Bind(wx.EVT_MOUSEWHEEL, self.OnMinMouseWheel) |
360 | 360 | ||
361 | # self.spin_max.Bind(wx.lib.intctrl.EVT_INT, self.ChangeMaxValue) | 361 | # self.spin_max.Bind(wx.lib.intctrl.EVT_INT, self.ChangeMaxValue) |
362 | - self.spin_max.Bind(wx.EVT_LEAVE_WINDOW, self._FireSpinMaxChanged) | ||
363 | - self.spin_max.Bind(wx.EVT_KILL_FOCUS, self._FireSpinMaxChanged) | ||
364 | - self.spin_max.Bind(wx.EVT_KEY_DOWN, self._FireSpinMaxChange) | 362 | + self.spin_max.Bind(wx.EVT_LEAVE_WINDOW, self._FireSpinMaxChange) |
363 | + self.spin_max.Bind(wx.EVT_KILL_FOCUS, self._FireSpinMaxChange) | ||
364 | + #self.spin_max.Bind(wx.EVT_KEY_DOWN, self._FireSpinMaxChange) | ||
365 | self.spin_max.Bind(wx.EVT_MOUSEWHEEL, self.OnMaxMouseWheel) | 365 | self.spin_max.Bind(wx.EVT_MOUSEWHEEL, self.OnMaxMouseWheel) |
366 | 366 | ||
367 | def OnSlider(self, evt): | 367 | def OnSlider(self, evt): |
@@ -384,6 +384,7 @@ class GradientCtrl(wx.Panel): | @@ -384,6 +384,7 @@ class GradientCtrl(wx.Panel): | ||
384 | if value != self.GetMinValue(): | 384 | if value != self.GetMinValue(): |
385 | self.SetMinValue(value) | 385 | self.SetMinValue(value) |
386 | self._GenerateEvent(myEVT_THRESHOLD_CHANGING) | 386 | self._GenerateEvent(myEVT_THRESHOLD_CHANGING) |
387 | + print "VALLUUUEE", value | ||
387 | 388 | ||
388 | def _FireSpinMinChanged(self, evt): | 389 | def _FireSpinMinChanged(self, evt): |
389 | if self.changed: | 390 | if self.changed: |
@@ -439,7 +440,7 @@ class GradientCtrl(wx.Panel): | @@ -439,7 +440,7 @@ class GradientCtrl(wx.Panel): | ||
439 | value = self.min_range | 440 | value = self.min_range |
440 | 441 | ||
441 | def SetMaxValue(self, value): | 442 | def SetMaxValue(self, value): |
442 | - if value: | 443 | + if value is not None: |
443 | value = int(value) | 444 | value = int(value) |
444 | if value > self.max_range: | 445 | if value > self.max_range: |
445 | value = int(self.max_range) | 446 | value = int(self.max_range) |
@@ -448,7 +449,7 @@ class GradientCtrl(wx.Panel): | @@ -448,7 +449,7 @@ class GradientCtrl(wx.Panel): | ||
448 | self.maximun = value | 449 | self.maximun = value |
449 | 450 | ||
450 | def SetMinValue(self, value): | 451 | def SetMinValue(self, value): |
451 | - if value: | 452 | + if value is not None: |
452 | value = int(value) | 453 | value = int(value) |
453 | if value < self.min_range: | 454 | if value < self.min_range: |
454 | value = int(self.min_range) | 455 | value = int(self.min_range) |