Changeset 06b0138 in sasview for src/sas/qtgui/Perspectives/Fitting/ViewDelegate.py

Timestamp:

Jun 8, 2017 3:12:46 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:

70080a0

Parents:

aca8418

Message:

Polydispersity support: cleanup and unit tests SASVIEW-575

File:

• src/sas/qtgui/Perspectives/Fitting/ViewDelegate.py (modified) (7 diffs)

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

@@ -4 +4 @@
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
 
-# Main parameter table view columns
-PARAM_PROPERTY=0
-PARAM_VALUE=1
-PARAM_MIN=2
-PARAM_MAX=3
-PARAM_UNIT=4
-
-# polydispersity functions
-POLYDISPERSE_FUNCTIONS=['rectangle', 'array', 'lognormal', 'gaussian', 'schulz']
-# polydispersity columns
-POLY_PARAMETER=0
-POLY_PD=1
-POLY_MIN=2
-POLY_MAX=3
-POLY_NPTS=4
-POLY_NSIGS=5
-POLY_FUNCTION=6
-POLY_EDITABLE_PARAMS = [POLY_MIN, POLY_MAX, POLY_NPTS, POLY_NSIGS]
-
-
 class ModelViewDelegate(QtGui.QStyledItemDelegate):
     """
     Custom delegate for appearance and behavior control of the model view
     """
+    # Main parameter table view columns
+    PARAM_PROPERTY=0
+    PARAM_VALUE=1
+    PARAM_MIN=2
+    PARAM_MAX=3
+    PARAM_UNIT=4
+
     def paint(self, painter, option, index):
         """
         Overwrite generic painter for certain columns
         """
-        if index.column() in (PARAM_UNIT, PARAM_MIN, PARAM_MAX):
+        if index.column() in (self.PARAM_UNIT, self.PARAM_MIN, self.PARAM_MAX):
             # Units - present in nice HTML
             options = QtGui.QStyleOptionViewItemV4(option)
@@ -69 +56 @@
         if not index.isValid():
             return 0
-        if index.column() == PARAM_VALUE: #only in the value column
+        if index.column() == self.PARAM_VALUE: #only in the value column
             editor = QtGui.QLineEdit(widget)
             validator = QtGui.QDoubleValidator()
@@ -81 +68 @@
         Overwrite generic model update method for certain columns
         """
-        if index.column() in (PARAM_MIN, PARAM_MAX):
+        if index.column() in (self.PARAM_MIN, self.PARAM_MAX):
             try:
                 value_float = float(editor.text())
@@ -95 +82 @@
     Custom delegate for appearance and behavior control of the polydispersity view
     """
+    # polydispersity functions
+    POLYDISPERSE_FUNCTIONS=['rectangle', 'array', 'lognormal', 'gaussian', 'schulz']
+    # polydispersity columns
+    POLY_PARAMETER=0
+    POLY_PD=1
+    POLY_MIN=2
+    POLY_MAX=3
+    POLY_NPTS=4
+    POLY_NSIGS=5
+    POLY_FUNCTION=6
+    POLY_EDITABLE_PARAMS = [POLY_MIN, POLY_MAX, POLY_NPTS, POLY_NSIGS]
+
     combo_updated = QtCore.pyqtSignal(str, int)
+
     def createEditor(self, widget, option, index):
         # Remember the current choice
@@ -101 +101 @@
         if not index.isValid():
             return 0
-        if index.column() == POLY_FUNCTION:
+        if index.column() == self.POLY_FUNCTION:
             editor = QtGui.QComboBox(widget)
-            for function in POLYDISPERSE_FUNCTIONS:
+            for function in self.POLYDISPERSE_FUNCTIONS:
                 editor.addItem(function)
             current_index = editor.findText(current_text)
@@ -109 +109 @@
             editor.currentIndexChanged.connect(lambda: self.combo_updated.emit(str(editor.currentText()), index.row()))
             return editor
-        elif index.column() in POLY_EDITABLE_PARAMS:
+        elif index.column() in self.POLY_EDITABLE_PARAMS:
             editor = QtGui.QLineEdit(widget)
             validator = QtGui.QDoubleValidator()
@@ -121 +121 @@
         Overwrite generic painter for certain columns
         """
-        if index.column() in (POLY_MIN, POLY_MAX):
+        if index.column() in (self.POLY_MIN, self.POLY_MAX):
             # Units - present in nice HTML
             options = QtGui.QStyleOptionViewItemV4(option)