Download as
Browse Code »

Commit 546ea0d2bb7cb5358e2c1a8107c904ef30ed1b87

Authored by Paulo Henrique Junqueira Amorim
1 parent fe53df6d
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: Fixed open sagittal study

Showing 1 changed file with 14 additions and 27 deletions   Show diff stats
invesalius/reader/dicom_reader.py
  Diff comments   View file @546ea0d
... ... @@ -101,9 +101,8 @@ class LoadDicom:
101 101  
102 102 grouper = self.grouper
103 103  
104   - reader = gdcm.Reader()
  104 + reader = gdcm.ImageReader()
105 105 reader.SetFileName(self.filepath)
106   -
107 106 if (reader.Read()):
108 107 file = reader.GetFile()
109 108  
... ... @@ -207,8 +206,20 @@ class LoadDicom:
207 206 write_png.SetFileName(thumbnail_path)
208 207 write_png.Write()
209 208  
  209 + #------ Verify the orientation --------------------------------
  210 +
  211 + img = reader.GetImage()
  212 + direc_cosines = img.GetDirectionCosines()
  213 + orientation = gdcm.Orientation()
  214 + try:
  215 + type = orientation.GetType(tuple(direc_cosines))
  216 + except TypeError:
  217 + type = orientation.GetType(direc_cosines)
  218 + label = orientation.GetLabel(type)
  219 +
  220 +
210 221 # ---------- Refactory --------------------------------------
211   - data_dict['invesalius'] = {'orientation_label' : GetImageOrientationLabel(self.filepath)}
  222 + data_dict['invesalius'] = {'orientation_label' : label}
212 223  
213 224 # -------------------------------------------------------------
214 225 dict_file[self.filepath] = data_dict
... ... @@ -240,30 +251,6 @@ class LoadDicom:
240 251 #plistlib.writePlist(main_dict, ".//teste.plist")"""
241 252  
242 253  
243   -def GetImageOrientationLabel(filename):
244   - """
245   - Return Label regarding the orientation of
246   - an image. (AXIAL, SAGITTAL, CORONAL,
247   - OBLIQUE or UNKNOWN)
248   - """
249   - gdcm_reader = gdcm.ImageReader()
250   - gdcm_reader.SetFileName(filename)
251   -
252   - img = gdcm_reader.GetImage()
253   - direc_cosines = img.GetDirectionCosines()
254   - orientation = gdcm.Orientation()
255   - try:
256   - type = orientation.GetType(tuple(direc_cosines))
257   - except TypeError:
258   - type = orientation.GetType(direc_cosines)
259   - label = orientation.GetLabel(type)
260   -
261   - if (label):
262   - return label
263   - else:
264   - return ""
265   -
266   -
267 254 def yGetDicomGroups(directory, recursive=True, gui=True):
268 255 """
269 256 Return all full paths to DICOM files inside given directory.
... ...