Changeset 5e66738 in sasview

Timestamp:

Jan 30, 2018 9:20:14 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:

14ec91c5

Parents:

da9a0722

Message:

Code review cleanup

File:

• src/sas/qtgui/Perspectives/Fitting/MultiConstraint.py (modified) (5 diffs)

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

@@ -3 +3 @@
 """
 import os
+import webbrowser
+
+# numpy methods required for the validator! Don't remove.
+# pylint: disable=unused-import,unused-wildcard-import,redefined-builtin
 from numpy import *
 
-from PyQt5 import QtCore
-from PyQt5 import QtGui
 from PyQt5 import QtWidgets
-import webbrowser
 
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
@@ -16 +17 @@
 
 class MultiConstraint(QtWidgets.QDialog, Ui_MultiConstraintUI):
+    """
+    Logic class for interacting with MultiConstrainedUI view
+    """
     def __init__(self, parent=None, params=None):
+        """
+        parent: ConstraintWidget object
+        params: tuple of strings describing model parameters
+        """
         super(MultiConstraint, self).__init__()
 
@@ -23 +31 @@
         self.setModal(True)
         self.params = params
+        self.parent = parent
 
         self.setupLabels()
@@ -37 +46 @@
     def revert(self):
         """
-        switch M1 <-> M2
+        Swap parameters in the view
         """
         # Switch parameters
@@ -103 +112 @@
         # 3. parameter name should be a separate word, but can have "()[]*+-/ " around
         valid_neighbours = "()[]*+-/ "
-        has_only_parameter = False
         start_loc = parameter_string_start -1
         end_loc = parameter_string_end
-        if not any([constraint_text[start_loc] == char for char in valid_neighbours]):
+        if not any([constraint_text[start_loc] == ch for ch in valid_neighbours]):
             return False
         if end_loc < len(constraint_text):
-            if not any([constraint_text[end_loc] == char for char in valid_neighbours]):
+            if not any([constraint_text[end_loc] == ch for ch in valid_neighbours]):
                 return False