Changeset a684c64 in sasview for src/sas

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:

3560196

Parents:

173ee3a

git-author:

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

git-committer:

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

Message:

Implement saving/loading calculated parameters on project save

Location:

src/sas

Files:

• sascalc/corfunc/corfunc_calculator.py (modified) (1 diff)
• sasgui/perspectives/corfunc/corfunc_panel.py (modified) (7 diffs)
• sasgui/perspectives/corfunc/corfunc_state.py (modified) (6 diffs)

src/sas/sascalc/corfunc/corfunc_calculator.py

@@ -202 +202 @@
             'd0': d0,
             'A': A,
-            'Lc/max': Lc/x[maxs[0]]
+            'fill': Lc/x[maxs[0]]
         }
 

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

@@ -20 +20 @@
     'd0': "Average Core Thickness: ",
     'A': "PolyDispersity: ",
-    'Lc/max': "Filling Fraction: "
+    'fill': "Filling Fraction: "
 }
 
@@ -62 +62 @@
         self.qmax = (0, 0)
         self.background = 0
+        self.extracted_params = None
         # Dictionary for saving refs to text boxes used to display output data
         self._output_boxes = None
@@ -97 +98 @@
         if self.state.background is not None:
             self.set_background(self.state.background)
+        if self.state.outputs is not None and self.state.outputs != {}:
+            self.set_extracted_params(self.state.outputs)
 
     def get_state(self):
@@ -107 +110 @@
         state.set_saved_state('qmax2_tcl', self.qmax[1])
         state.set_saved_state('background_tcl', self.background)
+        state.outputs = self.extracted_params
         if self._data is not None:
             state.file = self._data.title
@@ -134 +138 @@
         self._calculator.set_data(data)
         # Reset the outputs
-        for key in OUTPUT_STRINGS.keys():
-            self._output_boxes[key].SetValue("-")
+        self.set_extracted_params(None)
         if self._manager is not None:
             from sas.sasgui.perspectives.corfunc.corfunc import IQ_DATA_LABEL
@@ -220 +223 @@
                 StatusEvent(status=msg, info="Error"))
             return
-        for key in OUTPUT_STRINGS.keys():
-            value = params[key]
-            self._output_boxes[key].SetValue(value)
+        self.set_extracted_params(params)
 
     def save_project(self, doc=None):
@@ -257 +258 @@
         self._background_input.SetValue(str(bg))
         self._calculator.background = bg
+
+    def set_extracted_params(self, params):
+        self.extracted_params = params
+        if params is None:
+            for key in OUTPUT_STRINGS.keys():
+                self._output_boxes[key].SetValue('-')
+        else:
+            for key in OUTPUT_STRINGS.keys():
+                value = params[key]
+                self._output_boxes[key].SetValue(value)
 
 

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

@@ -24 +24 @@
 # List of output parameters, used by __str__
 output_list = [
-    ["long_period", "Long Period"],
-    ["hard_block_thickness", "Average Hard Block Thickness"],
-    ["interface_thickness", "Average Interface Thickness"],
-    ["core_thickness", "Average Core Thickness"],
-    ["polydispersity", "PolyDispersity"],
-    ["filling", "Filling Fraction"]
+    ['max', "Long Period (A): "],
+    ['Lc', "Average Hard Block Thickness (A): "],
+    ['dtr', "Average Interface Thickness (A): "],
+    ['d0', "Average Core Thickness: "],
+    ['A', "PolyDispersity: "],
+    ['fill', "Filling Fraction: "]
 ]
 
@@ -44 +44 @@
         self.qmax = [0, 0]
         self.background = None
-        self.outputs = None
+        self.outputs = {}
 
         self.saved_state = DEFAULT_STATE
@@ -160 +160 @@
             state.appendChild(element)
 
+        # Output parameters
+        output = new_doc.createElement("output")
+        top_element.appendChild(output)
+        for item in output_list:
+            element = new_doc.createElement(item[0])
+            element.appendChild(new_doc.createTextNode(self.outputs[item[0]]))
+            output.appendChild(element)
 
         # Save the file or return the original document with the state
@@ -206 +213 @@
                         self.set_saved_state(name=item, value=value)
 
+            # Parse outputs
+            entry = get_content('ns:output', node)
+            if entry is not None:
+                for item in output_list:
+                    parameter = get_content("ns:{}".format(item[0]), entry)
+                    if parameter is not None:
+                        self.outputs[item[0]] = parameter.text.strip()
+
 
 
@@ -214 +229 @@
 
     type_name = "Corfunc"
+
+    type = ["Invariant file (*.inv)|*.inv",
+            "SASView file (*.svs)|*.svs"]
+
+    ext = ['.cor', '.COR', '.svs', '.SVS']
 
     def __init__(self, callback):
@@ -234 +254 @@
             basename = os.path.basename(path)
             root, ext = os.path.splitext(basename)
-            if ext.lower() != '.xml' and ext.lower() != '.svs':
+            if not ext.lower() in self.ext:
                 raise IOError, "{} is not a supported file type".format(ext)
             tree = etree.parse(path, parser=etree.ETCompatXMLParser())