Changeset ea5fa58 in sasview for sansguiframe/src/sans/guiframe/CategoryManager.py

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

File:

• sansguiframe/src/sans/guiframe/CategoryManager.py (modified) (6 diffs)

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()
 
-