Changeset 654e8e0 in sasview for src/sas/sasgui/perspectives/fitting

Timestamp:

Sep 1, 2016 2:36:07 PM (8 years ago)

Author:

krzywon

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:

7b2d6fb

Parents:

a3f1c11e

git-author:

Jeff Krzywon <krzywon@…> (09/01/16 14:36:07)

git-committer:

Jeff KRzywon <krzywon@…> (09/01/16 14:36:07)

Message:

Resolves #644 and #642: Improved loading performance for cansas XML data. Loading invariants and fits from save states no longer throw errors or open multiple windows.

File:

• src/sas/sasgui/perspectives/fitting/pagestate.py (modified) (1 diff)

src/sas/sasgui/perspectives/fitting/pagestate.py

@@ -1569 +1569 @@
                     if output[ind].run_name is not None\
                         and len(output[ind].run_name) != 0:
-                        name = output[ind].run_name
+                        if isinstance(output[ind].run_name, dict):
+                            name = output[ind].run_name.keys()[0]
+                        else:
+                            name = output[ind].run_name
                     else:
                         name = original_fname