Download as
Browse Code »

Commit fe6a94e1db7531cbf7bf611ecd7bbff3851de6a8

Authored by tfmoraes
1 parent 847232db
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

Merging improvement from dicom branch to master

Showing 2 changed files with 4 additions and 3 deletions   Show diff stats
invesalius/reader/dicom.py
  Diff comments   View file @fe6a94e
... ... @@ -1580,8 +1580,9 @@ class Parser():
1580 1580 except(KeyError):
1581 1581 return 'ISO_IR_100'
1582 1582  
1583   - if encoding != None and encoding != "None":
1584   -
  1583 + if encoding is None or encoding == "None" or not encoding.strip():
  1584 + return 'ISO_IR 100'
  1585 + else:
1585 1586 #Problem with 0051 anonymized
1586 1587 if (encoding.split(":"))[0] == "Loaded":
1587 1588 return 'ISO_IR 100'
... ...
invesalius/reader/dicom_reader.py
  Diff comments   View file @fe6a94e
... ... @@ -121,7 +121,7 @@ class LoadDicom:
121 121 ds = reader.GetFile().GetDataSet()
122 122 if ds.FindDataElement(tag):
123 123 encoding = str(ds.GetDataElement(tag).GetValue())
124   - if not(encoding != None and encoding != "None" and encoding != "Loaded"):
  124 + if encoding is None or encoding == "None" or encoding.startswith("Loaded"):
125 125 encoding = "ISO_IR 100"
126 126 else:
127 127 encoding = "ISO_IR_100"
... ...