Changeset e8418bb in sasview for src/sas/sasgui/perspectives/corfunc

Timestamp:

Aug 4, 2016 4:17:12 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:

40b14f3

Parents:

2ed088a

Message:

Fix bug when displaying output params if one of them is 0

File:

• src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) (1 diff)

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

@@ -636 +636 @@
             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)
+        rounded_str = ""
+        try:
+            # 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)
+        except:
+            # Method for finding significant_digit fails if x is 0 (since log10(0)=inf)
+            if x == 0.0:
+                rounded_str = "0.0"
+            else:
+                rounded_str = "-"
+
         return rounded_str