Download as
Browse Code »

Commit da74828263b2fbca975ccf3e88db5ffdafbcfe89

Authored by Paulo Henrique Junqueira Amorim
1 parent 8fa8e038
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: Turned volume raycast

Showing 1 changed file with 11 additions and 4 deletions   Show diff stats
invesalius/data/volume.py
  Diff comments   View file @da74828
@@ -26,7 +26,8 @@ import wx.lib.pubsub as ps @@ -26,7 +26,8 @@ import wx.lib.pubsub as ps
26 26
27 import constants as const 27 import constants as const
28 import project as prj 28 import project as prj
29 - 29 +import slice_
  30 +import imagedata_utils
30 from data import vtk_utils 31 from data import vtk_utils
31 from vtk.util import numpy_support 32 from vtk.util import numpy_support
32 33
@@ -447,7 +448,14 @@ class Volume(): @@ -447,7 +448,14 @@ class Volume():
447 448
448 def LoadVolume(self): 449 def LoadVolume(self):
449 proj = prj.Project() 450 proj = prj.Project()
450 - image = proj.imagedata 451 + slice_data = slice_.Slice()
  452 + n_array = slice_data.matrix
  453 + spacing = slice_data.spacing
  454 + slice_number = 0
  455 + orientation = 'AXIAL'
  456 +
  457 + image = imagedata_utils.to_vtk(n_array, spacing, slice_number, orientation)
  458 + self.image = image
451 459
452 number_filters = len(self.config['convolutionFilters']) 460 number_filters = len(self.config['convolutionFilters'])
453 461
@@ -571,8 +579,7 @@ class Volume(): @@ -571,8 +579,7 @@ class Volume():
571 self.volume_mapper) 579 self.volume_mapper)
572 580
573 def CalculateHistogram(self): 581 def CalculateHistogram(self):
574 - proj = prj.Project()  
575 - image = proj.imagedata 582 + image = self.image
576 r = int(image.GetScalarRange()[1] - image.GetScalarRange()[0]) 583 r = int(image.GetScalarRange()[1] - image.GetScalarRange()[0])
577 accumulate = vtk.vtkImageAccumulate() 584 accumulate = vtk.vtkImageAccumulate()
578 accumulate.SetInput(image) 585 accumulate.SetInput(image)