diff --git a/invesalius/control.py b/invesalius/control.py index 5a03546..00674d6 100644 --- a/invesalius/control.py +++ b/invesalius/control.py @@ -373,8 +373,7 @@ class Controller(): self.Slice.spacing = proj.spacing Publisher.sendMessage('Load slice to viewer', - (proj.imagedata, - proj.mask_dict)) + (proj.mask_dict)) Publisher.sendMessage('Load slice plane') diff --git a/invesalius/data/viewer_slice.py b/invesalius/data/viewer_slice.py index c923117..6f5497a 100755 --- a/invesalius/data/viewer_slice.py +++ b/invesalius/data/viewer_slice.py @@ -845,8 +845,8 @@ class Viewer(wx.Panel): self.interactor.Bind(wx.EVT_SIZE, self.OnSize) def LoadImagedata(self, pubsub_evt): - imagedata, mask_dict = pubsub_evt.data - self.SetInput(imagedata, mask_dict) + mask_dict = pubsub_evt.data + self.SetInput(mask_dict) def LoadRenderers(self, imagedata): number_renderers = self.layout[0] * self.layout[1] @@ -911,7 +911,7 @@ class Viewer(wx.Panel): self.cursor_ = cursor return cursor - def SetInput(self, imagedata, mask_dict): + def SetInput(self, mask_dict): self.slice_ = sl.Slice() max_slice_number = sl.Slice().GetNumberOfSlices(self.orientation) @@ -921,7 +921,7 @@ class Viewer(wx.Panel): self.slice_data = self.create_slice_window() self.slice_data.SetCursor(self.__create_cursor()) self.cam = self.slice_data.renderer.GetActiveCamera() - self.__build_cross_lines(imagedata) + self.__build_cross_lines() # Set the slice number to the last slice to ensure the camera if far # enough to show all slices. @@ -936,7 +936,7 @@ class Viewer(wx.Panel): ## Insert cursor self.SetInteractorStyle(const.STATE_DEFAULT) - def __build_cross_lines(self, imagedata): + def __build_cross_lines(self): renderer = self.slice_data.overlay_renderer cross = vtk.vtkCursor3D() diff --git a/invesalius/project.py b/invesalius/project.py index bde0ee9..96ae4d1 100644 --- a/invesalius/project.py +++ b/invesalius/project.py @@ -22,7 +22,6 @@ import glob import os import plistlib import shutil -import stat import tarfile import tempfile @@ -35,7 +34,6 @@ import data.mask as msk import data.polydata_utils as pu import data.surface as srf from presets import Presets -from reader import dicom from utils import Singleton, debug import version @@ -47,18 +45,13 @@ class Project(object): def __init__(self): # Patient/ acquistion information self.name = '' - self.dicom_sample = '' self.modality = '' self.original_orientation = '' self.window = '' self.level = '' - # Original imagedata (shouldn't be changed) - self.imagedata = '' - # Masks (vtkImageData) self.mask_dict = {} - self.last_mask_index = 0 # Surfaces are (vtkPolyData) self.surface_dict = {} @@ -107,7 +100,6 @@ class Project(object): output @ index: index of item that was inserted """ - #self.last_mask_index = mask.index index = len(self.mask_dict) self.mask_dict[index] = mask return index -- libgit2 0.21.2