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

Timestamp:

Aug 25, 2017 8:37:30 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:

4d1eff2

Parents:

b2a5042

git-author:

Piotr Rozyczko <rozyczko@…> (08/25/17 08:31:37)

git-committer:

Piotr Rozyczko <rozyczko@…> (08/25/17 08:37:30)

Message:

Fixed a crash when the file open dialog would lose reference to the underlying listview cell on cell losing focus SASVIEW-625

File:

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

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

@@ -85 +85 @@
     Custom delegate for appearance and behavior control of the polydispersity view
     """
-    #POLYDISPERSE_FUNCTIONS = ['rectangle', 'array', 'lognormal', 'gaussian', 'schulz']
-    POLYDISPERSE_FUNCTIONS = ['rectangle', 'lognormal', 'gaussian', 'schulz']
+    POLYDISPERSE_FUNCTIONS = ['rectangle', 'array', 'lognormal', 'gaussian', 'schulz']
+    #POLYDISPERSE_FUNCTIONS = ['rectangle', 'lognormal', 'gaussian', 'schulz']
 
     combo_updated = QtCore.pyqtSignal(str, int)
+    filename_updated = QtCore.pyqtSignal(int)
 
     def __init__(self, parent=None):
@@ -103 +104 @@
         self.poly_nsigs = 5
         self.poly_function = 6
+        self.poly_filename = 7
 
     def editableParameters(self):
@@ -126 +128 @@
         self.poly_nsigs = 6
         self.poly_function = 7
+        self.poly_filename = 8
 
     def createEditor(self, widget, option, index):
         # Remember the current choice
-        current_text = index.data().toString()
         if not index.isValid():
             return 0
-        if index.column() == self.poly_function:
-            editor = QtGui.QComboBox(widget)
-            for function in self.POLYDISPERSE_FUNCTIONS:
-                editor.addItem(function)
-            current_index = editor.findText(current_text)
-            editor.setCurrentIndex(current_index if current_index>-1 else 3)
-            editor.currentIndexChanged.connect(lambda: self.combo_updated.emit(str(editor.currentText()), index.row()))
-            return editor
+        elif index.column() == self.poly_filename:
+            # Notify the widget that we want to change the filename
+            self.filename_updated.emit(index.row())
+            return None
         elif index.column() in self.editableParameters():
-            editor = QtGui.QLineEdit(widget)
+            self.editor = QtGui.QLineEdit(widget)
             validator = QtGui.QDoubleValidator()
-            editor.setValidator(validator)
-            return editor
+            self.editor.setValidator(validator)
+            return self.editor
         else:
             QtGui.QStyledItemDelegate.createEditor(self, widget, option, index)