Download as
Browse Code »

Commit 29ad776e5e16c3b080a5a5b8bce344445794237c

Authored by tatiana
1 parent 9055b1d5
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: In process of arranging insertion of plane in raycasting

Showing 2 changed files with 16 additions and 20 deletions   Show diff stats
invesalius/data/volume.py
  Diff comments   View file @29ad776
@@ -465,9 +465,12 @@ class Volume(): @@ -465,9 +465,12 @@ class Volume():
465 ps.Publisher().sendMessage('Load volume into viewer', (volume, colour)) 465 ps.Publisher().sendMessage('Load volume into viewer', (volume, colour))
466 466
467 def OnEnableTool(self, pubsub_evt): 467 def OnEnableTool(self, pubsub_evt):
468 - tool_name = pubsub_evt.data 468 + tool_name, enable = pubsub_evt.data
469 if tool_name == "Cut plane": 469 if tool_name == "Cut plane":
470 - plane = CutPlane(self.final_imagedata, self.volume_mapper) 470 + if enable:
  471 + plane = CutPlane(self.final_imagedata, self.volume_mapper)
  472 + else:
  473 + print "TODO: Desabilitar plano"
471 474
472 def TranslateScale(self, scale, value): 475 def TranslateScale(self, scale, value):
473 #if value < 0: 476 #if value < 0:
invesalius/gui/default_viewers.py
  Diff comments   View file @29ad776
@@ -288,20 +288,25 @@ class VolumeToolPanel(wx.Panel): @@ -288,20 +288,25 @@ class VolumeToolPanel(wx.Panel):
288 """Events from raycasting menu.""" 288 """Events from raycasting menu."""
289 id = evt.GetId() 289 id = evt.GetId()
290 if id in ID_TO_NAME.keys(): 290 if id in ID_TO_NAME.keys():
  291 + # Raycassting type was selected
291 name = ID_TO_NAME[evt.GetId()] 292 name = ID_TO_NAME[evt.GetId()]
292 ps.Publisher().sendMessage('Load raycasting preset', 293 ps.Publisher().sendMessage('Load raycasting preset',
293 ID_TO_NAME[evt.GetId()]) 294 ID_TO_NAME[evt.GetId()])
  295 + # Enable or disable tools
294 if name != const.RAYCASTING_OFF_LABEL: 296 if name != const.RAYCASTING_OFF_LABEL:
295 - self.menu_raycasting.Enable(RAYCASTING_TOOLS, 1) 297 + self.menu_raycasting.Enable(RAYCASTING_TOOLS, 1)
296 else: 298 else:
297 self.menu_raycasting.Enable(RAYCASTING_TOOLS, 0) 299 self.menu_raycasting.Enable(RAYCASTING_TOOLS, 0)
  300 +
298 else: 301 else:
  302 + # Raycasting tool
  303 + # TODO: In future, when more tools are available
299 item = ID_TO_TOOL_ITEM[evt.GetId()] 304 item = ID_TO_TOOL_ITEM[evt.GetId()]
300 - if not item.IsChecked():  
301 - for i in ID_TO_TOOL_ITEM.values():  
302 - if i is not item:  
303 - i.Check(0)  
304 - 305 + #if not item.IsChecked():
  306 + # for i in ID_TO_TOOL_ITEM.values():
  307 + # if i is not item:
  308 + # i.Check(0)
  309 + if item.IsChecked():
305 ps.Publisher().sendMessage('Enable raycasting tool', 310 ps.Publisher().sendMessage('Enable raycasting tool',
306 [ID_TO_TOOL[evt.GetId()],1]) 311 [ID_TO_TOOL[evt.GetId()],1])
307 else: 312 else:
@@ -321,15 +326,3 @@ class VolumeToolPanel(wx.Panel): @@ -321,15 +326,3 @@ class VolumeToolPanel(wx.Panel):
321 colour = c = [i/255.0 for i in evt.GetValue()] 326 colour = c = [i/255.0 for i in evt.GetValue()]
322 ps.Publisher().sendMessage('Change volume viewer background colour', colour) 327 ps.Publisher().sendMessage('Change volume viewer background colour', colour)
323 328
324 - #def OnToggleRaycasting(self, evt):  
325 - # print "oi"  
326 - # if self.button_raycasting_toggle:  
327 - # ps.Publisher().sendMessage('Hide raycasting volume')  
328 - # self.button_raycasting.SetBackgroundColour(self.GetParent().GetBackgroundColour())  
329 - # #self.button_raycasting.SetBitmapSelected(ID_TO_BMP2[0])  
330 - # self.button_raycasting_toggle = 0  
331 - # else:  
332 - # ps.Publisher().sendMessage('Show raycasting volume')  
333 - # self.button_raycasting_toggle = 1  
334 - # #self.button_raycasting.SetBitmapSelected(ID_TO_BMP2[1])  
335 - # self.button_raycasting.SetBackgroundColour((255,255,255))