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

Timestamp:

Sep 13, 2017 6:24:34 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:

3c8242c

Parents:

9909967

Message:

Startup time improvements - hiding expensive imports and such

Location:

src/sas/qtgui/MainWindow

Files:

• DataExplorer.py (modified) (1 diff)
• GuiManager.py (modified) (3 diffs)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -451 +451 @@
         model = self.model if plot_to_show.is_data else self.theory_model
         plots = GuiUtils.plotsFromFilename(filename, model)
-        _ = [self.plotData([(None, plot)]) for plot in plots]
+        for plot in plots:
+            plot_id = plot.id
+            if plot_id in self.active_plots.keys():
+                self.active_plots[plot_id].replacePlot(plot_id, plot_to_show)
+            else:
+                self.plotData([(None, plot)])
 
     def addDataPlot2D(self, plot_set, item):

src/sas/qtgui/MainWindow/GuiManager.py

@@ -11 +11 @@
 
 from twisted.internet import reactor
-
 # General SAS imports
 from sas.qtgui.Utilities.ConnectionProxy import ConnectionProxy
 from sas.qtgui.Utilities.SasviewLogger import XStream
-from sas.qtgui.Utilities.IPythonWidget import IPythonWidget
+
 import sas.qtgui.Utilities.LocalConfig as LocalConfig
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
+
 import sas.qtgui.Utilities.ObjectLibrary as ObjectLibrary
-
 from sas.qtgui.MainWindow.UI.AcknowledgementsUI import Ui_Acknowledgements
 from sas.qtgui.MainWindow.AboutBox import AboutBox
 from sas.qtgui.MainWindow.WelcomePanel import WelcomePanel
+
 from sas.qtgui.MainWindow.DataManager import DataManager
 
@@ -96 +96 @@
         self._helpView = QtWebKit.QWebView()
         # Needs URL like path, so no path.join() here
+        GuiUtils._init()
         self._helpLocation = GuiUtils.HELP_DIRECTORY_LOCATION + "/index.html"
 
@@ -568 +569 @@
         Display the Jupyter console as a docked widget.
         """
+        # Import moved here for startup performance reasons
+        from sas.qtgui.Utilities.IPythonWidget import IPythonWidget
         terminal = IPythonWidget()