Changes in src/sas/sasgui/perspectives/fitting/basepage.py [b76e65a:33dc18f] in sasview

File:

• src/sas/sasgui/perspectives/fitting/basepage.py (modified) (5 diffs)

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

@@ -1841 +1841 @@
             if models.name != "NoStructure":
                 mlist.append((models.name, models))
-
         # Sort the models
         mlist_sorted = sorted(mlist)
@@ -2929 +2928 @@
             return False
 
-
-    def _get_copy_params_details(self):
-        """
-        Combines polydisperse parameters with self.parameters so that they can
-        be written to the clipboard (for Excel or LaTeX). Also returns a list of
-        the names of parameters that have been fitted
-
-        :returns: all_params - A list of all parameters, in the format of 
-        self.parameters
-        :returns: fitted_par_names - A list of the names of parameters that have
-        been fitted
-        """
-        # Names of params that are being fitted
-        fitted_par_names = [param[1] for param in self.param_toFit]
-        # Names of params with associated polydispersity
-        disp_params = [param[1].split('.')[0] for param in self.fittable_param]
-
-        # Create array of all parameters
-        all_params = copy.copy(self.parameters)
-        for param in self.parameters:
-            if param[1] in disp_params:
-                # Polydisperse params aren't in self.parameters, so need adding
-                # to all_params
-                name = param[1] + ".width"
-                index = all_params.index(param) + 1
-                to_insert = []
-                if name in fitted_par_names:
-                    # Param is fitted, so already has a param list in self.param_toFit
-                    to_insert = self.param_toFit[fitted_par_names.index(name)]
-                else:
-                    # Param isn't fitted, so mockup a param list
-                    to_insert = [None, name, self.model.getParam(name), None, None]
-                all_params.insert(index, to_insert)
-        return all_params, fitted_par_names
-
     def get_copy_excel(self):
         """
@@ -2977 +2941 @@
         Get the string copies of the param names and values in the tap
         """
-        if not self.parameters:
-            # Do nothing if parameters doesn't exist
-            return False
-
         content = ''
+
         crlf = chr(13) + chr(10)
         tab = chr(9)
 
-        all_params, fitted_param_names = self._get_copy_params_details()
-
-        # Construct row of parameter names
-        for param in all_params:
-            name = param[1] # Parameter name
-            content += name
-            content += tab
-            if name in fitted_param_names:
-                # Only print errors for fitted parameters
-                content += name + "_err"
+        # Do it if params exist
+        if self.parameters:
+
+            for param in self.parameters:
+                content += param[1]  # parameter name
                 content += tab
-
-        content += crlf
-
-        # Construct row of parameter values and errors
-        for param in all_params:
-            value = param[2]
-            if hasattr(value, 'GetValue'):
-                # param[2] is a text box
-                value = value.GetValue()
-            else:
-                # param[2] is a float (from our self._get_copy_params_details)
-                value = str(value)
-            content += value
-            content += tab
-            if param[1] in fitted_param_names:
-                # Only print errors for fitted parameters
-                content += param[4].GetValue()
-                content += tab 
-
-        return content
+                content += param[1] + "_err"
+                content += tab
+
+            content += crlf
+
+            # row of values and errors...
+            for param in self.parameters:
+                content += param[2].GetValue()  # value
+                content += tab
+                content += param[4].GetValue()  # error
+                content += tab
+
+            return content
+        else:
+            return False
 
     def get_copy_latex(self):
@@ -3030 +2981 @@
         Get the string copies of the param names and values in the tap
         """
-        if not self.parameters:
-            # Do nothing if self.parameters doesn't exist
-            return False
-        
         content = '\\begin{table}'
         content += '\\begin{tabular}[h]'
@@ -3040 +2987 @@
         tab = chr(9)
 
-        all_params, fitted_param_names = self._get_copy_params_details()
-
-        content += '{|'
-        for param in all_params:
-            content += 'l|l|'
-        content += '}\hline'
-        content += crlf
-
-        # Construct row of parameter names
-        for index, param in enumerate(all_params):
-            name = param[1] # Parameter name
-            content += name.replace('_', '\_')  # Escape underscores
-            if name in fitted_param_names:
-                # Only print errors for fitted parameters
+        # Do it if params exist
+        if self.parameters:
+
+            content += '{|'
+            for param in self.parameters:
+                content += 'l|l|'
+            content += '}\hline'
+            content += crlf
+
+            for index, param in enumerate(self.parameters):
+                content += param[1].replace('_', '\_')  # parameter name
                 content += ' & '
-                content += name.replace('_', '\_') + "\_err"
-            if index < len(all_params) - 1:
+                content += param[1].replace('_', '\_') + "\_err"
+                if index < len(self.parameters) - 1:
+                    content += ' & '
+            content += '\\\\ \\hline'
+            content += crlf
+
+            # row of values and errors...
+            for index, param in enumerate(self.parameters):
+                content += param[2].GetValue()  # parameter value
                 content += ' & '
-
-        content += '\\\\ \\hline'
-        content += crlf
-
-        # Construct row of values and errors
-        for index, param in enumerate(all_params):
-            value = param[2]
-            if hasattr(value, "GetValue"):
-                # value is a text box
-                value = value.GetValue()
-            else:
-                # value is a float (from self._get_copy_params_details)
-                value = str(value)
-            content += value
-            if param[1] in fitted_param_names:
-                # Only print errors for fitted params
-                content += ' & '
-                content += param[4].GetValue()
-            if index < len(all_params) - 1:
-                content += ' & '
-        
-        content += '\\\\ \\hline'
-        content += crlf
-        content += '\\end{tabular}'
-        content += '\\end{table}'
-
-        return content
+                content += param[4].GetValue()  # parameter error
+                if index < len(self.parameters) - 1:
+                    content += ' & '
+            content += '\\\\ \\hline'
+            content += crlf
+
+            content += '\\end{tabular}'
+            content += '\\end{table}'
+            return content
+        else:
+            return False
 
     def set_clipboard(self, content=None):