Changeset 460bdf4 in sasview

Timestamp:

Mar 27, 2019 11:52:28 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl

Children:

770c42c

Parents:

dc3b34e

Message:

Fixed bug for when subsequent C&S jobs would fail.
Modified constraint display to correspond better to the control state.

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• ComplexConstraint.py (modified) (1 diff)
• ConstraintWidget.py (modified) (3 diffs)

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

@@ -150 +150 @@
         param2 = self.cbParam2.currentText()
         if source == "cbParam1":
-            self.txtParam.setText(self.tab_names[0] + ":" + param1)
+            self.txtParam.setText(self.cbModel1.currentText() + ":" + param1)
         else:
-            self.txtConstraint.setText(self.tab_names[1] + "." + param2)
+            self.txtConstraint.setText(self.cbModel2.currentText() + "." + param2)
         # Check if any of the parameters are polydisperse
         params_list = [param1, param2]

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

@@ -470 +470 @@
         self.cmdFit.setStyleSheet('QPushButton {color: black;}')
         self.cmdFit.setText("Fit")
+        self.is_running = False
 
         # Notify the parent about completed fitting
@@ -515 +516 @@
         self.cmdFit.setStyleSheet('QPushButton {color: black;}')
         self.cmdFit.setText("Fit")
+        self.is_running = False
 
         # Notify the parent about completed fitting
@@ -549 +551 @@
         self.cmdFit.setStyleSheet('QPushButton {color: black;}')
         self.cmdFit.setText("Fit")
+        self.is_running = False
 
         # Notify the parent about completed fitting