Changeset 5dc6d84 in sasview for invariantview/perspectives/invariant

Timestamp:

Jan 23, 2011 2:46:28 PM (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:

5385a9e

Parents:

88989768

Message:

fixed a bug in importing time and extrapolation string on report

File:

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

invariantview/perspectives/invariant/invariant_state.py

@@ -2 +2 @@
 """
 
-import time
+#import time
 import os
 import sys
@@ -252 +252 @@
         """
         from xml.dom.minidom import getDOMImplementation
-        #import time
+        import time
         timestamp = time.time()
         # Check whether we have to write a standalone XML file
@@ -480 +480 @@
                     bool_0 = extra[0].split("=")
                     bool_1 = extra[1].split("=")
-                    s_7 = " " + bool_0[0] + "Q region = " + bool_0[1]
-                    s_8 = " " + bool_1[0] + "Q region = " + bool_1[1]
+                    s_8 = " " + bool_0[0] + "Q region = " + bool_0[1]
+                    s_7 = " " + bool_1[0] + "Q region = " + bool_1[1]
                 elif item[0] == "npts low":
                     s_9 = item[1]
-                elif item[0] == " npts high":
+                elif item[0] == "npts high":
                     s_10 = item[1]
                 elif item[0] == "volume fraction":
@@ -494 +494 @@
                     error = item[1].split("+-")[1].strip()
                     s_18 = val + " ± " + error
+                elif item[0].split("(")[0].strip() == "power low":
+                    s_11 = item[0]+" ="+item[1]
                 elif item[0].split("(")[0].strip() == "power high":
-                    s_11 = item[0]+" ="+item[1]
-                elif item[0].split("(")[0].strip() == "power low":
                     s_12 = item[0]+" ="+item[1]
                 elif item[0].split("[")[0].strip() == "Q* from low Q extrapolation":