Download as
Browse Code »

Commit 4cf108365d726e33b9364b65221fd04759221398

Authored by Paulo Henrique Junqueira Amorim
1 parent 7f23d9ef
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: Reduced Matrix slice by slice

Showing 1 changed file with 11 additions and 16 deletions   Show diff stats
invesalius/reader/dicom_reader.py
  Diff comments   View file @4cf1083
@@ -84,14 +84,13 @@ def LoadImages(dir_): @@ -84,14 +84,13 @@ def LoadImages(dir_):
84 array = vtk.vtkStringArray() 84 array = vtk.vtkStringArray()
85 85
86 #Case Reduce Matrix of the Image 86 #Case Reduce Matrix of the Image
87 - flag = 0  
88 - reduce_factor = 3 87 + reduce_matrix = 1
89 88
90 img_app = vtk.vtkImageAppend() 89 img_app = vtk.vtkImageAppend()
91 img_app.SetAppendAxis(2) #Define Stack in Z 90 img_app.SetAppendAxis(2) #Define Stack in Z
92 91
93 for x in xrange(len(files)): 92 for x in xrange(len(files)):
94 - if not(flag): 93 + if not(reduce_matrix):
95 array.InsertValue(x,files[x]) 94 array.InsertValue(x,files[x])
96 else: 95 else:
97 #SIf the resolution of the 96 #SIf the resolution of the
@@ -100,24 +99,20 @@ def LoadImages(dir_): @@ -100,24 +99,20 @@ def LoadImages(dir_):
100 read.SetFileName(files[x]) 99 read.SetFileName(files[x])
101 read.Update() 100 read.Update()
102 101
  102 + #Resample image in x,y dimension
  103 + img = ResampleMatrix(read.GetOutput(), 256)
  104 +
103 #Stack images in Z axes 105 #Stack images in Z axes
104 - img = ResampleMatrix(read.GetOutput(), reduce_factor)  
105 img_app.AddInput(img) 106 img_app.AddInput(img)
106 - 107 +
  108 + img_app.Update()
107 img_axial = vtk.vtkImageData() 109 img_axial = vtk.vtkImageData()
108 110
109 - if (flag):  
110 - img_app.Update() 111 + if (reduce_matrix):
111 img_axial.DeepCopy(img_app.GetOutput()) 112 img_axial.DeepCopy(img_app.GetOutput())
112 -  
113 - #TODO: Code challenge (imagedata_utils.ResampleMatrix),  
114 - #it is necessary to know the new spacing.  
115 - #spacing = read.GetOutput().GetSpacing()  
116 - extent = read.GetOutput().GetExtent()  
117 - size = read.GetOutput().GetDimensions()  
118 - height = float(size[1]/reduce_factor)  
119 - resolution = (height/(extent[1]-extent[0])+1)*spacing  
120 - img_axial.SetSpacing(spacing, spacing, spacing_z * resolution) 113 + img_axial.SetSpacing(img_axial.GetSpacing()[0],\
  114 + img_axial.GetSpacing()[1],\
  115 + spacing_z)
121 else: 116 else:
122 read = vtkgdcm.vtkGDCMImageReader() 117 read = vtkgdcm.vtkGDCMImageReader()
123 read.SetFileNames(array) 118 read.SetFileNames(array)