Changeset 0633048 in sasview for src/sas/sasgui/perspectives

Timestamp:

Dec 9, 2016 1:52:27 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:

8aec639

Parents:

9eb8fae

Message:

#795: String parameters are now handled properly. Try/except blocks that gave save state compatibility from SasView? v2.2.1 to v3.0.0 were removed.

Location:

src/sas/sasgui/perspectives/fitting

Files:

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

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

@@ -1156 +1156 @@
         self._show_combox_helper()
         # select the current model
-        try:
-            # to support older version
-            category_pos = int(state.categorycombobox)
-        except:
-            state._convert_to_sasmodels()
-            state.categorycombobox = unicode(state.categorycombobox)
-            if state.categorycombobox in self.categorybox.Items:
-                category_pos = self.categorybox.Items.index(
-                    state.categorycombobox)
-            else:
-                # Look in master list for model name (model.lower)
-                category_pos = self.get_cat_combo_box_pos(state)
+        state._convert_to_sasmodels()
+        state.categorycombobox = unicode(state.categorycombobox)
+        if state.categorycombobox in self.categorybox.Items:
+            category_pos = self.categorybox.Items.index(
+                state.categorycombobox)
+        else:
+            # Look in master list for model name (model.lower)
+            category_pos = self.get_cat_combo_box_pos(state)
 
         self.categorybox.Select(category_pos)
         self._show_combox(None)
-        try:
-            # to support older version
-            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()):
-                if self.formfactorbox.GetString(ind_form) == \
-                                                    (state.formfactorcombobox):
-                    formfactor_pos = int(ind_form)
+        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()):
+            if self.formfactorbox.GetString(ind_form) == \
+                                                (state.formfactorcombobox):
+                formfactor_pos = int(ind_form)
+                break
+
+        self.formfactorbox.Select(formfactor_pos)
+
+        structfactor_pos = 0
+        if state.structurecombobox is not None:
+            state.structurecombobox = unicode(state.structurecombobox)
+            for ind_struct in range(self.structurebox.GetCount()):
+                if self.structurebox.GetString(ind_struct) == \
+                                                (state.structurecombobox):
+                    structfactor_pos = int(ind_struct)
                     break
-
-        self.formfactorbox.Select(formfactor_pos)
-
-        structfactor_pos = 0
-        try:
-            # to support older version
-            structfactor_pos = int(state.structurecombobox)
-        except:
-            if state.structurecombobox is not None:
-                state.structurecombobox = unicode(state.structurecombobox)
-                for ind_struct in range(self.structurebox.GetCount()):
-                    if self.structurebox.GetString(ind_struct) == \
-                                                    (state.structurecombobox):
-                        structfactor_pos = int(ind_struct)
-                        break
 
         self.structurebox.SetSelection(structfactor_pos)

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

@@ -392 +392 @@
                 self.formfactorcombobox = 'hardsphere'
 
-    def param_remap_to_sasmodels_convert(self, params):
+    def param_remap_to_sasmodels_convert(self, params, is_string=False):
         """
         Remaps the parameters for sasmodels conversion
@@ -412 +412 @@
                 lower[0] = False
                 lower[1] = numpy.nan
-            p[name] = float(value)
+            if is_string:
+                p[name] = str(value)
+            else:
+                p[name] = float(value)
             p[name + ".fittable"] = bool(fittable)
             p[name + ".std"] = float(uncert[1])
@@ -468 +471 @@
             convert.convert_model(self.formfactorcombobox, params)
         if len(self.str_parameters) > 0:
-            str_p = self.param_remap_to_sasmodels_convert(self.str_parameters)
-            formfactor, str_params = convert.convert_model(formfactor, str_p)
-        else:
-            str_params = None
+            str_pars = self.param_remap_to_sasmodels_convert(
+                self.str_parameters, True)
+            formfactor, str_params = convert.convert_model(
+                self.formfactorcombobox, str_pars)
+            for key, value in str_params.iteritems():
+                params[key] = value
 
         # Only convert if old != new, otherwise all the same
         if formfactor != self.formfactorcombobox or \
                         structurefactor != self.structurecombobox:
+            # Spherical SLD number of layers changed between 3.1.2 and 4.0
+            if self.formfactorcombobox == 'SphericalSLDModel':
+                self.multi_factor += 1
             self.formfactorcombobox = formfactor
             self.structurecombobox = structurefactor
             self.parameters = []
             self.parameters = self.param_remap_from_sasmodels_convert(params)
-            if str_params:
-                self.str_parameters = \
-                    self.param_remap_from_sasmodels_convert(str_params)
 
     def _repr_helper(self, list, rep):