Changeset caeb382 in sasview for src/sas

Timestamp:

Aug 22, 2016 7:14:25 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:

20ced5c

Parents:

ff11b21

Message:

Refactor writing outputs in corfunc_state

File:

• src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) (2 diffs)

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

@@ -70 +70 @@
         state += "Qmax:         {}\n".format(str(self.qmax))
         state += "Background:   {}\n".format(str(self.background))
-        if self.outputs is None:
-            return state
-        state += "\nOutputs:\n"
-        for output in output_list:
-            key = output[0]
-            name = output[1]
-            state += "{}: {}\n".format(name, str(self.outputs[key]))
+
+        if self.outputs != {} and self.outputs is not None:
+            state += "\nOutputs:\n"
+            for key, value in self.outputs.iteritems():
+                name = output_list[key][1]
+                state += "{}: {}\n".format(name, str(value))
 
         return state
@@ -176 +175 @@
             output = new_doc.createElement("output")
             top_element.appendChild(output)
-            for item in output_list:
-                element = new_doc.createElement(item[0])
-                value = self.outputs[item[0]]
+            for key, value in self.outputs.iteritems():
+                element = new_doc.createElement(key)
                 element.appendChild(new_doc.createTextNode(str(value)))
                 output.appendChild(element)