Download as
Browse Code »

Commit 9a65a3410352e6637ff61fc6c5172b7ea6b63056

Authored by fabioaz
1 parent 553830f4
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: Workaround to solve problem when using multiprocessing under Windows.

Showing 1 changed file with 24 additions and 2 deletions   Show diff stats
invesalius/data/surface_process.py
  Diff comments   View file @9a65a34
@@ -7,10 +7,31 @@ import vtk @@ -7,10 +7,31 @@ import vtk
7 7
8 import i18n 8 import i18n
9 import converters 9 import converters
10 -import imagedata_utils as iu 10 +# import imagedata_utils as iu
11 11
12 from scipy import ndimage 12 from scipy import ndimage
13 13
  14 +# TODO: Code duplicated from file {imagedata_utils.py}.
  15 +def ResampleImage3D(imagedata, value):
  16 + """
  17 + Resample vtkImageData matrix.
  18 + """
  19 + spacing = imagedata.GetSpacing()
  20 + extent = imagedata.GetExtent()
  21 + size = imagedata.GetDimensions()
  22 +
  23 + width = float(size[0])
  24 + height = float(size[1]/value)
  25 +
  26 + resolution = (height/(extent[1]-extent[0])+1)*spacing[1]
  27 +
  28 + resample = vtk.vtkImageResample()
  29 + resample.SetInput(imagedata)
  30 + resample.SetAxisMagnificationFactor(0, resolution)
  31 + resample.SetAxisMagnificationFactor(1, resolution)
  32 +
  33 + return resample.GetOutput()
  34 +
14 class SurfaceProcess(multiprocessing.Process): 35 class SurfaceProcess(multiprocessing.Process):
15 36
16 def __init__(self, pipe, filename, shape, dtype, mask_filename, 37 def __init__(self, pipe, filename, shape, dtype, mask_filename,
@@ -100,7 +121,8 @@ class SurfaceProcess(multiprocessing.Process): @@ -100,7 +121,8 @@ class SurfaceProcess(multiprocessing.Process):
100 del a_image 121 del a_image
101 122
102 if self.imagedata_resolution: 123 if self.imagedata_resolution:
103 - image = iu.ResampleImage3D(image, self.imagedata_resolution) 124 + # image = iu.ResampleImage3D(image, self.imagedata_resolution)
  125 + image = ResampleImage3D(image, self.imagedata_resolution)
104 126
105 flip = vtk.vtkImageFlip() 127 flip = vtk.vtkImageFlip()
106 flip.SetInput(image) 128 flip.SetInput(image)