Changeset dc5ef15 in sasview for src/sas/qtgui/MainWindow/GuiManager.py

Timestamp:

May 18, 2017 3:36:57 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:

6066a3f

Parents:

2a432e7

Message:

Removed qtgui dependency on sasgui and wx SASVIEW-590

File:

• src/sas/qtgui/MainWindow/GuiManager.py (modified) (3 diffs)

src/sas/qtgui/MainWindow/GuiManager.py

@@ -11 +11 @@
 
 from twisted.internet import reactor
+
 # General SAS imports
-
-from sas.sasgui.guiframe.data_manager import DataManager
-from sas.sasgui.guiframe.proxy import Connection
+from sas.qtgui.Utilities.ConnectionProxy import ConnectionProxy
 from sas.qtgui.Utilities.SasviewLogger import XStream
 from sas.qtgui.Utilities.IPythonWidget import IPythonWidget
@@ -24 +23 @@
 from sas.qtgui.MainWindow.AboutBox import AboutBox
 from sas.qtgui.MainWindow.WelcomePanel import WelcomePanel
+from sas.qtgui.MainWindow.DataManager import DataManager
 
 from sas.qtgui.Calculators.SldPanel import SldPanel
@@ -278 +278 @@
         """
         version_info = {"version": "0.0.0"}
-        c = Connection(LocalConfig.__update_URL__, LocalConfig.UPDATE_TIMEOUT)
+        c = ConnectionProxy(LocalConfig.__update_URL__, LocalConfig.UPDATE_TIMEOUT)
         response = c.connect()
         if response is None: