Download as
Browse Code »

Commit 2a1576075872c5c9a3c1d541650bb7a3bc5eb127

Authored by tfmoraes
1 parent ef60a61b
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: Changing the cursor to all slice_data

Showing 2 changed files with 28 additions and 20 deletions   Show diff stats
invesalius/data/cursor_actors.py
  Diff comments   View file @2a15760
... ... @@ -288,6 +288,12 @@ class CursorRectangle:
288 288 def SetSpacing(self, spacing):
289 289 self.spacing = spacing
290 290  
  291 + def Show(self, value=1):
  292 + if value:
  293 + self.actor.VisibilityOn()
  294 + else:
  295 + self.actor.VisibilityOff()
  296 +
291 297 def __build_actor(self):
292 298 """
293 299 Function to plot the Retangle
... ...
invesalius/data/viewer_slice.py
  Diff comments   View file @2a15760
... ... @@ -156,27 +156,29 @@ class Viewer(wx.Panel):
156 156  
157 157 def ChangeBrushActor(self, pubsub_evt):
158 158 brush_type = pubsub_evt.data
159   - self._brush_cursor_type = brush_type
160   - self.ren.RemoveActor(self.cursor.actor)
161   -
162   - if brush_type == const.BRUSH_SQUARE:
163   - cursor = ca.CursorRectangle()
164   - elif brush_type == const.BRUSH_CIRCLE:
165   - cursor = ca.CursorCircle()
166   - self.cursor = cursor
167   -
168   - cursor.SetOrientation(self.orientation)
169   - coordinates = {"SAGITAL": [self.slice_number, 0, 0],
170   - "CORONAL": [0, self.slice_number, 0],
171   - "AXIAL": [0, 0, self.slice_number]}
172   - cursor.SetPosition(coordinates[self.orientation])
173   - cursor.SetSpacing(self.imagedata.GetSpacing())
174   - cursor.SetColour(self._brush_cursor_colour)
175   - cursor.SetSize(self._brush_cursor_size)
176   - self.ren.AddActor(cursor.actor)
177   - self.ren.Render()
  159 + for slice_data in self.slice_data_list:
  160 + self._brush_cursor_type = brush_type
  161 + #self.ren.RemoveActor(self.cursor.actor)
  162 +
  163 + if brush_type == const.BRUSH_SQUARE:
  164 + cursor = ca.CursorRectangle()
  165 + elif brush_type == const.BRUSH_CIRCLE:
  166 + cursor = ca.CursorCircle()
  167 + #self.cursor = cursor
  168 +
  169 + cursor.SetOrientation(self.orientation)
  170 + coordinates = {"SAGITAL": [self.slice_number, 0, 0],
  171 + "CORONAL": [0, self.slice_number, 0],
  172 + "AXIAL": [0, 0, self.slice_number]}
  173 + cursor.SetPosition(coordinates[self.orientation])
  174 + cursor.SetSpacing(self.imagedata.GetSpacing())
  175 + cursor.SetColour(self._brush_cursor_colour)
  176 + cursor.SetSize(self._brush_cursor_size)
  177 + slice_data.SetCursor(cursor)
  178 + #self.ren.AddActor(cursor.actor)
  179 + #self.ren.Render()
178 180 self.interactor.Render()
179   - self.cursor = cursor
  181 + #self.cursor = cursor
180 182  
181 183 def OnMouseClick(self, obj, evt_vtk):
182 184 self.mouse_pressed = 1
... ...