Changeset 0595bb7 in sasview

Timestamp:

Jan 10, 2018 5:15:53 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:

eae226b

Parents:

7fd20fc

git-author:

Piotr Rozyczko <rozyczko@…> (12/24/17 10:42:41)

git-committer:

Piotr Rozyczko <rozyczko@…> (01/10/18 05:15:53)

Message:

Constraint validator - initial implementation + tests. SASVIEW-844

Files:

• installers/installer_generator.py (modified) (1 prop)
• src/sas/qtgui/GUITests.py (modified) (2 diffs)
• src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified) (3 diffs)
• src/sas/qtgui/Perspectives/Fitting/MultiConstraint.py (modified) (3 diffs, 1 prop)
• src/sas/qtgui/Perspectives/Fitting/UnitTesting/MultiConstraintTest.py (added)

src/sas/qtgui/GUITests.py

@@ -56 +56 @@
 from Perspectives.Fitting.UnitTesting import FitPageTest
 from Perspectives.Fitting.UnitTesting import FittingOptionsTest
+from Perspectives.Fitting.UnitTesting import MultiConstraintTest
+
 #  Invariant
 from Perspectives.Invariant.UnitTesting import InvariantPerspectiveTest
 from Perspectives.Invariant.UnitTesting import InvariantDetailsTest
-#  Inversion
-from Perspectives.Inversion.UnitTesting import InversionPerspectiveTest
-
 
 def suite():
@@ -114 +113 @@
         unittest.makeSuite(FitPageTest.FitPageTest,                       'test'),
         unittest.makeSuite(FittingOptionsTest.FittingOptionsTest,         'test'),
+        unittest.makeSuite(MultiConstraintTest.MultiConstraintTest,       'test'),
         #  Invariant
         unittest.makeSuite(InvariantPerspectiveTest.InvariantPerspectiveTest,  'test'),

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

@@ -80 +80 @@
     Main widget for selecting form and structure factor models
     """
+    constraintAddedSignal = QtCore.pyqtSignal(list)
     def __init__(self, parent=None, data=None, tab_id=1):
 
@@ -452 +453 @@
         # Respond to change in parameters from the UI
         self._model_model.itemChanged.connect(self.onMainParamsChange)
+        self.constraintAddedSignal.connect(self.modifyViewOnConstraint)
         self._poly_model.itemChanged.connect(self.onPolyModelChange)
         self._magnet_model.itemChanged.connect(self.onMagnetModelChange)
@@ -506 +508 @@
 
         # Define the callbacks
-        self.actionConstrain.triggered.connect(self.addConstraint)
-        self.actionMutualMultiConstrain.triggered.connect(self.showMultiConstrain)
+        self.actionConstrain.triggered.connect(self.addSimpleConstraint)
+        self.actionMutualMultiConstrain.triggered.connect(self.showMultiConstraint)
         self.actionSelect.triggered.connect(self.selectParameters)
         self.actionDeselect.triggered.connect(self.deselectParameters)
         return menu
 
-    def showMultiConstrain(self):
+    def showMultiConstraint(self):
         """
         Show the constraint widget and receive the expression
         """
         from sas.qtgui.Perspectives.Fitting.MultiConstraint import MultiConstraint
-        params_list = [s.data() for s in self.lstParams.selectionModel().selectedRows()]
+        from .Constraints import Constraint
+        selected_rows = self.lstParams.selectionModel().selectedRows()
+
+        params_list = [s.data() for s in selected_rows]
         mc_widget = MultiConstraint(self, params=params_list)
         mc_widget.exec_()
-        constraint = mc_widget.txtConstraint.text()
+        constraint = Constraint()
+        c_text = mc_widget.txtConstraint.text()
         # Pass the constraint to the parser
+
         self.communicate.statusBarUpdateSignal.emit('Constraints added')
+        # Change the colour of the row
         pass
 
-    def addConstraint(self):
+    def modifyViewOnConstraint(self, row):
+        """
+        Add visual cues that the parameter is constrained
+        """
+        value = self._model_model.item(row, 1).text()
+        # Set min/max to the value constrained
+        self._model_model.item(row,2).setText(value)
+        self._model_model.item(row,3).setText(value)
+        font = QtGui.QFont()
+        font.setItalic(True)
+        brush = QtGui.QBrush(QtGui.QColor('blue'))
+        self._model_model.blockSignals(True)
+        # Modify font and foreground of affected rows
+        for column in range(0, self._model_model.columnCount()):
+            self._model_model.item(row, column).setForeground(brush)
+            self._model_model.item(row, column).setFont(font)
+            self._model_model.item(row, column).setEditable(False)
+        self._model_model.blockSignals(False)
+
+    def addSimpleConstraint(self):
         """
         Adds a constraint on a single parameter.
         """
+        from .Constraints import Constraint
+        for row in self.selectedParameters():
+            param = self._model_model.item(row, 0).text()
+            value = self._model_model.item(row, 1).text()
+            constraint = Constraint(param=param, value=value)
+            item = QtGui.QStandardItem()
+            item.setData(constraint)
+            self._model_model.item(row, 1).setChild(0, item)
+            #self.constraintAddedSignal.emit([row])
+            self.modifyViewOnConstraint(row)
         self.communicate.statusBarUpdateSignal.emit('Constraint added')
         pass

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

@@ -2 +2 @@
 Widget for parameter constraints.
 """
+from numpy import *
+
 from PyQt5 import QtCore
 from PyQt5 import QtGui
@@ -23 +25 @@
         self.setupTooltip()
 
+        # Set param text control to the second parameter passed
+        self.txtConstraint.setText(self.params[1])
+
         self.cmdOK.clicked.connect(self.accept)
         self.cmdRevert.clicked.connect(self.revert)
+        self.txtConstraint.editingFinished.connect(self.validateFormula)
 
     def revert(self):
@@ -52 +58 @@
         self.txtConstraint.setToolTip(tooltip)
 
-        pass
+    def validateFormula(self):
+        """
+        Add visual cues when formula is incorrect
+        """
+        formula_is_valid = False
+        formula_is_valid = self.validateConstraint(self.txtConstraint.text())
+        if not formula_is_valid:
+            self.cmdOK.setEnabled(False)
+            self.txtConstraint.setStyleSheet("QLineEdit {background-color: red;}")
+        else:
+            self.cmdOK.setEnabled(True)
+            self.txtConstraint.setStyleSheet("QLineEdit {background-color: white;}")
 
+    def validateConstraint(self, constraint_text):
+        """
+        Ensure the constraint has proper form
+        """
+        # 0. none or empty
+        if not constraint_text or not isinstance(constraint_text, str):
+            return False
+
+        param_str = str(self.params[1])
+        constraint_text = constraint_text.strip()
+
+        # 1. just the parameter
+        if param_str == constraint_text:
+            return True
+
+        # 2. ensure the text contains parameter name
+        parameter_string_start = constraint_text.find(param_str)
+        has_parameter_name = (parameter_string_start > -1)
+        if not has_parameter_name:
+            return False
+        parameter_string_end = parameter_string_start + len(param_str)
+
+        # 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]):
+            return False
+        if end_loc < len(constraint_text):
+            if not any([constraint_text[end_loc] == char for char in valid_neighbours]):
+                return False
+
+        # 4. replace parameter name with "1" and try to evaluate the expression
+        try:
+            expression_to_evaluate = constraint_text.replace(param_str, "1.0")
+            eval(expression_to_evaluate)
+        except Exception:
+            # Too many cases to cover individually, just a blanket
+            # Exception should be sufficient
+            # Note that in current numpy things like sqrt(-1) don't
+            # raise but just return warnings
+            return False
+
+        return True
+
+
+