Changeset 6ca38f3 in sasview for invariantview/perspectives/invariant/invariant_state.py

Timestamp:

Aug 3, 2010 9:20:39 AM (14 years ago)

Author:

Jae Cho <jhjcho@…>

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, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

5b03122

Parents:

186c4eb

Message:

used better symbols for % and +_ on report(html_window)

File:

• invariantview/perspectives/invariant/invariant_state.py (modified) (3 diffs)

invariantview/perspectives/invariant/invariant_state.py

@@ -226 +226 @@
                 except:
                     pass
-                state += "(%s %s)"%(format_number(value),'o/o')
+                state += "(%s %s)"%(format_number(value),'%')
             # Outputs
             else:
@@ -486 +486 @@
                     s_10 = item[1]
                 elif item[0] == "volume fraction":
-                    s_17 = item[1]
+                    val=item[1].split("+-")[0].strip()
+                    error = item[1].split("+-")[1].strip()
+                    s_17 = val+" ± "+error
                 elif item[0] == "specific surface":
-                    s_18 = item[1]
+                    val=item[1].split("+-")[0].strip()
+                    error = item[1].split("+-")[1].strip()
+                    s_18 = val+" ± "+error
                 elif item[0].split("(")[0].strip()=="power high":
                     s_11 = item[0]+" ="+item[1]
@@ -494 +498 @@
                     s_12 = item[0]+" ="+item[1]
                 elif item[0].split("[")[0].strip()=="Q* from low Q extrapolation":
-                    s_13 = item[1]
+                    #looks messy but this way the symbols +_ and % work on html
+                    val=item[1].split("+-")[0].strip()
+                    error = item[1].split("+-")[1].strip()
+                    err = error.split("%")[0].strip()
+                    percent = error.split("%")[1].strip()
+                    s_13 = val+" ± "+err+"&#37"+percent
                 elif item[0].split("[")[0].strip()=="Q* from data":
-                    s_14 = item[1]
+                    val=item[1].split("+-")[0].strip()
+                    error = item[1].split("+-")[1].strip()
+                    err = error.split("%")[0].strip()
+                    percent = error.split("%")[1].strip()
+                    s_14 = val+" ± "+err+"&#37"+percent
                 elif item[0].split("[")[0].strip()=="Q* from high Q extrapolation":
-                    s_15 = item[1]
+                    val=item[1].split("+-")[0].strip()
+                    error = item[1].split("+-")[1].strip()
+                    err = error.split("%")[0].strip()
+                    percent = error.split("%")[1].strip()
+                    s_15 = val+" ± "+err+"&#37"+percent
                 elif item[0].split("[")[0].strip()=="total Q*":
-                    s_16 = item[1]
+                    val=item[1].split("+-")[0].strip()
+                    error = item[1].split("+-")[1].strip()
+                    s_16 = val+" ± "+error
                 else:
                     continue