Changeset 998ca90 in sasview for src/sas/sasgui/guiframe/data_panel.py

Timestamp:

Oct 7, 2016 10:21:40 AM (8 years ago)

Author:

krzywon

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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

ff3f5821

Parents:

cb823f0

Message:

#189 #12 Saving and loading project now fully saves and loads a simultaneous fits. Loading a project will reset Sasview state to its base state (with a warning). One error on load to fix before calling this finished.

File:

• src/sas/sasgui/guiframe/data_panel.py (modified) (1 diff)

src/sas/sasgui/guiframe/data_panel.py

@@ -890 +890 @@
 
 
-    def on_remove(self, event):
+    def on_remove(self, event, msg=""):
         """
         Get a list of item checked and remove them from the treectrl
         Ask the parent to remove reference to this item
         """
-        msg = "This operation will delete the data sets checked "
-        msg += "and all the dependents."
+        if msg == "":
+            msg = "This operation will delete the data sets checked "
+            msg += "and all the dependents."
         msg_box = wx.MessageDialog(None, msg, 'Warning', wx.OK|wx.CANCEL)
         if msg_box.ShowModal() != wx.ID_OK:
-            return
+            return True
 
         data_to_remove, theory_to_remove, _ = self.set_data_helper()