Changeset 4fbf0db in sasview

Timestamp:

Sep 17, 2018 8:59:58 AM (6 years ago)

Author:

wojciech

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:

68dc2873

Parents:

14ec7dfd

Message:

Fixes for batch fitting

Location:

src/sas/qtgui

Files:

• Perspectives/Inversion/InversionPerspective.py (modified) (2 diffs)
• Utilities/GridPanel.py (modified) (3 diffs)

src/sas/qtgui/Perspectives/Inversion/InversionPerspective.py

@@ -55 +55 @@
 
         self._manager = parent
+        self._parent = parent
         self.communicate = parent.communicator()
         self.communicate.dataDeletedSignal.connect(self.removeData)
@@ -657 +658 @@
 
         pr = self._calculator.clone()
-        nfunc = self.getNFunc()
-        self.calcThread = CalcPr(pr, nfunc,
+        #Making sure that nfunc and alpha parameters are correctly initialized
+        pr.suggested_alpha = self._calculator.alpha
+        self.calcThread = CalcPr(pr, self.nTermsSuggested,
                                  error_func=self._threadError,
                                  completefn=self._calculateCompleted,

src/sas/qtgui/Utilities/GridPanel.py

@@ -54 +54 @@
         # Fill in the table from input data
         self.setupTable(widget=self.tblParams, data=output_data)
+        #TODO: This is not what was inteded to be.
         if output_data is not None:
             # Set a table tooltip describing the model
-            model_name = output_data[0][0].model.id
+            model_name = list(output_data.keys())[0]
             self.tabWidget.setTabToolTip(0, model_name)
 
@@ -418 +419 @@
     def __init__(self, parent = None, output_data=None):
 
-        super(BatchInversionOutputPanel, self).__init__(parent, output_data)
+        super(BatchInversionOutputPanel, self).__init__(parent._parent, output_data)
         _translate = QtCore.QCoreApplication.translate
         self.setWindowTitle(_translate("GridPanelUI", "Batch P(r) Results"))
 
-    def setupTable(self, data):
+    def setupTable(self, widget=None,  data=None):
         """
         Create tablewidget items and show them, based on params
@@ -433 +434 @@
                       'Calc. Time [sec]']
 
+        if data is None:
+            return
         keys = data.keys()
         rows = len(keys)