Changeset 18b7ecb9 in sasview

Timestamp:

Oct 7, 2016 2:26:18 PM (8 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

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:

ed9f872, 1f648cf8

Parents:

48b8f6d

git-author:

Piotr Rozyczko <rozyczko@…> (10/07/16 14:24:39)

git-committer:

Piotr Rozyczko <rozyczko@…> (10/07/16 14:26:18)

Message:

Save Analysis improvements. Fixed #629

Location:

src/sas/sasgui

Files:

• guiframe/panel_base.py (modified) (1 diff)
• perspectives/invariant/invariant_panel.py (modified) (4 diffs)
• perspectives/pr/inversion_panel.py (modified) (5 diffs)

src/sas/sasgui/guiframe/panel_base.py

@@ -317 +317 @@
         """
         return self._drag_flag
-    
+
+    def _set_analysis(self, flag):
+        """
+        Set the Analysis Save state flag and informs the manager
+        so it refreshes the menu/whole panel
+        """
+        self._set_save_flag(flag)
+        if self._manager is not None:
+            wx.PostEvent(self._manager.parent, PanelOnFocusEvent(panel=self))
+
     def _set_reset_flag(self, flag=True):
         """

src/sas/sasgui/perspectives/invariant/invariant_panel.py

@@ -95 +95 @@
         self.is_state_data = False
         self.is_power_out = False
+        self._set_analysis(False)
 
         #container of invariant value
@@ -170 +171 @@
             self._reset_state_list()
             self._set_bookmark_flag(True)
+            self._set_analysis(True)
         return True
 
@@ -281 +283 @@
             self.new_state = False
             self.is_state_data = False
+            self._set_analysis(True)
 
     def clear_panel(self):
@@ -911 +914 @@
         self.button_calculate.SetFocus()
         #self.SetupScrolling()
+        self._set_analysis(False)
 
     def _set_state(self, event):

src/sas/sasgui/perspectives/pr/inversion_panel.py

@@ -43 +43 @@
         #Set window's font size
         self.SetWindowVariant(variant=FONT_VARIANT)
+        self._set_analysis(False)
 
         self.plots = plots
@@ -396 +397 @@
             self.bck = state.bck
 
+        # We have the data available for serialization
+        self._set_analysis(True)
+
         # Perform inversion
         self._on_invert(None)
@@ -401 +405 @@
     def set_manager(self, manager):
         self._manager = manager
+        if manager is not None:
+            self._set_analysis(False)
 
     def _do_layout(self):
@@ -752 +758 @@
         self.nterms_estimate_ctl.Enable(False)
         self.nterms_estimate_ctl.SetLabel("")
+        self._set_analysis(False)
+
         self._on_pars_changed()
 
@@ -936 +944 @@
                 self._on_pars_changed(None)
                 self._on_invert(None)
+                self._set_analysis(True)
             except:
                 msg = "InversionControl._change_file: %s" % sys.exc_value