Changes in src/sas/sasgui/perspectives/fitting/basepage.py [c192960:58a8f76] in sasview

File:

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

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

@@ -641 +641 @@
         # get the strings for report
         report_str, text_str = self.state.report(fig_urls=refs)
+
         # Show the dialog
         report_list = [report_str, text_str, images]
-        dialog = ReportDialog(report_list, imgRAM, refs, None, wx.ID_ANY, "")
+        dialog = ReportDialog(report_list, None, wx.ID_ANY, "")
         dialog.Show()
 
@@ -676 +677 @@
             refs.append('memory:' + name)
             imgRAM.AddFile(name, canvas.bitmap, wx.BITMAP_TYPE_PNG)
+
             # append figs
             images.append(fig)
@@ -1365 +1367 @@
             except Exception:
                 logger.error(traceback.format_exc())
-            index, selection = self._find_polyfunc_selection(disp_model)
+            selection = self._find_polyfunc_selection(disp_model)
             for list in self.fittable_param:
                 if list[1] == key and list[7] is not None:
-                    list[7].SetSelection(index)
+                    list[7].SetSelection(selection)
                     # For the array disp_model, set the values and weights
-                    if selection == 'array':
+                    if selection == 1:
                         disp_model.set_weights(self.values[key],
                                                self.weights[key])
@@ -1383 +1385 @@
                             logger.error(traceback.format_exc())
             # For array, disable all fixed params
-            if selection == 'array':
+            if selection == 1:
                 for item in self.fixed_param:
                     if item[1].split(".")[0] == key.split(".")[0]:
@@ -1470 +1472 @@
             # we need to check here ourselves.
             if not is_modified:
-                is_modified = self._check_value_enter(self.fittable_param)
-                is_modified = self._check_value_enter(
-                    self.fixed_param) or is_modified
-                is_modified = self._check_value_enter(
-                    self.parameters) or is_modified
+                is_modified = (self._check_value_enter(self.fittable_param)
+                               or self._check_value_enter(self.fixed_param)
+                               or self._check_value_enter(self.parameters))
 
             # Here we should check whether the boundaries have been modified.
@@ -1536 +1536 @@
                         data=[self.data])
             # Check the values
-            is_modified = self._check_value_enter(self.fittable_param)
-            is_modified = self._check_value_enter(self.fixed_param) or is_modified
-            is_modified = self._check_value_enter(self.parameters) or is_modified
+            is_modified = (self._check_value_enter(self.fittable_param)
+                           or self._check_value_enter(self.fixed_param)
+                           or self._check_value_enter(self.parameters))
 
             # If qmin and qmax have been modified, update qmin and qmax and
@@ -2324 +2324 @@
 
             # Update value in model if it has changed
-            if (value != self.model.getParam(name) or
-                    (np.isnan(value) and np.isnan(self.model.getParam(name)))):
+            if value != self.model.getParam(name):
                 self.model.setParam(name, value)
                 is_modified = True
@@ -2669 +2668 @@
     def _find_polyfunc_selection(self, disp_func=None):
         """
-        Find Combobox selection from disp_func
+        FInd Comboox selection from disp_func
 
         :param disp_function: dispersion distr. function
@@ -2676 +2675 @@
         if disp_func is not None:
             try:
-                return (list(POLYDISPERSITY_MODELS).index(disp_func.type),
-                       disp_func.type)
+                return POLYDISPERSITY_MODELS.values().index(disp_func.__class__)
             except ValueError:
                 pass  # Fall through to default class
-        return (list(POLYDISPERSITY_MODELS).index('gaussian'), 'gaussian')
+        return POLYDISPERSITY_MODELS.keys().index('gaussian')
 
     def on_reset_clicked(self, event):