Changeset 2d466e4 in sasview

Timestamp:

Jan 17, 2018 9:44: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:

c5a2722f

Parents:

47d7d2d

Message:

Started work on the complex constraint widget SASVIEW-853

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• ComplexConstraint.py (added)
• ConstraintWidget.py (modified) (2 diffs, 1 prop)
• FittingWidget.py (modified) (4 diffs)
• UI/ComplexConstraintUI.ui (added)

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

@@ -9 +9 @@
 from sas.qtgui.Perspectives.Fitting.UI.ConstraintWidgetUI import Ui_ConstraintWidgetUI
 from sas.qtgui.Perspectives.Fitting.FittingWidget import FittingWidget
+from sas.qtgui.Perspectives.Fitting.ComplexConstraint import ComplexConstraint
 
 class ConstraintWidget(QtWidgets.QWidget, Ui_ConstraintWidgetUI):
@@ -434 +435 @@
         Invoke the complex constraint editor
         """
-        pass
+        selected_rows = self.selectedParameters(self.tblTabList)
+        assert(len(selected_rows)==2)
+
+        tab_list = [ObjectLibrary.getObject(self.tblTabList.item(s, 0).data(0)) for s in selected_rows]
+        # Create and display the widget for param1 and param2
+        cc_widget = ComplexConstraint(self, tabs=tab_list)
+        if cc_widget.exec_() != QtWidgets.QDialog.Accepted:
+            return
+
+        #constraint = Constraint()
+        #c_text = cc_widget.txtConstraint.text()
+        pass

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

@@ -567 +567 @@
         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
 
@@ -576 +574 @@
 
         # Which row is the constrained parameter in?
-        row = self.rowFromName(constraint.param)
+        row = self.getRowFromName(constraint.param)
         self._model_model.item(row, 1).setChild(0, item)
         self.constraintAddedSignal.emit([row])
@@ -589 +587 @@
         self.communicate.statusBarUpdateSignal.emit('Constraints added')
 
-    def rowFromName(self, name):
+    def getRowFromName(self, name):
         """
         Given parameter name get the row number in self._model_model
@@ -598 +596 @@
                 return row
         return None
+
+    def getParamNames(self):
+        """
+        Return list of all parameters for the current model
+        """
+        #params = []
+        #for row in range(self._model_model.rowCount()):
+        #    params.append(self._model_model.item(row).text())
+        #return params
+        return [self._model_model.item(row).text() for row in range(self._model_model.rowCount())]
 
     def modifyViewOnRow(self, row, font=None, brush=None):