Download as
Browse Code »

Commit 3344ab38c411f78911ab130b463dd9cc2127dcce

Authored by Paulo Henrique Junqueira Amorim
1 parent 7438e3f3
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: Changed Window and Level pop-up menu, item name "Other" to "Manual"

Showing 4 changed files with 7 additions and 6 deletions   Show diff stats
invesalius/constants.py
  Diff comments   View file @3344ab3
@@ -155,13 +155,14 @@ WINDOW_LEVEL = {"Abdomen":(350,50), @@ -155,13 +155,14 @@ WINDOW_LEVEL = {"Abdomen":(350,50),
155 "Lung - Soft":(1600,-600), 155 "Lung - Soft":(1600,-600),
156 "Lung - Hard":(1000,-600), 156 "Lung - Hard":(1000,-600),
157 "Mediastinum":(350,25), 157 "Mediastinum":(350,25),
158 - "Other":(None, None), #Case the user change window and level 158 + "Manual":(None, None), #Case the user change window and level
159 "Pelvis": (450,50), 159 "Pelvis": (450,50),
160 "Sinus":(4000, 400), 160 "Sinus":(4000, 400),
161 "Vasculature - Hard":(240,80), 161 "Vasculature - Hard":(240,80),
162 "Vasculature - Soft":(650,160)} 162 "Vasculature - Soft":(650,160)}
163 163
164 -REDUCE_IMAGEDATA_QUALITY = 1 164 +REDUCE_IMAGEDATA_QUALITY = 1
  165 +
165 166
166 # if 1, use vtkVolumeRaycastMapper, if 0, use vtkFixedPointVolumeRayCastMapper 167 # if 1, use vtkVolumeRaycastMapper, if 0, use vtkFixedPointVolumeRayCastMapper
167 TYPE_RAYCASTING_MAPPER = 0 168 TYPE_RAYCASTING_MAPPER = 0
invesalius/control.py
  Diff comments   View file @3344ab3
@@ -100,7 +100,7 @@ class Controller(): @@ -100,7 +100,7 @@ class Controller():
100 threshold_range = proj.imagedata.GetScalarRange() 100 threshold_range = proj.imagedata.GetScalarRange()
101 101
102 const.WINDOW_LEVEL['Default'] = (window, level) 102 const.WINDOW_LEVEL['Default'] = (window, level)
103 - const.WINDOW_LEVEL['Other'] = (window, level) 103 + const.WINDOW_LEVEL['Manual'] = (window, level)
104 104
105 const.THRESHOLD_OUTVALUE = threshold_range[0] 105 const.THRESHOLD_OUTVALUE = threshold_range[0]
106 const.THRESHOLD_INVALUE = threshold_range[1] 106 const.THRESHOLD_INVALUE = threshold_range[1]
invesalius/data/viewer_slice.py
  Diff comments   View file @3344ab3
@@ -251,7 +251,7 @@ class Viewer(wx.Panel): @@ -251,7 +251,7 @@ class Viewer(wx.Panel):
251 "WL: %d WW: %d"%(self.acum_achange_level,\ 251 "WL: %d WW: %d"%(self.acum_achange_level,\
252 self.acum_achange_window)) 252 self.acum_achange_window))
253 253
254 - const.WINDOW_LEVEL['Other'] = (self.acum_achange_window,\ 254 + const.WINDOW_LEVEL['Manual'] = (self.acum_achange_window,\
255 self.acum_achange_level) 255 self.acum_achange_level)
256 ps.Publisher().sendMessage('Check window and level other') 256 ps.Publisher().sendMessage('Check window and level other')
257 257
invesalius/gui/widgets/slice_menu.py
  Diff comments   View file @3344ab3
@@ -43,12 +43,12 @@ class SliceMenu(wx.Menu): @@ -43,12 +43,12 @@ class SliceMenu(wx.Menu):
43 #Case the user change window and level 43 #Case the user change window and level
44 new_id = self.other_wl_id = wx.NewId() 44 new_id = self.other_wl_id = wx.NewId()
45 wl_item = wx.MenuItem(submenu_wl, new_id,\ 45 wl_item = wx.MenuItem(submenu_wl, new_id,\
46 - 'Other', kind=wx.ITEM_RADIO) 46 + 'Manual', kind=wx.ITEM_RADIO)
47 submenu_wl.AppendItem(wl_item) 47 submenu_wl.AppendItem(wl_item)
48 self.ID_TO_TOOL_ITEM[new_id] = wl_item 48 self.ID_TO_TOOL_ITEM[new_id] = wl_item
49 49
50 for name in sorted(const.WINDOW_LEVEL): 50 for name in sorted(const.WINDOW_LEVEL):
51 - if not(name == 'Default' or name == 'Other'): 51 + if not(name == 'Default' or name == 'Manual'):
52 new_id = wx.NewId() 52 new_id = wx.NewId()
53 wl_item = wx.MenuItem(submenu_wl, new_id,\ 53 wl_item = wx.MenuItem(submenu_wl, new_id,\
54 name, kind=wx.ITEM_RADIO) 54 name, kind=wx.ITEM_RADIO)