Download as
Browse Code »

Commit ef4591da93362b6ad8938f4a840dc35418484428

Authored by Paulo Henrique Junqueira Amorim
1 parent 75348ea4
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

ADD: Part of the implementation new DICOM Class, selected the series with the la… 

…rgest number of slices.
Showing 2 changed files with 12 additions and 10 deletions   Show diff stats
invesalius/reader/dicom_grouper.py
  Diff comments   View file @ef4591d
@@ -94,6 +94,7 @@ class DicomGroup: @@ -94,6 +94,7 @@ class DicomGroup:
94 94
95 def GetSpacing(self): 95 def GetSpacing(self):
96 list_ = self.GetSortedList() 96 list_ = self.GetSortedList()
  97 +
97 if (len(list_) > 1): 98 if (len(list_) > 1):
98 dicom = list_[0] 99 dicom = list_[0]
99 axis = ORIENT_MAP[dicom.image.orientation_label] 100 axis = ORIENT_MAP[dicom.image.orientation_label]
@@ -142,7 +143,7 @@ class PatientGroup: @@ -142,7 +143,7 @@ class PatientGroup:
142 if not slice_added: 143 if not slice_added:
143 # If we're here, then Problem 2 occured 144 # If we're here, then Problem 2 occured
144 # TODO: Optimize recursion 145 # TODO: Optimize recursion
145 - self.AddFile(file_path, index+1) 146 + self.AddFile(dicom, index+1)
146 147
147 group.GetSpacing() 148 group.GetSpacing()
148 149
invesalius/reader/dicom_reader.py
  Diff comments   View file @ef4591d
@@ -32,19 +32,20 @@ def LoadImages(dir_): @@ -32,19 +32,20 @@ def LoadImages(dir_):
32 # TODO!!! SUPER GAMBIARRA!!! DO THIS BETTER 32 # TODO!!! SUPER GAMBIARRA!!! DO THIS BETTER
33 33
34 patient_group = GetDicomFiles(dir_) 34 patient_group = GetDicomFiles(dir_)
35 - 35 + #select the series with the largest
  36 + #number of slices.
  37 + nslices_old = 0
36 for patient in patient_group: 38 for patient in patient_group:
37 group_list = patient.GetGroups() 39 group_list = patient.GetGroups()
38 for group in group_list: 40 for group in group_list:
39 - d = group.GetList()  
40 - spacing = group.spacing  
41 -  
42 - #dcm_series = dicom_grouper.DicomGroup()  
43 - #dcm_series.SetFileList(dcm_files)  
44 - #dcm_series.Update()  
45 - 41 + nslices = group.nslices
  42 + if (nslices >= nslices_old):
  43 + dicoms = group.GetList()
  44 + spacing = group.spacing
  45 + nslices_old = nslices
  46 +
46 file_list = [] 47 file_list = []
47 - for dicom in d: 48 + for dicom in dicoms:
48 file_list.append(dicom.image.file) 49 file_list.append(dicom.image.file)
49 50
50 #Coronal Crash. necessary verify 51 #Coronal Crash. necessary verify