Changeset fd5ac0d in sasview for src/sas/guiframe

Timestamp:

Feb 13, 2015 3:26:52 AM (10 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:

7a04dbb

Parents:

b9a5f0e

Message:

I have completed the removal of all SANS references.
I will build, run, and run all unit tests before pushing.

Location:

src/sas/guiframe

Files:

• CategoryInstaller.py (modified) (4 diffs)
• config.py (modified) (3 diffs)
• dummyapp.py (modified) (2 diffs)

src/sas/guiframe/CategoryInstaller.py

@@ -33 +33 @@
         returns the dir where installed_models.txt should be
         """
-import sas.dataloader.readers
+        import sas.dataloader.readers
         return sas.dataloader.readers.get_data_path()
 
@@ -41 +41 @@
         returns the dir where models.py should be
         """
-import sas.perspectives.fitting.models
+        import sas.perspectives.fitting.models
         return sas.perspectives.fitting.models.get_model_python_path()
     
@@ -52 +52 @@
         # when deploying using py2app (it will be in Contents/Resources), or
         # py2exe (it will be in the exec dir).
-import sas.sansview
+        import sas.sasview
         cat_file = "default_categories.json"
         
         possible_cat_file_paths = [
-            os.path.join(os.path.split(sas.sansview.__file__)[0], cat_file),           # Source
+            os.path.join(os.path.split(sas.sasview.__file__)[0], cat_file),           # Source
             os.path.join(os.path.dirname(sys.executable), '..', 'Resources', cat_file), # Mac
             os.path.join(os.path.dirname(sys.executable), cat_file)                     # Windows
@@ -70 +70 @@
     def _get_home_dir():
         """
-        returns the users sansview config dir
+        returns the users sasview config dir
         """
         return os.path.join(os.path.expanduser("~"), ".sasview")

src/sas/guiframe/config.py

@@ -11 +11 @@
 __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']
 
 
@@ -60 +60 @@
 _copyright = "(c) 2008, University of Tennessee"
 #edit the lists below of file state your plugin can read
-#for sansview this how you can edit these lists
+#for sasview this how you can edit these lists
 #PLUGIN_STATE_EXTENSIONS = ['.prv','.fitv', '.inv']
 #APPLICATION_STATE_EXTENSION = '.svs'
@@ -66 +66 @@
 #                  'Fitting files (*.fitv)|*.fitv',
 #                  'Invariant files (*.inv)|*.inv']
-#APPLICATION_WLIST = 'SansView files (*.svs)|*.svs'
+#APPLICATION_WLIST = 'SasView files (*.svs)|*.svs'
 APPLICATION_WLIST = ''
 APPLICATION_STATE_EXTENSION = None

src/sas/guiframe/dummyapp.py

@@ -101 +101 @@
                  "self._on_context_do_something"]]   
 
-class SansView():
+class SasView():
     
     def __init__(self):
@@ -124 +124 @@
     from multiprocessing import freeze_support
     freeze_support()
-    sansview = SansView()
+    sasview = SasView()