Changeset c4c4957 in sasview

Timestamp:

Nov 20, 2018 2:06:25 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

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:

be7c981

Parents:

8c85ac1

Message:

Batch results tabs now have meaningful names SASVIEW-1204

Location:

src/sas/qtgui

Files:

• Perspectives/Fitting/ConstraintWidget.py (modified) (2 diffs)
• Perspectives/Fitting/FittingWidget.py (modified) (1 diff)
• Utilities/GridPanel.py (modified) (3 diffs)

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

@@ -1 +1 @@
 import logging
+import copy
 
 from twisted.internet import threads
@@ -364 +365 @@
 
         # Show the grid panel
-        self.parent.communicate.sendDataToGridSignal.emit(result[0])
+        page_name = "ConstSimulPage"
+        results = copy.deepcopy(result[0])
+        results.append(page_name)
+        self.parent.communicate.sendDataToGridSignal.emit(results)
 
         msg = "Fitting completed successfully in: %s s.\n" % GuiUtils.formatNumber(elapsed)

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

@@ -1493 +1493 @@
 
         # Show the grid panel
-        self.communicate.sendDataToGridSignal.emit(result[0])
+        page_name = "BatchPage" + str(self.tab_id)
+        results = copy.deepcopy(result[0])
+        results.append(page_name)
+        self.communicate.sendDataToGridSignal.emit(results)
 
         elapsed = result[1]

src/sas/qtgui/Utilities/GridPanel.py

@@ -126 +126 @@
         return
 
-    def addTabPage(self):
+    def addTabPage(self, name=None):
         """
         Add new tab page with QTableWidget
@@ -141 +141 @@
         # However, some models have LONG names, which doesn't look well on the tab bar.
         self.tab_number += 1
-        tab_name = "Tab " + str(self.tab_number)
+        if name is not None:
+            tab_name = name
+        else:
+            tab_name = "Tab " + str(self.tab_number)
         # each table needs separate slots.
         tab_widget.customContextMenuRequested.connect(self.showContextMenu)
@@ -153 +156 @@
         Create a new tab with batch fitting results
         """
+        # pull out page name from results
+        page_name = None
+        if len(results)>=2:
+            if isinstance(results[-1], str):
+                page_name = results[-1]
+                _ = results.pop(-1)
+
         if self.has_data:
-            self.addTabPage()
+            self.addTabPage(name=page_name)
+        else:
+            self.tabWidget.setTabText(0, page_name)
         # Update the new widget
         # Fill in the table from input data in the last/newest page