Download as
Browse Code »

Commit 490289b9721102fddd36712b265f1eb4370af2ee

Authored by tfmoraes
1 parent 56f7a128
Exists in master and in 67 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, 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

Added a method in viewer_volume to unload a given volume

Showing 2 changed files with 12 additions and 1 deletions   Show diff stats
invesalius/data/viewer_volume.py
  Diff comments   View file @490289b
@@ -122,6 +122,8 @@ class Viewer(wx.Panel): @@ -122,6 +122,8 @@ class Viewer(wx.Panel):
122 # Raycating - related 122 # Raycating - related
123 Publisher.subscribe(self.LoadVolume, 123 Publisher.subscribe(self.LoadVolume,
124 'Load volume into viewer') 124 'Load volume into viewer')
  125 + Publisher.subscribe(self.UnloadVolume,
  126 + 'Unload volume')
125 Publisher.subscribe(self.OnSetWindowLevelText, 127 Publisher.subscribe(self.OnSetWindowLevelText,
126 'Set volume window and level text') 128 'Set volume window and level text')
127 Publisher.subscribe(self.OnHideRaycasting, 129 Publisher.subscribe(self.OnHideRaycasting,
@@ -681,6 +683,10 @@ class Viewer(wx.Panel): @@ -681,6 +683,10 @@ class Viewer(wx.Panel):
681 683
682 self.UpdateRender() 684 self.UpdateRender()
683 685
  686 + def UnloadVolume(self, pubsub_evt):
  687 + volume = pubsub_evt.data
  688 + self.ren.RemoveVolume(volume)
  689 +
684 def OnSetViewAngle(self, evt_pubsub): 690 def OnSetViewAngle(self, evt_pubsub):
685 view = evt_pubsub.data 691 view = evt_pubsub.data
686 self.SetViewAngle(view) 692 self.SetViewAngle(view)
invesalius/data/volume.py
  Diff comments   View file @490289b
@@ -87,6 +87,7 @@ class Volume(): @@ -87,6 +87,7 @@ class Volume():
87 self.volume = None 87 self.volume = None
88 self.image = None 88 self.image = None
89 self.loaded_image = 0 89 self.loaded_image = 0
  90 + self.to_reload = False
90 self.__bind_events() 91 self.__bind_events()
91 92
92 def __bind_events(self): 93 def __bind_events(self):
@@ -162,6 +163,10 @@ class Volume(): @@ -162,6 +163,10 @@ class Volume():
162 self.__load_preset_config() 163 self.__load_preset_config()
163 164
164 if self.config: 165 if self.config:
  166 + if self.to_reload:
  167 + self.exist = False
  168 + Publisher.sendMessage('Unload volume', self.volume)
  169 +
165 if self.exist: 170 if self.exist:
166 self.__load_preset() 171 self.__load_preset()
167 self.volume.SetVisibility(1) 172 self.volume.SetVisibility(1)
@@ -180,7 +185,7 @@ class Volume(): @@ -180,7 +185,7 @@ class Volume():
180 self.loaded_image = False 185 self.loaded_image = False
181 del self.image 186 del self.image
182 self.image = None 187 self.image = None
183 - self.exist = None 188 + self.to_reload = True
184 189
185 def __load_preset_config(self): 190 def __load_preset_config(self):
186 self.config = prj.Project().raycasting_preset 191 self.config = prj.Project().raycasting_preset