Changeset 460bdf4 in sasview


Ignore:
Timestamp:
Mar 27, 2019 11:52:28 AM (6 months 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:
2 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/Perspectives/Fitting/ComplexConstraint.py

    rcf9f39e r460bdf4  
    150150        param2 = self.cbParam2.currentText() 
    151151        if source == "cbParam1": 
    152             self.txtParam.setText(self.tab_names[0] + ":" + param1) 
     152            self.txtParam.setText(self.cbModel1.currentText() + ":" + param1) 
    153153        else: 
    154             self.txtConstraint.setText(self.tab_names[1] + "." + param2) 
     154            self.txtConstraint.setText(self.cbModel2.currentText() + "." + param2) 
    155155        # Check if any of the parameters are polydisperse 
    156156        params_list = [param1, param2] 
  • src/sas/qtgui/Perspectives/Fitting/ConstraintWidget.py

    r14e1ff0 r460bdf4  
    470470        self.cmdFit.setStyleSheet('QPushButton {color: black;}') 
    471471        self.cmdFit.setText("Fit") 
     472        self.is_running = False 
    472473 
    473474        # Notify the parent about completed fitting 
     
    515516        self.cmdFit.setStyleSheet('QPushButton {color: black;}') 
    516517        self.cmdFit.setText("Fit") 
     518        self.is_running = False 
    517519 
    518520        # Notify the parent about completed fitting 
     
    549551        self.cmdFit.setStyleSheet('QPushButton {color: black;}') 
    550552        self.cmdFit.setText("Fit") 
     553        self.is_running = False 
    551554 
    552555        # Notify the parent about completed fitting 
Note: See TracChangeset for help on using the changeset viewer.