Create option in app.py to import and then save the project

Santiago Castro
1 parent 7eed215f
Showing 4 changed files with 47 additions and 0 deletions Show diff stats
.dockerignore
Dockerfile
app.py
invesalius/control.py
@@ -0,0 +1,3 @@
+.git*
+.python-version
+Dockerfile
@@ -0,0 +1,27 @@
+FROM ubuntu:16.04
+
+RUN apt-get update
+RUN apt-get install -y \
+    cython \
+    python-concurrent.futures \
+    python-gdcm \
+    python-matplotlib \
+    python-nibabel \
+    python-numpy \
+    python-pil \
+    python-psutil \
+    python-scipy \
+    python-serial \
+    python-skimage \
+    python-vtk6 \
+    python-vtkgdcm \
+    python-wxgtk3.0 \
+    xvfb # For a virtual X server.
+
+WORKDIR /usr/local/app
+
+COPY . .
+
+RUN python setup.py build_ext --inplace
+
+RUN Xvfb :10 -ac -screen 0 1024x768x24 &
@@ -245,6 +245,12 @@ def parse_comand_line():
     parser.add_option("-i", "--import",
                       action="store",
                       dest="dicom_dir")
+
+    parser.add_option("-s", "--save",
+                      action="store",
+                      dest="save",
+                      help="To save the project after an import.")
+
     options, args = parser.parse_args()
  
     # If debug argument...
@@ -256,6 +262,11 @@ def parse_comand_line():
     if options.dicom_dir:
         import_dir = options.dicom_dir
         Publisher.sendMessage('Import directory', import_dir)
+
+        if options.save:
+            Publisher.sendMessage('Save project', os.path.abspath(options.save))
+            return True
+
         return True
  
     # Check if there is a file path somewhere in what the user wrote
@@ -98,6 +98,8 @@ class Controller():
  
         Publisher.subscribe(self.SetBitmapSpacing, 'Set bitmap spacing')
  
+        Publisher.subscribe(self.OnSaveProject, 'Save project')
+
     def SetBitmapSpacing(self, pubsub_evt):
         proj = prj.Project()
         proj.spacing = pubsub_evt.data
@@ -334,6 +336,10 @@ class Controller():
         session.OpenProject(filepath)
         Publisher.sendMessage("Enable state project", True)
  
+    def OnSaveProject(self, pubsub_evt):
+        path = pubsub_evt.data
+        self.SaveProject(path)
+
     def SaveProject(self, path=None):
         Publisher.sendMessage('Begin busy cursor')
         session = ses.Session()
...	...	@@ -0,0 +1,3 @@
	1	+.git*
	2	+.python-version
	3	+Dockerfile
...	...
...	...	@@ -0,0 +1,27 @@
	1	+FROM ubuntu:16.04
	2	+
	3	+RUN apt-get update
	4	+RUN apt-get install -y \
	5	+ cython \
	6	+ python-concurrent.futures \
	7	+ python-gdcm \
	8	+ python-matplotlib \
	9	+ python-nibabel \
	10	+ python-numpy \
	11	+ python-pil \
	12	+ python-psutil \
	13	+ python-scipy \
	14	+ python-serial \
	15	+ python-skimage \
	16	+ python-vtk6 \
	17	+ python-vtkgdcm \
	18	+ python-wxgtk3.0 \
	19	+ xvfb # For a virtual X server.
	20	+
	21	+WORKDIR /usr/local/app
	22	+
	23	+COPY . .
	24	+
	25	+RUN python setup.py build_ext --inplace
	26	+
	27	+RUN Xvfb :10 -ac -screen 0 1024x768x24 &
...	...
...	...	@@ -245,6 +245,12 @@ def parse_comand_line():
245	245	parser.add_option("-i", "--import",
246	246	action="store",
247	247	dest="dicom_dir")
	248	+
	249	+ parser.add_option("-s", "--save",
	250	+ action="store",
	251	+ dest="save",
	252	+ help="To save the project after an import.")
	253	+
248	254	options, args = parser.parse_args()
249	255
250	256	# If debug argument...
...	...	@@ -256,6 +262,11 @@ def parse_comand_line():
256	262	if options.dicom_dir:
257	263	import_dir = options.dicom_dir
258	264	Publisher.sendMessage('Import directory', import_dir)
	265	+
	266	+ if options.save:
	267	+ Publisher.sendMessage('Save project', os.path.abspath(options.save))
	268	+ return True
	269	+
259	270	return True
260	271
261	272	# Check if there is a file path somewhere in what the user wrote
...	...
...	...	@@ -98,6 +98,8 @@ class Controller():
98	98
99	99	Publisher.subscribe(self.SetBitmapSpacing, 'Set bitmap spacing')
100	100
	101	+ Publisher.subscribe(self.OnSaveProject, 'Save project')
	102	+
101	103	def SetBitmapSpacing(self, pubsub_evt):
102	104	proj = prj.Project()
103	105	proj.spacing = pubsub_evt.data
...	...	@@ -334,6 +336,10 @@ class Controller():
334	336	session.OpenProject(filepath)
335	337	Publisher.sendMessage("Enable state project", True)
336	338
	339	+ def OnSaveProject(self, pubsub_evt):
	340	+ path = pubsub_evt.data
	341	+ self.SaveProject(path)
	342	+
337	343	def SaveProject(self, path=None):
338	344	Publisher.sendMessage('Begin busy cursor')
339	345	session = ses.Session()
...	...