Changeset 3a39c2e in sasview for sasview

Timestamp:

Feb 13, 2015 3:53:03 AM (9 years ago)

Author:

krzywon

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:

8c9ffde

Parents:

79492222

Message:

Next iteration of the SANS→SAS is complete.

Location:

sasview

Files:

• installer.iss (modified) (4 diffs)
• installer_generator.py (modified) (4 diffs)
• local_config.py (modified) (1 diff)
• sasview.py (modified) (5 diffs)
• setup_exe.py (modified) (5 diffs)
• setup_mac.py (modified) (5 diffs)
• welcome_panel.py (modified) (1 diff)

sasview/installer.iss

@@ -34 +34 @@
 Root: HKCR;     Subkey: ".abs\OpenWithList\SasView.exe";         Flags: uninsdeletekey noerror
 Root: HKCR;     Subkey: ".d1d\OpenWithList\SasView.exe";         Flags: uninsdeletekey noerror
-Root: HKCR;     Subkey: ".sans\OpenWithList\SasView.exe";        Flags: uninsdeletekey noerror
+Root: HKCR;     Subkey: ".sas\OpenWithList\SasView.exe";         Flags: uninsdeletekey noerror
 Root: HKCR;     Subkey: ".nxs\OpenWithList\SasView.exe";         Flags: uninsdeletekey noerror
 Root: HKCR; Subkey: "applications\SasView.exe\shell\open\command";      ValueType: string; ValueName: "";       ValueData: """{app}\SasView.exe""  ""%1""";      Flags: uninsdeletevalue noerror
@@ -44 +44 @@
 Root: HKCU;     Subkey: "Software\Classes\.abs\OpenWithList\SasView.exe";        Flags: uninsdeletekey noerror
 Root: HKCU;     Subkey: "Software\Classes\.d1d\OpenWithList\SasView.exe";        Flags: uninsdeletekey noerror
-Root: HKCU;     Subkey: "Software\Classes\.sans\OpenWithList\SasView.exe";       Flags: uninsdeletekey noerror
+Root: HKCU;     Subkey: "Software\Classes\.sas\OpenWithList\SasView.exe";        Flags: uninsdeletekey noerror
 Root: HKCU;     Subkey: "Software\Classes\.nxs\OpenWithList\SasView.exe";        Flags: uninsdeletekey noerror
 Root: HKCU; Subkey: "Software\Classes\applications\SasView.exe\shell\open\command";     ValueType: string; ValueName: "";       ValueData: """{app}\SasView.exe""  ""%1""";      Flags: uninsdeletevalue noerror
@@ -54 +54 @@
 Root: HKCR; Subkey: "{app}\SasView.exe\shell\open\command";     ValueType: string; ValueName: "";       ValueData: """{app}\SasView.exe""  ""%1""";      Flags: uninsdeletevalue noerror        
 Root: HKCR; Subkey: "{app}\images\ball.ico";    ValueType: string; ValueName: "";       ValueData: "{app}\SasView.exe,0";        Flags: uninsdeletevalue noerror        
-Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment";     ValueType: expandsz; ValueName: "SANSVIEWPATH"; ValueData: "{app}";      Flags: uninsdeletevalue noerror
+Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment";     ValueType: expandsz; ValueName: "SASVIEWPATH";  ValueData: "{app}";      Flags: uninsdeletevalue noerror
 ; Write to PATH (below) is disabled; need more tests
-;Root: HKCU; Subkey: "Environment";     ValueType: expandsz; ValueName: "PATH"; ValueData: "%SANSVIEWPATH%;{olddata}";   Check: NeedsAddPath()
+;Root: HKCU; Subkey: "Environment";     ValueType: expandsz; ValueName: "PATH"; ValueData: "%SASVIEWPATH%;{olddata}";    Check: NeedsAddPath()
 
 
@@ -114 +114 @@
   RegQueryStringValue(HKEY_CURRENT_USER,'Environment','PATH', oldpath)
   oldpath := oldpath + ';';
-  newpath := '%SANSVIEWPATH%';
+  newpath := '%SASVIEWPATH%';
   i := 0;
   while (Pos(';', oldpath) > 0) do begin

sasview/installer_generator.py

@@ -45 +45 @@
         
         #(ext, type, name, flags)
-        from sans.dataloader.loader import Loader
+        from sas.dataloader.loader import Loader
         wild_cards = Loader().get_wildcards()
         for item in wild_cards:
@@ -145 +145 @@
 
     
-    #SANSVIEWPATH
+    #SASVIEWPATH
     msg += """Root: HKLM; Subkey: "%s";\t"""  %  str('SYSTEM\CurrentControlSet\Control\Session Manager\Environment')
     msg += """ValueType: %s; """ % str('expandsz')
-    msg += """ValueName: "%s";\t""" % str('SANSVIEWPATH') 
+    msg += """ValueName: "%s";\t""" % str('SASVIEWPATH') 
     msg += """ValueData: "{app}";\t"""
     msg += """ Flags: %s""" % str('uninsdeletevalue noerror')
@@ -158 +158 @@
     msg += """ValueType: %s; """ % str('expandsz')
     msg += """ValueName: "%s";\t""" % str('PATH') 
-    msg += """ValueData: "%s;{olddata}";\t""" % str('%SANSVIEWPATH%')
+    msg += """ValueData: "%s;{olddata}";\t""" % str('%SASVIEWPATH%')
     msg += """ Check: %s""" % str('NeedsAddPath()')
     msg += "\n"
@@ -280 +280 @@
     msg += """'PATH', oldpath)\n"""
     msg += """  oldpath := oldpath + ';';\n"""
-    msg += """  newpath := '%SANSVIEWPATH%';\n"""
+    msg += """  newpath := '%SASVIEWPATH%';\n"""
     msg += """  i := 0;\n"""
     msg += """  while (Pos(';', oldpath) > 0) do begin\n"""

sasview/local_config.py

@@ -4 +4 @@
 import time
 import os
-from sans.guiframe.gui_style import GUIFRAME
-import sans.sansview
+from sas.guiframe.gui_style import GUIFRAME
+import sas.sasview
 import logging
 
 # Version of the application
 __appname__ = "SasView"
-__version__ = sans.sansview.__version__
-__build__ = sans.sansview.__build__
+__version__ = sas.sasview.__version__
+__build__ = sas.sasview.__build__
 __download_page__ = 'http://sourceforge.net/projects/sasview/files/'
 __update_URL__ = ['svn.code.sf.net', 
-                  '/p/sasview/code/trunk/sansview.latestversion']
+                  '/p/sasview/code/trunk/sasview.latestversion']
 
 

sasview/sasview.py

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

sasview/setup_exe.py

@@ -19 +19 @@
 # put the build directory at the front of the path
 if os.path.abspath(os.path.dirname(__file__)) != os.path.abspath(os.getcwd()):
-    raise RuntimeError("Must run setup_exe from the sansview directory")
+    raise RuntimeError("Must run setup_exe from the sasview directory")
 from distutils.util import get_platform
 root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -239 +239 @@
 data_files += periodictable.data_files()
 
-import sans.perspectives.fitting as fitting
+import sas.perspectives.fitting as fitting
 data_files += fitting.data_files()
 
-import sans.perspectives.calculator as calculator
+import sas.perspectives.calculator as calculator
 data_files += calculator.data_files()
 
-import sans.perspectives.invariant as invariant
+import sas.perspectives.invariant as invariant
 data_files += invariant.data_files()
 
-import sans.guiframe as guiframe
+import sas.guiframe as guiframe
 data_files += guiframe.data_files()
 
-import sans.models as models
+import sas.models as models
 data_files += models.data_files()
 
@@ -258 +258 @@
     data_files.append((os.path.split(dirname)[0], [f]))
 
-# Copy the settings file for the sans.dataloader file extension associations
-import sans.dataloader.readers
-f = os.path.join(sans.dataloader.readers.get_data_path(),'defaults.xml')
+# Copy the settings file for the sas.dataloader file extension associations
+import sas.dataloader.readers
+f = os.path.join(sas.dataloader.readers.get_data_path(),'defaults.xml')
 if os.path.isfile(f):
     data_files.append(('.', [f]))
@@ -345 +345 @@
 target_wx_client = Target(
     description = 'SasView',
-    script = 'sansview.py',
+    script = 'sasview.py',
     icon_resources = [(1, os.path.join(images_dir, "ball.ico"))],
     other_resources = [(24,1,manifest)],
@@ -357 +357 @@
 gen.generate_installer()
 #initialize category stuff
-#from sans.guiframe.CategoryInstaller import CategoryInstaller
+#from sas.guiframe.CategoryInstaller import CategoryInstaller
 #CategoryInstaller.check_install()
 

sasview/setup_mac.py

@@ -13 +13 @@
 from setuptools import setup
 import periodictable.xsf
-import sans.dataloader.readers 
+import sas.dataloader.readers 
 import os
 import string
@@ -29 +29 @@
 DATA_FILES = periodictable.data_files()
 #invariant and calculator help doc
-import sans.perspectives.fitting as fitting
+import sas.perspectives.fitting as fitting
 DATA_FILES += fitting.data_files()
-import sans.perspectives.calculator as calculator
+import sas.perspectives.calculator as calculator
 DATA_FILES += calculator.data_files()
-import sans.perspectives.invariant as invariant
+import sas.perspectives.invariant as invariant
 DATA_FILES += invariant.data_files()
-import sans.models as models
+import sas.models as models
 DATA_FILES += models.data_files()
-import sans.guiframe as guiframe
+import sas.guiframe as guiframe
 DATA_FILES += guiframe.data_files()
 
 #CANSAxml reader data files
-RESOURCES_FILES.append(os.path.join(sans.dataloader.readers.get_data_path(),'defaults.xml'))
+RESOURCES_FILES.append(os.path.join(sas.dataloader.readers.get_data_path(),'defaults.xml'))
 
 # Locate libxml2 library
@@ -53 +53 @@
     raise RuntimeError, "Could not find libxml2 on the system"
 
-APP = ['sansview.py']
+APP = ['sasview.py']
 DATA_FILES += ['images','test','media', 'custom_config.py', 'local_config.py',
                'default_categories.json']
@@ -67 +67 @@
         list = []
         EXCEPTION_LIST = ['*', '.', '']
-        from sans.dataloader.loader import Loader
+        from sas.dataloader.loader import Loader
         wild_cards = Loader().get_wildcards()
         for item in wild_cards:
@@ -100 +100 @@
                                    CFBundleTypeRole="Shell" )],)
 
-APP = ['sansview.py']
+APP = ['sasview.py']
 DATA_FILES += ['images','test','media']
 

sasview/welcome_panel.py

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