From ae52a3cc8abc870582bcb88281700be7febac70e Mon Sep 17 00:00:00 2001
From: tatiana <tatiana.alchueyr@gmail.com>
Date: Thu, 28 Jan 2010 11:50:38 +0000
Subject: [PATCH] FIX: Problem on gradient initialization

---
 invesalius/control.py              | 14 +++++++-------
 invesalius/gui/task_slice.py       |  4 ++--
 invesalius/gui/widgets/gradient.py |  6 ++++--
 invesalius/project.py              |  4 ++--
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/invesalius/control.py b/invesalius/control.py
index 4ea2cf7..464acbf 100755
--- a/invesalius/control.py
+++ b/invesalius/control.py
@@ -324,13 +324,6 @@ class Controller():
         const.WINDOW_LEVEL[_('Default')] = (proj.window, proj.level)
         const.WINDOW_LEVEL[_('Manual')] = (proj.window, proj.level)
 
-
-        ps.Publisher().sendMessage('Set project name', proj.name)
-        ps.Publisher().sendMessage('Load surface dict',
-                                    proj.surface_dict)
-        self.LoadImagedataInfo() # TODO: where do we insert this <<<?
-        ps.Publisher().sendMessage('Show content panel')
-        ps.Publisher().sendMessage('Update AUI')
         ps.Publisher().sendMessage('Load slice to viewer',
                         (proj.imagedata,
                         proj.mask_dict))
@@ -340,6 +333,13 @@ class Controller():
         ps.Publisher().sendMessage('Update window level value',\
                                     (proj.window, proj.level))
 
+        ps.Publisher().sendMessage('Set project name', proj.name)
+        ps.Publisher().sendMessage('Load surface dict',
+                                    proj.surface_dict)
+        self.LoadImagedataInfo() # TODO: where do we insert this <<<?
+        ps.Publisher().sendMessage('Show content panel')
+        ps.Publisher().sendMessage('Update AUI')
+
         if len(proj.mask_dict):
             mask_index = len(proj.mask_dict) -1
             ps.Publisher().sendMessage('Show mask', (mask_index, True))
diff --git a/invesalius/gui/task_slice.py b/invesalius/gui/task_slice.py
index 7a78c50..138e70b 100644
--- a/invesalius/gui/task_slice.py
+++ b/invesalius/gui/task_slice.py
@@ -468,8 +468,8 @@ class MaskProperties(wx.Panel):
 
     def OnComboThresh(self, evt):
         (thresh_min, thresh_max) = Project().presets.thresh_ct[evt.GetString()]
-        self.gradient.SetMinValue(thresh_min)
-        self.gradient.SetMaxValue(thresh_max)
+        self.gradient.SetMinValue(thresh_min, True)
+        self.gradient.SetMaxValue(thresh_max, True)
 
     def OnSlideChanged(self, evt):
         thresh_min = self.gradient.GetMinValue()
diff --git a/invesalius/gui/widgets/gradient.py b/invesalius/gui/widgets/gradient.py
index d061942..5da77d0 100755
--- a/invesalius/gui/widgets/gradient.py
+++ b/invesalius/gui/widgets/gradient.py
@@ -577,20 +577,22 @@ class GradientSlider(wx.Panel):
         self.slided = 0
         self._GenerateEvent()
 
-    def SetMinValue(self, value):
+    def SetMinValue(self, value, do_event=False):
         try:
             value = value.data
         except AttributeError:
             pass
+        self.slided = 0 if do_event else 1
         self.GradientPanel.SetMinValue(value)
         self.SpinMin.SetValue(int(value))
         self.GradientPanel.Refresh()
 
-    def SetMaxValue(self, value):
+    def SetMaxValue(self, value, do_event=False):
         try:
             value = value.data
         except AttributeError:
             pass
+        self.slided = 0 if do_event else 1
         self.GradientPanel.SetMaxValue(value)
         self.SpinMax.SetValue(int(value))
         self.GradientPanel.Refresh()
diff --git a/invesalius/project.py b/invesalius/project.py
index fd0f475..7ab3bd4 100755
--- a/invesalius/project.py
+++ b/invesalius/project.py
@@ -35,7 +35,7 @@ import data.polydata_utils as pu
 import data.surface as srf
 from presets import Presets
 from reader import dicom
-from utils import Singleton
+from utils import Singleton, debug
 import version
 
 class Project(object):
@@ -153,7 +153,7 @@ class Project(object):
         elif type_ == "CT":
             self.threshold_modes = self.presets.thresh_ct
         else:
-            utils.debug("Different Acquisition Modality!!!")
+            debug("Different Acquisition Modality!!!")
         self.modality = type_
 
     def SetRaycastPreset(self, label):
--
libgit2 0.21.2