Changeset bdfe0be in sasview for src/sas/qtgui/Perspectives/Fitting/FittingOptions.py

Timestamp:

Sep 20, 2018 2:03:16 AM (6 years ago)

Author:

wojciech

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

863ebca

Parents:

c1bc9de (diff), 8873ab7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ESS_GUI' of ​https://github.com/SasView/sasview into ESS_GUI_Pr_fixes

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
@@ -121 +123 @@
 
         # Convert the name into widget instance
-        widget_to_activate = eval(widget_name)
+        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
+
         index_for_this_id = self.stackedWidget.indexOf(widget_to_activate)
 
@@ -133 +149 @@
         # OK has to be reinitialized to True
         self.buttonBox.button(QtWidgets.QDialogButtonBox.Ok).setEnabled(True)
+
+        # keep reference
+        self.previous_index = index
 
     def onApply(self):
@@ -143 +162 @@
             # e.g. 'samples' for 'dream' is 'self.samples_dream'
             widget_name = 'self.'+option+'_'+self.current_fitter_id
-            line_edit = eval(widget_name)
+            try:
+                line_edit = eval(widget_name)
+            except AttributeError:
+                # Skip bumps monitors
+                continue
             if line_edit is None or not isinstance(line_edit, QtWidgets.QLineEdit):
                 continue
@@ -165 +188 @@
                 return
             try:
-                new_value = widget.currentText() if isinstance(widget, QtWidgets.QComboBox) \
-                    else float(widget.text())
+                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())
                 self.config.values[self.current_fitter_id][option] = new_value
             except ValueError: