Download as
Browse Code »

Commit dd3709f64348d3080ea17d81c320ff232bbc8f43

Authored by tatiana
1 parent b0904169
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

FIX: Brush square in coronal and sagittal

Showing 2 changed files with 7 additions and 4 deletions   Show diff stats
invesalius/control.py
  Diff comments   View file @dd3709f
@@ -7,7 +7,7 @@ import data.imagedata_utils as utils @@ -7,7 +7,7 @@ import data.imagedata_utils as utils
7 import data.surface as surface 7 import data.surface as surface
8 import data.volume as volume 8 import data.volume as volume
9 import reader.dicom_reader as dicom 9 import reader.dicom_reader as dicom
10 -#import reader.analyze_reader as analyze 10 +import reader.analyze_reader as analyze
11 11
12 DEFAULT_THRESH_MODE = 0 12 DEFAULT_THRESH_MODE = 0
13 13
invesalius/data/viewer_slice.py
  Diff comments   View file @dd3709f
@@ -46,7 +46,9 @@ class Viewer(wx.Panel): @@ -46,7 +46,9 @@ class Viewer(wx.Panel):
46 self.slice_number = 0 46 self.slice_number = 0
47 47
48 self._brush_cursor_op = 'Draw' 48 self._brush_cursor_op = 'Draw'
49 - self.brush_cursor_size = 30 49 + self._brush_cursor_size = 30
  50 + self._brush_cursor_colour = [0,0,1]
  51 + self._brush_cursor_type = 'circle'
50 self.cursor = None 52 self.cursor = None
51 # VTK pipeline and actors 53 # VTK pipeline and actors
52 self.__config_interactor() 54 self.__config_interactor()
@@ -123,7 +125,7 @@ class Viewer(wx.Panel): @@ -123,7 +125,7 @@ class Viewer(wx.Panel):
123 125
124 def ChangeBrushSize(self, pubsub_evt): 126 def ChangeBrushSize(self, pubsub_evt):
125 size = pubsub_evt.data 127 size = pubsub_evt.data
126 - self.brush_cursor_size = size 128 + self._brush_cursor_size = size
127 self.cursor.SetSize(size) 129 self.cursor.SetSize(size)
128 self.ren.Render() 130 self.ren.Render()
129 self.interactor.Render() 131 self.interactor.Render()
@@ -139,6 +141,7 @@ class Viewer(wx.Panel): @@ -139,6 +141,7 @@ class Viewer(wx.Panel):
139 141
140 def ChangeBrushActor(self, pubsub_evt): 142 def ChangeBrushActor(self, pubsub_evt):
141 brush_type = pubsub_evt.data 143 brush_type = pubsub_evt.data
  144 + self._brush_cursor_type = brush_type
142 self.ren.RemoveActor(self.cursor.actor) 145 self.ren.RemoveActor(self.cursor.actor)
143 146
144 if brush_type == 'square': 147 if brush_type == 'square':
@@ -154,7 +157,7 @@ class Viewer(wx.Panel): @@ -154,7 +157,7 @@ class Viewer(wx.Panel):
154 cursor.SetPosition(coordinates[self.orientation]) 157 cursor.SetPosition(coordinates[self.orientation])
155 cursor.SetSpacing(self.imagedata.GetSpacing()) 158 cursor.SetSpacing(self.imagedata.GetSpacing())
156 cursor.SetColour(self._brush_cursor_colour) 159 cursor.SetColour(self._brush_cursor_colour)
157 - cursor.SetSize(self.brush_cursor_size) 160 + cursor.SetSize(self._brush_cursor_size)
158 self.ren.AddActor(cursor.actor) 161 self.ren.AddActor(cursor.actor)
159 self.ren.Render() 162 self.ren.Render()
160 self.interactor.Render() 163 self.interactor.Render()