Changeset 70ecd530 in sasview

Timestamp:

Oct 24, 2011 2:42:48 PM (13 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

bce8148

Parents:

7247844

Message:

minor cchange to allow sphinx build

Location:

sansguiframe/src/sans/guiframe

Files:

• config.py (modified) (2 diffs)
• dummyapp.py (modified) (1 diff)
• gui_manager.py (modified) (1 diff)
• local_perspectives/data_loader/__init__.py (modified) (1 diff)
• local_perspectives/data_loader/data_loader.py (modified) (1 diff)
• local_perspectives/plotting/__init__.py (modified) (1 diff)

sansguiframe/src/sans/guiframe/config.py

@@ -59 +59 @@
 SPLASH_SCREEN_WIDTH = 500
 SPLASH_SCREEN_HEIGHT = 300
+WELCOME_PANEL_ON  = False
 TUTORIAL_PATH = None
 SS_MAX_DISPLAY_TIME = 4000 #4 sec
@@ -81 +82 @@
 # OPEN and SAVE project menu
 OPEN_SAVE_PROJECT_MENU = True
-
+CLEANUP_PLOT = False
+# OPEN and SAVE project menu
+OPEN_SAVE_PROJECT_MENU = False
+#VIEW MENU
+VIEW_MENU = False
+#EDIT MENU
+EDIT_MENU = False
 import wx.lib.newevent
 (StatusBarEvent, EVT_STATUS) = wx.lib.newevent.NewEvent()

sansguiframe/src/sans/guiframe/dummyapp.py

@@ -3 +3 @@
 Allows the user to set an external data manager
 """
-import gui_manager
+import sans.guiframe.gui_manager as gui_manager
 
 from sans.guiframe.plugin_base import PluginBase

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -85 +85 @@
     # Didn't find local config, load the default 
     import sans.guiframe.config as config
+ 
+if config is None:
+    # Didn't find local config, load the default 
+    import sans.guiframe.config as config
+       
 custom_config = None
 try:

sansguiframe/src/sans/guiframe/local_perspectives/data_loader/__init__.py

@@ -1 +1 @@
 PLUGIN_ID = "DataLoader plug-in 1.0"
-from data_loader import *
+from sans.guiframe.local_perspectives.data_loader import *

sansguiframe/src/sans/guiframe/local_perspectives/data_loader/data_loader.py

@@ -31 +31 @@
 except:
     # Didn't find local config, load the default 
-    import config
-
+    import sans.guiframe.config as config
+
+if config is None:
+    import sans.guiframe.config as config
+    
        
 extension_list = []

sansguiframe/src/sans/guiframe/local_perspectives/plotting/__init__.py

@@ -1 +1 @@
 PLUGIN_ID = "Plotting plug-in 1.0"
-from plotting import *
+from sans.guiframe.local_perspectives.plotting import *