ENH: Save inv3 project structure

tatiana
1 parent 30840beb
Showing 3 changed files with 9 additions and 8 deletions Show diff stats
invesalius/data/mask.py
invesalius/data/surface.py
invesalius/project.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]
@@ -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')
@@ -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:
	@@ -45,7 +45,7 @@ class Mask():		@@ -45,7 +45,7 @@ class Mask():
45	if isinstance(d[key], vtk.vtkImageData):	45	if isinstance(d[key], vtk.vtkImageData):
46	img_name = '%s_%s.vti' % (filename, key)	46	img_name = '%s_%s.vti' % (filename, key)
47	iu.Export(d[key], img_name, bin=True)	47	iu.Export(d[key], img_name, bin=True)
48	- mask[key] = {'$imagedata': img_name}	48	+ mask[key] = {'$vti': img_name}
49	else:	49	else:
50	mask[key] = d[key]	50	mask[key] = d[key]
51		51
	@@ -50,7 +50,7 @@ class Surface():		@@ -50,7 +50,7 @@ class Surface():
50	if isinstance(d[key], vtk.vtkPolyData):	50	if isinstance(d[key], vtk.vtkPolyData):
51	img_name = '%s_%s.vtp' % (filename, key)	51	img_name = '%s_%s.vtp' % (filename, key)
52	pu.Export(d[key], img_name, bin=True)	52	pu.Export(d[key], img_name, bin=True)
53	- surface[key] = {'$polydata': img_name}	53	+ surface[key] = {'$vtp': img_name}
54	else:	54	else:
55	surface[key] = d[key]	55	surface[key] = d[key]
56	plistlib.writePlist(surface, filename + '.plist')	56	plistlib.writePlist(surface, filename + '.plist')