Changeset 0e33a8d in sasview

Timestamp:

Jul 1, 2015 1:57:24 PM (9 years ago)

Author:

Doucet, Mathieu <doucetm@…>

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:

3a5f7c8

Parents:

c80e0ac

Message:

Minor fixes to state loading

Location:

src/sas/perspectives

Files:

• fitting/pagestate.py (modified) (1 diff)
• invariant/invariant_panel.py (modified) (1 diff)

src/sas/perspectives/fitting/pagestate.py

@@ -882 +882 @@
                                 # pass if line is empty (it happens)
                                 logging.error(sys.exc_value)
-                    dic[name] = numpy.array(value_list)
+                        dic[name] = numpy.array(value_list)
                     setattr(self, item[1], dic)
 

src/sas/perspectives/invariant/invariant_panel.py

@@ -829 +829 @@
         try:
             attr = getattr(self, key)
-            attr.SetValue(str(value))
+            if attr.__class__.__name__ == "StaticText":
+                return
+            if type(value) is not bool:
+                value = str(value)
+            attr.SetValue(value)
         except:
             logging.error("Invariant state: %s", sys.exc_value)