Changeset d85c194 in sasview for sasview

Timestamp:

Feb 22, 2016 9: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

Location:

sasview

Files:

• local_config.py (modified) (1 diff)
• sasview.py (modified) (5 diffs)
• setup_exe.py (modified) (2 diffs)
• setup_mac.py (modified) (1 diff)
• welcome_panel.py (modified) (1 diff)

sasview/local_config.py

@@ -4 +4 @@
 import time
 import os
-from sas.guiframe.gui_style import GUIFRAME
+from sas.sasgui.guiframe.gui_style import GUIFRAME
 import sas.sasview
 import logging

sasview/sasview.py

@@ -88 +88 @@
     reload(sys)
     sys.setdefaultencoding("iso-8859-1")
-from sas.guiframe import gui_manager
-from sas.guiframe.gui_style import GUIFRAME
+from sas.sasgui.guiframe import gui_manager
+from sas.sasgui.guiframe.gui_style import GUIFRAME
 from welcome_panel import WelcomePanel
 # For py2exe, import config here
@@ -116 +116 @@
         # Fitting perspective
         try:
-            import sas.perspectives.fitting as module    
+            import sas.sasgui.perspectives.fitting as module    
             fitting_plug = module.Plugin()
             self.gui.add_perspective(fitting_plug)
@@ -125 +125 @@
         # P(r) perspective
         try:
-            import sas.perspectives.pr as module
+            import sas.sasgui.perspectives.pr as module
             pr_plug = module.Plugin()
             self.gui.add_perspective(pr_plug)
@@ -134 +134 @@
         #Invariant perspective
         try:
-            import sas.perspectives.invariant as module
+            import sas.sasgui.perspectives.invariant as module
             invariant_plug = module.Plugin()
             self.gui.add_perspective(invariant_plug)
@@ -144 +144 @@
         #Calculator perspective   
         try:
-            import sas.perspectives.calculator as module
+            import sas.sasgui.perspectives.calculator as module
             calculator_plug = module.Plugin()
             self.gui.add_perspective(calculator_plug)

sasview/setup_exe.py

@@ -244 +244 @@
 data_files += periodictable.data_files()
 
-import sas.perspectives.fitting as fitting
+import sas.sasgui.perspectives.fitting as fitting
 data_files += fitting.data_files()
 
-import sas.perspectives.calculator as calculator
+import sas.sasgui.perspectives.calculator as calculator
 data_files += calculator.data_files()
 
-import sas.perspectives.invariant as invariant
+import sas.sasgui.perspectives.invariant as invariant
 data_files += invariant.data_files()
 
-import sas.guiframe as guiframe
+import sas.sasgui.guiframe as guiframe
 data_files += guiframe.data_files()
 
@@ -388 +388 @@
 gen.generate_installer()
 #initialize category stuff
-#from sas.guiframe.CategoryInstaller import CategoryInstaller
+#from sas.sasgui.guiframe.CategoryInstaller import CategoryInstaller
 #CategoryInstaller.check_install(s)
 

sasview/setup_mac.py

@@ -35 +35 @@
 DATA_FILES = periodictable.data_files()
 #invariant and calculator help doc
-import sas.perspectives.fitting as fitting
+import sas.sasgui.perspectives.fitting as fitting
 DATA_FILES += fitting.data_files()
-import sas.perspectives.calculator as calculator
+import sas.sasgui.perspectives.calculator as calculator
 DATA_FILES += calculator.data_files()
-import sas.perspectives.invariant as invariant
+import sas.sasgui.perspectives.invariant as invariant
 DATA_FILES += invariant.data_files()
 import sas.models as models
 DATA_FILES += models.data_files()
-import sas.guiframe as guiframe
+import sas.sasgui.guiframe as guiframe
 DATA_FILES += guiframe.data_files()
 

sasview/welcome_panel.py

@@ -9 +9 @@
 import local_config as config
 from wx.lib.scrolledpanel import ScrolledPanel
-from sas.guiframe.panel_base import PanelBase
+from sas.sasgui.guiframe.panel_base import PanelBase
 #Font size width
 if sys.platform.count("win32") > 0: