Download as
Browse Code »

Commit 613eaf3943ba46ffff51d05bdb4223d72ddcc709

Authored by Paulo Henrique Junqueira Amorim
1 parent e76c7155
Exists in master and in 68 other branches 3d_inter_style, MIPs, beta3, beta4, brush_pix, canvas_reeng, canvas_text, casmoothing_cython, clean, command-line, cython_threshold, debian_cython, editor_improvements, encoding, ff_mask, ff_mask_improv, ffill_gui, ffill_segmentation, fill_holes_auto, fixes_pre_beta5, floodfill, get_pixel, import_mesh, interactor_style, inv3.0.1, invesalius-libift, mactoolbar, mactoolbar_bkp, manual_v3.1, mask_boolean_op, mask_boolean_op_bkp, mask_copy, mask_greatest_component, measure, measure_canvas, measure_improvements, measure_placement_test, measure_spacing, orientation, phoenix, region_growing_confidence, remote, remove_local_wxpython, rmatsuda-fix_ref_MTC, rmatsuda-fix_remove_marker_bug, rmatsuda-trigger_bug_fix, rotvol, segmentation_menu, select_part, smoothing_bin, smoothing_bin_pll, surface_area, threshold_history, user_guide_en, usp-navegador, vti, vtk6, watershed, watershed_improvements, watershed_improvements_bkp, watershed_merge, workdir, wwwlgui, wx2.9_mac, wxgtk3, wxgtk3_b5, wxgtk3_bkp, xmartlabs-command-line

FIX: Opening project with edited points

Showing 3 changed files with 10 additions and 5 deletions   Show diff stats
invesalius/data/slice_.py
  Diff comments   View file @613eaf3
@@ -157,6 +157,8 @@ class Slice(object): @@ -157,6 +157,8 @@ class Slice(object):
157 157
158 def __set_current_mask_threshold(self, evt_pubsub): 158 def __set_current_mask_threshold(self, evt_pubsub):
159 session = ses.Session() 159 session = ses.Session()
  160 + print session.project_status != const.PROJ_OPEN
  161 + print session.project_status
160 #FIXME: find a better way to implement this 162 #FIXME: find a better way to implement this
161 if (self.num_gradient >= 2) or \ 163 if (self.num_gradient >= 2) or \
162 (session.project_status != const.PROJ_OPEN): 164 (session.project_status != const.PROJ_OPEN):
@@ -275,11 +277,6 @@ class Slice(object): @@ -275,11 +277,6 @@ class Slice(object):
275 277
276 proj = Project() 278 proj = Project()
277 proj.mask_dict[self.current_mask.index].threshold_range = threshold_range 279 proj.mask_dict[self.current_mask.index].threshold_range = threshold_range
278 -  
279 - session = ses.Session()  
280 - session.ChangeProject()  
281 -  
282 -  
283 280
284 281
285 def ShowMask(self, index, value): 282 def ShowMask(self, index, value):
invesalius/gui/task_slice.py
  Diff comments   View file @613eaf3
@@ -31,6 +31,7 @@ import gui.widgets.foldpanelbar as fpb @@ -31,6 +31,7 @@ import gui.widgets.foldpanelbar as fpb
31 import widgets.colourselect as csel 31 import widgets.colourselect as csel
32 32
33 from project import Project 33 from project import Project
  34 +import session as ses
34 35
35 BTN_NEW = wx.NewId() 36 BTN_NEW = wx.NewId()
36 37
@@ -476,6 +477,8 @@ class MaskProperties(wx.Panel): @@ -476,6 +477,8 @@ class MaskProperties(wx.Panel):
476 if self.bind_evt_gradient: 477 if self.bind_evt_gradient:
477 ps.Publisher().sendMessage('Set threshold values', 478 ps.Publisher().sendMessage('Set threshold values',
478 (thresh_min, thresh_max)) 479 (thresh_min, thresh_max))
  480 + session = ses.Session()
  481 + session.ChangeProject()
479 482
480 def OnSelectColour(self, evt): 483 def OnSelectColour(self, evt):
481 colour = evt.GetValue() 484 colour = evt.GetValue()
invesalius/gui/widgets/gradient.py
  Diff comments   View file @613eaf3
@@ -558,6 +558,7 @@ class GradientSlider(wx.Panel): @@ -558,6 +558,7 @@ class GradientSlider(wx.Panel):
558 def ChangeMinValue(self, e): 558 def ChangeMinValue(self, e):
559 # Why do I need to change slide min value if it has been changed for 559 # Why do I need to change slide min value if it has been changed for
560 # the user? 560 # the user?
  561 +
561 if not self.slided: 562 if not self.slided:
562 self.GradientPanel.SetMinValue(int(self.SpinMin.GetValue())) 563 self.GradientPanel.SetMinValue(int(self.SpinMin.GetValue()))
563 self._GenerateEvent() 564 self._GenerateEvent()
@@ -582,7 +583,9 @@ class GradientSlider(wx.Panel): @@ -582,7 +583,9 @@ class GradientSlider(wx.Panel):
582 except AttributeError: 583 except AttributeError:
583 pass 584 pass
584 self.GradientPanel.SetMinValue(value) 585 self.GradientPanel.SetMinValue(value)
  586 + self.slided = 1
585 self.SpinMin.SetValue(int(value)) 587 self.SpinMin.SetValue(int(value))
  588 + self.slided = 0
586 self.GradientPanel.Refresh() 589 self.GradientPanel.Refresh()
587 590
588 def SetMaxValue(self, value): 591 def SetMaxValue(self, value):
@@ -591,7 +594,9 @@ class GradientSlider(wx.Panel): @@ -591,7 +594,9 @@ class GradientSlider(wx.Panel):
591 except AttributeError: 594 except AttributeError:
592 pass 595 pass
593 self.GradientPanel.SetMaxValue(value) 596 self.GradientPanel.SetMaxValue(value)
  597 + self.slided = 1
594 self.SpinMax.SetValue(int(value)) 598 self.SpinMax.SetValue(int(value))
  599 + self.slided = 0
595 self.GradientPanel.Refresh() 600 self.GradientPanel.Refresh()
596 601
597 def SetMaxRange(self, value): 602 def SetMaxRange(self, value):