Changeset 161713c in sasview

Timestamp:

Feb 14, 2017 9:14:11 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:

4c7dd9f

Parents:

7b8485f

Message:

Validate Table View entries in 2D slicer parameter editor - prototype for future use in fitting

Location:

src/sas

Files:

• qtgui/Plotter2D.py (modified) (2 diffs)
• qtgui/SlicerModel.py (modified) (1 diff, 1 prop)
• qtgui/SlicerParameters.py (modified) (5 diffs)
• sasgui/guiframe/local_perspectives/plotting/AnnulusSlicer.py (modified) (1 diff)
• sasgui/guiframe/local_perspectives/plotting/AzimutSlicer.py (modified) (1 diff)
• sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified) (1 diff)

src/sas/qtgui/Plotter2D.py

@@ -136 +136 @@
         self.actionDataInfo = self.contextMenu.addAction("&DataInfo")
         self.actionDataInfo.triggered.connect(
-            functools.partial(self.onDataInfo, self.data))
+             functools.partial(self.onDataInfo, self.data))
 
         self.actionSavePointsAsFile = self.contextMenu.addAction("&Save Points as a File")
         self.actionSavePointsAsFile.triggered.connect(
-            functools.partial(self.onSavePoints, self.data))
+             functools.partial(self.onSavePoints, self.data))
         self.contextMenu.addSeparator()
 
@@ -225 +225 @@
         self.param_model = self.slicer.model()
         # Pass the model to the Slicer Parameters widget
-        self.slicer_widget = SlicerParameters(model=self.param_model)
+        self.slicer_widget = SlicerParameters(model=self.param_model,
+                                              validate_method=self.slicer.validate)
         self.slicer_widget.close_signal.connect(slicer_closed)
         # Add the plot to the workspace

src/sas/qtgui/SlicerModel.py

@@ -52 +52 @@
         raise NotImplementedError("Parameter setter must be implemented in derived class.")
 
+    def validate(self):
+        ''' pure virtual '''
+        raise NotImplementedError("Validator must be implemented in derived class.")
+

src/sas/qtgui/SlicerParameters.py

@@ -2 +2 @@
 Allows users to modify the box slicer parameters.
 """
+import numpy
 import functools
 from PyQt4 import QtGui
@@ -16 +17 @@
     """
     close_signal = QtCore.pyqtSignal()
-    def __init__(self, model=None):
+    def __init__(self, model=None, validate_method=None):
         super(SlicerParameters, self).__init__()
 
         self.setupUi(self)
+
         assert isinstance(model, QtGui.QStandardItemModel)
 
         self.model = model
+        self.validate_method = validate_method
 
         # Define a proxy model so cell enablement can be finegrained.
@@ -35 +38 @@
 
         # Specify the validator on the parameter value column.
-        self.lstParams.setItemDelegate(ValidatedItemDelegate())
+        self.delegate = EditDelegate(self, validate_method=self.validate_method)
+        self.lstParams.setItemDelegate(self.delegate)
+        self.delegate.refocus_signal.connect(self.onFocus)
 
         # Display Help on clicking the button
@@ -53 +58 @@
         header.setStretchLastSection(True)
 
+    def onFocus(self, row, column):
+        """ Set the focus on the cell (row, column) """
+        selection_model = self.lstParams.selectionModel()
+        selection_model.select(self.model.index(row, column), QtGui.QItemSelectionModel.Select)
+        self.lstParams.setSelectionModel(selection_model)
+        self.lstParams.setCurrentIndex(self.model.index(row, column))
 
     def setModel(self, model):
@@ -105 +116 @@
         return flags
 
+class PositiveDoubleEditor(QtGui.QLineEdit):
+    # a signal to tell the delegate when we have finished editing
+    editingFinished = QtCore.Signal()
 
-class ValidatedItemDelegate(QtGui.QStyledItemDelegate):
-    """
-    Simple delegate enabling adding a validator to a cell editor.
-    """
-    def createEditor(self, widget, option, index):
-        '''Overwrite default editor'''
-        if not index.isValid():
-            return 0
-        if index.column() == 1: # Edir only cells in the second column
-            editor = QtGui.QLineEdit(widget)
+    def __init__(self, parent=None):
+            # Initialize the editor object
+            super(PositiveDoubleEditor, self).__init__(parent)
+            self.setAutoFillBackground(True)
             validator = QtGui.QDoubleValidator()
             # Don't use the scientific notation, cause 'e'.
             validator.setNotation(QtGui.QDoubleValidator.StandardNotation)
-            editor.setValidator(validator)
-            return editor
-        return super(ValidatedItemDelegate, self).createEditor(widget, option, index)
+
+            self.setValidator(validator)
+
+    def focusOutEvent(self, event):
+            # Once focus is lost, tell the delegate we're done editing
+            self.editingFinished.emit()
+
+
+class EditDelegate(QtGui.QStyledItemDelegate):
+    refocus_signal = QtCore.pyqtSignal(int, int)
+    def __init__(self, parent=None, validate_method=None):
+        super(EditDelegate, self).__init__(parent)
+        self.editor = None
+        self.index = None
+        self.validate_method = validate_method
+
+    def createEditor(self, parent, option, index):
+        # Creates and returns the custom editor object we will use to edit the cell
+        if not index.isValid():
+            return 0
+
+        result = index.column()
+        if result==1:
+                self.editor = PositiveDoubleEditor(parent)
+                self.index = index
+                return self.editor
+        else:
+                return QtGui.QStyledItemDelegate.createEditor(self, parent, option, index)
+
+    def setModelData(self, editor, model, index):
+        """
+        Custom version of the model update, rejecting bad values
+        """
+        self.index = index
+
+        # Find out the changed parameter name and proposed value
+        new_value = self.editor.text().toFloat()[0]
+        param_name = str(model.sourceModel().item(index.row(),0).text())
+
+        validated = True
+        if self.validate_method:
+            # Validate the proposed value in the slicer
+            value_accepted = self.validate_method(param_name, new_value)
+
+        if value_accepted:
+            # Update the model only if value accepted
+            return super(EditDelegate, self).setModelData(editor, model, index)          

src/sas/sasgui/guiframe/local_perspectives/plotting/AnnulusSlicer.py

@@ -154 +154 @@
         self.draw()
 
+    def validate(self, param_name, param_value):
+        """
+        Test the proposed new value "value" for row "row" of parameters
+        """
+        MIN_DIFFERENCE = 0.01
+        isValid = True
+
+        if param_name == 'inner_radius':
+            # First, check the closeness
+            if numpy.fabs(param_value - self.getParams()['outer_radius']) < MIN_DIFFERENCE:
+                print("Inner and outer radii too close. Please adjust.")
+                isValid = False
+            elif param_value > self.qmax:
+                print("Inner radius exceeds maximum range. Please adjust.")
+                isValid = False
+        elif param_name == 'outer_radius':
+            # First, check the closeness
+            if numpy.fabs(param_value - self.getParams()['inner_radius']) < MIN_DIFFERENCE:
+                print("Inner and outer radii too close. Please adjust.")
+                isValid = False
+            elif param_value > self.qmax:
+                print("Outer radius exceeds maximum range. Please adjust.")
+                isValid = False
+        elif param_name == 'nbins':
+            # Can't be 0
+            if param_value < 1:
+                print("Number of bins cannot be less than or equal to 0. Please adjust.")
+                isValid = False
+
+        return isValid
 
     def moveend(self, ev):

src/sas/sasgui/guiframe/local_perspectives/plotting/AzimutSlicer.py

@@ -182 +182 @@
                      NewPlotEvent(plot=new_plot, title=str(new_sector.__name__)))
 
+
+    def validate(self, param_name, param_value):
+        """
+        Test the proposed new value "value" for row "row" of parameters
+        """
+        # Here, always return true
+        return True
+
     def moveend(self, ev):
         #TODO: why is this empty?

src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py

@@ -176 +176 @@
         self.draw()
 
+    def validate(self, param_name, param_value):
+        """
+        Test the proposed new value "value" for row "row" of parameters
+        """
+        MIN_DIFFERENCE = 0.01
+        isValid = True
+
+        if param_name == 'Delta_Phi [deg]':
+            # First, check the closeness
+            if numpy.fabs(param_value) < MIN_DIFFERENCE:
+                print("Sector angles too close. Please adjust.")
+                isValid = False
+        elif param_name == 'nbins':
+            # Can't be 0
+            if param_value < 1:
+                print("Number of bins cannot be less than or equal to 0. Please adjust.")
+                isValid = False
+        return isValid
+
     def moveend(self, ev):
         """