Commit 9c04ee14fcd3d6739259509eddbede00f5275c83
1 parent
b5e06cb4
Exists in
master
and in
68 other branches
ENH: Double click to restore image size
Showing
1 changed file
with
13 additions
and
12 deletions
Show diff stats
invesalius/data/viewer_slice.py
| @@ -158,11 +158,8 @@ class Viewer(wx.Panel): | @@ -158,11 +158,8 @@ class Viewer(wx.Panel): | ||
| 158 | "MouseMoveEvent": self.OnZoomMove, | 158 | "MouseMoveEvent": self.OnZoomMove, |
| 159 | "LeftButtonPressEvent": self.OnZoomClick, | 159 | "LeftButtonPressEvent": self.OnZoomClick, |
| 160 | "LeftButtonReleaseEvent": self.OnReleaseModes, | 160 | "LeftButtonReleaseEvent": self.OnReleaseModes, |
| 161 | - "RightButtonReleaseEvent":self.OnUnZoom | 161 | + #"RightButtonReleaseEvent":self.OnUnZoom |
| 162 | }, | 162 | }, |
| 163 | - 'ZOOMSELECT':{ | ||
| 164 | - "RightButtonReleaseEvent":self.OnUnZoom | ||
| 165 | - }, | ||
| 166 | 'CHANGESLICE':{ | 163 | 'CHANGESLICE':{ |
| 167 | "MouseMoveEvent": self.OnChangeSliceMove, | 164 | "MouseMoveEvent": self.OnChangeSliceMove, |
| 168 | "LeftButtonPressEvent": self.OnChangeSliceClick, | 165 | "LeftButtonPressEvent": self.OnChangeSliceClick, |
| @@ -181,13 +178,17 @@ class Viewer(wx.Panel): | @@ -181,13 +178,17 @@ class Viewer(wx.Panel): | ||
| 181 | else: | 178 | else: |
| 182 | style = vtk.vtkInteractorStyleImage() | 179 | style = vtk.vtkInteractorStyleImage() |
| 183 | 180 | ||
| 184 | - # Check all modes set by user | ||
| 185 | - for mode in self.modes: | ||
| 186 | - # Check each event available for each mode | ||
| 187 | - for event in action[mode]: | ||
| 188 | - # Bind event | ||
| 189 | - style.AddObserver(event, | ||
| 190 | - action[mode][event]) | 181 | + # Check all modes set by user |
| 182 | + for mode in self.modes: | ||
| 183 | + # Check each event available for each mode | ||
| 184 | + for event in action[mode]: | ||
| 185 | + # Bind event | ||
| 186 | + style.AddObserver(event, | ||
| 187 | + action[mode][event]) | ||
| 188 | + | ||
| 189 | + if ((mode == "ZOOM") or (mode == "ZOOMSELECT")): | ||
| 190 | + self.interactor.Bind(wx.EVT_LEFT_DCLICK, self.OnUnZoom) | ||
| 191 | + | ||
| 191 | self.style = style | 192 | self.style = style |
| 192 | self.interactor.SetInteractorStyle(style) | 193 | self.interactor.SetInteractorStyle(style) |
| 193 | 194 | ||
| @@ -310,7 +311,7 @@ class Viewer(wx.Panel): | @@ -310,7 +311,7 @@ class Viewer(wx.Panel): | ||
| 310 | self.mouse_pressed = 1 | 311 | self.mouse_pressed = 1 |
| 311 | evt.StartDolly() | 312 | evt.StartDolly() |
| 312 | 313 | ||
| 313 | - def OnUnZoom(self, evt, obj): | 314 | + def OnUnZoom(self, evt, obj = None): |
| 314 | mouse_x, mouse_y = self.interactor.GetLastEventPosition() | 315 | mouse_x, mouse_y = self.interactor.GetLastEventPosition() |
| 315 | ren = self.interactor.FindPokedRenderer(mouse_x, mouse_y) | 316 | ren = self.interactor.FindPokedRenderer(mouse_x, mouse_y) |
| 316 | slice_data = self.get_slice_data(ren) | 317 | slice_data = self.get_slice_data(ren) |