Download as
Browse Code »

Commit ff5ac19376b917254fdc7526eb0d28e532b05162

Authored by tfmoraes
1 parent e53432ed
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

ENH: Using the right shape in memmap

Showing 1 changed file with 2 additions and 4 deletions   Show diff stats
invesalius/data/imagedata_utils.py
  Diff comments   View file @ff5ac19
@@ -462,15 +462,13 @@ def dcm2memmap(files, slice_size): @@ -462,15 +462,13 @@ def dcm2memmap(files, slice_size):
462 returns it and its related filename. 462 returns it and its related filename.
463 """ 463 """
464 temp_file = tempfile.mktemp() 464 temp_file = tempfile.mktemp()
465 - shape = len(files), slice_size[0], slice_size[1] 465 + shape = len(files), slice_size[1], slice_size[0]
466 466
467 matrix = numpy.memmap(temp_file, mode='w+', dtype='int16', shape=shape) 467 matrix = numpy.memmap(temp_file, mode='w+', dtype='int16', shape=shape)
468 - 468 + dcm_reader = vtkgdcm.vtkGDCMImageReader()
469 for n, f in enumerate(files): 469 for n, f in enumerate(files):
470 - dcm_reader = vtkgdcm.vtkGDCMImageReader()  
471 dcm_reader.SetFileName(f) 470 dcm_reader.SetFileName(f)
472 dcm_reader.Update() 471 dcm_reader.Update()
473 -  
474 image = dcm_reader.GetOutput() 472 image = dcm_reader.GetOutput()
475 array = numpy_support.vtk_to_numpy(image.GetPointData().GetScalars()) 473 array = numpy_support.vtk_to_numpy(image.GetPointData().GetScalars())
476 array.shape = matrix.shape[1], matrix.shape[2] 474 array.shape = matrix.shape[1], matrix.shape[2]