Changeset 0764593 in sasview

Timestamp:

Jan 23, 2018 2:20:45 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:

eb1a386

Parents:

ba01ad1

Message:

Minor fixes to the complex constraint widget

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• ComplexConstraint.py (modified) (2 diffs, 1 prop)
• ConstraintWidget.py (modified) (2 diffs)

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

@@ -66 +66 @@
         self.txtName2.setText(self.tab_names[1])
 
+        # Show only parameters not already constrained
         self.cbParam1.clear()
-        self.cbParam1.addItems(self.params[0])
+        items = [param for i,param in enumerate(self.params[0]) if not self.tabs[0].rowHasConstraint(i)]
+        self.cbParam1.addItems(items)
         self.cbParam2.clear()
-        self.cbParam2.addItems(self.params[1])
+        items = [param for i,param in enumerate(self.params[1]) if not self.tabs[1].rowHasConstraint(i)]
+        self.cbParam2.addItems(items)
 
         self.txtParam.setText(self.tab_names[0] + ":" + self.cbParam1.currentText())
@@ -112 +115 @@
         self.params[1], self.params[0] = self.params[0], self.params[1]
         self.tab_names[1], self.tab_names[0] = self.tab_names[0], self.tab_names[1]
+        self.tabs[1], self.tabs[0] = self.tabs[0], self.tabs[1]
         # Try to swap parameter names in the line edit
         current_text = self.txtConstraint.text()

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

@@ -141 +141 @@
         # 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)
@@ -163 +162 @@
         # Replace constraint name
         temp_tab.replaceConstraintName(self.current_cell, new_moniker)
+        # Replace constraint name in the remaining tabs
+        for tab in self.available_tabs.values():
+            tab.replaceConstraintName(self.current_cell, new_moniker)
         # Reinitialize the display
         self.initializeFitList()