Download as
Browse Code »

Commit d30ecf1a692568b6d8ebccc2a0199b41cb8cbf7d

Authored by Thiago Franco de Moraes
1 parent 5ef973b1
Exists in master and in 38 other branches canvas_reeng, canvas_text, casmoothing_cython, command-line, debian_cython, ff_mask, ff_mask_improv, ffill_gui, ffill_segmentation, fill_holes_auto, fixes_pre_beta5, get_pixel, import_mesh, inv3.0.1, mactoolbar, mactoolbar_bkp, manual_v3.1, measure_canvas, measure_improvements, measure_placement_test, phoenix, region_growing_confidence, 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, user_guide_en, usp-navegador, vti, vtk6, workdir, xmartlabs-command-line

Added shift-scroll to all image slice styles

Showing 1 changed file with 25 additions and 20 deletions   Show diff stats
invesalius/data/styles.py
  Diff comments   View file @d30ecf1
... ... @@ -129,10 +129,33 @@ class DefaultInteractorStyle(BaseImageInteractorStyle):
129 129 evt.StartDolly()
130 130  
131 131 def OnScrollForward(self, evt, obj):
132   - self.viewer.OnScrollForward()
  132 + iren = self.viewer.interactor
  133 + viewer = self.viewer
  134 + if iren.GetShiftKey():
  135 + opacity = viewer.slice_.opacity + 0.1
  136 + if opacity <= 1:
  137 + viewer.slice_.opacity = opacity
  138 + self.viewer.slice_.buffer_slices['AXIAL'].discard_vtk_mask()
  139 + self.viewer.slice_.buffer_slices['CORONAL'].discard_vtk_mask()
  140 + self.viewer.slice_.buffer_slices['SAGITAL'].discard_vtk_mask()
  141 + Publisher.sendMessage('Reload actual slice')
  142 + else:
  143 + self.viewer.OnScrollForward()
133 144  
134 145 def OnScrollBackward(self, evt, obj):
135   - self.viewer.OnScrollBackward()
  146 + iren = self.viewer.interactor
  147 + viewer = self.viewer
  148 +
  149 + if iren.GetShiftKey():
  150 + opacity = viewer.slice_.opacity - 0.1
  151 + if opacity >= 0.1:
  152 + viewer.slice_.opacity = opacity
  153 + self.viewer.slice_.buffer_slices['AXIAL'].discard_vtk_mask()
  154 + self.viewer.slice_.buffer_slices['CORONAL'].discard_vtk_mask()
  155 + self.viewer.slice_.buffer_slices['SAGITAL'].discard_vtk_mask()
  156 + Publisher.sendMessage('Reload actual slice')
  157 + else:
  158 + self.viewer.OnScrollBackward()
136 159  
137 160  
138 161 class CrossInteractorStyle(DefaultInteractorStyle):
... ... @@ -711,15 +734,6 @@ class EditorInteractorStyle(DefaultInteractorStyle):
711 734 Publisher.sendMessage('Set edition brush size', size)
712 735 cursor.SetPosition(cursor.position)
713 736 self.viewer.interactor.Render()
714   -
715   - elif iren.GetShiftKey():
716   - opacity = viewer.slice_.opacity + 0.1
717   - if opacity <= 1:
718   - viewer.slice_.opacity = opacity
719   - self.viewer.slice_.buffer_slices['AXIAL'].discard_vtk_mask()
720   - self.viewer.slice_.buffer_slices['CORONAL'].discard_vtk_mask()
721   - self.viewer.slice_.buffer_slices['SAGITAL'].discard_vtk_mask()
722   - Publisher.sendMessage('Reload actual slice')
723 737 else:
724 738 self.OnScrollForward(obj, evt)
725 739  
... ... @@ -738,15 +752,6 @@ class EditorInteractorStyle(DefaultInteractorStyle):
738 752 Publisher.sendMessage('Set edition brush size', size)
739 753 cursor.SetPosition(cursor.position)
740 754 self.viewer.interactor.Render()
741   -
742   - elif iren.GetShiftKey():
743   - opacity = viewer.slice_.opacity - 0.1
744   - if opacity >= 0.1:
745   - viewer.slice_.opacity = opacity
746   - self.viewer.slice_.buffer_slices['AXIAL'].discard_vtk_mask()
747   - self.viewer.slice_.buffer_slices['CORONAL'].discard_vtk_mask()
748   - self.viewer.slice_.buffer_slices['SAGITAL'].discard_vtk_mask()
749   - Publisher.sendMessage('Reload actual slice')
750 755 else:
751 756 self.OnScrollBackward(obj, evt)
752 757  
... ...