Changes in src/sas/sasgui/perspectives/fitting/pagestate.py [0b1d7d3:c8e1996] in sasview

File:

• src/sas/sasgui/perspectives/fitting/pagestate.py (modified) (2 diffs)

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

@@ -25 +25 @@
 from lxml import etree
 
-from sasmodels import convert
 import sasmodels.weights
 
@@ -356 +355 @@
             obj.saved_states[copy_name] = copy_state
         return obj
-
-    def _is_sasmodels(self):
-        """
-        A check to see if the loaded save state was saved in SasView v4_0+
-        :return: None
-        """
-        newname = convert._conversion_target(self.formfactorcombobox)
-        if newname == None:
-            return True
-        else:
-            return False
-
-    def _convert_to_sasmodels(self):
-        """
-        Convert parameters to a form usable by sasmodels converter
-
-        :return: None
-        """
-        # Create conversion dictionary to send to sasmodels
-        p = dict()
-        for fittable, name, value, _, uncert, lower, upper, units in \
-                self.parameters:
-            if not value:
-                value = numpy.nan
-            if not uncert or uncert[1] == '':
-                uncert[0] = False
-                uncert[1] = numpy.nan
-            if not upper or upper[1] == '':
-                upper[0] = False
-                upper[1] = numpy.nan
-            if not lower or lower[1] == '':
-                lower[0] = False
-                lower[1] = numpy.nan
-            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
-
-        structurefactor, params = \
-            convert.convert_model(self.structurecombobox, p)
-        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
-        if formfactor != self.formfactorcombobox or \
-                        structurefactor != self.structurecombobox:
-            self.formfactorcombobox = formfactor
-            self.structurecombobox = structurefactor
-            self.parameters = []
-            for name, info in params.iteritems():
-                if ".fittable" in name or ".std" in name or ".upper" in name or\
-                        ".lower" in name or ".units" in name:
-                    pass
-                else:
-                    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:
-                        std = [True, str(std)]
-                    else:
-                        std = [False, '']
-                    if lower is not None and lower is not numpy.nan:
-                        lower = [True, str(lower)]
-                    else:
-                        lower = [True, '-inf']
-                    if upper is not None and upper is not numpy.nan:
-                        upper = [True, str(upper)]
-                    else:
-                        upper = [True, 'inf']
-                    param_list = [bool(fittable), str(name), str(info),
-                                  "+/-", std, lower, upper, str(units)]
-                    self.parameters.append(param_list)
-
 
     def _repr_helper(self, list, rep):