Changeset 2e3f9e3 in sasview

Timestamp:

Apr 25, 2011 1:06:01 PM (14 years ago)

Author:

Jae Cho <jhjcho@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

6f28e70

Parents:

fd224fd

Message:

fixed svs project saving

File:

• guiframe/gui_manager.py (modified) (3 diffs)

guiframe/gui_manager.py

@@ -1341 +1341 @@
         reader, ext = self._current_perspective.get_extensions()
         path = None
+        extension = '*' + APPLICATION_STATE_EXTENSION
         dlg = wx.FileDialog(self, "Save Project file",
                             self._default_save_location, "",
-                             APPLICATION_STATE_EXTENSION, 
+                             extension, 
                              wx.SAVE)
         if dlg.ShowModal() == wx.ID_OK:
@@ -1358 +1359 @@
             doc = self.on_save_helper(doc, reader, panel, path)
         
-            
-    def on_save_helper(self, doc, reader, panel, path):
-        """
-        Save state into a file
-        """
-        try:
-            data = panel.get_data()
-            state = panel.get_state()
-
-            if reader is not None:
-                if data is not None:
-                    new_doc = reader.write_toXML(data, state)
-                    if hasattr(doc, "firstChild"):
-                        child = new_doc.firstChild.firstChild
-                        doc.firstChild.appendChild(child)  
-                    else:
-                        doc = new_doc 
-        except: 
-            raise
-            #pass
         # Write the XML document
         if doc != None:
@@ -1386 +1367 @@
             msg = "%s cannot read %s\n" % (str(APPLICATION_NAME), str(path))
             #raise RuntimeError, msg
+                    
+    def on_save_helper(self, doc, reader, panel, path):
+        """
+        Save state into a file
+        """
+        try:
+            if reader is not None:
+                # case of a panel with multi-pages
+                if hasattr(panel, "opened_pages"):
+                    for uid, page in panel.opened_pages.iteritems():
+                        data = page.get_data()
+                        # state must be cloned
+                        state = page.get_state().clone()
+                        if data is not None:
+                            new_doc = reader.write_toXML(data, state)
+                            if doc != None and hasattr(doc, "firstChild"):
+                                child = new_doc.firstChild.firstChild
+                                doc.firstChild.appendChild(child)  
+                            else:
+                                doc = new_doc 
+                # case of only a panel
+                else:
+                    data = panel.get_data()
+                    state = panel.get_state()
+                    if data is not None:
+                        new_doc = reader.write_toXML(data, state)
+                        if doc != None and hasattr(doc, "firstChild"):
+                            child = new_doc.firstChild.firstChild
+                            doc.firstChild.appendChild(child)  
+                        else:
+                            doc = new_doc 
+        except: 
+            raise
+            #pass
+
         return doc