Download as
Browse Code »

Commit b5e06cb4aadcba95534b38665f643e84bfb1a1c0

Authored by Paulo Henrique Junqueira Amorim
1 parent fa852f10
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: Changed parameters style

Showing 3 changed files with 15 additions and 20 deletions   Show diff stats
invesalius/control.py
  Diff comments   View file @b5e06cb
... ... @@ -9,7 +9,7 @@ import project as prj
9 9 import data.imagedata_utils as utils
10 10 import data.surface as surface
11 11 import data.volume as volume
12   -import reader.dicom_reader as dicom
  12 +import reader.dicom_reader as dcm
13 13 import reader.analyze_reader as analyze
14 14  
15 15 DEFAULT_THRESH_MODE = 0
... ... @@ -45,21 +45,22 @@ class Controller():
45 45 dir_ = pubsub_evt.data
46 46  
47 47 # Select medical images from directory and generate vtkImageData
48   - output = dicom.LoadImages(dir_)
  48 + output = dcm.LoadImages(dir_)
49 49 proj = prj.Project()
50 50 proj.name = "Untitled"
51 51  
52 52 if output:
53   - imagedata, acquisition_modality, tilt_value, orientation,\
54   - window, level = output
55   -
  53 + #acquisition_modality, tilt_value, orientation,window, level
  54 + imagedata, dicom = output
  55 + orientation = dicom.image.orientation_label
56 56 if (orientation == "CORONAL"):
57 57 orientation = const.CORONAL
58 58 elif(orientation == "SAGITTAL"):
59 59 orientation = const.SAGITAL
60 60 else:
61 61 orientation = const.AXIAL
62   -
  62 +
  63 + tilt_value = dicom.acquisition.tilt
63 64 if (tilt_value):
64 65 #TODO: Show dialog so user can set not other value
65 66 tilt_value *= -1
... ... @@ -86,11 +87,11 @@ class Controller():
86 87 print "Sorry, but there are no medical images supported on this dir."
87 88 else:
88 89 # Create new project
89   - proj.SetAcquisitionModality(acquisition_modality)
  90 + proj.SetAcquisitionModality(dicom.acquisition.modality)
90 91 proj.imagedata = imagedata
91 92 proj.original_orientation = orientation
92   - proj.window = window = float(window)
93   - proj.level = level = float(level)
  93 + proj.window = window = float(dicom.image.window)
  94 + proj.level = level = float(dicom.image.level)
94 95 const.WINDOW_LEVEL['Default'] = (window, level)
95 96 const.WINDOW_LEVEL['Other'] = (window, level)
96 97  
... ...
invesalius/reader/dicom.py
  Diff comments   View file @b5e06cb
... ... @@ -1668,6 +1668,7 @@ class Acquisition(object):
1668 1668 self.tilt = parser.GetAcquisitionGantryTilt()
1669 1669 self.serie_number = parser.GetImageSeriesNumber()
1670 1670 self.id_study = parser.GetStudyID()
  1671 + self.modality = parser.GetAcquisitionModality()
1671 1672  
1672 1673 class Image(object):
1673 1674  
... ...
invesalius/reader/dicom_reader.py
  Diff comments   View file @b5e06cb
... ... @@ -69,17 +69,9 @@ def LoadImages(dir_):
69 69 dicom = groups[key][0][x]
70 70 file_list.append(dicom.image.file)
71 71  
72   - information = groups[key][0][x]
73   -
74   - tilt = dicom.acquisition.tilt#groups[key][0][x][11]
75   - spacing = dicom.image.spacing#groups[key][1][14]
76   - #spacing_z = #groups[key][1][30]
77   - orientation = dicom.image.orientation_label#groups[key][0][x][7]
78   - window = dicom.image.window#groups[key][0][x][12]
79   - level = dicom.image.level#groups[key][0][x][13]
80   -
81 72 files = file_list
82   - print dicom.image.orientation_label
  73 + spacing = dicom.image.spacing
  74 +
83 75 #Coronal Crash. necessary verify
84 76 if (dicom.image.orientation_label <> "CORONAL"):
85 77 #Organize reversed image
... ... @@ -87,6 +79,7 @@ def LoadImages(dir_):
87 79 sorter.SetComputeZSpacing(True)
88 80 sorter.SetZSpacingTolerance(1e-10)
89 81 sorter.Sort(file_list)
  82 +
90 83 #Getting organized image
91 84 files = sorter.GetFilenames()
92 85  
... ... @@ -130,7 +123,7 @@ def LoadImages(dir_):
130 123  
131 124 image_data.Update()
132 125  
133   - return image_data, acquisition_modality, tilt, orientation, window, level
  126 + return image_data, dicom
134 127  
135 128 def GetDicomFiles(path, recursive = False):
136 129 # TODO!!! SUPER GAMBIARRA!!! DO THIS BETTER
... ...