Download as
Browse Code »

Commit 491e13292ab7711edfab6bfb2401dbec89a56de2

Authored by tatiana
1 parent ded8a20d
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: Bindings according to mode

Showing 2 changed files with 19 additions and 8 deletions   Show diff stats
invesalius/data/viewer_slice.py
  Diff comments   View file @491e132
... ... @@ -104,12 +104,13 @@ class Viewer(wx.Panel):
104 104 "LeftButtonReleaseEvent": self.OnMouseRelease
105 105 }
106 106 }
107   -
  107 +
108 108 # Bind method according to current mode
109 109 style = self.style
110   - style.AddObserver("MouseMoveEvent", action[mode]["MouseMoveEvent"])
111   - style.AddObserver("LeftButtonPressEvent", action[mode]["LeftButtonPressEvent"])
112   - style.AddObserver("LeftButtonReleaseEvent", action[mode]["LeftButtonReleaseEvent"])
  110 +
  111 + for event in action:
  112 + style.AddObserver(event, action[mode][event])
  113 +
113 114  
114 115 def OnMouseClick(self, obj, evt_vtk):
115 116 self.mouse_pressed = 1
... ...
invesalius/data/viewer_volume.py
  Diff comments   View file @491e132
... ... @@ -57,6 +57,7 @@ class Viewer(wx.Panel):
57 57 self.ren = ren
58 58  
59 59 self.__bind_events()
  60 + self.__bind_events_wx()
60 61  
61 62 def __bind_events(self):
62 63 ps.Publisher().subscribe(self.LoadActor, 'Load surface actor into viewer')
... ... @@ -68,6 +69,19 @@ class Viewer(wx.Panel):
68 69 ps.Publisher().subscribe(self.SetWidgetInteractor, 'Set Widget Interactor')
69 70  
70 71  
  72 + def __bind_events_wx(self):
  73 + self.Bind(wx.EVT_SIZE, self.OnSize)
  74 +
  75 + def OnSize(self, evt):
  76 + print "viewer_volume :: OnSize"
  77 + self.UpdateRender()
  78 + self.Refresh()
  79 + print dir(self.iren)
  80 + self.UpdateRender()
  81 + self.iren.UpdateWindowUI()
  82 + self.iren.Update()
  83 + evt.Skip()
  84 +
71 85 def LoadVolume(self, pubsub_evt):
72 86 volume, colour = pubsub_evt.data
73 87 self.light = self.ren.GetLights().GetNextItem()
... ... @@ -88,10 +102,6 @@ class Viewer(wx.Panel):
88 102 ren = self.ren
89 103 ren.AddActor(actor)
90 104 ren.ResetCamera()
91   - #ren.GetActiveCamera().Elevation(90)
92   - #ren.GetActiveCamera().SetViewUp(0, 0, 1)
93   -
94   - #ren.GetActiveCamera().Dolly(1.5)
95 105 ren.ResetCameraClippingRange()
96 106  
97 107 self.iren.Render()
... ...