Download as
Browse Code »

Commit d30ecf1a692568b6d8ebccc2a0199b41cb8cbf7d

Authored by Thiago Franco de Moraes
1 parent 5ef973b1
Exists in master and in 2 other branches inv3.0.1, usp-navegador

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,10 +129,33 @@ class DefaultInteractorStyle(BaseImageInteractorStyle):
129 evt.StartDolly() 129 evt.StartDolly()
130 130
131 def OnScrollForward(self, evt, obj): 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 def OnScrollBackward(self, evt, obj): 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 class CrossInteractorStyle(DefaultInteractorStyle): 161 class CrossInteractorStyle(DefaultInteractorStyle):
@@ -711,15 +734,6 @@ class EditorInteractorStyle(DefaultInteractorStyle): @@ -711,15 +734,6 @@ class EditorInteractorStyle(DefaultInteractorStyle):
711 Publisher.sendMessage('Set edition brush size', size) 734 Publisher.sendMessage('Set edition brush size', size)
712 cursor.SetPosition(cursor.position) 735 cursor.SetPosition(cursor.position)
713 self.viewer.interactor.Render() 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 else: 737 else:
724 self.OnScrollForward(obj, evt) 738 self.OnScrollForward(obj, evt)
725 739
@@ -738,15 +752,6 @@ class EditorInteractorStyle(DefaultInteractorStyle): @@ -738,15 +752,6 @@ class EditorInteractorStyle(DefaultInteractorStyle):
738 Publisher.sendMessage('Set edition brush size', size) 752 Publisher.sendMessage('Set edition brush size', size)
739 cursor.SetPosition(cursor.position) 753 cursor.SetPosition(cursor.position)
740 self.viewer.interactor.Render() 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 else: 755 else:
751 self.OnScrollBackward(obj, evt) 756 self.OnScrollBackward(obj, evt)
752 757