Changeset d4dac80 in sasview for src/sas/qtgui/MainWindow

Timestamp:

Apr 25, 2018 6:59:33 AM (7 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:

017b285

Parents:

93c79b5

git-author:

Piotr Rozyczko <rozyczko@…> (03/22/18 16:46:19)

git-committer:

Piotr Rozyczko <rozyczko@…> (04/25/18 06:59:33)

Message:

Merge branch 'ESS_GUI' into ESS_GUI_better_batch

Location:

src/sas/qtgui/MainWindow

Files:

• DataExplorer.py (modified) (1 diff)
• GuiManager.py (modified) (7 diffs)
• UI/MainWindowUI.ui (modified) (1 diff)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -476 +476 @@
         self.chkBatch.setEnabled(self.parent.perspective().allowBatch())
 
+    def itemFromFilename(self, filename):
+        """
+        Retrieves model item corresponding to the given filename
+        """
+        item = GuiUtils.itemFromFilename(filename, self.model)
+        return item
+
     def displayFile(self, filename=None, is_data=True):
         """

src/sas/qtgui/MainWindow/GuiManager.py

@@ -21 +21 @@
 from sas.qtgui.Utilities.TabbedModelEditor import TabbedModelEditor
 from sas.qtgui.Utilities.PluginManager import PluginManager
+from sas.qtgui.Utilities.GridPanel import BatchOutputPanel
+
 from sas.qtgui.MainWindow.UI.AcknowledgementsUI import Ui_Acknowledgements
 from sas.qtgui.MainWindow.AboutBox import AboutBox
@@ -130 +132 @@
         self.aboutWidget = AboutBox()
         self.welcomePanel = WelcomePanel()
+        self.grid_window = None
 
         # Add calculators - floating for usability
@@ -263 +266 @@
             msg = "Guiframe does not have a current perspective"
             logging.info(msg)
+
+    def findItemFromFilename(self, filename):
+        """
+        Queries the data explorer for the index corresponding to the filename within
+        """
+        return self.filesWidget.itemFromFilename(filename)
 
     def quitApplication(self):
@@ -405 +414 @@
         self._workspace.actionGPU_Options.triggered.connect(self.actionGPU_Options)
         self._workspace.actionFit_Results.triggered.connect(self.actionFit_Results)
-        self._workspace.actionChain_Fitting.triggered.connect(self.actionChain_Fitting)
         self._workspace.actionAdd_Custom_Model.triggered.connect(self.actionAdd_Custom_Model)
         self._workspace.actionEdit_Custom_Model.triggered.connect(self.actionEdit_Custom_Model)
@@ -428 +436 @@
         self._workspace.actionCheck_for_update.triggered.connect(self.actionCheck_for_update)
 
+        self.communicate.sendDataToGridSignal.connect(self.showBatchOutput)
+
     #============ FILE =================
     def actionLoadData(self):
@@ -527 +537 @@
         """
         """
-        print("actionShow_Grid_Window TRIGGERED")
-        pass
+        self.showBatchOutput(None)
+
+    def showBatchOutput(self, output_data):
+        """
+        Display/redisplay the batch fit viewer
+        """
+        if self.grid_window is None:
+            self.grid_window = BatchOutputPanel(parent=self, output_data=output_data)
+            subwindow = self._workspace.workspace.addSubWindow(self.grid_window)
+
+            #self.grid_window = BatchOutputPanel(parent=self, output_data=output_data)
+            self.grid_window.show()
+            return
+        if output_data:
+            self.grid_window.addFitResults(output_data)
+        self.grid_window.show()
+        if self.grid_window.windowState() == Qt.WindowMinimized:
+            self.grid_window.setWindowState(Qt.WindowActive)
 
     def actionHide_Toolbar(self):
@@ -658 +684 @@
         """
         print("actionFit_Results TRIGGERED")
-        pass
-
-    def actionChain_Fitting(self):
-        """
-        """
-        print("actionChain_Fitting TRIGGERED")
         pass
 

src/sas/qtgui/MainWindow/UI/MainWindowUI.ui

@@ -106 +106 @@
     <addaction name="actionFit_Results"/>
     <addaction name="separator"/>
-    <addaction name="actionChain_Fitting"/>
-    <addaction name="separator"/>
     <addaction name="actionAdd_Custom_Model"/>
     <addaction name="actionEdit_Custom_Model"/>