Commit 6e3bbfcd4f34fcb63943e09bd57898286dede6b9

Authored by Paulo Henrique Junqueira Amorim
1 parent 6a2fe195

ENH: Changed name of strings (color to colour)

invesalius/constants.py
@@ -31,23 +31,23 @@ SAGITAL_SLICE_CAM_VIEW_UP = {"AXIAL":(-1, 0, 0), "CORONAL":(0, 1, 0), "SAGITAL" @@ -31,23 +31,23 @@ SAGITAL_SLICE_CAM_VIEW_UP = {"AXIAL":(-1, 0, 0), "CORONAL":(0, 1, 0), "SAGITAL"
31 CORONAL_SLICE_CAM_POSITION = {"AXIAL":(0, -1, 0), "CORONAL":(0, 0, 1), "SAGITAL":(1, 0, 0)} 31 CORONAL_SLICE_CAM_POSITION = {"AXIAL":(0, -1, 0), "CORONAL":(0, 0, 1), "SAGITAL":(1, 0, 0)}
32 CORONAL_SLICE_CAM_VIEW_UP = {"AXIAL":(0, 0, -1), "CORONAL":(0, 1, 0), "SAGITAL":(0, 1, 0)} 32 CORONAL_SLICE_CAM_VIEW_UP = {"AXIAL":(0, 0, -1), "CORONAL":(0, 1, 0), "SAGITAL":(0, 1, 0)}
33 33
34 -SLICE_POSITION = {AXIAL:[AXIAL_SLICE_CAM_VIEW_UP, AXIAL_SLICE_CAM_POSITION],  
35 - SAGITAL:[SAGITAL_SLICE_CAM_VIEW_UP, SAGITAL_SLICE_CAM_POSITION], 34 +SLICE_POSITION = {AXIAL:[AXIAL_SLICE_CAM_VIEW_UP, AXIAL_SLICE_CAM_POSITION],
  35 + SAGITAL:[SAGITAL_SLICE_CAM_VIEW_UP, SAGITAL_SLICE_CAM_POSITION],
36 CORONAL:[CORONAL_SLICE_CAM_VIEW_UP, CORONAL_SLICE_CAM_POSITION]} 36 CORONAL:[CORONAL_SLICE_CAM_VIEW_UP, CORONAL_SLICE_CAM_POSITION]}
37 37
38 #Color Table from Slice 38 #Color Table from Slice
39 #NumberOfColors, SaturationRange, HueRange, ValueRange 39 #NumberOfColors, SaturationRange, HueRange, ValueRange
40 -SLICE_COLOR_TABLE = {"Default (Gray)":(None,(0,0),(0,0),(0,1)), 40 +SLICE_COLOR_TABLE = {"Default ":(None,(0,0),(0,0),(0,1)),
41 "Hue":(None,(1,1),(0,1),(1,1)), 41 "Hue":(None,(1,1),(0,1),(1,1)),
42 - "Saturation":(None,(0,1),(0.6,0.6),(1,1)), 42 + "Saturation":(None,(0,1),(0.6,0.6),(1,1)),
43 "Desert":(256, (1,1), (0, 0.1), (1,1)), 43 "Desert":(256, (1,1), (0, 0.1), (1,1)),
44 - "Rainbow":(256,(1,1),(0,0.8),(1,1)), 44 + "Rainbow":(256,(1,1),(0,0.8),(1,1)),
45 "Ocen":(256,(1,1),(0.667, 0.5),(1,1)), 45 "Ocen":(256,(1,1),(0.667, 0.5),(1,1)),
46 "Inverse Gray":(256, (0, 0), (0, 0), (1,0)), 46 "Inverse Gray":(256, (0, 0), (0, 0), (1,0)),
47 - } 47 + }
48 48
49 # Volume view angle 49 # Volume view angle
50 -VOL_FRONT = wx.NewId() 50 +VOL_FRONT = wx.NewId()
51 VOL_BACK = wx.NewId() 51 VOL_BACK = wx.NewId()
52 VOL_RIGHT = wx.NewId() 52 VOL_RIGHT = wx.NewId()
53 VOL_LEFT = wx.NewId() 53 VOL_LEFT = wx.NewId()
@@ -159,7 +159,7 @@ WINDOW_LEVEL = {"Abdomen":(350,50), @@ -159,7 +159,7 @@ WINDOW_LEVEL = {"Abdomen":(350,50),
159 "Sinus":(4000, 400), 159 "Sinus":(4000, 400),
160 "Vasculature - Hard":(240,80), 160 "Vasculature - Hard":(240,80),
161 "Vasculature - Soft":(650,160)} 161 "Vasculature - Soft":(650,160)}
162 - 162 +
163 REDUCE_IMAGEDATA_QUALITY = 1 163 REDUCE_IMAGEDATA_QUALITY = 1
164 164
165 # if 1, use vtkVolumeRaycastMapper, if 0, use vtkFixedPointVolumeRayCastMapper 165 # if 1, use vtkVolumeRaycastMapper, if 0, use vtkFixedPointVolumeRayCastMapper
@@ -167,9 +167,9 @@ TYPE_RAYCASTING_MAPPER = 0 @@ -167,9 +167,9 @@ TYPE_RAYCASTING_MAPPER = 0
167 167
168 folder=RAYCASTING_PRESETS_DIRECTORY= os.path.join("..", "presets", "raycasting") 168 folder=RAYCASTING_PRESETS_DIRECTORY= os.path.join("..", "presets", "raycasting")
169 169
170 -RAYCASTING_TYPES = [filename.split(".")[0] for filename in 170 +RAYCASTING_TYPES = [filename.split(".")[0] for filename in
171 os.listdir(folder) if 171 os.listdir(folder) if
172 - os.path.isfile(os.path.join(folder,filename))] 172 + os.path.isfile(os.path.join(folder,filename))]
173 RAYCASTING_TYPES.append(' Off') 173 RAYCASTING_TYPES.append(' Off')
174 RAYCASTING_TYPES.sort() 174 RAYCASTING_TYPES.sort()
175 RAYCASTING_OFF_LABEL = ' Off' 175 RAYCASTING_OFF_LABEL = ' Off'
@@ -225,5 +225,5 @@ IMAGE_TILING = {"1 x 1":(1,1), "1 x 2":(1,2), @@ -225,5 +225,5 @@ IMAGE_TILING = {"1 x 1":(1,1), "1 x 2":(1,2),
225 "4 x 1":(4,1), "4 x 2":(4,2), 225 "4 x 1":(4,1), "4 x 2":(4,2),
226 "4 x 3":(4,3), "4 x 4":(4,4), 226 "4 x 3":(4,3), "4 x 4":(4,4),
227 "4 x 5":(4,5), "5 x 4":(5,4)} 227 "4 x 5":(4,5), "5 x 4":(5,4)}
228 -  
229 - 228 +
  229 +
invesalius/gui/widgets/slice_menu.py
@@ -29,9 +29,9 @@ class SliceMenu(wx.Menu): @@ -29,9 +29,9 @@ class SliceMenu(wx.Menu):
29 def __init__(self): 29 def __init__(self):
30 wx.Menu.__init__(self) 30 wx.Menu.__init__(self)
31 self.ID_TO_TOOL_ITEM = {} 31 self.ID_TO_TOOL_ITEM = {}
32 - 32 +
33 #------------ Sub menu of the window and level ---------- 33 #------------ Sub menu of the window and level ----------
34 - submenu_wl = wx.Menu() 34 + submenu_wl = wx.Menu()
35 new_id = wx.NewId() 35 new_id = wx.NewId()
36 wl_item = wx.MenuItem(submenu_wl, new_id,\ 36 wl_item = wx.MenuItem(submenu_wl, new_id,\
37 'Default', kind=wx.ITEM_RADIO) 37 'Default', kind=wx.ITEM_RADIO)
@@ -46,20 +46,20 @@ class SliceMenu(wx.Menu): @@ -46,20 +46,20 @@ class SliceMenu(wx.Menu):
46 self.ID_TO_TOOL_ITEM[new_id] = name 46 self.ID_TO_TOOL_ITEM[new_id] = name
47 47
48 #------------ Sub menu of the pseudo colors ------------- 48 #------------ Sub menu of the pseudo colors -------------
49 - submenu_pseudo_colors = wx.Menu() 49 + submenu_pseudo_colours = wx.Menu()
50 new_id = wx.NewId() 50 new_id = wx.NewId()
51 - color_item = wx.MenuItem(submenu_pseudo_colors, new_id,\  
52 - 'Default (Gray)', kind=wx.ITEM_RADIO)  
53 - submenu_pseudo_colors.AppendItem(color_item)  
54 - self.ID_TO_TOOL_ITEM[new_id] = 'Default (Gray)' 51 + color_item = wx.MenuItem(submenu_pseudo_colours, new_id,\
  52 + 'Default ', kind=wx.ITEM_RADIO)
  53 + submenu_pseudo_colours.AppendItem(color_item)
  54 + self.ID_TO_TOOL_ITEM[new_id] = 'Default '
55 for name in sorted(const.SLICE_COLOR_TABLE): 55 for name in sorted(const.SLICE_COLOR_TABLE):
56 - if not(name == 'Default (Gray)'): 56 + if not(name == 'Default '):
57 new_id = wx.NewId() 57 new_id = wx.NewId()
58 color_item = wx.MenuItem(submenu_wl, new_id,\ 58 color_item = wx.MenuItem(submenu_wl, new_id,\
59 name, kind=wx.ITEM_RADIO) 59 name, kind=wx.ITEM_RADIO)
60 - submenu_pseudo_colors.AppendItem(color_item) 60 + submenu_pseudo_colours.AppendItem(color_item)
61 self.ID_TO_TOOL_ITEM[new_id] = name 61 self.ID_TO_TOOL_ITEM[new_id] = name
62 - 62 +
63 #------------ Sub menu of the image tiling --------------- 63 #------------ Sub menu of the image tiling ---------------
64 submenu_image_tiling = wx.Menu() 64 submenu_image_tiling = wx.Menu()
65 for name in sorted(const.IMAGE_TILING): 65 for name in sorted(const.IMAGE_TILING):
@@ -70,23 +70,23 @@ class SliceMenu(wx.Menu): @@ -70,23 +70,23 @@ class SliceMenu(wx.Menu):
70 self.ID_TO_TOOL_ITEM[new_id] = name 70 self.ID_TO_TOOL_ITEM[new_id] = name
71 71
72 # Add sub itens in the menu 72 # Add sub itens in the menu
73 - self.AppendMenu(-1, "Window Width & Level", submenu_wl)  
74 - self.AppendMenu(-1, "Pseudo Colors", submenu_pseudo_colors)  
75 - self.AppendMenu(-1, "Image Tiling", submenu_image_tiling)  
76 - 73 + self.AppendMenu(-1, "Window Width and Level", submenu_wl)
  74 + self.AppendMenu(-1, "Pseudo Colour", submenu_pseudo_colours)
  75 + self.AppendMenu(-1, "Image Tiling", submenu_image_tiling)
  76 +
77 # It doesn't work in Linux 77 # It doesn't work in Linux
78 self.Bind(wx.EVT_MENU, self.OnPopup) 78 self.Bind(wx.EVT_MENU, self.OnPopup)
79 # In Linux the bind must be putted in the submenu 79 # In Linux the bind must be putted in the submenu
80 if sys.platform == 'linux2': 80 if sys.platform == 'linux2':
81 submenu_wl.Bind(wx.EVT_MENU, self.OnPopup) 81 submenu_wl.Bind(wx.EVT_MENU, self.OnPopup)
82 - submenu_pseudo_colors.Bind(wx.EVT_MENU, self.OnPopup) 82 + submenu_pseudo_colours.Bind(wx.EVT_MENU, self.OnPopup)
83 submenu_image_tiling.Bind(wx.EVT_MENU, self.OnPopup) 83 submenu_image_tiling.Bind(wx.EVT_MENU, self.OnPopup)
84 - 84 +
85 def OnPopup(self, evt): 85 def OnPopup(self, evt):
86 - 86 +
87 id = evt.GetId() 87 id = evt.GetId()
88 key = self.ID_TO_TOOL_ITEM[evt.GetId()] 88 key = self.ID_TO_TOOL_ITEM[evt.GetId()]
89 - 89 +
90 if(key in const.WINDOW_LEVEL.keys()): 90 if(key in const.WINDOW_LEVEL.keys()):
91 window, level = const.WINDOW_LEVEL[key] 91 window, level = const.WINDOW_LEVEL[key]
92 ps.Publisher().sendMessage('Bright and contrast adjustment image', 92 ps.Publisher().sendMessage('Bright and contrast adjustment image',
@@ -96,16 +96,16 @@ class SliceMenu(wx.Menu): @@ -96,16 +96,16 @@ class SliceMenu(wx.Menu):
96 ps.Publisher().sendMessage('Update window and level text',\ 96 ps.Publisher().sendMessage('Update window and level text',\
97 "WL: %d WW: %d"%(level, window)) 97 "WL: %d WW: %d"%(level, window))
98 ps.Publisher().sendMessage('Update slice viewer') 98 ps.Publisher().sendMessage('Update slice viewer')
99 - 99 +
100 elif(key in const.SLICE_COLOR_TABLE.keys()): 100 elif(key in const.SLICE_COLOR_TABLE.keys()):
101 values = const.SLICE_COLOR_TABLE[key] 101 values = const.SLICE_COLOR_TABLE[key]
102 ps.Publisher().sendMessage('Change color table from background image', values) 102 ps.Publisher().sendMessage('Change color table from background image', values)
103 ps.Publisher().sendMessage('Update slice viewer') 103 ps.Publisher().sendMessage('Update slice viewer')
104 - 104 +
105 elif(key in const.IMAGE_TILING.keys()): 105 elif(key in const.IMAGE_TILING.keys()):
106 values = const.IMAGE_TILING[key] 106 values = const.IMAGE_TILING[key]
107 ps.Publisher().sendMessage('Set slice viewer layout', values) 107 ps.Publisher().sendMessage('Set slice viewer layout', values)
108 ps.Publisher().sendMessage('Update slice viewer') 108 ps.Publisher().sendMessage('Update slice viewer')
109 - 109 +
110 evt.Skip() 110 evt.Skip()
111 111