Changeset b4fc0f9 in sasview for src/sas/sasgui

Timestamp:

Nov 15, 2016 2:29:45 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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

377c19a2

Parents:

600005c

Message:

#795: Orientation parameters returned by sasmodels are now handled properly.

Location:

src/sas/sasgui/perspectives/fitting

Files:

• basepage.py (modified) (2 diffs)
• pagestate.py (modified) (1 diff)

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

@@ -1572 +1572 @@
         if len(statelist) == 0 or len(listtorestore) == 0:
             return
-        if len(statelist) != len(listtorestore):
-            return
 
         ordered_list = []
@@ -1581 +1579 @@
                     ordered_list.append(param)
                     break
+        if len(ordered_list) != len(statelist):
+            return
         statelist = ordered_list
 
-        for j in range(len(listtorestore)):
+        for j in range(len(statelist)) if len(statelist) < len(listtorestore) \
+                else range(len(listtorestore)):
             item_page = listtorestore[j]
             item_page_info = statelist[j]
+            if (item_page_info[1] == "theta" or item_page_info[1] == "phi") \
+                and not self._is_2D():
+                break
             # change the state of the check box for simple parameters
             if item_page[0] is not None:

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

@@ -401 +401 @@
                     lower = params.get(name + ".lower")
                     units = params.get(name + ".units")
-                    if std is not None:
+                    if std is not None and std is not numpy.nan:
                         std = [True, str(std)]
                     else: