Changeset 406644a in sasview for src/sas/sasgui/perspectives

Timestamp:

Nov 30, 2016 3:29:47 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:

7602675

Parents:

db5294e

Message:

#795: A few more models have been properly converted and tested to work. Still to do: 4 models not loading, custom models, and fix an error thrown when negative values are loaded.

Location:

src/sas/sasgui/perspectives/fitting

Files:

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

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

@@ -1583 +1583 @@
                     ordered_list.append(param)
                     break
-        if len(ordered_list) != len(statelist):
+        if len(ordered_list) != len(statelist) \
+                and len(ordered_list) != len(listtorestore):
             return
         statelist = ordered_list
 
+        #FIXME: Get rid of check above and simple assign params based on name
         for j in range(len(statelist)) if len(statelist) < len(listtorestore) \
                 else range(len(listtorestore)):
@@ -1598 +1600 @@
                 item_page[0].SetValue(item_page_info[0])
             if item_page[2] is not None:
+                # TODO: On loading save state, should try to coerce length and
+                # TODO: scale params to positive values
                 item_page[2].SetValue(item_page_info[2])
                 if item_page[2].__class__.__name__ == "ComboBox":

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

@@ -412 +412 @@
                     pass
                 else:
-                    fittable = params.get(name + ".fittable")
-                    std = params.get(name + ".std")
-                    upper = params.get(name + ".upper")
-                    lower = params.get(name + ".lower")
+                    fittable = params.get(name + ".fittable", True)
+                    std = params.get(name + ".std", '0.0')
+                    upper = params.get(name + ".upper", 'inf')
+                    lower = params.get(name + ".lower", '-inf')
                     units = params.get(name + ".units")
                     if std is not None and std is not numpy.nan: