Download as
Browse Code »

Commit 6d6bf3025d6d26cc7194b355a8e8ea7ba42dac7c

Authored by tatiana
1 parent 8dd10d55
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

ENH: Close project (raycasting), still needs work

Showing 3 changed files with 34 additions and 4 deletions   Show diff stats
invesalius/control.py
  Diff comments   View file @6d6bf30
@@ -240,7 +240,6 @@ class Controller(): @@ -240,7 +240,6 @@ class Controller():
240 240
241 ps.Publisher().sendMessage('Hide content panel') 241 ps.Publisher().sendMessage('Hide content panel')
242 ps.Publisher().sendMessage('Close project data') 242 ps.Publisher().sendMessage('Close project data')
243 -  
244 session = ses.Session() 243 session = ses.Session()
245 session.CloseProject() 244 session.CloseProject()
246 245
@@ -432,8 +431,12 @@ class Controller(): @@ -432,8 +431,12 @@ class Controller():
432 ps.Publisher().sendMessage('Set threshold modes', 431 ps.Publisher().sendMessage('Set threshold modes',
433 (thresh_modes,default_threshold)) 432 (thresh_modes,default_threshold))
434 433
435 - def LoadRaycastingPreset(self, pubsub_evt):  
436 - label = pubsub_evt.data 434 + def LoadRaycastingPreset(self, pubsub_evt=None):
  435 + if pubsub_evt:
  436 + label = pubsub_evt.data
  437 + else:
  438 + return
  439 +
437 if label != const.RAYCASTING_OFF_LABEL: 440 if label != const.RAYCASTING_OFF_LABEL:
438 if label in const.RAYCASTING_FILES.keys(): 441 if label in const.RAYCASTING_FILES.keys():
439 path = os.path.join(const.RAYCASTING_PRESETS_DIRECTORY, 442 path = os.path.join(const.RAYCASTING_PRESETS_DIRECTORY,
invesalius/data/viewer_volume.py
  Diff comments   View file @6d6bf30
@@ -72,6 +72,9 @@ class Viewer(wx.Panel): @@ -72,6 +72,9 @@ class Viewer(wx.Panel):
72 self.text.SetValue("") 72 self.text.SetValue("")
73 self.ren.AddActor(self.text.actor) 73 self.ren.AddActor(self.text.actor)
74 74
  75 +
  76 + self.slice_plane = None
  77 +
75 self.view_angle = None 78 self.view_angle = None
76 79
77 self.__bind_events() 80 self.__bind_events()
@@ -123,7 +126,16 @@ class Viewer(wx.Panel): @@ -123,7 +126,16 @@ class Viewer(wx.Panel):
123 126
124 ps.Publisher().subscribe(self.OnShowText, 127 ps.Publisher().subscribe(self.OnShowText,
125 'Show text actors on viewers') 128 'Show text actors on viewers')
  129 + ps.Publisher().subscribe(self.OnCloseProject, 'Close project data')
126 130
  131 + def OnCloseProject(self, pubsub_evt):
  132 + if self.raycasting_volume:
  133 + self.raycasting_volume = False
  134 + if self.slice_plane:
  135 + self.Disable()
  136 + self.mouse_pressed = 0
  137 + self.on_wl = False
  138 +
127 139
128 def OnHideText(self, pubsub_evt): 140 def OnHideText(self, pubsub_evt):
129 self.text.Hide() 141 self.text.Hide()
invesalius/data/volume.py
  Diff comments   View file @6d6bf30
@@ -81,7 +81,7 @@ class Volume(): @@ -81,7 +81,7 @@ class Volume():
81 self.curve = 0 81 self.curve = 0
82 self.plane = None 82 self.plane = None
83 self.plane_on = False 83 self.plane_on = False
84 - 84 + self.volume = None
85 self.__bind_events() 85 self.__bind_events()
86 86
87 def __bind_events(self): 87 def __bind_events(self):
@@ -99,6 +99,21 @@ class Volume(): @@ -99,6 +99,21 @@ class Volume():
99 'Set raycasting relative window and level') 99 'Set raycasting relative window and level')
100 ps.Publisher().subscribe(self.OnEnableTool, 100 ps.Publisher().subscribe(self.OnEnableTool,
101 'Enable raycasting tool') 101 'Enable raycasting tool')
  102 + ps.Publisher().subscribe(self.OnCloseProject, 'Close project data')
  103 +
  104 + def OnCloseProject(self, pubsub_evt):
  105 + self.CloseProject()
  106 +
  107 +
  108 + def CloseProject(self):
  109 +
  110 + if self.plane:
  111 + self.plane = None
  112 + ps.Publisher().sendMessage('Remove surface actor from viewer', self.plane_actor)
  113 + if self.exist:
  114 + self.exist = None
  115 + ps.Publisher().sendMessage('Remove surface actor from viewer', self.volume)
  116 +
102 117
103 def OnLoadVolume(self, pubsub_evt): 118 def OnLoadVolume(self, pubsub_evt):
104 label = pubsub_evt.data 119 label = pubsub_evt.data