Changeset 64c7f39 in sasview

Timestamp:

Nov 15, 2016 10:38:55 AM (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:

600005c

Parents:

4ec7089

Message:

#795: Forward conversion of v3.0+ save states working for simple models, but requires testing of complex and reparameratized models.

Location:

src/sas/sasgui/perspectives/fitting

Files:

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

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

@@ -1575 +1575 @@
             return
 
+        ordered_list = []
+        for i in range(len(listtorestore)) :
+            for param in statelist:
+                if param[1] == listtorestore[i][1]:
+                    ordered_list.append(param)
+                    break
+        statelist = ordered_list
+
         for j in range(len(listtorestore)):
             item_page = listtorestore[j]

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

@@ -363 +363 @@
         """
         from sasmodels import convert
+        import re
         # Create conversion dictionary to send to sasmodels
         p = dict()
@@ -378 +379 @@
                 lower[0] = False
                 lower[1] = numpy.nan
-            p[name] = {
-                "fittable" : bool(fittable),
-                "value" : float(value),
-                "std" : float(uncert[1]),
-                "upper" : float(upper[1]),
-                "lower" : float(lower[1]),
-                "units" : units,
-            }
+            p[name] = float(value)
+            p[name + ".fittable"] = bool(fittable)
+            p[name + ".std"] = float(uncert[1])
+            p[name + ".upper"] = float(upper[1])
+            p[name + ".lower"] = float(lower[1])
+            p[name + ".units"] = units
         name, params = convert.convert_model(self.formfactorcombobox, p)
 
@@ -393 +392 @@
             self.parameters = []
             for name, info in params.iteritems():
-                if info.get("std") is not numpy.nan:
-                    std = ['True', str(info.get("std"))]
+                if ".fittable" in name or ".std" in name or ".upper" in name or\
+                        ".lower" in name or ".units" in name:
+                    pass
                 else:
-                    std = ['False', '']
-                if info.get("lower") is not numpy.nan:
-                    lower = ['True', str(info.get("lower"))]
-                else:
-                    lower = ['False', '']
-                if info.get("upper") is not numpy.nan:
-                    upper = ['True', str(info.get("upper"))]
-                else:
-                    upper = ['False', '']
-                param_list = [info.get("fittable"), name, info.get("value"),
-                              "+/-", std, lower, upper]
-                self.parameters.append(param_list)
+                    fittable = params.get(name + ".fittable")
+                    std = params.get(name + ".std")
+                    upper = params.get(name + ".upper")
+                    lower = params.get(name + ".lower")
+                    units = params.get(name + ".units")
+                    if std is not None:
+                        std = [True, str(std)]
+                    else:
+                        std = [False, '']
+                    if lower is not None:
+                        lower = [True, str(lower)]
+                    else:
+                        lower = [False, '']
+                    if upper is not None:
+                        upper = [True, str(upper)]
+                    else:
+                        upper = [False, '']
+                    param_list = [bool(fittable), str(name), str(info),
+                                  "+/-", std, lower, upper, str(units)]
+                    self.parameters.append(param_list)