From 5ba543ca4ff61a14d5057ff1601dc6002d90395f Mon Sep 17 00:00:00 2001 From: tfmoraes Date: Thu, 16 Dec 2010 16:08:55 +0000 Subject: [PATCH] ENH: Improvements in gradient widget, like, the impossibility of set max threshold greather than max range --- invesalius/gui/widgets/gradient.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/invesalius/gui/widgets/gradient.py b/invesalius/gui/widgets/gradient.py index 20995e6..e734120 100755 --- a/invesalius/gui/widgets/gradient.py +++ b/invesalius/gui/widgets/gradient.py @@ -155,8 +155,8 @@ class GradientSlider(wx.Panel): value = self._min_position_to_minimun(x) self.minimun = value self.min_position = x - self.Refresh() self._generate_event(myEVT_SLIDER_CHANGING) + self.Refresh() # The user is moving the second push (Max) elif self.selected == 2: @@ -169,8 +169,8 @@ class GradientSlider(wx.Panel): value = self._max_position_to_maximun(x) self.maximun = value self.max_position = x - self.Refresh() self._generate_event(myEVT_SLIDER_CHANGING) + self.Refresh() # The user is moving the slide. elif self.selected == 3: @@ -196,8 +196,8 @@ class GradientSlider(wx.Panel): self.maximun = self.minimun + diff_values self.CalculateControlPositions() - self.Refresh() self._generate_event(myEVT_SLIDER_CHANGING) + self.Refresh() evt.Skip() @@ -416,20 +416,30 @@ class GradientCtrl(wx.Panel): self.spin_min.SetMax(value) self.spin_max.SetMax(value) self.gradient_slider.SetMaxRange(value) + self.max_range = value + if value > self.max_range: + value = self.max_range def SetMinRange(self, value): self.spin_min.SetMin(value) self.spin_max.SetMin(value) self.gradient_slider.SetMinRange(value) + self.min_range = value + if value < self.min_range: + value = self.min_range def SetMaxValue(self, value): value = int(value) + if value > self.max_range: + value = int(self.max_range) self.spin_max.SetValue(value) self.gradient_slider.SetMaximun(value) self.maximun = value def SetMinValue(self, value): value = int(value) + if value < self.min_range: + value = int(self.min_range) self.spin_min.SetValue(value) self.gradient_slider.SetMinimun(value) self.minimun = value -- libgit2 0.21.2