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

Timestamp:

Oct 26, 2018 6:44:15 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:

b1b71ad

Parents:

a3c59503 (diff), 75906a1 (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' into ESS_GUI_project_save

Location:

src/sas/qtgui/MainWindow

Files:

• DataExplorer.py (modified) (1 diff)
• GuiManager.py (modified) (9 diffs)
• MainWindow.py (modified) (2 diffs)
• UI/MainWindowUI.ui (modified) (3 diffs)
• DataManager.py (modified) (1 diff)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -1470 +1470 @@
         self.manager.update_stored_data(deleted_names)
 
+    def closeAllPlots(self):
+        """
+        Close all currently displayed plots
+        """
+
+        for plot_id in PlotHelper.currentPlots():
+            try:
+                plotter = PlotHelper.plotById(plot_id)
+                plotter.close()
+                self.plot_widgets[plot_id].close()
+                self.plot_widgets.pop(plot_id, None)
+            except AttributeError as ex:
+                logging.error("Closing of %s failed:\n %s" % (plot_id, str(ex)))
+
     def closePlotsForItem(self, item):
         """

src/sas/qtgui/MainWindow/GuiManager.py

@@ -24 +24 @@
 from sas.qtgui.Utilities.PluginManager import PluginManager
 from sas.qtgui.Utilities.GridPanel import BatchOutputPanel
+from sas.qtgui.Utilities.ResultPanel import ResultPanel
 
 from sas.qtgui.Utilities.ReportDialog import ReportDialog
@@ -147 +148 @@
         self.aboutWidget = AboutBox()
         self.categoryManagerWidget = CategoryManager(self._parent, manager=self)
+
         self.grid_window = None
         self.grid_window = BatchOutputPanel(parent=self)
@@ -154 +156 @@
         self.grid_subwindow.setVisible(False)
         self.grid_window.windowClosedSignal.connect(lambda: self.grid_subwindow.setVisible(False))
+
+        self.results_panel = ResultPanel(parent=self._parent, manager=self)
+        self.results_frame = self._workspace.workspace.addSubWindow(self.results_panel)
+        self.results_frame.setVisible(False)
+        self.results_panel.windowClosedSignal.connect(lambda: self.results_frame.setVisible(False))
 
         self._workspace.toolBar.setVisible(LocalConfig.TOOLBAR_SHOW)
@@ -443 +450 @@
         """
         # disable not yet fully implemented actions
-        #self._workspace.actionOpen_Analysis.setVisible(False)
         self._workspace.actionUndo.setVisible(False)
         self._workspace.actionRedo.setVisible(False)
@@ -450 +456 @@
         self._workspace.actionImage_Viewer.setVisible(False)
         self._workspace.actionCombine_Batch_Fit.setVisible(False)
-        self._workspace.actionFit_Results.setVisible(False)
         # orientation viewer set to invisible SASVIEW-1132
         self._workspace.actionOrientation_Viewer.setVisible(False)
@@ -510 +515 @@
         self._workspace.actionNext.triggered.connect(self.actionNext)
         self._workspace.actionPrevious.triggered.connect(self.actionPrevious)
+        self._workspace.actionClosePlots.triggered.connect(self.actionClosePlots)
         # Analysis
         self._workspace.actionFitting.triggered.connect(self.actionFitting)
@@ -524 +530 @@
 
         self.communicate.sendDataToGridSignal.connect(self.showBatchOutput)
+        self.communicate.resultPlotUpdateSignal.connect(self.showFitResults)
 
     #============ FILE =================
@@ -853 +860 @@
         """
         """
-        print("actionFit_Results TRIGGERED")
-        pass
+        self.showFitResults(None)
+
+    def showFitResults(self, output_data):
+        """
+        Show bumps convergence plots
+        """
+        self.results_frame.setVisible(True)
+        if output_data:
+            self.results_panel.onPlotResults(output_data)
 
     def actionAdd_Custom_Model(self):
@@ -945 +959 @@
         """
         self._workspace.workspace.activatePreviousSubWindow()
+
+    def actionClosePlots(self):
+        """
+        Closes all Plotters and Plotter2Ds.
+        """
+        self.filesWidget.closeAllPlots()
+        pass
 
     #============ HELP =================

src/sas/qtgui/MainWindow/MainWindow.py

@@ -6 +6 @@
 from PyQt5.QtWidgets import QApplication
 from PyQt5.QtGui import QPixmap
+from PyQt5.QtCore import Qt
 import os
 import sys
@@ -58 +59 @@
     splash = SplashScreen()
     splash.show()
-
+    app.setAttribute(Qt.AA_EnableHighDpiScaling)
     # fix for pyinstaller packages app to avoid ReactorAlreadyInstalledError
     import sys

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

@@ -25 +25 @@
      <y>0</y>
      <width>915</width>
-     <height>21</height>
+     <height>26</height>
     </rect>
    </property>
@@ -128 +128 @@
     <addaction name="actionPrevious"/>
     <addaction name="separator"/>
+    <addaction name="actionClosePlots"/>
    </widget>
    <widget class="QMenu" name="menuAnalysis">
@@ -571 +572 @@
    </property>
   </action>
+  <action name="actionClosePlots">
+   <property name="text">
+    <string>Close All Plots</string>
+   </property>
+  </action>
  </widget>
  <resources/>

src/sas/qtgui/MainWindow/DataManager.py

@@ -29 +29 @@
 from sas.qtgui.Plotting.PlotterData import Data1D
 from sas.qtgui.Plotting.PlotterData import Data2D
-from sas.qtgui.Plotting.Plottables import Plottable
 from sas.qtgui.Plotting.Plottables import PlottableTheory1D
 from sas.qtgui.Plotting.Plottables import PlottableFit1D