Changeset d85c194 in sasview for src/sas/sasgui/guiframe/gui_manager.py

Timestamp:

Feb 22, 2016 7:04:24 AM (8 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

master, 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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

06aaa75d

Parents:

d7bb526

Message:

Remaining modules refactored

File:

• src/sas/sasgui/guiframe/gui_manager.py (moved) (moved from src/sas/guiframe/gui_manager.py) (13 diffs)

src/sas/sasgui/guiframe/gui_manager.py

@@ -29 +29 @@
 import json
 
-from sas.guiframe.events import EVT_CATEGORY
-from sas.guiframe.events import EVT_STATUS
-from sas.guiframe.events import EVT_APPEND_BOOKMARK
-from sas.guiframe.events import EVT_PANEL_ON_FOCUS
-from sas.guiframe.events import EVT_NEW_LOAD_DATA
-from sas.guiframe.events import EVT_NEW_COLOR
-from sas.guiframe.events import StatusEvent
-from sas.guiframe.events import NewPlotEvent
-from sas.guiframe.gui_style import GUIFRAME
-from sas.guiframe.gui_style import GUIFRAME_ID
-from sas.guiframe.data_panel import DataPanel
-from sas.guiframe.panel_base import PanelBase
-from sas.guiframe.gui_toolbar import GUIToolBar
-from sas.guiframe.data_processor import GridFrame
-from sas.guiframe.events import EVT_NEW_BATCH
-from sas.guiframe.CategoryManager import CategoryManager
+from sas.sasgui.guiframe.events import EVT_CATEGORY
+from sas.sasgui.guiframe.events import EVT_STATUS
+from sas.sasgui.guiframe.events import EVT_APPEND_BOOKMARK
+from sas.sasgui.guiframe.events import EVT_PANEL_ON_FOCUS
+from sas.sasgui.guiframe.events import EVT_NEW_LOAD_DATA
+from sas.sasgui.guiframe.events import EVT_NEW_COLOR
+from sas.sasgui.guiframe.events import StatusEvent
+from sas.sasgui.guiframe.events import NewPlotEvent
+from sas.sasgui.guiframe.gui_style import GUIFRAME
+from sas.sasgui.guiframe.gui_style import GUIFRAME_ID
+from sas.sasgui.guiframe.data_panel import DataPanel
+from sas.sasgui.guiframe.panel_base import PanelBase
+from sas.sasgui.guiframe.gui_toolbar import GUIToolBar
+from sas.sasgui.guiframe.data_processor import GridFrame
+from sas.sasgui.guiframe.events import EVT_NEW_BATCH
+from sas.sasgui.guiframe.CategoryManager import CategoryManager
 from sas.sascalc.dataloader.loader import Loader
-from sas.guiframe.proxy import Connection
+from sas.sasgui.guiframe.proxy import Connection
 from matplotlib import _pylab_helpers
 
@@ -121 +121 @@
     if config is None:
         # Didn't find local config, load the default
-        import sas.guiframe.config as config
+        import sas.sasgui.guiframe.config as config
         logging.info("using default local_config")
     else:
@@ -128 +128 @@
     logging.info("found local_config in %s" % PATH_APP)
 
-from sas.guiframe.customdir  import SetupCustom
+from sas.sasgui.guiframe.customdir  import SetupCustom
 c_conf_dir = SetupCustom().setup_dir(PATH_APP)
 custom_config = _find_local_config('custom_config', c_conf_dir)
@@ -312 +312 @@
         #data manager
         self.batch_on = False
-        from sas.guiframe.data_manager import DataManager
+        from sas.sasgui.guiframe.data_manager import DataManager
         self._data_manager = DataManager()
         self._data_panel = None#DataPanel(parent=self)
@@ -814 +814 @@
         """
         # Status bar
-        from sas.guiframe.gui_statusbar import StatusBar
+        from sas.sasgui.guiframe.gui_statusbar import StatusBar
         self.sb = StatusBar(self, wx.ID_ANY)
         self.SetStatusBar(self.sb)
@@ -869 +869 @@
         if style1 == GUIFRAME.DATALOADER_ON:
             try:
-                from sas.guiframe.local_perspectives.data_loader import data_loader
+                from sas.sasgui.guiframe.local_perspectives.data_loader import data_loader
                 self._data_plugin = data_loader.Plugin()
                 plugins.append(self._data_plugin)
@@ -878 +878 @@
         if style2 == GUIFRAME.PLOTTING_ON:
             try:
-                from sas.guiframe.local_perspectives.plotting import plotting
+                from sas.sasgui.guiframe.local_perspectives.plotting import plotting
                 self._plotting_plugin = plotting.Plugin()
                 plugins.append(self._plotting_plugin)
@@ -1453 +1453 @@
         Build a panel to allow to edit Mask
         """
-        from sas.guiframe.startup_configuration \
+        from sas.sasgui.guiframe.startup_configuration \
         import StartupConfiguration as ConfDialog
 
@@ -2123 +2123 @@
         """
         if config._do_acknowledge:
-            import sas.guiframe.acknowledgebox as AcknowledgeBox
+            import sas.sasgui.guiframe.acknowledgebox as AcknowledgeBox
             dialog = AcknowledgeBox.DialogAcknowledge(None, -1, "")
             dialog.ShowModal()
@@ -2135 +2135 @@
         """
         if config._do_aboutbox:
-            import sas.guiframe.aboutbox as AboutBox
+            import sas.sasgui.guiframe.aboutbox as AboutBox
             dialog = AboutBox.DialogAbout(None, -1, "")
             dialog.ShowModal()
@@ -2150 +2150 @@
             if IS_WIN:
                 try:
-                    from sas.guiframe.pdfview import PDFFrame
+                    from sas.sasgui.guiframe.pdfview import PDFFrame
                     dialog = PDFFrame(None, -1, "Tutorial", path)
                     # put icon
@@ -2362 +2362 @@
             else:
                 #if not append then new plot
-                from sas.guiframe.dataFitting import Data2D
+                from sas.sasgui.guiframe.dataFitting import Data2D
                 if issubclass(Data2D, new_plot.__class__):
                     #for 2 D always plot in a separated new plot
@@ -3395 +3395 @@
                                    parent=parent,
                                    id=wx.ID_ANY)
-        from sas.guiframe.gui_statusbar import SPageStatusbar
+        from sas.sasgui.guiframe.gui_statusbar import SPageStatusbar
         statusBar = SPageStatusbar(s_screen)
         s_screen.SetStatusBar(statusBar)