Changeset e43fc91 in sasview

Timestamp:

Aug 25, 2017 6: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 06:31:37)

git-committer:

Piotr Rozyczko <rozyczko@…> (08/25/17 06: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

Files:

• sasview/sasview.spec (modified) (1 diff)
• src/sas/qtgui/Perspectives/Fitting/FittingUtilities.py (modified) (2 diffs)
• src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified) (12 diffs)
• src/sas/qtgui/Perspectives/Fitting/ViewDelegate.py (modified) (3 diffs)

sasview/sasview.spec

@@ -25 +25 @@
     UPX=True
 
-SCRIPT_TO_SOURCE = 'run.py'
+SCRIPT_TO_SOURCE = 'sasview.py'
 
 # Warning! pyinstaller/py2exe etc. don't have the __file__ attribute

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

@@ -159 +159 @@
     model.setHeaderData(5, QtCore.Qt.Horizontal, QtCore.QVariant("Nsigs"))
     model.setHeaderData(6, QtCore.Qt.Horizontal, QtCore.QVariant("Function"))
+    model.setHeaderData(7, QtCore.Qt.Horizontal, QtCore.QVariant("Filename"))
 
 def addErrorPolyHeadersToModel(model):
@@ -172 +173 @@
     model.setHeaderData(6, QtCore.Qt.Horizontal, QtCore.QVariant("Nsigs"))
     model.setHeaderData(7, QtCore.Qt.Horizontal, QtCore.QVariant("Function"))
+    model.setHeaderData(8, QtCore.Qt.Horizontal, QtCore.QVariant("Filename"))
 
 def addShellsToModel(parameters, model, index):

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

@@ -286 +286 @@
         # Polydispersity function combo response
         self.lstPoly.itemDelegate().combo_updated.connect(self.onPolyComboIndexChange)
+        self.lstPoly.itemDelegate().filename_updated.connect(self.onPolyFilenameChange)
 
         # Magnetism model displayed in magnetism list
@@ -566 +567 @@
             # name of the function - just pass
             return
+        elif model_column == self.lstPoly.itemDelegate().poly_filename:
+            # filename for array - just pass
+            return
         else:
             try:
@@ -1488 +1492 @@
 
         header.ResizeMode(QtGui.QHeaderView.Interactive)
-        # Resize column 0 and 6 to content
+        # Resize column 0 and 7 to content
         header.setResizeMode(0, QtGui.QHeaderView.ResizeToContents)
-        header.setResizeMode(6, QtGui.QHeaderView.ResizeToContents)
+        header.setResizeMode(7, QtGui.QHeaderView.ResizeToContents)
 
     def setPolyModel(self):
@@ -1500 +1504 @@
         self._poly_model.clear()
 
-        [self.setPolyModelParameters(param) for _, param in \
+        [self.setPolyModelParameters(i, param) for i, param in \
             enumerate(self.model_parameters.form_volume_parameters) if param.polydisperse]
         FittingUtilities.addPolyHeadersToModel(self._poly_model)
 
-    def setPolyModelParameters(self, param):
+    def setPolyModelParameters(self, i, param):
         """
         Standard of multishell poly parameter driver
@@ -1519 +1523 @@
                     # Remove [n] and add the shell numeral
                     name = param_name[0:param_name.index('[')] + str(ishell)
-                    self.addNameToPolyModel(name)
+                    self.addNameToPolyModel(i, name)
         else:
             # Just create a simple param entry
-            self.addNameToPolyModel(param_name)
-
-    def addNameToPolyModel(self, param_name):
+            self.addNameToPolyModel(i, param_name)
+
+    def addNameToPolyModel(self, i, param_name):
         """
         Creates a checked row in the poly model with param_name
@@ -1539 +1543 @@
         checked_list = ["Distribution of " + param_name, str(width),
                         str(min), str(max),
-                        str(npts), str(nsigs), "gaussian      "]
+                        str(npts), str(nsigs), "gaussian      ",'']
         FittingUtilities.addCheckedListToModel(self._poly_model, checked_list)
 
@@ -1545 +1549 @@
         func = QtGui.QComboBox()
         func.addItems([str(name_disp) for name_disp in POLYDISPERSITY_MODELS.iterkeys()])
-        # set the default index
+        # Set the default index
         func.setCurrentIndex(func.findText(DEFAULT_POLYDISP_FUNCTION))
+        ind = self._poly_model.index(i,self.lstPoly.itemDelegate().poly_function)
+        self.lstPoly.setIndexWidget(ind, func)
+        func.currentIndexChanged.connect(lambda: self.onPolyComboIndexChange(str(func.currentText()), i))
+
+    def onPolyFilenameChange(self, row_index):
+        """
+        Respond to filename_updated signal from the delegate
+        """
+        # For the given row, invoke the "array" combo handler
+        array_caption = 'array'
+        self.onPolyComboIndexChange(array_caption, row_index)
+        # Get the combo box reference
+        ind = self._poly_model.index(row_index, self.lstPoly.itemDelegate().poly_function)
+        widget = self.lstPoly.indexWidget(ind)
+        # Update the combo box so it displays "array"
+        widget.blockSignals(True)
+        widget.setCurrentIndex(self.lstPoly.itemDelegate().POLYDISPERSE_FUNCTIONS.index(array_caption))
+        widget.blockSignals(False)
 
     def onPolyComboIndexChange(self, combo_string, row_index):
@@ -1554 +1576 @@
         # Get npts/nsigs for current selection
         param = self.model_parameters.form_volume_parameters[row_index]
+        file_index = self._poly_model.index(row_index, self.lstPoly.itemDelegate().poly_function)
+        combo_box = self.lstPoly.indexWidget(file_index)
+        orig_index = combo_box.currentIndex()
 
         def updateFunctionCaption(row):
@@ -1565 +1590 @@
         if combo_string == 'array':
             try:
-                self.loadPolydispArray()
+                self.loadPolydispArray(row_index)
                 # Update main model for display
                 self.iterateOverModel(updateFunctionCaption)
-            except (ValueError, IOError):
-                # Don't do anything if file lookup failed
+                # disable the row
+                lo = self.lstPoly.itemDelegate().poly_pd
+                hi = self.lstPoly.itemDelegate().poly_function
+                [self._poly_model.item(row_index, i).setEnabled(False) for i in xrange(lo, hi)]
                 return
-            # disable the row
-            [self._poly_model.item(row_index, i).setEnabled(False) for i in xrange(6)]
-            return
+            except IOError:
+                combo_box.setCurrentIndex(orig_index)
+                # Pass for cancel/bad read
+                pass
 
         # Enable the row in case it was disabled by Array
         self._poly_model.blockSignals(True)
-        [self._poly_model.item(row_index, i).setEnabled(True) for i in xrange(6)]
+        max_range = self.lstPoly.itemDelegate().poly_filename
+        [self._poly_model.item(row_index, i).setEnabled(True) for i in xrange(7)]
+        file_index = self._poly_model.index(row_index, self.lstPoly.itemDelegate().poly_filename)
+        self._poly_model.setData(file_index, QtCore.QVariant(""))
         self._poly_model.blockSignals(False)
 
@@ -1591 +1622 @@
         self.iterateOverModel(updateFunctionCaption)
 
-    def loadPolydispArray(self):
+    def loadPolydispArray(self, row_index):
         """
         Show the load file dialog and loads requested data into state
@@ -1599 +1630 @@
             None, QtGui.QFileDialog.DontUseNativeDialog)
 
-        if datafile is None:
+        if datafile is None or str(datafile)=='':
             logging.info("No weight data chosen.")
             raise IOError
@@ -1623 +1654 @@
         self.disp_model = POLYDISPERSITY_MODELS['array']()
         self.disp_model.set_weights(np.array(values), np.array(weights))
+        # + update the cell with filename
+        fname = os.path.basename(str(datafile))
+        fname_index = self._poly_model.index(row_index, self.lstPoly.itemDelegate().poly_filename)
+        self._poly_model.setData(fname_index, QtCore.QVariant(fname))
 
     def setMagneticModel(self):

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)