Changeset 725d9c06 in sasview for src/sas/qtgui/Perspectives/Fitting


Ignore:
Timestamp:
Feb 8, 2018 3:50:04 AM (7 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:
235d766
Parents:
a90c9c5
Message:

More code review changes

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

Legend:

Unmodified
Added
Removed

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

    r14ec91c5 r725d9c06  
    33""" 
    44import os 
     5 
     6# numpy methods required for the validator! Don't remove. 
     7# pylint: disable=unused-import,unused-wildcard-import,redefined-builtin 
    58from numpy import * 
    69 
    … …  
    1518# Local UI 
    1619from sas.qtgui.Perspectives.Fitting.UI.ComplexConstraintUI import Ui_ComplexConstraintUI 
    17 from sas.qtgui.Perspectives.Fitting.Constraint import Constraint 
    1820 
    1921class ComplexConstraint(QtWidgets.QDialog, Ui_ComplexConstraintUI): 
    … …  
    4648        self.tab_names = [tab.kernel_module.name for tab in self.tabs] 
    4749        self.params = [tab.getParamNames() for tab in self.tabs] 
    48         pass 
    4950 
    5051    def setupSignals(self): 
    … …  
    104105        else: 
    105106            self.txtConstraint.setText(self.tab_names[1] + "." + self.cbParam2.currentText()) 
    106         pass 
    107107 
    108108    def onOperatorChange(self, index): 
    … …  
    140140        Add visual cues when formula is incorrect 
    141141        """ 
    142         formula_is_valid = False 
    143142        formula_is_valid = self.validateConstraint(self.txtConstraint.text()) 
    144143        if not formula_is_valid: 
    … …  
    177176        if parameter_string_start < 0: 
    178177            return False 
    179         parameter_string_end = parameter_string_start + len(param_str) 
    180178 
    181179        # 3. replace parameter name with "1" and try to evaluate the expression 

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

    ra90c9c5 r725d9c06  
    77 
    88from PyQt5 import QtGui, QtWidgets 
    9 from PyQt5 import QtWebKit 
    109 
    1110# set up import paths 

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

    ra90c9c5 r725d9c06  
    66 
    77from PyQt5 import QtGui, QtCore, QtWidgets 
    8 from PyQt5 import QtWebKit 
    98from PyQt5.QtTest import QTest 
    109 

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

    r14ec91c5 r725d9c06  
    55 
    66from PyQt5 import QtGui, QtWidgets 
    7 from PyQt5 import QtWebKit 
    87 
    98from unittest.mock import MagicMock 

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

    rda9a0722 r725d9c06  
    77 
    88from PyQt5 import QtGui, QtWidgets 
    9 from PyQt5 import QtWebKit 
    109 
    1110# set up import paths 
Note: See TracChangeset for help on using the changeset viewer.