diff --git a/invesalius/data/mask.py b/invesalius/data/mask.py index 8b8d681..3f918a0 100644 --- a/invesalius/data/mask.py +++ b/invesalius/data/mask.py @@ -45,7 +45,7 @@ class Mask(): if isinstance(d[key], vtk.vtkImageData): img_name = '%s_%s.vti' % (filename, key) iu.Export(d[key], img_name, bin=True) - mask[key] = {'$imagedata': img_name} + mask[key] = {'$vti': img_name} else: mask[key] = d[key] diff --git a/invesalius/data/surface.py b/invesalius/data/surface.py index c061b05..4512ed7 100644 --- a/invesalius/data/surface.py +++ b/invesalius/data/surface.py @@ -50,7 +50,7 @@ class Surface(): if isinstance(d[key], vtk.vtkPolyData): img_name = '%s_%s.vtp' % (filename, key) pu.Export(d[key], img_name, bin=True) - surface[key] = {'$polydata': img_name} + surface[key] = {'$vtp': img_name} else: surface[key] = d[key] plistlib.writePlist(surface, filename + '.plist') diff --git a/invesalius/project.py b/invesalius/project.py index 14b4c59..f8a5e7e 100755 --- a/invesalius/project.py +++ b/invesalius/project.py @@ -138,26 +138,28 @@ class Project(object): for key in self.__dict__: if getattr(self.__dict__[key], 'SavePlist', None): - project[key] = {'path': self.__dict__[key].SavePlist(filename)} + project[key] = {'$plist': self.__dict__[key].SavePlist(filename)} else: project[key] = self.__dict__[key] masks = {} for index in self.mask_dict: - masks[str(index)] = self.mask_dict[index].SavePlist(filename) + masks[str(index)] = {'#mask':\ + self.mask_dict[index].SavePlist(filename)} print index surfaces = {} for index in self.surface_dict: - surfaces[str(index)] = self.surface_dict[index].SavePlist(filename) + surfaces[str(index)] = {'#surface':\ + self.surface_dict[index].SavePlist(filename)} print index project['surface_dict'] = surfaces project['mask_dict'] = masks img_file = '%s_%s.vti' % (filename, 'imagedata') iu.Export(self.imagedata, img_file, bin=True) - project['imagedata'] = img_file - + project['imagedata'] = {'$vti':img_file} + print project plistlib.writePlist(project, filename + '.plist') Compress(dir_, "teste.inv3")#os.path.join("~/Desktop/","teste.inv3")) @@ -173,7 +175,6 @@ class Project(object): for key in project: setattr(self, key, project[key]) - print "depois", self.__dict__ #masks = project['masks'] #for index in masks: -- libgit2 0.21.2