Changeset 06234fc in sasview for src/sas


Ignore:
Timestamp:
Feb 14, 2018 7:10:07 AM (6 years ago)
Author:
Piotr Rozyczko <rozyczko@…>
Branches:
ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc
Children:
fca1f50
Parents:
6e58f2f
Message:

Add model name to constraints on the same model

File:
1 edited

Legend:

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

    r6e58f2f r06234fc  
    574574        constraint.param = mc_widget.params[0] 
    575575        # Function should have the model name preamble 
    576         constraint.func = c_text 
     576        model_name = self.kernel_module.name 
     577        constraint.func = model_name + "." + c_text 
    577578        # Which row is the constrained parameter in? 
    578579        row = self.getRowFromName(constraint.param) 
     
    703704            self.constraintAddedSignal.emit([row]) 
    704705            self.modifyViewOnRow(row) 
    705             break 
    706706 
    707707        self.communicate.statusBarUpdateSignal.emit('Constraint removed') 
     
    794794        Return a list of tuples. Each tuple contains constraints mapped as 
    795795        ('constrained parameter', 'function to constrain') 
    796         e.g. [('sld','5*sld_solvent')]. 
     796        e.g. [('sld','5*M2.sld_solvent')]. 
    797797        Only for constraints with defined VALUE 
    798798        """ 
     
    11571157        self.setFittingStopped() 
    11581158 
    1159         assert result is not None 
     1159        #assert result is not None 
     1160        if assert in None: 
     1161            msg = "Fitting failed after: %s s.\n" % GuiUtils.formatNumber(elapsed) 
     1162            self.communicate.statusBarUpdateSignal.emit(msg) 
     1163            return 
    11601164 
    11611165        res_list = result[0][0] 
Note: See TracChangeset for help on using the changeset viewer.