Changeset ea5fa58 in sasview for sansguiframe

Timestamp:

Sep 20, 2012 1:22:02 PM (12 years ago)

Author:

Jae Cho <jhjcho@…>

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:

bda809e

Parents:

b71a53b

Message:

category stuffs start working in interp. environment

Location:

sansguiframe/src/sans/guiframe

Files:

• CategoryInstaller.py (modified) (7 diffs)
• CategoryManager.py (modified) (6 diffs)
• __init__.py (modified) (1 diff)
• customdir.py (modified) (4 diffs)

sansguiframe/src/sans/guiframe/CategoryInstaller.py

@@ -6 +6 @@
 
 @author kieranrcampbell@gmail.com
-
+@modified by NIST/MD sanview team
 """
 
@@ -14 +14 @@
 from collections import defaultdict
 
-user_file = 'serialized_cat.p'
+USER_FILE = 'serialized_cat.p'
 
 class CategoryInstaller:
@@ -47 +47 @@
         returns the dir where default_cat.p should be
         """
-        import sans.dataloader.readers
-        return sans.dataloader.readers.get_data_path()
+        from sans import sansview as sasview
+        app_path = os.path.dirname(sasview.__file__)
+        return app_path
 
     @staticmethod
@@ -55 +56 @@
         returns the users sansview config dir
         """
-        return os.path.join(os.path.expanduser("~"),
-                            ".sansview")
+        return os.path.join(os.path.expanduser("~"), ".sasview")
 
     @staticmethod
@@ -95 +95 @@
     def get_user_file():
         """
-        returns the user data file, eg .sansview/serialized_cat.p
+        returns the user data file, eg .sasview/serialized_cat.p
         """
         return os.path.join(CategoryInstaller._get_home_dir(),
-                            user_file)
+                            USER_FILE)
 
     @staticmethod
@@ -107 +107 @@
         """
         return os.path.join(\
-            CategoryInstaller._get_default_cat_p_dir, 
-            "default_categories.p")
+            CategoryInstaller._get_default_cat_p_dir(), "default_categories.p")
         
     @staticmethod
@@ -128 +127 @@
             serialized_file = CategoryInstaller.get_user_file()
         else:
-            serialized_file = os.path.join(homedir, user_file)
+            serialized_file = os.path.join(homedir, USER_FILE)
 
         if os.path.exists(serialized_file):

sansguiframe/src/sans/guiframe/CategoryManager.py

@@ -16 +16 @@
 import wx
 import sys
+import os
 from wx.lib.mixins.listctrl import CheckListCtrlMixin, ListCtrlAutoWidthMixin
 from collections import defaultdict
@@ -290 +291 @@
         cat_file = open(CategoryInstaller.get_user_file(), 'wb')
 
-        pickle.dump( self.master_category_dict,
-                     cat_file )
+        pickle.dump( self.master_category_dict, cat_file )
 
    
@@ -299 +299 @@
         """
         try:
-            cat_file = open(CategoryInstaller.get_user_file(),
-                            'rb')
-            self.master_category_dict = pickle.load(cat_file)
-    
+                file = CategoryInstaller.get_user_file()
+                if os.path.isfile(file):
+                    cat_file = open(file, 'rb')
+                    self.master_category_dict = pickle.load(cat_file)
+                else:
+                        cat_file = open(CategoryInstaller.get_default_file(), 'rb')
+                        self.master_category_dict = pickle.load(cat_file)
         except IOError:
             print 'Problem reading in category file. Please review'
@@ -421 +424 @@
         vbox.Add(self.ok_button, flag = wx.ALL | wx.ALIGN_RIGHT, 
                  border = 10)
-
-
-        self.current_categories.SetSelection(0)
+        
+        if self.current_categories.GetCount() > 0:
+                self.current_categories.SetSelection(0)
         self.new_text.Disable()
         self.SetSizer(vbox)
@@ -494 +497 @@
         return ret
 
-
-
-
-
 if __name__ == '__main__':
         
@@ -510 +509 @@
         app.MainLoop()
 
-

sansguiframe/src/sans/guiframe/__init__.py

@@ -70 +70 @@
     for f in findall(path):
         data_files.append(('media/guiframe_media', [f]))
-    path = get_media_path(media="catdata")
-    for f in findall(path):
-        data_files.append(('.', [f]))
 
     return data_files

sansguiframe/src/sans/guiframe/customdir.py

@@ -3 +3 @@
 import os.path
 import shutil
+from sans.guiframe.CategoryInstaller import CategoryInstaller
 
 CONF_DIR = 'config' 
 APPLICATION_NAME = 'sasview'
+
+def _find_usersasview_dir():
+    """
+    Find and return user/.sasview dir
+    """
+    dir = os.path.join(os.path.expanduser("~"), 
+                       ("." + APPLICATION_NAME))
+    return dir
 
 def _find_customconf_dir():
@@ -12 +21 @@
     The plugin directory is located in the user's home directory.
     """
-    dir = os.path.join(os.path.expanduser("~"), 
-                       ("." + APPLICATION_NAME), CONF_DIR)
+    u_dir = _find_usersasview_dir()
+    dir = os.path.join(u_dir, CONF_DIR)
     
     return dir
@@ -19 +28 @@
 def _setup_conf_dir(path):
     """
-    Setup the custom config dir
+    Setup the custom config dir and cat file
     """
     dir = _find_customconf_dir()
@@ -26 +35 @@
         os.makedirs(dir)
     file = os.path.join(dir, "custom_config.py")
+    u_dir = _find_usersasview_dir()
+    cat_file = os.path.join(u_dir, "serialized_cat.p")
+    # Place example user models as needed
+    if not os.path.isfile(cat_file):
+        try:
+            default_cat_file = CategoryInstaller.get_default_file()
+            if os.path.isfile(default_cat_file):
+                shutil.copyfile(default_cat_file, cat_file)
+            else:
+                print "Unable to find/copy default cat file"
+        except:
+            print "Unable to copy default cat file to the user dir."
+
     # Place example user models as needed
     try: