Changeset e02d8f6 in sasview for src/sas

Timestamp:

Jul 11, 2016 2:36:55 AM (8 years ago)

Author:

lewis

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:

9c90cf3

Parents:

3901e7c

git-author:

Lewis O'Driscoll <lewis.o'driscoll@…> (07/06/16 09:20:28)

git-committer:

Lewis O'Driscoll <lewis.o'driscoll@…> (07/11/16 02:36:55)

Message:

Implement saving/loading state to/from a .svs project file

Location:

src/sas/sasgui/perspectives/corfunc

Files:

• corfunc.py (modified) (4 diffs)
• corfunc_panel.py (modified) (7 diffs)
• corfunc_state.py (added)

src/sas/sasgui/perspectives/corfunc/corfunc.py

@@ -13 +13 @@
 from sas.sasgui.guiframe.dataFitting import Data1D
 from sas.sasgui.perspectives.pr.pr_widgets import DataDialog
+from sas.sasgui.perspectives.corfunc.corfunc_state import Reader
+from sas.sascalc.dataloader.loader import Loader
+import sas.sascalc.dataloader
 
 
@@ -30 +33 @@
         self._always_active = True
 
+        self.state_reader = Reader(self.set_state)
+        self._extensions = '.cor'
+        l = Loader()
+        l.associate_file_reader('.cor', self.state_reader)
+
     def get_panels(self, parent):
         """
@@ -43 +51 @@
 
         return [self.corfunc_panel]
+
+    def set_state(self, state=None, datainfo=None):
+        """
+        Callback for CorfuncState reader. Called when a .cor file is loaded
+        """
+        self.corfunc_panel.set_state(state=state, data=datainfo)
 
     def set_data(self, data_list=None):
@@ -98 +112 @@
                                                 id=self.data_id))
                     self.data_id = data.id
-                    self.corfunc_panel._set_data(data)
+                    self.corfunc_panel.set_data(data)
                 except:
                     msg = "Corfunc set_data: " + str(sys.exc_value)

src/sas/sasgui/perspectives/corfunc/corfunc_panel.py

@@ -9 +9 @@
 from sas.sasgui.perspectives.invariant.invariant_widgets import InvTextCtrl
 from sas.sasgui.perspectives.fitting.basepage import ModelTextCtrl
+from sas.sasgui.perspectives.corfunc.corfunc_state import CorfuncState
 
 if sys.platform.count("win32") > 0:
@@ -39 +40 @@
         self._qmax1_input = None
         self._qmax2_input = None
-        self._qmin = 0
-        self._qmax = (0, 0)
+        self.qmin = 0
+        self.qmax = (0, 0)
         # Dictionary for saving IDs of text boxes used to display output data
         self._output_ids = None
         self.state = None
+        self._do_layout()
         self.set_state()
-        self._do_layout()
         self._qmin_input.Bind(wx.EVT_TEXT, self._on_enter_qrange)
         self._qmax1_input.Bind(wx.EVT_TEXT, self._on_enter_qrange)
@@ -51 +52 @@
 
     def set_state(self, state=None, data=None):
-        # TODO: Implement state restoration
-        return False
+        if state is None:
+            self.state = CorfuncState()
+        else:
+            self.state = state
+        if data is not None:
+            self.state.data = data
+        self.set_data(self.state.data, set_qrange=False)
+        if self.state.qmin is not None:
+            self.set_qmin(self.state.qmin)
+        if self.state.qmax is not None and self.state.qmax != (None, None):
+            self.set_qmax(tuple(self.state.qmax))
+
+    def get_state(self):
+        """
+        Return the state of the panel
+        """
+        state = CorfuncState()
+        state.set_saved_state('qmin_tcl', self.qmin)
+        state.set_saved_state('qmax1_tcl', self.qmax[0])
+        state.set_saved_state('qmax2_tcl', self.qmax[1])
+        if self._data is not None:
+            state.file = self._data.title
+            state.data = self._data
+        self.state = state
+
+        return self.state
 
     def onSetFocus(self, evt):
@@ -59 +84 @@
         self._validate_qrange()
 
-    def _set_data(self, data=None):
+    def set_data(self, data=None, set_qrange=True):
         """
         Update the GUI to reflect new data that has been loaded in
@@ -65 +90 @@
         :param data: The data that has been loaded
         """
-        self._data_name_box.SetValue(str(data.name))
+        if data is None:
+            return
+        self._data_name_box.SetValue(str(data.title))
         self._data = data
         if self._manager is not None:
             self._manager.show_data(data=data, reset=True)
-        lower = data.x[-1]*0.05
-        upper1 = data.x[-1] - lower*5
-        upper2 = data.x[-1]
-        self.set_qmin(lower)
-        self.set_qmax((upper1, upper2))
-
-
-    def _on_enter_qrange(self, event):
+        if set_qrange:
+            lower = data.x[-1]*0.05
+            upper1 = data.x[-1] - lower*5
+            upper2 = data.x[-1]
+            self.set_qmin(lower)
+            self.set_qmax((upper1, upper2))
+
+    def get_data(self):
+        return self._data
+
+    def save_project(self, doc=None):
+        """
+        Return an XML node containing the state of the panel
+        """
+        data = self._data
+        state = self.get_state()
+        if data is not None:
+            new_doc, sasentry = self._manager.state_reader._to_xml_doc(data)
+            new_doc = state.toXML(doc=new_doc, entry_node=sasentry)
+            if new_doc is not None:
+                if doc is not None and hasattr(doc, "firstChild"):
+                    child = new_doc.getElementsByTagName("SASentry")
+                    for item in child:
+                        doc.firstChild.appendChild(item)
+                else:
+                    doc = new_doc
+        return doc
+
+
+    def _on_enter_qrange(self, event=None):
         """
         Read values from input boxes and save to memory.
         """
-        event.Skip()
+        if event is not None: event.Skip()
         if not self._validate_qrange():
             return
@@ -91 +140 @@
         from sas.sasgui.perspectives.corfunc.corfunc import GROUP_ID_IQ_DATA
         group_id = GROUP_ID_IQ_DATA
-        wx.PostEvent(self._manager.parent, PlotQrangeEvent(
-            ctrl=[self._qmin_input, self._qmax1_input, self._qmax2_input],
-            active=event.GetEventObject(), id=data_id, group_id=group_id,
-            leftdown=False))
+        if event is not None:
+            wx.PostEvent(self._manager.parent, PlotQrangeEvent(
+                ctrl=[self._qmin_input, self._qmax1_input, self._qmax2_input],
+                active=event.GetEventObject(), id=data_id, group_id=group_id,
+                leftdown=False))
 
     def set_qmin(self, qmin):
@@ -139 +189 @@
             "qmin must be less than qmax"
             qmin_valid = False
-        # import pdb; pdb.set_trace()
+
         if not (qmin_valid and qmax_valid):
             if not qmin_valid: