Changeset c994f8f in sasview

Timestamp:

Sep 5, 2011 9:43:17 PM (13 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:

d72ef56

Parents:

902f373

Message:

added custom path saving by view setting

Files:

• calculatorview/custom_config.py (modified) (1 diff)
• sansguiframe/src/sans/guiframe/gui_manager.py (modified) (5 diffs)
• sansguiframe/src/sans/guiframe/startup_configuration.py (modified) (5 diffs)
• sansview/custom_config.py (modified) (2 diffs)

calculatorview/custom_config.py

@@ -10 +10 @@
 TOOLBAR_SHOW = False
 DEFAULT_PERSPECTIVE = "Calculator"
+DEFAULT_OPEN_FOLDER = None

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -83 +83 @@
     # Didn't find local config, load the default 
     import sans.guiframe.config as config
+custom_config = None
 try:
     path = PATH_APP
@@ -118 +119 @@
     DEFAULT_PERSPECTIVE = custom_config.DEFAULT_PERSPECTIVE
     CLEANUP_PLOT = custom_config.CLEANUP_PLOT
+    # custom open_path
+    open_folder = custom_config.DEFAULT_OPEN_FOLDER
+    if open_folder != None and os.path.isdir(open_folder):
+        DEFAULT_OPEN_FOLDER = os.path.abspath(open_folder)
+    else:
+        DEFAULT_OPEN_FOLDER = PATH_APP
 except:
+    raise
     DATALOADER_SHOW = True
     TOOLBAR_SHOW = True
@@ -129 +137 @@
     DEFAULT_PERSPECTIVE = None
     CLEANUP_PLOT = False
+    DEFAULT_OPEN_FOLDER = PATH_APP
 
 DEFAULT_STYLE = config.DEFAULT_STYLE
@@ -238 +247 @@
 
         # Default locations
-        self._default_save_location = os.getcwd()        
-        
+        self._default_save_location = DEFAULT_OPEN_FOLDER       
         # Welcome panel
         self.defaultPanel = None
@@ -1564 +1572 @@
             error_message += str(sys.exc_value) + "\n"
             print error_message
-           
+        print "_default_save_location", self._default_save_location  
     def load_folder(self, path):
         """

sansguiframe/src/sans/guiframe/startup_configuration.py

@@ -27 +27 @@
                    'WELCOME_PANEL_SHOW':False,
                    'CLEANUP_PLOT':False,
-                   'DEFAULT_PERSPECTIVE':'Fitting'}
+                   'DEFAULT_PERSPECTIVE':'Fitting',
+                   'DEFAULT_OPEN_FOLDER': None}
 try:
     CURRENT_STRINGS = {'GUIFRAME_WIDTH':CURRENT.GUIFRAME_WIDTH,
@@ -38 +39 @@
                        'WELCOME_PANEL_SHOW':CURRENT.WELCOME_PANEL_SHOW,
                        'CLEANUP_PLOT':CURRENT.CLEANUP_PLOT,
-                       'DEFAULT_PERSPECTIVE':CURRENT.DEFAULT_PERSPECTIVE}
+                       'DEFAULT_PERSPECTIVE':CURRENT.DEFAULT_PERSPECTIVE,
+                       'DEFAULT_OPEN_FOLDER':CURRENT.DEFAULT_OPEN_FOLDER}
 except:
     CURRENT_STRINGS = DEFAULT_STRINGS
@@ -68 +70 @@
         self.SetWindowVariant(variant=FONT_VARIANT)
         self.current_string = copy.deepcopy(CURRENT_STRINGS)
-        self.return_string = {}
+        self.return_string = copy.deepcopy(DEFAULT_STRINGS)
         # build layout
         panel = wx.Panel(self, -1)
@@ -160 +162 @@
                                         self.parent.cleanup_plots
             perspective = self.parent.get_current_perspective()
-            self.current_string['DEFAULT_PERSPECTIVE'] = str(perspective.sub_menu)
+            self.current_string['DEFAULT_PERSPECTIVE'] =\
+                                            str(perspective.sub_menu)
+            location = ''
+            temp = self.parent._default_save_location.split("\\")
+            for strings in temp:
+                location += (strings + "/")
+            self.current_string['DEFAULT_OPEN_FOLDER'] = location
+                        #self.parent._default_save_location.ascii_letters
             
         except:
@@ -199 +208 @@
         out_f.write("#Application appearance custom configuration\n" )
         for key, item in strings.iteritems():
-            if key == 'DEFAULT_PERSPECTIVE':
-                out_f.write("%s = '%s'\n" % (key,str(item)))
+            if (key == 'DEFAULT_PERSPECTIVE') or \
+                (key == 'DEFAULT_OPEN_FOLDER' and item != None):
+                out_f.write("%s = \"%s\"\n" % (key,str(item)))
             else:
                 out_f.write("%s = %s\n" % (key,str(item)))

sansview/custom_config.py

@@ -1 +1 @@
 #Application appearance custom configuration
 DATAPANEL_WIDTH = 235
+CLEANUP_PLOT = False
 FIXED_PANEL = True
 PLOPANEL_WIDTH = 415
@@ -6 +7 @@
 GUIFRAME_HEIGHT = 840
 GUIFRAME_WIDTH = 1150
-CLEANUP_PLOT = False
+DEFAULT_OPEN_FOLDER = None
 WELCOME_PANEL_SHOW = False
 TOOLBAR_SHOW = True
-DEFAULT_PERSPECTIVE = 'Fitting'
+DEFAULT_PERSPECTIVE = "Fitting"