Changeset 47d7d2d in sasview

Timestamp:

Jan 17, 2018 4:53:35 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:

2d466e4

Parents:

be8f4b0

Message:

Editable moniker field, updating the model below.
Improved table behaviour

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• ConstraintWidget.py (modified) (10 diffs)
• FittingWidget.py (modified) (3 diffs)

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

@@ -21 +21 @@
         self.currentType = "FitPage"
 
+        # Remember previous content of modified cell
+        self.current_cell = ""
+
         # Set up the widgets
         self.initializeWidgets()
@@ -38 +41 @@
         Set up various widget states
         """
-        labels = ['FitPage', 'Model', 'Data', 'Mnemonics']
+        labels = ['FitPage', 'Model', 'Data', 'Mnemonic']
         # tab widget - headers
+        self.editable_tab_columns = [labels.index('Mnemonic')]
         self.tblTabList.setColumnCount(len(labels))
         self.tblTabList.setHorizontalHeaderLabels(labels)
@@ -61 +65 @@
         Set up signals/slots for this widget
         """
+        # simple widgets
         self.btnSingle.toggled.connect(self.onFitTypeChange)
         self.btnBatch.toggled.connect(self.onFitTypeChange)
@@ -66 +71 @@
         self.cmdFit.clicked.connect(self.onFit)
         self.cmdHelp.clicked.connect(self.onHelp)
+
+        # QTableWidgets
+        self.tblTabList.cellChanged.connect(self.onMonikerEdit)
+        self.tblTabList.cellDoubleClicked.connect(self.onTabCellEntered)
+        self.tblConstraints.cellChanged.connect(self.onConstraintChange)
+
+        # External signals
         self.parent.tabsModifiedSignal.connect(self.initializeFitList)
 
@@ -100 +112 @@
         """
         pass
+
+    def onMonikerEdit(self, row, column):
+        """
+        Modify the model moniker
+        """
+        if column not in self.editable_tab_columns:
+            return
+        item = self.tblTabList.item(row, column)
+        new_moniker = item.data(0)
+
+        # The new name should be validated on the fly, with QValidator
+        # but let's just assure it post-factum
+        is_good_moniker = self.validateMoniker(new_moniker)
+        is_good_moniker = True
+        if not is_good_moniker:
+            item.setBackground(QtCore.Qt.red)
+            self.cmdFit.setEnabled(False)
+        else:
+            self.tblTabList.blockSignals(True)
+            item.setBackground(QtCore.Qt.white)
+            self.tblTabList.blockSignals(False)
+            self.cmdFit.setEnabled(True)
+            if not self.current_cell:
+                return
+            # Remember the value
+            if self.current_cell not in self.available_tabs:
+                return
+            temp_tab = self.available_tabs[self.current_cell]
+            # Remove the key from the dictionaries
+            self.available_tabs.pop(self.current_cell, None)
+            # Change the model name
+            model = temp_tab.kernel_module
+            model.name = new_moniker
+            # Replace constraint name
+            temp_tab.replaceConstraintName(self.current_cell, new_moniker)
+            # Reinitialize the display
+            self.initializeFitList()
+        pass
+
+    def onConstraintChange(self, row, column):
+        """
+        Modify the constraint in-place.
+        Tricky.
+        """
+        pass
+
+    def onTabCellEntered(self, row, column):
+        """
+        Remember the original tab list cell data.
+        Needed for reverting back on bad validation
+        """
+        if column != 3:
+            return
+        self.current_cell = self.tblTabList.item(row, column).data(0)
 
     def isTabImportable(self, tab):
@@ -151 +217 @@
         #self.actionConstrain.triggered.connect(self.addSimpleConstraint)
         #self.actionRemoveConstraint.triggered.connect(self.deleteConstraint)
-        #self.actionMutualMultiConstrain.triggered.connect(self.showMultiConstraint)
+        self.actionMutualMultiConstrain.triggered.connect(self.showMultiConstraint)
         self.actionSelect.triggered.connect(self.selectModels)
         self.actionDeselect.triggered.connect(self.deselectModels)
@@ -246 +312 @@
         Delete all selected constraints.
         """
+        # Removing rows from the table we're iterating over,
+        # so prepare a list of data first
         constraints_to_delete = []
         for row in self.selectedParameters(self.tblConstraints):
@@ -257 +325 @@
         self.initializeFitList()
 
+    def uneditableItem(self, data=""):
+        """
+        Returns an uneditable Table Widget Item
+        """
+        item = QtWidgets.QTableWidgetItem(data)
+        item.setFlags( QtCore.Qt.ItemIsSelectable |  QtCore.Qt.ItemIsEnabled )
+        return item
+
     def updateFitLine(self, tab):
         """
@@ -272 +348 @@
 
         # Update the model table widget
-        item = QtWidgets.QTableWidgetItem(tab_name)
-        item.setCheckState(QtCore.Qt.Checked)
+        #item = QtWidgets.QTableWidgetItem(tab_name)
+        #item.setCheckState(QtCore.Qt.Checked)
+        #item.setFlags( QtCore.Qt.ItemIsSelectable |  QtCore.Qt.ItemIsEnabled )
         pos = self.tblTabList.rowCount()
         self.tblTabList.insertRow(pos)
+        item = self.uneditableItem(tab_name)
+        item.setFlags(item.flags() ^ QtCore.Qt.ItemIsUserCheckable)
+        item.setCheckState(QtCore.Qt.Checked)
         self.tblTabList.setItem(pos, 0, item)
-        self.tblTabList.setItem(pos, 1, QtWidgets.QTableWidgetItem(model_name))
-        self.tblTabList.setItem(pos, 2, QtWidgets.QTableWidgetItem(model_filename))
-        self.tblTabList.setItem(pos, 3, QtWidgets.QTableWidgetItem(moniker))
-
-        #self.available_tabs[pos] = (model, model_data)
-        #self.available_tabs[moniker] = tab
+        self.tblTabList.setItem(pos, 1, self.uneditableItem(model_name))
+        self.tblTabList.setItem(pos, 2, self.uneditableItem(model_filename))
+        # Moniker is editable, so no option change
+        item = QtWidgets.QTableWidgetItem(moniker)
+        # Disable signals so we don't get infinite call recursion
+        self.tblTabList.blockSignals(True)
+        self.tblTabList.setItem(pos, 3, item)
+        self.tblTabList.blockSignals(False)
 
         # Check if any constraints present in tab
@@ -332 +414 @@
             # We have at least 1 fit page, allow fitting
             self.cmdFit.setEnabled(True)
+
+    def validateMoniker(self, new_moniker=None):
+        """
+        Check new_moniker for correctness.
+        It must be non-empty.
+        It must not be the same as other monikers.
+        """
+        if not new_moniker:
+            return False
+
+        for existing_moniker in self.available_tabs:
+            if existing_moniker == new_moniker and existing_moniker != self.current_cell:
+                return False
+
+        return True
+
+    def showMultiConstraint(self):
+        """
+        Invoke the complex constraint editor
+        """
+        pass

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

@@ -566 +566 @@
         # widget.params[0] is the parameter we're constraining
         constraint.param = mc_widget.params[0]
+        # Function should have the model name preamble
+        #model_name = self.kernel_module.name
+        #constraint.func = model_name + ":" + c_text
         constraint.func = c_text
 
@@ -741 +744 @@
         e.g. [('sld','5*sld_solvent')]
         """
-        model_name = self.modelName()
-        self.kernel_module.name = model_name
+        model_name = self.kernel_module.name
         param_number = self._model_model.rowCount()
         def preamble(s):
@@ -812 +814 @@
             model = None
         self.respondToModelStructure(model=model, structure_factor=structure)
+
+    def replaceConstraintName(self, old_name, new_name=""):
+        """
+        Replace names of models in defined constraints
+        """
+        param_number = self._model_model.rowCount()
+        # loop over parameters
+        for row in range(param_number):
+            if self.rowHasConstraint(row):
+                func = self._model_model.item(row, 1).child(0).data().func
+                if old_name in func:
+                    new_func = func.replace(old_name, new_name)
+                    self._model_model.item(row, 1).child(0).data().func = new_func
+
+        pass
 
     def respondToModelStructure(self, model=None, structure_factor=None):