Changeset 0b1d7d3 in sasview

Timestamp:

Dec 1, 2016 2:08:50 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:

c9677c9

Parents:

7602675

Message:

Plugin models are loaded properly (if they can be found) and fixed a bug in parameter setting routine.

Location:

src/sas/sasgui/perspectives/fitting

Files:

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

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

@@ -1177 +1177 @@
             formfactor_pos = int(state.formfactorcombobox)
         except:
+            if self.categorybox.GetValue() == 'Customized Models' \
+                    and '[plug-in]' not in state.formfactorcombobox:
+                state.formfactorcombobox = \
+                    '[plug-in] ' + state.formfactorcombobox
             formfactor_pos = 0
             for ind_form in range(self.formfactorbox.GetCount()):
@@ -1581 +1585 @@
                 if param[1] == listtorestore[j][1]:
                     item_page = listtorestore[j]
-                    item_page_info = statelist[j]
+                    item_page_info = param
                     if (item_page_info[1] == "theta" or item_page_info[1] ==
                             "phi") and not self._is_2D():

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

@@ -400 +400 @@
         formfactor, params = \
             convert.convert_model(self.formfactorcombobox, params)
+        # if len(self.str_parameters) > 0:
+        #     formfactor, str_params = \
+        #         convert.convert_model(formfactor, self.str_parameters)
 
         # Only convert if old != new, otherwise all the same
@@ -421 +424 @@
                     else:
                         std = [False, '']
-                    if lower is not None:
+                    if lower is not None and lower is not numpy.nan:
                         lower = [True, str(lower)]
                     else:
-                        lower = [False, '']
-                    if upper is not None:
+                        lower = [True, '-inf']
+                    if upper is not None and upper is not numpy.nan:
                         upper = [True, str(upper)]
                     else:
-                        upper = [False, '']
+                        upper = [True, 'inf']
                     param_list = [bool(fittable), str(name), str(info),
                                   "+/-", std, lower, upper, str(units)]