Changeset 2e5081b in sasview for src/sas/qtgui/Perspectives/Fitting/ConstraintWidget.py

Timestamp:

Nov 26, 2018 7:07:55 AM (5 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

9c207f5

Parents:

9c05f22

Message:

Redone the widget slightly, to fit with requirements in trac#1135.
Added comboboxes for all available fitpage names
Removed constraint of needing two selected fitpages
Removed the "Swap" button - it is redundant now.
Added context dependence on the "Select All" action.
Removed immediate constraint validation to allow for more complex
formulas

File:

• src/sas/qtgui/Perspectives/Fitting/ConstraintWidget.py (modified) (2 diffs)

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

@@ -33 +33 @@
         self.setDragDropMode(QtWidgets.QAbstractItemView.InternalMove)
 
-        self._is_dragged = True
+        self._is_dragged = False
 
     def isDragged(self):
@@ -872 +872 @@
         """
         selected_rows = self.selectedParameters(self.tblTabList)
-        if len(selected_rows)!=2:
-            msg = "Please select two fit pages from the Source Choice table."
-            msgbox = QtWidgets.QMessageBox(self.parent)
-            msgbox.setIcon(QtWidgets.QMessageBox.Warning)
-            msgbox.setText(msg)
-            msgbox.setWindowTitle("2 fit page constraints")
-            retval = msgbox.exec_()
-            return
-
-        tab_list = [ObjectLibrary.getObject(self.tblTabList.item(s, 0).data(0)) for s in selected_rows]
+
+        tab_list = [ObjectLibrary.getObject(self.tblTabList.item(s, 0).data(0)) for s in range(self.tblTabList.rowCount())]
         # Create and display the widget for param1 and param2
         cc_widget = ComplexConstraint(self, tabs=tab_list)