Download as
Browse Code »

Commit 8956275144a3f047e70863ea2c9ad051a0d5850f

Authored by Thiago Franco de Moraes
1 parent 15441ada
Exists in master and in 3 other branches inv3.0.1, usp-navegador, wxgtk3_b5

Numpad keys used set the visualization type 

0 - Normal
1 - MaxIP
2 - MinIP
3 - MeanIP
4 - MIDA
5 - Contour MaxIP
6 - Contour MIDA

* Not skipping the event when user types these keys, to avoid raising
  vtk events
Showing 1 changed file with 7 additions and 7 deletions   Show diff stats
invesalius/data/viewer_slice.py
  Diff comments   View file @8956275
@@ -1133,6 +1133,7 @@ class Viewer(wx.Panel): @@ -1133,6 +1133,7 @@ class Viewer(wx.Panel):
1133 1133
1134 def OnKeyDown(self, evt=None, obj=None): 1134 def OnKeyDown(self, evt=None, obj=None):
1135 pos = self.scroll.GetThumbPosition() 1135 pos = self.scroll.GetThumbPosition()
  1136 + skip = True
1136 1137
1137 min = 0 1138 min = 0
1138 max = self.slice_.GetMaxSliceNumber(self.orientation) 1139 max = self.slice_.GetMaxSliceNumber(self.orientation)
@@ -1141,11 +1142,9 @@ class Viewer(wx.Panel): @@ -1141,11 +1142,9 @@ class Viewer(wx.Panel):
1141 wx.WXK_NUMPAD1 : const.PROJECTION_MaxIP, 1142 wx.WXK_NUMPAD1 : const.PROJECTION_MaxIP,
1142 wx.WXK_NUMPAD2 : const.PROJECTION_MinIP, 1143 wx.WXK_NUMPAD2 : const.PROJECTION_MinIP,
1143 wx.WXK_NUMPAD3 : const.PROJECTION_MeanIP, 1144 wx.WXK_NUMPAD3 : const.PROJECTION_MeanIP,
1144 - wx.WXK_NUMPAD4 : const.PROJECTION_LMIP,  
1145 - wx.WXK_NUMPAD5 : const.PROJECTION_MIDA,  
1146 - wx.WXK_NUMPAD6 : const.PROJECTION_CONTOUR_MIP,  
1147 - wx.WXK_NUMPAD7 : const.PROJECTION_CONTOUR_LMIP,  
1148 - wx.WXK_NUMPAD8 : const.PROJECTION_CONTOUR_MIDA,} 1145 + wx.WXK_NUMPAD4 : const.PROJECTION_MIDA,
  1146 + wx.WXK_NUMPAD5 : const.PROJECTION_CONTOUR_MIP,
  1147 + wx.WXK_NUMPAD6 : const.PROJECTION_CONTOUR_MIDA,}
1149 1148
1150 if self._flush_buffer: 1149 if self._flush_buffer:
1151 self.slice_.apply_slice_buffer_to_mask(self.orientation) 1150 self.slice_.apply_slice_buffer_to_mask(self.orientation)
@@ -1173,12 +1172,13 @@ class Viewer(wx.Panel): @@ -1173,12 +1172,13 @@ class Viewer(wx.Panel):
1173 print "PROJECTION MANOLO!" 1172 print "PROJECTION MANOLO!"
1174 self.slice_.SetTypeProjection(projections[evt.GetKeyCode()]) 1173 self.slice_.SetTypeProjection(projections[evt.GetKeyCode()])
1175 Publisher.sendMessage('Set projection type', projections[evt.GetKeyCode()]) 1174 Publisher.sendMessage('Set projection type', projections[evt.GetKeyCode()])
1176 - self.ReloadActualSlice() 1175 + Publisher.sendMessage('Reload actual slice')
  1176 + skip = False
1177 1177
1178 self.UpdateSlice3D(pos) 1178 self.UpdateSlice3D(pos)
1179 self.interactor.Render() 1179 self.interactor.Render()
1180 1180
1181 - if evt: 1181 + if evt and skip:
1182 evt.Skip() 1182 evt.Skip()
1183 1183
1184 def OnScrollForward(self, evt=None, obj=None): 1184 def OnScrollForward(self, evt=None, obj=None):