Changeset d7adf97 in sasview for src/sas/qtgui/Utilities

Timestamp:

Sep 19, 2018 1:55:07 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:

42d79fc

Parents:

68dc2873 (diff), fc5d2d7f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ESS_GUI' of ​https://github.com/SasView/sasview into ESS_GUI_Pr_fixes

Location:

src/sas/qtgui/Utilities

Files:

• GuiUtils.py (modified) (1 diff)
• GridPanel.py (modified) (3 diffs)

src/sas/qtgui/Utilities/GuiUtils.py

@@ -567 +567 @@
     The assumption - data stored in SasView standard, in child 0
     """
-    return item.child(0).data()
+    try:
+        data = item.child(0).data()
+    except AttributeError:
+        data = None
+    return data
 
 def openLink(url):

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)