Changeset 2ff9e37 in sasview

Timestamp:

Jul 11, 2016 4: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:

d4f5637

Parents:

d888abf

git-author:

Lewis O'Driscoll <lewis.o'driscoll@…> (07/11/16 04:31:53)

git-committer:

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

Message:

On project load, only plot extrapolation/transform if they were plotted before project save

Location:

src/sas/sasgui/perspectives/corfunc

Files:

• corfunc_panel.py (modified) (3 diffs)
• corfunc_state.py (modified) (4 diffs)

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

@@ -98 +98 @@
         if self.state.background is not None:
             self.set_background(self.state.background)
+        if self.state.is_extrapolated:
+            self.compute_extrapolation()
+        else:
+            return
+        if self.state.is_transformed:
+            self.compute_transform()
+        else:
+            return
         if self.state.outputs is not None and self.state.outputs != {}:
             self.set_extracted_params(self.state.outputs)
-            self.compute_extrapolation()
-            self.compute_transform()
 
     def get_state(self):
@@ -116 +122 @@
             state.file = self._data.title
             state.data = self._data
+        if self._extrapolated_data is not None:
+            state.is_extrapolated = True
+        if self._transformed_data is not None:
+            state.is_transformed = True
         self.state = state
 
@@ -236 +246 @@
         state = self.get_state()
         if data is not None:
+            import pdb; pdb.set_trace()
             new_doc, sasentry = self._manager.state_reader._to_xml_doc(data)
             new_doc = state.toXML(doc=new_doc, entry_node=sasentry)

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

@@ -46 +46 @@
         self.background = None
         self.outputs = {}
+        self.is_extrapolated = False
+        self.is_transformed = False
 
         self.saved_state = DEFAULT_STATE
@@ -161 +163 @@
             state.appendChild(element)
 
+        # Whether or not the extrapolate & transform buttons have been clicked
+        element = new_doc.createElement("is_extrapolated")
+        top_element.appendChild(element)
+        element.appendChild(new_doc.createTextNode(str(int(self.is_extrapolated))))
+
+        element = new_doc.createElement("is_transformed")
+        top_element.appendChild(element)
+        element.appendChild(new_doc.createTextNode(str(int(self.is_transformed))))
+
         # Output parameters
         if self.outputs != {} and self.outputs is not None:
@@ -187 +198 @@
         :param node: node of an XML document to read from (optional)
         """
+        import pdb; pdb.set_trace()
         if node.get('version') and node.get('version') == '1.0':
             # Parse filename
@@ -214 +226 @@
                             value = None
                         self.set_saved_state(name=item, value=value)
+
+            # Parse is_extrapolated and is_transformed
+            entry = get_content('ns:is_extrapolated', node)
+            if entry is not None:
+                self.is_extrapolated = bool(int(entry.text.strip()))
+            entry = get_content('ns:is_transformed', node)
+            if entry is not None:
+                self.is_transformed = bool(int(entry.text.strip()))
 
             # Parse outputs