Changeset 72bd8e7 in sasview

Timestamp:

Oct 13, 2011 1:17:33 PM (13 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

a86260e2

Parents:

db0c347

Message:

make sure and error message is display for save project

File:

• fittingview/src/sans/perspectives/fitting/fitpanel.py (modified) (3 diffs)

fittingview/src/sans/perspectives/fitting/fitpanel.py

@@ -81 +81 @@
          that guiframe can write to file
         """
+        msg = ""
         for uid, page in self.opened_pages.iteritems():
-            data = page.get_data()
-            # state must be cloned
-            state = page.get_state().clone()
-            if data is not None:
-                new_doc = self._manager.state_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 
+            if page.batch_on:
+                pos = self.GetPageIndex(page)
+                if pos != -1 and page != self.sim_page:
+                    msg += "%s .\n" % str(self.GetPageText(pos))
+            else:
+                data = page.get_data()
+                # state must be cloned
+                state = page.get_state().clone()
+                if data is not None:
+                    new_doc = self._manager.state_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 
+        if msg.strip() != "":
+            temp = "Save Project is not supported for Batch page.\n"
+            temp += "The following pages will not be save:\n"
+            message = temp + msg
+            wx.PostEvent(self._manager.parent, StatusEvent(status=message,
+                                                            info="warning"))
         return doc    
     
@@ -443 +455 @@
             elif not data_1d_list and data_2d_list:
                 page.fill_data_combobox(data_2d_list)
+                
         pos = self.GetPageIndex(page)
         caption = "BatchPage" + str(self.batch_page_index)
@@ -449 +462 @@
         page.window_caption = caption
         page.window_name = caption
+        self.SetSelection(pos)
         self.opened_pages[page.uid] = page
         return page