Changeset 6ca0da0 in sasview

Timestamp:

Feb 13, 2018 7:08:33 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

c736154

Parents:

731efec

Message:

More code review fixes

File:

• src/sas/qtgui/Perspectives/Fitting/ConstraintWidget.py (modified) (7 diffs)

src/sas/qtgui/Perspectives/Fitting/ConstraintWidget.py

@@ -1 @@
-import os
-import sys
 import logging
 
@@ -141 +139 @@
 
         # Single fitter for the simultaneous run
-        sim_fitter = Fit()
-        sim_fitter.fitter_id = self.page_id
+        fitter = Fit()
+        fitter.fitter_id = self.page_id
 
         # Notify the parent about fitting started
@@ -151 +149 @@
         page_ids = []
         fitter_id = 0
-        sim_fitter=[sim_fitter]
+        sim_fitter_list=[fitter]
         # Prepare the fitter object
         try:
@@ -159 +157 @@
                     # No such tab!
                     return
-                sim_fitter, fitter_id = tab_object.prepareFitters(fitter=sim_fitter[0], fit_id=fitter_id)
+                sim_fitter_list, fitter_id = tab_object.prepareFitters(fitter=sim_fitter_list[0], fit_id=fitter_id)
                 page_ids.append([tab_object.page_id])
-        except ValueError as ex:
+        except ValueError:
             # No parameters selected in one of the tabs
             no_params_msg = "Fitting can not be performed.\n" +\
                             "Not all tabs chosen for fitting have parameters selected for fitting."
-            reply = QtWidgets.QMessageBox.question(self,
-                                               'Warning',
-                                               no_params_msg,
-                                               QtWidgets.QMessageBox.Ok)
+            QtWidgets.QMessageBox.question(self,
+                                           'Warning',
+                                            no_params_msg,
+                                            QtWidgets.QMessageBox.Ok)
 
             return
@@ -189 +187 @@
         # new fit thread object
         calc_fit = FitThread(handler=handler,
-                             fn=sim_fitter,
+                             fn=sim_fitter_list,
                              batch_inputs=batch_inputs,
                              batch_outputs=batch_outputs,
@@ -389 +387 @@
         # Select for fitting
         param_string = "Fit Page " if num_rows==1 else "Fit Pages "
-        to_string = "to its current value" if num_rows==1 else "to their current values"
 
         self.actionSelect = QtWidgets.QAction(self)
@@ -435 +432 @@
         # Select for fitting
         param_string = "constraint " if num_rows==1 else "constraints "
-        to_string = "to its current value" if num_rows==1 else "to their current values"
 
         self.actionSelect = QtWidgets.QAction(self)