Changeset 305114c in sasview for src/sas/qtgui/Perspectives/Fitting/ComplexConstraint.py

Timestamp:

Sep 14, 2018 10:10:09 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

aa88b76

Parents:

86d3207

Message:

Added a warning label to simple and complex constraint widgets,
shown whenever polydisperse parameters are constrained SASVIEW-1042

File:

• src/sas/qtgui/Perspectives/Fitting/ComplexConstraint.py (modified) (3 diffs)

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

@@ -13 +13 @@
 import webbrowser
 
+from sas.qtgui.Perspectives.Fitting import FittingUtilities
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
 ALLOWED_OPERATORS = ['=','<','>','>=','<=']
@@ -32 +33 @@
         self.operator = '='
 
+        self.warning = self.lblWarning.text()
         self.setupData()
+        self.setupSignals()
         self.setupWidgets()
-        self.setupSignals()
         self.setupTooltip()
-
-        self.setFixedSize(self.minimumSizeHint())
 
         # Default focus is on OK
@@ -101 +101 @@
         # Find out the signal source
         source = self.sender().objectName()
+        param1 = self.cbParam1.currentText()
+        param2 = self.cbParam2.currentText()
         if source == "cbParam1":
-            self.txtParam.setText(self.tab_names[0] + ":" + self.cbParam1.currentText())
+            self.txtParam.setText(self.tab_names[0] + ":" + param1)
         else:
-            self.txtConstraint.setText(self.tab_names[1] + "." + self.cbParam2.currentText())
+            self.txtConstraint.setText(self.tab_names[1] + "." + param2)
+        # Check if any of the parameters are polydisperse
+        params_list = [param1, param2]
+        all_pars = [tab.model_parameters for tab in self.tabs]
+        is2Ds = [tab.is2D for tab in self.tabs]
+        txt = ""
+        for pars, is2D in zip(all_pars, is2Ds):
+            if any([FittingUtilities.isParamPolydisperse(p, pars, is2D) for p in params_list]):
+                # no parameters are pd - reset the text to not show the warning
+                txt = self.warning
+        self.lblWarning.setText(txt)
+
 
     def onOperatorChange(self, index):