Download as
Browse Code »

Commit 462913dd1a7d6d5c550b9bb94878f8cee58ffd3e

Authored by Paulo Henrique Junqueira Amorim
1 parent 6442ff71
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: Reverted: VTK Warning was displayed when imported with original resolution DICOM

Showing 2 changed files with 13 additions and 7 deletions   Show diff stats
invesalius/data/imagedata_utils.py
  Diff comments   View file @462913d
@@ -210,6 +210,13 @@ def ExtractVOI(imagedata,xi,xf,yi,yf,zi,zf): @@ -210,6 +210,13 @@ def ExtractVOI(imagedata,xi,xf,yi,yf,zi,zf):
210 210
211 def CreateImageData(filelist, zspacing): 211 def CreateImageData(filelist, zspacing):
212 message = "Generating multiplanar visualization..." 212 message = "Generating multiplanar visualization..."
  213 +
  214 + if not const.VTK_WARNING:
  215 + fow = vtk.vtkFileOutputWindow()
  216 + fow.SetFileName('vtkoutput.txt')
  217 + ow = vtk.vtkOutputWindow()
  218 + ow.SetInstance(fow)
  219 +
213 if not(const.REDUCE_IMAGEDATA_QUALITY): 220 if not(const.REDUCE_IMAGEDATA_QUALITY):
214 update_progress= vtk_utils.ShowProgress(1, dialog_type = "ProgressDialog") 221 update_progress= vtk_utils.ShowProgress(1, dialog_type = "ProgressDialog")
215 222
invesalius/reader/dicom_reader.py
  Diff comments   View file @462913d
@@ -118,13 +118,6 @@ def yGetDicomGroups(directory, recursive=True, gui=True): @@ -118,13 +118,6 @@ def yGetDicomGroups(directory, recursive=True, gui=True):
118 yield grouper.GetPatientsGroups() 118 yield grouper.GetPatientsGroups()
119 119
120 def GetDicomGroups(directory, recursive=True): 120 def GetDicomGroups(directory, recursive=True):
121 -  
122 - if not const.VTK_WARNING:  
123 - fow = vtk.vtkFileOutputWindow()  
124 - fow.SetFileName('vtkoutput.txt')  
125 - ow = vtk.vtkOutputWindow()  
126 - ow.SetInstance(fow)  
127 -  
128 return yGetDicomGroups(directory, recursive, gui=False).next() 121 return yGetDicomGroups(directory, recursive, gui=False).next()
129 122
130 123
@@ -152,6 +145,12 @@ class ProgressDicomReader: @@ -152,6 +145,12 @@ class ProgressDicomReader:
152 145
153 def GetDicomGroups(self, path, recursive): 146 def GetDicomGroups(self, path, recursive):
154 147
  148 + if not const.VTK_WARNING:
  149 + fow = vtk.vtkFileOutputWindow()
  150 + fow.SetFileName('vtkoutput.txt')
  151 + ow = vtk.vtkOutputWindow()
  152 + ow.SetInstance(fow)
  153 +
155 y = yGetDicomGroups(path, recursive) 154 y = yGetDicomGroups(path, recursive)
156 for value_progress in y: 155 for value_progress in y:
157 if not self.running: 156 if not self.running: