Download as
Browse Code »

Commit 5007ecbb00fdd521886d6a857ccc7830c26278d2

Authored by Paulo Henrique Junqueira Amorim
1 parent a052ca0a
Exists in master and in 67 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, 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: Fix problem unicode

Showing 2 changed files with 5 additions and 7 deletions   Show diff stats
invesalius/reader/dicom.py
  Diff comments   View file @5007ecb
... ... @@ -1926,12 +1926,7 @@ class Image(object):
1926 1926 self.number = parser.GetImageNumber()
1927 1927 self.spacing = spacing = parser.GetPixelSpacing()
1928 1928 self.orientation_label = parser.GetImageOrientationLabel()
1929   -
1930   - if (sys.platform == 'win32'):
1931   - self.file = parser.filename.encode(utils.get_system_encoding())
1932   - else:
1933   - self.file = parser.filename.encode('utf-8')
1934   -
  1929 + self.file = parser.filename
1935 1930 self.time = parser.GetImageTime()
1936 1931 self.type = parser.GetImageType()
1937 1932 self.size = (parser.GetDimensionX(), parser.GetDimensionY())
... ...
invesalius/utils.py
  Diff comments   View file @5007ecb
... ... @@ -254,4 +254,7 @@ def get_physical_memory():
254 254  
255 255  
256 256 def get_system_encoding():
257   - return locale.getdefaultlocale()[1]
  257 + if (sys.platform == 'win32'):
  258 + return locale.getdefaultlocale()[1]
  259 + else:
  260 + return 'utf-8'
... ...