Download as
Browse Code »

Commit ae52a3cc8abc870582bcb88281700be7febac70e

Authored by tatiana
1 parent 9f9376b4

FIX: Problem on gradient initialization

Showing 4 changed files with 15 additions and 13 deletions   Show diff stats
invesalius/control.py
  Diff comments   View file @ae52a3c
... ... @@ -324,13 +324,6 @@ class Controller():
324 324 const.WINDOW_LEVEL[_('Default')] = (proj.window, proj.level)
325 325 const.WINDOW_LEVEL[_('Manual')] = (proj.window, proj.level)
326 326  
327   -
328   - ps.Publisher().sendMessage('Set project name', proj.name)
329   - ps.Publisher().sendMessage('Load surface dict',
330   - proj.surface_dict)
331   - self.LoadImagedataInfo() # TODO: where do we insert this <<<?
332   - ps.Publisher().sendMessage('Show content panel')
333   - ps.Publisher().sendMessage('Update AUI')
334 327 ps.Publisher().sendMessage('Load slice to viewer',
335 328 (proj.imagedata,
336 329 proj.mask_dict))
... ... @@ -340,6 +333,13 @@ class Controller():
340 333 ps.Publisher().sendMessage('Update window level value',\
341 334 (proj.window, proj.level))
342 335  
  336 + ps.Publisher().sendMessage('Set project name', proj.name)
  337 + ps.Publisher().sendMessage('Load surface dict',
  338 + proj.surface_dict)
  339 + self.LoadImagedataInfo() # TODO: where do we insert this <<<?
  340 + ps.Publisher().sendMessage('Show content panel')
  341 + ps.Publisher().sendMessage('Update AUI')
  342 +
343 343 if len(proj.mask_dict):
344 344 mask_index = len(proj.mask_dict) -1
345 345 ps.Publisher().sendMessage('Show mask', (mask_index, True))
... ...
invesalius/gui/task_slice.py
  Diff comments   View file @ae52a3c
... ... @@ -468,8 +468,8 @@ class MaskProperties(wx.Panel):
468 468  
469 469 def OnComboThresh(self, evt):
470 470 (thresh_min, thresh_max) = Project().presets.thresh_ct[evt.GetString()]
471   - self.gradient.SetMinValue(thresh_min)
472   - self.gradient.SetMaxValue(thresh_max)
  471 + self.gradient.SetMinValue(thresh_min, True)
  472 + self.gradient.SetMaxValue(thresh_max, True)
473 473  
474 474 def OnSlideChanged(self, evt):
475 475 thresh_min = self.gradient.GetMinValue()
... ...
invesalius/gui/widgets/gradient.py
  Diff comments   View file @ae52a3c
... ... @@ -577,20 +577,22 @@ class GradientSlider(wx.Panel):
577 577 self.slided = 0
578 578 self._GenerateEvent()
579 579  
580   - def SetMinValue(self, value):
  580 + def SetMinValue(self, value, do_event=False):
581 581 try:
582 582 value = value.data
583 583 except AttributeError:
584 584 pass
  585 + self.slided = 0 if do_event else 1
585 586 self.GradientPanel.SetMinValue(value)
586 587 self.SpinMin.SetValue(int(value))
587 588 self.GradientPanel.Refresh()
588 589  
589   - def SetMaxValue(self, value):
  590 + def SetMaxValue(self, value, do_event=False):
590 591 try:
591 592 value = value.data
592 593 except AttributeError:
593 594 pass
  595 + self.slided = 0 if do_event else 1
594 596 self.GradientPanel.SetMaxValue(value)
595 597 self.SpinMax.SetValue(int(value))
596 598 self.GradientPanel.Refresh()
... ...
invesalius/project.py
  Diff comments   View file @ae52a3c
... ... @@ -35,7 +35,7 @@ import data.polydata_utils as pu
35 35 import data.surface as srf
36 36 from presets import Presets
37 37 from reader import dicom
38   -from utils import Singleton
  38 +from utils import Singleton, debug
39 39 import version
40 40  
41 41 class Project(object):
... ... @@ -153,7 +153,7 @@ class Project(object):
153 153 elif type_ == "CT":
154 154 self.threshold_modes = self.presets.thresh_ct
155 155 else:
156   - utils.debug("Different Acquisition Modality!!!")
  156 + debug("Different Acquisition Modality!!!")
157 157 self.modality = type_
158 158  
159 159 def SetRaycastPreset(self, label):
... ...