Changeset df7a7e3 in sasview for sansview

Timestamp:

Sep 17, 2012 7:11:50 PM (12 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

b71a53b

Parents:

cf7653d3

Message:

merging category branch

Location:

sansview

Files:

• sansview.py (modified) (3 diffs)
• setup_exe.py (modified) (2 diffs)
• setup_mac.py (modified) (1 diff)

sansview/sansview.py

@@ -11 +11 @@
 import os
 import logging
+from shutil import copy
 logging.basicConfig(level=logging.INFO,
                     format='%(asctime)s %(levelname)s %(message)s',
@@ -67 +68 @@
             fitting_plug = module.Plugin()
             self.gui.add_perspective(fitting_plug)
-        except:
+        except Exception as inst:
+            logging.error("Fitting problems: " + str(inst))
             logging.error("%s: could not find Fitting plug-in module"% APP_NAME) 
             logging.error(sys.exc_value)  
@@ -101 +103 @@
             logging.error(sys.exc_value)  
 
+        # initialize category stuff
+        user_file = os.path.join(os.path.expanduser("~"),
+                                 'serialized_categories.p')
+        
+        if not os.path.isfile(user_file): 
+            # either first time starting sansview or the
+            # user has deleted their category file
+            my_dir = os.path.dirname(os.path.abspath(__file__))
+            default_file = os.path.join(my_dir, '..',
+                                        'sansmodels',
+                                        'default_categories.p' )
+            copy(default_file, user_file)
+
             
         # Add welcome page

sansview/setup_exe.py

@@ -16 +16 @@
 import os, sys
 import platform
+
 
 if len(sys.argv) == 1:
@@ -328 +329 @@
     bundle_option = 3
 
+#initialize category stuff
+from sans.guiframe.CategoryInstaller import CategoryInstaller
+CategoryInstaller.check_install()
+
+
+
 setup(
     windows=[target_wx_client],

sansview/setup_mac.py

@@ -93 +93 @@
 EXTENSIONS_LIST = find_extension()
 
+#initialize category stuff
+from sans.guiframe.CategoryInstaller import CategoryInstaller
+CategoryInstaller.check_install()
+
+
  
 plist = dict(CFBundleDocumentTypes=[dict(CFBundleTypeExtensions=EXTENSIONS_LIST,