Download as
Browse Code »

Commit b14ca6cf6669832c018d2bbe7bb5c61988d2eabf

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

Some tests with surface creation

Showing 2 changed files with 5 additions and 7 deletions   Show diff stats
invesalius/data/slice_.py
  Diff comments   View file @b14ca6c
... ... @@ -583,7 +583,7 @@ class Slice(object):
583 583  
584 584 mask.matrix.flush()
585 585  
586   - ps.Publisher().sendMessage('Create surface', (mask, self.spacing))
  586 + ps.Publisher().sendMessage('Create surface', (self.matrix, self.matrix_filename, mask, self.spacing))
587 587  
588 588 def GetOutput(self):
589 589 return self.blend_filter.GetOutput()
... ...
invesalius/data/surface.py
  Diff comments   View file @b14ca6c
... ... @@ -375,8 +375,7 @@ class SurfaceManager():
375 375 """
376 376 Create surface actor, save into project and send it to viewer.
377 377 """
378   - surface_data = pubsub_evt.data
379   - mask, spacing = pubsub_evt.data
  378 + matrix, filename_img, mask, spacing = pubsub_evt.data
380 379 min_value, max_value = mask.threshold_range
381 380 fill_holes = True
382 381  
... ... @@ -439,7 +438,6 @@ class SurfaceManager():
439 438  
440 439 language = ses.Session().language
441 440  
442   - filename_img = mask.temp_file
443 441 overwrite = 0
444 442  
445 443 if (prj.Project().original_orientation == const.CORONAL):
... ... @@ -453,8 +451,8 @@ class SurfaceManager():
453 451 o_piece = 1
454 452 piece_size = 40
455 453  
456   - n_pieces = int(round(mask.matrix.shape[0] / piece_size + 0.5, 0))
457   - print "n_pieces", n_pieces, mask.matrix.shape
  454 + n_pieces = int(round(matrix.shape[0] / piece_size + 0.5, 0))
  455 + print "n_pieces", n_pieces, matrix.shape
458 456  
459 457 q_in = multiprocessing.Queue()
460 458 q_out = multiprocessing.Queue()
... ... @@ -462,7 +460,7 @@ class SurfaceManager():
462 460 p = []
463 461 for i in xrange(n_processors):
464 462 sp = surface_process.SurfaceProcess(pipe_in, filename_img,
465   - mask.matrix.shape, mask.matrix.dtype, spacing,
  463 + matrix.shape, matrix.dtype, spacing,
466 464 mode, min_value, max_value,
467 465 decimate_reduction, smooth_relaxation_factor,
468 466 smooth_iterations, language, fill_holes, keep_largest,
... ...