Changes in src/sas/qtgui/Perspectives/Fitting/FittingOptions.py [8873ab7:ff3b293] in sasview

File:

• src/sas/qtgui/Perspectives/Fitting/FittingOptions.py (modified) (5 diffs)

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

@@ -64 +64 @@
         default_index = self.cbAlgorithm.findText(default_name)
         self.cbAlgorithm.setCurrentIndex(default_index)
-        # previous algorithm choice
-        self.previous_index = default_index
 
         # Assign appropriate validators
@@ -123 +121 @@
 
         # Convert the name into widget instance
-        try:
-            widget_to_activate = eval(widget_name)
-        except AttributeError:
-            # We don't yet have this optimizer.
-            # Show message
-            msg = "This algorithm has not yet been implemented in SasView.\n"
-            msg += "Please choose a different algorithm"
-            QtWidgets.QMessageBox.warning(self,
-                                        'Warning',
-                                        msg,
-                                        QtWidgets.QMessageBox.Ok)
-            # Move the index to previous position
-            self.cbAlgorithm.setCurrentIndex(self.previous_index)
-            return
-
+        widget_to_activate = eval(widget_name)
         index_for_this_id = self.stackedWidget.indexOf(widget_to_activate)
 
@@ -149 +133 @@
         # OK has to be reinitialized to True
         self.buttonBox.button(QtWidgets.QDialogButtonBox.Ok).setEnabled(True)
-
-        # keep reference
-        self.previous_index = index
 
     def onApply(self):
@@ -162 +143 @@
             # e.g. 'samples' for 'dream' is 'self.samples_dream'
             widget_name = 'self.'+option+'_'+self.current_fitter_id
-            try:
-                line_edit = eval(widget_name)
-            except AttributeError:
-                # Skip bumps monitors
-                continue
+            line_edit = eval(widget_name)
             if line_edit is None or not isinstance(line_edit, QtWidgets.QLineEdit):
                 continue
@@ -188 +165 @@
                 return
             try:
-                if isinstance(widget, QtWidgets.QComboBox):
-                    new_value = widget.currentText()
-                else:
-                    try:
-                        new_value = int(widget.text())
-                    except ValueError:
-                        new_value = float(widget.text())
-                #new_value = widget.currentText() if isinstance(widget, QtWidgets.QComboBox) \
-                #    else float(widget.text())
+                new_value = widget.currentText() if isinstance(widget, QtWidgets.QComboBox) \
+                    else float(widget.text())
                 self.config.values[self.current_fitter_id][option] = new_value
             except ValueError: