Download as
Browse Code »

Commit 34c37117a547c9615a125f878d472a360843f77b

Authored by tatiana
1 parent 9cec3f0b
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: Reverted spin event on volume viewer and improved #53

Showing 2 changed files with 15 additions and 43 deletions   Show diff stats
invesalius/data/viewer_volume.py
  Diff comments   View file @34c3711
@@ -103,8 +103,6 @@ class Viewer(wx.Panel): @@ -103,8 +103,6 @@ class Viewer(wx.Panel):
103 ps.Publisher().subscribe(self.OnSetViewAngle, 103 ps.Publisher().subscribe(self.OnSetViewAngle,
104 'Set volume view angle') 104 'Set volume view angle')
105 105
106 - ps.Publisher().subscribe(self.SetNewMode,  
107 - ('Set interaction mode', const.MODE_WW_WL))  
108 ps.Publisher().subscribe(self.OnDisableBrightContrast, 106 ps.Publisher().subscribe(self.OnDisableBrightContrast,
109 ('Set interaction mode', 107 ('Set interaction mode',
110 const.MODE_SLICE_EDITOR)) 108 const.MODE_SLICE_EDITOR))
@@ -151,14 +149,11 @@ class Viewer(wx.Panel): @@ -151,14 +149,11 @@ class Viewer(wx.Panel):
151 "LeftButtonPressEvent": self.OnZoomClick, 149 "LeftButtonPressEvent": self.OnZoomClick,
152 "LeftButtonReleaseEvent": self.OnReleaseZoomClick, 150 "LeftButtonReleaseEvent": self.OnReleaseZoomClick,
153 }, 151 },
154 - #const.STATE_SPIN:  
155 - # {  
156 - # "MouseMoveEvent": self.OnSpinMove,  
157 - # "LeftButtonPressEvent": self.OnSpinClick,  
158 - # "LeftButtonReleaseEvent": self.OnReleaseSpinClick,  
159 - # },  
160 const.STATE_SPIN: 152 const.STATE_SPIN:
161 { 153 {
  154 + "MouseMoveEvent": self.OnSpinMove,
  155 + "LeftButtonPressEvent": self.OnSpinClick,
  156 + "LeftButtonReleaseEvent": self.OnReleaseSpinClick,
162 }, 157 },
163 const.STATE_WL: 158 const.STATE_WL:
164 { 159 {
@@ -166,7 +161,7 @@ class Viewer(wx.Panel): @@ -166,7 +161,7 @@ class Viewer(wx.Panel):
166 "LeftButtonPressEvent": self.OnWindowLevelClick, 161 "LeftButtonPressEvent": self.OnWindowLevelClick,
167 "LeftButtonReleaseEvent":self.OnWindowLevelRelease 162 "LeftButtonReleaseEvent":self.OnWindowLevelRelease
168 }, 163 },
169 - const.STATE_DEFAULT: 164 + const.STATE_DEFAULT:
170 { 165 {
171 } 166 }
172 } 167 }
@@ -186,43 +181,16 @@ class Viewer(wx.Panel): @@ -186,43 +181,16 @@ class Viewer(wx.Panel):
186 self.interactor.SetInteractorStyle(style) 181 self.interactor.SetInteractorStyle(style)
187 self.style = style 182 self.style = style
188 else: 183 else:
  184 + print "ELSE!"
189 style = vtk.vtkInteractorStyleTrackballCamera() 185 style = vtk.vtkInteractorStyleTrackballCamera()
190 self.interactor.SetInteractorStyle(style) 186 self.interactor.SetInteractorStyle(style)
191 self.style = style 187 self.style = style
192 188
193 # Check each event available for each mode 189 # Check each event available for each mode
194 for event in action[state]: 190 for event in action[state]:
  191 + print event
195 # Bind event 192 # Bind event
196 - style.AddObserver(event,action[state][event])  
197 -  
198 - def SetStyle(self, pubsub_evt):  
199 - print "SetStyle"  
200 - mode = pubsub_evt.data  
201 -  
202 - if (mode == const.MODE_ZOOM_SELECTION):  
203 - self.SetMode('ZOOMSELECT')  
204 - elif(mode == const.MODE_MOVE):  
205 - self.SetMode('PAN')  
206 - elif(mode == const.MODE_ZOOM):  
207 - self.SetMode('ZOOM')  
208 - elif(mode == const.MODE_ROTATE):  
209 - self.SetMode('SPIN')  
210 - elif(mode == const.MODE_WW_WL):  
211 - self.SetMode('WINDOWLEVEL')  
212 -  
213 - def SetNewMode(self, pubsub_evt):  
214 - mode = pubsub_evt.topic[1]  
215 -  
216 - if (mode == const.MODE_ZOOM_SELECTION):  
217 - self.SetMode('ZOOMSELECT')  
218 - elif(mode == const.MODE_MOVE):  
219 - self.SetMode('PAN')  
220 - elif(mode == const.MODE_ZOOM):  
221 - self.SetMode('ZOOM')  
222 - elif(mode == const.MODE_ROTATE):  
223 - self.SetMode('SPIN')  
224 - elif(mode == const.MODE_WW_WL):  
225 - self.SetMode('WINDOWLEVEL') 193 + style.AddObserver(event,action[state][event])
226 194
227 def OnSpinMove(self, evt, obj): 195 def OnSpinMove(self, evt, obj):
228 if (self.mouse_pressed): 196 if (self.mouse_pressed):
@@ -292,7 +260,6 @@ class Viewer(wx.Panel): @@ -292,7 +260,6 @@ class Viewer(wx.Panel):
292 new_state = self.interaction_style.AddState(state) 260 new_state = self.interaction_style.AddState(state)
293 self.SetInteractorStyle(new_state) 261 self.SetInteractorStyle(new_state)
294 else: 262 else:
295 - #level = const.STYLE_LEVEL[state]  
296 new_state = self.interaction_style.RemoveState(state) 263 new_state = self.interaction_style.RemoveState(state)
297 self.SetInteractorStyle(new_state) 264 self.SetInteractorStyle(new_state)
298 265
@@ -399,7 +366,12 @@ class Viewer(wx.Panel): @@ -399,7 +366,12 @@ class Viewer(wx.Panel):
399 366
400 self.ren.AddVolume(volume) 367 self.ren.AddVolume(volume)
401 self.text.SetValue("WL: %d WW: %d"%(wl, ww)) 368 self.text.SetValue("WL: %d WW: %d"%(wl, ww))
402 - 369 +
  370 + if self.on_wl:
  371 + self.text.Show()
  372 + else:
  373 + self.text.Hide()
  374 +
403 self.ren.SetBackground(colour) 375 self.ren.SetBackground(colour)
404 376
405 if not (self.view_angle): 377 if not (self.view_angle):
invesalius/version.py
  Diff comments   View file @34c3711
@@ -27,10 +27,10 @@ import re @@ -27,10 +27,10 @@ import re
27 27
28 def get_svn_revision(path=None): 28 def get_svn_revision(path=None):
29 """ 29 """
30 - Returns the SVN revision in the form SVN-XXXX, 30 + Returns the SVN revision in the form pspb-XXXX,
31 where XXXX is the revision number. 31 where XXXX is the revision number.
32 32
33 - Returns SVN-unknown if anything goes wrong, such as an unexpected 33 + Returns pspb-unknown if anything goes wrong, such as an unexpected
34 format of internal SVN files. 34 format of internal SVN files.
35 35
36 If path is provided, it should be a directory whose SVN info you want to 36 If path is provided, it should be a directory whose SVN info you want to