Changeset e73e723 in sasview

Timestamp:

Jul 12, 2016 10:10:33 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:

20e09c6

Parents:

5878a9ea

Message:

Move string conversion from calculator class to panel

Location:

src/sas

Files:

• sascalc/corfunc/corfunc_calculator.py (modified) (2 diffs)
• sasgui/perspectives/corfunc/corfunc_panel.py (modified) (3 diffs)
• sasgui/perspectives/corfunc/corfunc_state.py (modified) (2 diffs)

src/sas/sascalc/corfunc/corfunc_calculator.py

@@ -226 +226 @@
         }
 
-        for key, val in params.iteritems():
-            params[key] = self._round_sig_figs(val, 6)
-
         return params
 
@@ -276 +273 @@
 
         return s2
-
-    def _round_sig_figs(self, x, sigfigs):
-        """
-        Round a number to a given number of significant figures.
-
-        :param x: The value to round
-        :param sigfigs: How many significant figures to round to
-        :return rounded_str: x rounded to the given number of significant
-            figures, as a string
-        """
-        # Index of first significant digit
-        significant_digit = -int(np.floor(np.log10(np.abs(x))))
-        # Number of digits required for correct number of sig figs
-        digits = significant_digit + (sigfigs - 1)
-        rounded = np.round(x, decimals=digits)
-        rounded_str = "{1:.{0}f}".format(sigfigs -1  + significant_digit,
-            rounded)
-        return rounded_str

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

@@ -1 +1 @@
 import wx
 import sys
+import numpy as np
 from wx.lib.scrolledpanel import ScrolledPanel
 from sas.sasgui.guiframe.events import PlotQrangeEvent
@@ -313 +314 @@
                 error = True
             for key, value in params.iteritems():
-                self._output_boxes[key].SetValue(value)
+                rounded = self._round_sig_figs(value, 6)
+                self._output_boxes[key].SetValue(rounded)
         if error:
             msg = 'Not all parameters were able to be calculated'
@@ -605 +607 @@
         self._qmax2_input.Enable()
         self._background_input.Enable()
+
+    def _round_sig_figs(self, x, sigfigs):
+        """
+        Round a number to a given number of significant figures.
+
+        :param x: The value to round
+        :param sigfigs: How many significant figures to round to
+        :return rounded_str: x rounded to the given number of significant
+            figures, as a string
+        """
+        # Index of first significant digit
+        significant_digit = -int(np.floor(np.log10(np.abs(x))))
+        # Number of digits required for correct number of sig figs
+        digits = significant_digit + (sigfigs - 1)
+        rounded = np.round(x, decimals=digits)
+        rounded_str = "{1:.{0}f}".format(sigfigs -1  + significant_digit,
+            rounded)
+        return rounded_str

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

@@ -178 +178 @@
             for item in output_list:
                 element = new_doc.createElement(item[0])
-                element.appendChild(new_doc.createTextNode(self.outputs[item[0]]))
+                value = self.outputs[item[0]]
+                element.appendChild(new_doc.createTextNode(str(value)))
                 output.appendChild(element)
 
@@ -240 +241 @@
                     parameter = get_content("ns:{}".format(item[0]), entry)
                     if parameter is not None:
-                        self.outputs[item[0]] = parameter.text.strip()
+                        self.outputs[item[0]] = float(parameter.text.strip())