Changeset d72ac57 in sasview


Ignore:
Timestamp:
Nov 21, 2018 8:11:26 AM (6 years ago)
Author:
Piotr Rozyczko <piotr.rozyczko@…>
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:
99372b6
Parents:
442a9ae
Message:

Allow only '=' for constraints, until TRAC #426 is fixed

Location:
src/sas/qtgui/Perspectives/Fitting
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r09e0c32 rd72ac57  
    1717from sas.qtgui.Perspectives.Fitting.Constraint import Constraint 
    1818 
    19 ALLOWED_OPERATORS = ['=','<','>','>=','<='] 
     19#ALLOWED_OPERATORS = ['=','<','>','>=','<='] 
     20ALLOWED_OPERATORS = ['='] 
    2021 
    2122# Local UI 

  • src/sas/qtgui/Perspectives/Fitting/UnitTesting/ComplexConstraintTest.py

    recc5d043 rd72ac57  
    137137 
    138138        # Change parameter and operand 
    139         self.widget.cbOperator.setCurrentIndex(3) 
     139        #self.widget.cbOperator.setCurrentIndex(3) 
    140140        self.widget.cbParam2.setCurrentIndex(3) 
    141141        c = self.widget.constraint() 
    142142        self.assertEqual(c[0], 'M1') 
    143143        self.assertEqual(c[1].func, 'M1.sld_solvent') 
    144         self.assertEqual(c[1].operator, '>=') 
     144        #self.assertEqual(c[1].operator, '>=') 
    145145 
    146146    def testOnHelp(self): 
Note: See TracChangeset for help on using the changeset viewer.