Download as
Browse Code »

Commit a750b26ad594ec589629b45d345a947a4ec8f397

Authored by tatiana
1 parent e0382a10
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: Translation source-code adjustments

Showing 8 changed files with 129 additions and 93 deletions   Show diff stats
invesalius/constants.py
  Diff comments   View file @a750b26
@@ -43,7 +43,7 @@ TEXT_POS_RIGHT_DOWN = (1-X, 1-Y) # SetVerticalJustificationToBottom & @@ -43,7 +43,7 @@ TEXT_POS_RIGHT_DOWN = (1-X, 1-Y) # SetVerticalJustificationToBottom &
43 # SetJustificationToRight 43 # SetJustificationToRight
44 #------------------------------------------------------------------ 44 #------------------------------------------------------------------
45 TEXT_POS_HCENTRE_DOWN = (0.5, 1-Y) # SetJustificationToCentered 45 TEXT_POS_HCENTRE_DOWN = (0.5, 1-Y) # SetJustificationToCentered
46 - # SetVerticalJustificationToBottom 46 + # ChildrticalJustificationToBottom
47 #------------------------------------------------------------------ 47 #------------------------------------------------------------------
48 TEXT_POS_HCENTRE_UP = (0.5, Y) # SetJustificationToCentered 48 TEXT_POS_HCENTRE_UP = (0.5, Y) # SetJustificationToCentered
49 #------------------------------------------------------------------ 49 #------------------------------------------------------------------
@@ -102,13 +102,13 @@ MODE_ODONTOLOGY = 3 @@ -102,13 +102,13 @@ MODE_ODONTOLOGY = 3
102 102
103 #Color Table from Slice 103 #Color Table from Slice
104 #NumberOfColors, SaturationRange, HueRange, ValueRange 104 #NumberOfColors, SaturationRange, HueRange, ValueRange
105 -SLICE_COLOR_TABLE = {"Default ":(None,(0,0),(0,0),(0,1)),  
106 - "Hue":(None,(1,1),(0,1),(1,1)),  
107 - "Saturation":(None,(0,1),(0.6,0.6),(1,1)),  
108 - "Desert":(256, (1,1), (0, 0.1), (1,1)),  
109 - "Rainbow":(256,(1,1),(0,0.8),(1,1)),  
110 - "Ocen":(256,(1,1),(0.667, 0.5),(1,1)),  
111 - "Inverse Gray":(256, (0, 0), (0, 0), (1,0)), 105 +SLICE_COLOR_TABLE = {_("Default "):(None,(0,0),(0,0),(0,1)),
  106 + _("Hue"):(None,(1,1),(0,1),(1,1)),
  107 + _("Saturation"):(None,(0,1),(0.6,0.6),(1,1)),
  108 + _("Desert"):(256, (1,1), (0, 0.1), (1,1)),
  109 + _("Rainbow"):(256,(1,1),(0,0.8),(1,1)),
  110 + _("Ocen"):(256,(1,1),(0.667, 0.5),(1,1)),
  111 + _("Inverse Gray"):(256, (0, 0), (0, 0), (1,0)),
112 } 112 }
113 113
114 # Volume view angle 114 # Volume view angle
@@ -149,14 +149,14 @@ VOLUME_POSITION = {AXIAL: [AXIAL_VOLUME_CAM_VIEW_UP, AXIAL_VOLUME_CAM_POSITION], @@ -149,14 +149,14 @@ VOLUME_POSITION = {AXIAL: [AXIAL_VOLUME_CAM_VIEW_UP, AXIAL_VOLUME_CAM_POSITION],
149 149
150 # Mask threshold options 150 # Mask threshold options
151 proj = Project() 151 proj = Project()
152 -THRESHOLD_RANGE = proj.threshold_modes["Bone"] 152 +THRESHOLD_RANGE = proj.threshold_modes[_("Bone")]
153 THRESHOLD_PRESETS_INDEX = 0 #Bone 153 THRESHOLD_PRESETS_INDEX = 0 #Bone
154 THRESHOLD_HUE_RANGE = (0, 0.6667) 154 THRESHOLD_HUE_RANGE = (0, 0.6667)
155 THRESHOLD_INVALUE = 5000 155 THRESHOLD_INVALUE = 5000
156 THRESHOLD_OUTVALUE = 0 156 THRESHOLD_OUTVALUE = 0
157 157
158 # Mask properties 158 # Mask properties
159 -MASK_NAME_PATTERN = "Mask %d" 159 +MASK_NAME_PATTERN = _("Mask %d")
160 MASK_OPACITY = 0.40 160 MASK_OPACITY = 0.40
161 #MASK_OPACITY = 0.35 161 #MASK_OPACITY = 0.35
162 MASK_COLOUR = [(0.33, 1, 0.33), 162 MASK_COLOUR = [(0.33, 1, 0.33),
@@ -185,7 +185,7 @@ BRUSH_DRAW = 0 @@ -185,7 +185,7 @@ BRUSH_DRAW = 0
185 BRUSH_ERASE = 1 185 BRUSH_ERASE = 1
186 BRUSH_THRESH = 2 186 BRUSH_THRESH = 2
187 DEFAULT_BRUSH_OP = BRUSH_THRESH 187 DEFAULT_BRUSH_OP = BRUSH_THRESH
188 -BRUSH_OP_NAME = ["Draw", "Erase", "Threshold"] 188 +BRUSH_OP_NAME = [_("Draw"), _("Erase"), _("Threshold")]
189 189
190 BRUSH_COLOUR = (0,0,1.0) 190 BRUSH_COLOUR = (0,0,1.0)
191 BRUSH_SIZE = 30 191 BRUSH_SIZE = 30
@@ -196,36 +196,36 @@ BRUSH_SIZE = 30 @@ -196,36 +196,36 @@ BRUSH_SIZE = 30
196 # 2: smooth_relaxation_factor 196 # 2: smooth_relaxation_factor
197 # 3: decimate_reduction 197 # 3: decimate_reduction
198 SURFACE_QUALITY = { 198 SURFACE_QUALITY = {
199 - "Low": (3, 2, 0.3000, 0.4),  
200 - "Medium": (2, 2, 0.3000, 0.4),  
201 - "High": (0, 1, 0.3000, 0.1),  
202 - "Optimal": (0, 2, 0.3000, 0.4),  
203 - "Custom": (None, None, None, None)}  
204 -DEFAULT_SURFACE_QUALITY = "Optimal" 199 + _("Low"): (3, 2, 0.3000, 0.4),
  200 + _("Medium"): (2, 2, 0.3000, 0.4),
  201 + _("High"): (0, 1, 0.3000, 0.1),
  202 + _("Optimal *"): (0, 2, 0.3000, 0.4),
  203 + _("Custom"): (None, None, None, None)}
  204 +DEFAULT_SURFACE_QUALITY = _("Optimal *")
205 205
206 # Surface properties 206 # Surface properties
207 SURFACE_TRANSPARENCY = 0.0 207 SURFACE_TRANSPARENCY = 0.0
208 -SURFACE_NAME_PATTERN = "Surface %d" 208 +SURFACE_NAME_PATTERN = _("Surface %d")
209 209
210 # Imagedata - window and level presets 210 # Imagedata - window and level presets
211 -WINDOW_LEVEL = {"Abdomen":(350,50),  
212 - "Bone":(2000, 300),  
213 - "Brain Posterior Fossa":(120,40),  
214 - "Brain":(80,40),  
215 - "Default":(None, None), #Control class set window and level from DICOM  
216 - "Emphysema":(500,-850),  
217 - "Ischemia - Hard Non Contrast":(15,32),  
218 - "Ischemia - Soft Non Contrast":(80,20),  
219 - "Larynx":(180, 80),  
220 - "Liver":(2000, -500),  
221 - "Lung - Soft":(1600,-600),  
222 - "Lung - Hard":(1000,-600),  
223 - "Mediastinum":(350,25),  
224 - "Manual":(None, None), #Case the user change window and level  
225 - "Pelvis": (450,50),  
226 - "Sinus":(4000, 400),  
227 - "Vasculature - Hard":(240,80),  
228 - "Vasculature - Soft":(650,160)} 211 +WINDOW_LEVEL = {_("Abdomen"):(350,50),
  212 + _("Bone"):(2000, 300),
  213 + _("Brain Posterior Fossa"):(120,40),
  214 + _("Brain"):(80,40),
  215 + _("Default"):(None, None), #Control class set window and level from DICOM
  216 + _("Emphysema"):(500,-850),
  217 + _("Ischemia - Hard Non Contrast"):(15,32),
  218 + _("Ischemia - Soft Non Contrast"):(80,20),
  219 + _("Larynx"):(180, 80),
  220 + _("Liver"):(2000, -500),
  221 + _("Lung - Soft"):(1600,-600),
  222 + _("Lung - Hard"):(1000,-600),
  223 + _("Mediastinum"):(350,25),
  224 + _("Manual"):(None, None), #Case the user change window and level
  225 + _("Pelvis"): (450,50),
  226 + _("Sinus"):(4000, 400),
  227 + _("Vasculature - Hard"):(240,80),
  228 + _("Vasculature - Soft"):(650,160)}
229 229
230 if (sys.platform == 'win32') and (platform.architecture()[0] == '32bit'): 230 if (sys.platform == 'win32') and (platform.architecture()[0] == '32bit'):
231 REDUCE_IMAGEDATA_QUALITY = 1 231 REDUCE_IMAGEDATA_QUALITY = 1
@@ -235,15 +235,14 @@ else: @@ -235,15 +235,14 @@ else:
235 REDUCE_IMAGEDATA_QUALITY = 0 235 REDUCE_IMAGEDATA_QUALITY = 0
236 236
237 ICON_DIR = os.path.abspath(os.path.join('..', 'icons')) 237 ICON_DIR = os.path.abspath(os.path.join('..', 'icons'))
238 -LANGUAGE_DIR = os.path.abspath(os.path.join('..','locale'))  
239 -  
240 -ID_TO_BMP = {VOL_FRONT: ["Front", os.path.join(ICON_DIR, "view_front.png")],  
241 - VOL_BACK: ["Back", os.path.join(ICON_DIR, "view_back.png")],  
242 - VOL_TOP: ["Top", os.path.join(ICON_DIR, "view_top.png")],  
243 - VOL_BOTTOM: ["Bottom", os.path.join(ICON_DIR, "view_bottom.png")],  
244 - VOL_RIGHT: ["Right", os.path.join(ICON_DIR, "view_right.png")],  
245 - VOL_LEFT: ["Left", os.path.join(ICON_DIR, "view_left.png")],  
246 - VOL_ISO:["Isometric", os.path.join(ICON_DIR,"view_isometric.png")] 238 +
  239 +ID_TO_BMP = {VOL_FRONT: [_("Front"), os.path.join(ICON_DIR, "view_front.png")],
  240 + VOL_BACK: [_("Back"), os.path.join(ICON_DIR, "view_back.png")],
  241 + VOL_TOP: [_("Top"), os.path.join(ICON_DIR, "view_top.png")],
  242 + VOL_BOTTOM: [_("Bottom"), os.path.join(ICON_DIR, "view_bottom.png")],
  243 + VOL_RIGHT: [_("Right"), os.path.join(ICON_DIR, "view_right.png")],
  244 + VOL_LEFT: [_("Left"), os.path.join(ICON_DIR, "view_left.png")],
  245 + VOL_ISO:[_("Isometric"), os.path.join(ICON_DIR,"view_isometric.png")]
247 } 246 }
248 247
249 # if 1, use vtkVolumeRaycastMapper, if 0, use vtkFixedPointVolumeRayCastMapper 248 # if 1, use vtkVolumeRaycastMapper, if 0, use vtkFixedPointVolumeRayCastMapper
@@ -252,7 +251,38 @@ TYPE_RAYCASTING_MAPPER = 1 @@ -252,7 +251,38 @@ TYPE_RAYCASTING_MAPPER = 1
252 folder=RAYCASTING_PRESETS_DIRECTORY= os.path.abspath(os.path.join("..", 251 folder=RAYCASTING_PRESETS_DIRECTORY= os.path.abspath(os.path.join("..",
253 "presets", 252 "presets",
254 "raycasting")) 253 "raycasting"))
255 -RAYCASTING_TYPES = [filename.split(".")[0] for filename in 254 +_("Airways")
  255 +_("Airways II")
  256 +_("Black & White")
  257 +_("Bone + Skin")
  258 +_("Bone + Skin II")
  259 +_("Dark Bone")
  260 +_("Glossy")
  261 +_("Glossy II")
  262 +_("Gold Bone")
  263 +_("High Contrast")
  264 +_("Low Contrast")
  265 +_("Soft on White")
  266 +_("Mid Contrast")
  267 +_("No Shading")
  268 +_("Pencil")
  269 +_("Red on White")
  270 +_("Skin On Blue")
  271 +_("Skin On Blue II")
  272 +_("Soft on White")
  273 +_("Soft + Skin")
  274 +_("Soft + Skin II")
  275 +_("Soft + Skin III")
  276 +_("Soft On Blue")
  277 +_("Soft")
  278 +_("Standard")
  279 +_("Vascular")
  280 +_("Vascular II")
  281 +_("Vascular III")
  282 +_("Vascular IV")
  283 +_("Yellow Bone")
  284 +
  285 +RAYCASTING_TYPES = [_(filename.split(".")[0]) for filename in
256 os.listdir(folder) if 286 os.listdir(folder) if
257 os.path.isfile(os.path.join(folder,filename))] 287 os.path.isfile(os.path.join(folder,filename))]
258 288
@@ -260,13 +290,13 @@ folder = os.path.join(os.path.expanduser('~'), '.invesalius', 'presets') @@ -260,13 +290,13 @@ folder = os.path.join(os.path.expanduser('~'), '.invesalius', 'presets')
260 if not os.path.isdir(folder): 290 if not os.path.isdir(folder):
261 os.makedirs(folder) 291 os.makedirs(folder)
262 USER_RAYCASTING_PRESETS_DIRECTORY = folder 292 USER_RAYCASTING_PRESETS_DIRECTORY = folder
263 -RAYCASTING_TYPES += [filename.split(".")[0] for filename in 293 +RAYCASTING_TYPES += [_(filename.split(".")[0]) for filename in
264 os.listdir(folder) if 294 os.listdir(folder) if
265 os.path.isfile(os.path.join(folder,filename))] 295 os.path.isfile(os.path.join(folder,filename))]
266 -RAYCASTING_TYPES.append(' Off') 296 +RAYCASTING_TYPES.append(_(' Off'))
267 RAYCASTING_TYPES.sort() 297 RAYCASTING_TYPES.sort()
268 -RAYCASTING_OFF_LABEL = ' Off'  
269 -RAYCASTING_TOOLS = ["Cut plane"] 298 +RAYCASTING_OFF_LABEL = _(' Off')
  299 +RAYCASTING_TOOLS = [_("Cut plane")]
270 300
271 # If 0 dont't blur, 1 blur 301 # If 0 dont't blur, 1 blur
272 RAYCASTING_WWWL_BLUR = 0 302 RAYCASTING_WWWL_BLUR = 0
invesalius/gui/data_notebook.py
  Diff comments   View file @a750b26
@@ -398,7 +398,7 @@ class MeasuresListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin): @@ -398,7 +398,7 @@ class MeasuresListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
398 else: 398 else:
399 print "unchecked, ", index 399 print "unchecked, ", index
400 400
401 - def InsertNewItem(self, index=0, type_="Mask 1", value="(1000, 4500)", 401 + def InsertNewItem(self, index=0, type_="", value="(1000, 4500)",
402 colour=None): 402 colour=None):
403 self.InsertStringItem(index, "") 403 self.InsertStringItem(index, "")
404 self.SetStringItem(index, 1, type_, imageId = self.img_colour) 404 self.SetStringItem(index, 1, type_, imageId = self.img_colour)
invesalius/gui/dicom_preview_panel.py
  Diff comments   View file @a750b26
@@ -320,8 +320,8 @@ class SingleImagePreview(wx.Panel): @@ -320,8 +320,8 @@ class SingleImagePreview(wx.Panel):
320 self.dicom_list = [] 320 self.dicom_list = []
321 self.nimages = 1 321 self.nimages = 1
322 self.current_index = 0 322 self.current_index = 0
323 - self.window_width = const.WINDOW_LEVEL["Bone"][0]  
324 - self.window_level = const.WINDOW_LEVEL["Bone"][1] 323 + self.window_width = const.WINDOW_LEVEL[_("Bone")][0]
  324 + self.window_level = const.WINDOW_LEVEL[_("Bone")][1]
325 325
326 def __init_vtk(self): 326 def __init_vtk(self):
327 actor = vtk.vtkImageActor() 327 actor = vtk.vtkImageActor()
invesalius/gui/language_dialog.py
  Diff comments   View file @a750b26
@@ -22,8 +22,8 @@ import wx @@ -22,8 +22,8 @@ import wx
22 import wx.combo 22 import wx.combo
23 23
24 import i18n 24 import i18n
25 -import constants as const  
26 25
  26 +ICON_DIR = os.path.abspath(os.path.join('..', 'icons'))
27 27
28 class LanguageDialog(wx.Dialog): 28 class LanguageDialog(wx.Dialog):
29 """Class define the language to be used in the InVesalius, 29 """Class define the language to be used in the InVesalius,
@@ -46,9 +46,9 @@ class LanguageDialog(wx.Dialog): @@ -46,9 +46,9 @@ class LanguageDialog(wx.Dialog):
46 46
47 self.bitmapCmb = bitmapCmb = wx.combo.BitmapComboBox(self, style=wx.CB_READONLY) 47 self.bitmapCmb = bitmapCmb = wx.combo.BitmapComboBox(self, style=wx.CB_READONLY)
48 48
49 - bmp_brazilian_flag = wx.Bitmap(os.path.join(const.ICON_DIR, "pt_BR.bmp"), wx.BITMAP_TYPE_BMP)  
50 - bmp_english_flag = wx.Bitmap(os.path.join(const.ICON_DIR, "en_GB.bmp"), wx.BITMAP_TYPE_BMP)  
51 - bmp_spanish_flag = wx.Bitmap(os.path.join(const.ICON_DIR, "es.bmp"), wx.BITMAP_TYPE_BMP) 49 + bmp_brazilian_flag = wx.Bitmap(os.path.join(ICON_DIR, "pt_BR.bmp"), wx.BITMAP_TYPE_BMP)
  50 + bmp_english_flag = wx.Bitmap(os.path.join(ICON_DIR, "en_GB.bmp"), wx.BITMAP_TYPE_BMP)
  51 + bmp_spanish_flag = wx.Bitmap(os.path.join(ICON_DIR, "es.bmp"), wx.BITMAP_TYPE_BMP)
52 52
53 bitmapCmb.Append(self.locales[0], bmp_english_flag,"en_GB") 53 bitmapCmb.Append(self.locales[0], bmp_english_flag,"en_GB")
54 bitmapCmb.Append(self.locales[1], bmp_brazilian_flag,"pt_BR") 54 bitmapCmb.Append(self.locales[1], bmp_brazilian_flag,"pt_BR")
invesalius/gui/task_surface.py
  Diff comments   View file @a750b26
@@ -29,7 +29,7 @@ import gui.widgets.foldpanelbar as fpb @@ -29,7 +29,7 @@ import gui.widgets.foldpanelbar as fpb
29 #INTERPOLATION_MODE_LIST = ["Cubic", "Linear", "NearestNeighbor"] 29 #INTERPOLATION_MODE_LIST = ["Cubic", "Linear", "NearestNeighbor"]
30 QUALITY_LIST = [_("Low"), _("Medium"), _("High"), _("Optimal *"), _("Custom")] 30 QUALITY_LIST = [_("Low"), _("Medium"), _("High"), _("Optimal *"), _("Custom")]
31 SURFACE_LIST = [] 31 SURFACE_LIST = []
32 -MASK_LIST = ["Mask 1"] 32 +MASK_LIST = []
33 MIN_TRANSPARENCY = 0 33 MIN_TRANSPARENCY = 0
34 MAX_TRANSPARENCY = 100 34 MAX_TRANSPARENCY = 100
35 35
invesalius/i18n.py
  Diff comments   View file @a750b26
@@ -26,7 +26,7 @@ import gettext @@ -26,7 +26,7 @@ import gettext
26 import os 26 import os
27 import sys 27 import sys
28 28
29 -import constants as const 29 +LANGUAGE_DIR = os.path.abspath(os.path.join('..','locale'))
30 30
31 def GetLocales(): 31 def GetLocales():
32 """Return a dictionary which defines supported languages""" 32 """Return a dictionary which defines supported languages"""
@@ -45,7 +45,7 @@ def GetLocaleOS(): @@ -45,7 +45,7 @@ def GetLocaleOS():
45 45
46 def InstallLanguage(language): 46 def InstallLanguage(language):
47 47
48 - lang = gettext.translation('invesalius', const.LANGUAGE_DIR,\ 48 + lang = gettext.translation('invesalius', LANGUAGE_DIR,\
49 languages=[language], codeset='utf8') 49 languages=[language], codeset='utf8')
50 # Using unicode 50 # Using unicode
51 lang.install(unicode=1) 51 lang.install(unicode=1)
invesalius/presets.py
  Diff comments   View file @a750b26
@@ -27,39 +27,39 @@ class Presets(): @@ -27,39 +27,39 @@ class Presets():
27 27
28 def __init__(self): 28 def __init__(self):
29 self.thresh_ct = TwoWaysDictionary({ 29 self.thresh_ct = TwoWaysDictionary({
30 - "Bone":(226,3071),  
31 - "Soft Tissue":(-700,225),  
32 - "Enamel (Adult)":(1553,2850),  
33 - "Enamel (Child)":(2042,3071),  
34 - "Compact Bone (Adult)":(662,1988),  
35 - "Compact Bone (Child)":(586,2198),  
36 - "Spongial Bone (Adult)":(148,661),  
37 - "Spongial Bone (Child)":(156,585),  
38 - "Muscle Tissue (Adult)":(-5,135),  
39 - "Muscle Tissue (Child)":(-25,139),  
40 - "Fat Tissue (Adult)":(-205,-51),  
41 - "Fat Tissue (Adult)":(-212,-72),  
42 - "Skin Tissue (Adult)":(-718,-177),  
43 - "Skin Tissue (Child)":(-766,-202),  
44 - "Custom":('', '') 30 + _("Bone"):(226,3071),
  31 + _("Soft Tissue"):(-700,225),
  32 + _("Enamel (Adult)"):(1553,2850),
  33 + _("Enamel (Child)"):(2042,3071),
  34 + _("Compact Bone (Adult)"):(662,1988),
  35 + _("Compact Bone (Child)"):(586,2198),
  36 + _("Spongial Bone (Adult)"):(148,661),
  37 + _("Spongial Bone (Child)"):(156,585),
  38 + _("Muscle Tissue (Adult)"):(-5,135),
  39 + _("Muscle Tissue (Child)"):(-25,139),
  40 + _("Fat Tissue (Adult)"):(-205,-51),
  41 + _("Fat Tissue (Child)"):(-212,-72),
  42 + _("Skin Tissue (Adult)"):(-718,-177),
  43 + _("Skin Tissue (Child)"):(-766,-202),
  44 + _("Custom"):('', '')
45 }) 45 })
46 46
47 self.thresh_mri = TwoWaysDictionary({ 47 self.thresh_mri = TwoWaysDictionary({
48 - "Bone":(1250,4095),  
49 - "Soft Tissue":(324,1249),  
50 - "Enamel (Adult)":(2577,3874),  
51 - "Enamel (Child)":(3066,4095),  
52 - "Compact Bone (Adult)":(1686,3012),  
53 - "Compact Bone (Child)":(1610,3222),  
54 - "Spongial Bone (Adult)":(1172,1685),  
55 - "Spongial Bone (Child)":(1180,1609),  
56 - "Muscle Tissue (Adult)":(1019,1159),  
57 - "Muscle Tissue (Child)":(999,1163),  
58 - "Fat Tissue (Adult)":(819,973),  
59 - "Fat Tissue (Adult)":(812,952),  
60 - "Skin Tissue (Adult)":(306,847),  
61 - "Skin Tissue (Child)":(258,822),  
62 - "Custom":('', '') 48 + _("Bone"):(1250,4095),
  49 + _("Soft Tissue"):(324,1249),
  50 + _("Enamel (Adult)"):(2577,3874),
  51 + _("Enamel (Child)"):(3066,4095),
  52 + _("Compact Bone (Adult)"):(1686,3012),
  53 + _("Compact Bone (Child)"):(1610,3222),
  54 + _("Spongial Bone (Adult)"):(1172,1685),
  55 + _("Spongial Bone (Child)"):(1180,1609),
  56 + _("Muscle Tissue (Adult)"):(1019,1159),
  57 + _("Muscle Tissue (Child)"):(999,1163),
  58 + _("Fat Tissue (Adult)"):(819,973),
  59 + _("Fat Tissue (Child)"):(812,952),
  60 + _("Skin Tissue (Adult)"):(306,847),
  61 + _("Skin Tissue (Child)"):(258,822),
  62 + _("Custom"):('', '')
63 }) 63 })
64 self.__bind_events() 64 self.__bind_events()
65 65
@@ -116,5 +116,5 @@ class Presets(): @@ -116,5 +116,5 @@ class Presets():
116 116
117 def Test(self): 117 def Test(self):
118 print "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" 118 print "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
119 - print self.thresh_ct.get_value("Bone") 119 + print self.thresh_ct.get_value(_("Bone"))
120 print "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" 120 print "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
invesalius/session.py
  Diff comments   View file @a750b26
@@ -4,7 +4,6 @@ from threading import Thread @@ -4,7 +4,6 @@ from threading import Thread
4 import time 4 import time
5 import wx.lib.pubsub as ps 5 import wx.lib.pubsub as ps
6 6
7 -import constants as const  
8 from utils import Singleton 7 from utils import Singleton
9 8
10 import wx.lib.pubsub as ps 9 import wx.lib.pubsub as ps
@@ -24,6 +23,7 @@ class Session(object): @@ -24,6 +23,7 @@ class Session(object):
24 ps.Publisher().subscribe(self.StopRecording, "Stop Config Recording") 23 ps.Publisher().subscribe(self.StopRecording, "Stop Config Recording")
25 24
26 def CreateItens(self): 25 def CreateItens(self):
  26 + import constants as const
27 self.project_path = () 27 self.project_path = ()
28 self.debug = False 28 self.debug = False
29 29
@@ -55,6 +55,7 @@ class Session(object): @@ -55,6 +55,7 @@ class Session(object):
55 55
56 56
57 def CloseProject(self): 57 def CloseProject(self):
  58 + import constants as const
58 print "-- CloseProject" 59 print "-- CloseProject"
59 self.project_path = () 60 self.project_path = ()
60 self.project_status = const.PROJ_CLOSE 61 self.project_status = const.PROJ_CLOSE
@@ -62,6 +63,7 @@ class Session(object): @@ -62,6 +63,7 @@ class Session(object):
62 self.temp_item = False 63 self.temp_item = False
63 64
64 def SaveProject(self, path=()): 65 def SaveProject(self, path=()):
  66 + import constants as const
65 print "-- SaveProject" 67 print "-- SaveProject"
66 self.project_status = const.PROJ_OPEN 68 self.project_status = const.PROJ_OPEN
67 if path: 69 if path:
@@ -71,10 +73,12 @@ class Session(object): @@ -71,10 +73,12 @@ class Session(object):
71 self.temp_item = False 73 self.temp_item = False
72 74
73 def ChangeProject(self): 75 def ChangeProject(self):
  76 + import constants as const
74 print "-- ChangeProject" 77 print "-- ChangeProject"
75 self.project_status = const.PROJ_CHANGE 78 self.project_status = const.PROJ_CHANGE
76 79
77 def CreateProject(self, filename): 80 def CreateProject(self, filename):
  81 + import constants as const
78 print "-- CreateProject" 82 print "-- CreateProject"
79 # Set session info 83 # Set session info
80 self.project_path = (self.tempdir, filename) 84 self.project_path = (self.tempdir, filename)
@@ -83,6 +87,7 @@ class Session(object): @@ -83,6 +87,7 @@ class Session(object):
83 return self.tempdir 87 return self.tempdir
84 88
85 def OpenProject(self, filepath): 89 def OpenProject(self, filepath):
  90 + import constants as const
86 print "-- OpenProject" 91 print "-- OpenProject"
87 # Add item to recent projects list 92 # Add item to recent projects list
88 item = (path, file) = os.path.split(filepath) 93 item = (path, file) = os.path.split(filepath)
@@ -123,6 +128,7 @@ class Session(object): @@ -123,6 +128,7 @@ class Session(object):
123 128
124 129
125 def __add_to_list(self, item): 130 def __add_to_list(self, item):
  131 + import constants as const
126 # Last projects list 132 # Last projects list
127 l = self.recent_projects 133 l = self.recent_projects
128 134
@@ -226,4 +232,4 @@ class WriteSession(Thread): @@ -226,4 +232,4 @@ class WriteSession(Thread):
226 232
227 233
228 234
229 -  
230 \ No newline at end of file 235 \ No newline at end of file
  236 +