Download as
Browse Code »

Commit 9c04ee14fcd3d6739259509eddbede00f5275c83

Authored by Paulo Henrique Junqueira Amorim
1 parent b5e06cb4
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

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
  Diff comments   View file @9c04ee1
... ... @@ -158,11 +158,8 @@ class Viewer(wx.Panel):
158 158 "MouseMoveEvent": self.OnZoomMove,
159 159 "LeftButtonPressEvent": self.OnZoomClick,
160 160 "LeftButtonReleaseEvent": self.OnReleaseModes,
161   - "RightButtonReleaseEvent":self.OnUnZoom
  161 + #"RightButtonReleaseEvent":self.OnUnZoom
162 162 },
163   - 'ZOOMSELECT':{
164   - "RightButtonReleaseEvent":self.OnUnZoom
165   - },
166 163 'CHANGESLICE':{
167 164 "MouseMoveEvent": self.OnChangeSliceMove,
168 165 "LeftButtonPressEvent": self.OnChangeSliceClick,
... ... @@ -181,13 +178,17 @@ class Viewer(wx.Panel):
181 178 else:
182 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 192 self.style = style
192 193 self.interactor.SetInteractorStyle(style)
193 194  
... ... @@ -310,7 +311,7 @@ class Viewer(wx.Panel):
310 311 self.mouse_pressed = 1
311 312 evt.StartDolly()
312 313  
313   - def OnUnZoom(self, evt, obj):
  314 + def OnUnZoom(self, evt, obj = None):
314 315 mouse_x, mouse_y = self.interactor.GetLastEventPosition()
315 316 ren = self.interactor.FindPokedRenderer(mouse_x, mouse_y)
316 317 slice_data = self.get_slice_data(ren)
... ...