Changes in src/sas/qtgui/Utilities/GridPanel.py [4fbf0db:fa762f4] in sasview

File:

• src/sas/qtgui/Utilities/GridPanel.py (modified) (5 diffs)

src/sas/qtgui/Utilities/GridPanel.py

@@ -18 +18 @@
     ERROR_COLUMN_CAPTION = " (Err)"
     IS_WIN = (sys.platform == 'win32')
+    windowClosedSignal = QtCore.pyqtSignal()
     def __init__(self, parent = None, output_data=None):
 
@@ -54 +55 @@
         # 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 = list(output_data.keys())[0]
+            model_name = output_data[0][0].model.id
             self.tabWidget.setTabToolTip(0, model_name)
 
@@ -64 +64 @@
         Overwrite QDialog close method to allow for custom widget close
         """
-        # Maybe we should just minimize
-        self.setWindowState(QtCore.Qt.WindowMinimized)
+        # notify the parent so it hides this window
+        self.windowClosedSignal.emit()
         event.ignore()
 
@@ -153 +153 @@
         Create a new tab with batch fitting results
         """
-        self.addTabPage()
+        if self.has_data:
+            self.addTabPage()
         # Update the new widget
         # Fill in the table from input data in the last/newest page
@@ -311 +312 @@
         # Check if 2D model. If not, remove theta/phi
         if isinstance(model.data.sas_data, Data1D):
-            param_list.remove('theta')
-            param_list.remove('phi')
+            if 'theta' in param_list:
+                param_list.remove('theta')
+            if 'phi' in param_list:
+                param_list.remove('phi')
 
         rows = len(data)