Changeset 91ad45c in sasview for src/sas/qtgui/Perspectives/Fitting/ConstraintWidget.py

Timestamp:

Mar 1, 2018 8:02:28 AM (6 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:

e4c475b7

Parents:

fde5bcd

Message:

Chain fitting for constraint batch fitting

File:

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

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

@@ -32 +32 @@
         self.page_id = 301
 
+        # Are we chain fitting?
+        self.is_chain_fitting = False
+
         # Remember previous content of modified cell
         self.current_cell = ""
@@ -66 +69 @@
         self.tblTabList.customContextMenuRequested.connect(self.showModelContextMenu)
 
+        # Single Fit is the default, so disable chainfit
+        self.chkChain.setVisible(False)
+
         # disabled constraint 
         labels = ['Constraint']
@@ -86 +92 @@
         self.cmdFit.clicked.connect(self.onFit)
         self.cmdHelp.clicked.connect(self.onHelp)
+        self.chkChain.toggled.connect(self.onChainFit)
 
         # QTableWidgets
@@ -117 +124 @@
         source = self.sender().objectName()
         self.currentType = "BatchPage" if source == "btnBatch" else "FitPage"
+        self.chkChain.setVisible(source=="btnBatch")
         self.initializeFitList()
 
@@ -130 +138 @@
         """
         return [tab for tab in self.tabs_for_fitting if self.tabs_for_fitting[tab]]
+
+    def onChainFit(self, is_checked):
+        """
+        Respond to selecting the Chain Fit checkbox
+        """
+        self.is_chain_fitting = is_checked
 
     def onFit(self):
@@ -192 +206 @@
                              page_id=page_ids,
                              updatefn=updater,
-                             completefn=completefn)
+                             completefn=completefn,
+                             reset_flag=self.is_chain_fitting)
 
         if LocalConfig.USING_TWISTED:
@@ -370 +385 @@
         object = ObjectLibrary.getObject(tab)
         if not isinstance(object, FittingWidget): return False
-        if object.data is None: return False
+        if not object.data_is_loaded : return False
         return True