Download as
Browse Code »

Commit a13ab1bd1335a1824bdfccd2c9c7bde116227138

Authored by tfmoraes
1 parent 82530df3
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

ADD: A option to blur the volume when in setting ww & wl

Showing 2 changed files with 8 additions and 6 deletions   Show diff stats
invesalius/constants.py
  Diff comments   View file @a13ab1b
@@ -165,7 +165,7 @@ REDUCE_IMAGEDATA_QUALITY = 1 @@ -165,7 +165,7 @@ REDUCE_IMAGEDATA_QUALITY = 1
165 165
166 166
167 # if 1, use vtkVolumeRaycastMapper, if 0, use vtkFixedPointVolumeRayCastMapper 167 # if 1, use vtkVolumeRaycastMapper, if 0, use vtkFixedPointVolumeRayCastMapper
168 -TYPE_RAYCASTING_MAPPER = 1 168 +TYPE_RAYCASTING_MAPPER = 0
169 169
170 folder=RAYCASTING_PRESETS_DIRECTORY= os.path.join("..", "presets", "raycasting") 170 folder=RAYCASTING_PRESETS_DIRECTORY= os.path.join("..", "presets", "raycasting")
171 171
@@ -182,6 +182,8 @@ RAYCASTING_TYPES.sort() @@ -182,6 +182,8 @@ RAYCASTING_TYPES.sort()
182 RAYCASTING_OFF_LABEL = ' Off' 182 RAYCASTING_OFF_LABEL = ' Off'
183 RAYCASTING_TOOLS = ["Cut plane"] 183 RAYCASTING_TOOLS = ["Cut plane"]
184 184
  185 +# If 0 dont't blur, 1 blur
  186 +RAYCASTING_WWWL_BLUR = 0
185 187
186 188
187 #### 189 ####
invesalius/data/viewer_volume.py
  Diff comments   View file @a13ab1b
@@ -179,13 +179,16 @@ class Viewer(wx.Panel): @@ -179,13 +179,16 @@ class Viewer(wx.Panel):
179 self.interactor.Render() 179 self.interactor.Render()
180 180
181 def OnWindowLevelClick(self, obj, evt): 181 def OnWindowLevelClick(self, obj, evt):
  182 + if const.RAYCASTING_WWWL_BLUR:
  183 + self.style.StartZoom()
182 self.onclick = True 184 self.onclick = True
183 mouse_x, mouse_y = self.interactor.GetEventPosition() 185 mouse_x, mouse_y = self.interactor.GetEventPosition()
184 self.last_x, self.last_y = mouse_x, mouse_y 186 self.last_x, self.last_y = mouse_x, mouse_y
185 187
186 def OnWindowLevelRelease(self, obj, evt): 188 def OnWindowLevelRelease(self, obj, evt):
187 self.onclick = False 189 self.onclick = False
188 - 190 + if const.RAYCASTING_WWWL_BLUR:
  191 + self.style.EndZoom()
189 192
190 def ShowOrientationCube(self): 193 def ShowOrientationCube(self):
191 print "ORIENTATION CUBE!" 194 print "ORIENTATION CUBE!"
@@ -418,11 +421,7 @@ class Viewer(wx.Panel): @@ -418,11 +421,7 @@ class Viewer(wx.Panel):
418 def AppendActor(self, evt_pubsub=None): 421 def AppendActor(self, evt_pubsub=None):
419 self.ren.AddActor(evt_pubsub.data) 422 self.ren.AddActor(evt_pubsub.data)
420 423
421 -  
422 -  
423 -  
424 class SlicePlane: 424 class SlicePlane:
425 -  
426 def __init__(self): 425 def __init__(self):
427 project = prj.Project() 426 project = prj.Project()
428 self.original_orientation = project.original_orientation 427 self.original_orientation = project.original_orientation
@@ -670,3 +669,4 @@ class SlicePlane: @@ -670,3 +669,4 @@ class SlicePlane:
670 else: 669 else:
671 self.plane_z.SetPlaneOrientationToZAxes() 670 self.plane_z.SetPlaneOrientationToZAxes()
672 self.plane_z.SetSliceIndex(number) 671 self.plane_z.SetSliceIndex(number)
  672 +