r14ec91c5	r725d9c06
9	9	from PyQt5.QtTest import QTest
10	10	from PyQt5.QtCore import *
11		from PyQt5.QtWebKit import *
12	11	from unittest.mock import MagicMock
13	12

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

-                      r14ec91c5
+                      r725d9c06
 """
 import os
+# numpy methods required for the validator! Don't remove.
+# pylint: disable=unused-import,unused-wildcard-import,redefined-builtin
 from numpy import *
 …
 # Local UI
 from sas.qtgui.Perspectives.Fitting.UI.ComplexConstraintUI import Ui_ComplexConstraintUI
-from sas.qtgui.Perspectives.Fitting.Constraint import Constraint
 class ComplexConstraint(QtWidgets.QDialog, Ui_ComplexConstraintUI):
 …
         self.tab_names = [tab.kernel_module.name for tab in self.tabs]
         self.params = [tab.getParamNames() for tab in self.tabs]
-        pass
     def setupSignals(self):
 …
         else:
             self.txtConstraint.setText(self.tab_names[1] + "." + self.cbParam2.currentText())
-        pass
     def onOperatorChange(self, index):
 …
         Add visual cues when formula is incorrect
         """
-        formula_is_valid = False
         formula_is_valid = self.validateConstraint(self.txtConstraint.text())
         if not formula_is_valid:
 …
         if parameter_string_start < 0:
             return False
-        parameter_string_end = parameter_string_start + len(param_str)
         # 3. replace parameter name with "1" and try to evaluate the expression

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

ra90c9c5	r725d9c06
7	7
8	8	from PyQt5 import QtGui, QtWidgets
9		~~from PyQt5 import QtWebKit~~
10	9
11	10	# set up import paths

ra90c9c5	r725d9c06
6	6
7	7	from PyQt5 import QtGui, QtCore, QtWidgets
8		~~from PyQt5 import QtWebKit~~
9	8	from PyQt5.QtTest import QTest
10	9

r14ec91c5	r725d9c06
5	5
6	6	from PyQt5 import QtGui, QtWidgets
7		~~from PyQt5 import QtWebKit~~
8	7
9	8	from unittest.mock import MagicMock

rda9a0722	r725d9c06
7	7
8	8	from PyQt5 import QtGui, QtWidgets
9		~~from PyQt5 import QtWebKit~~
10	9
11	10	# set up import paths

Note: See TracChangeset for help on using the changeset viewer.