Changeset 026041c in sasview

Timestamp:

May 22, 2011 12:23:11 PM (14 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:

b3de12a4

Parents:

e0e22f2c

Message:

Startup-config: fixed minor bug

Location:

guiframe

Files:

• data_panel.py (modified) (1 diff)
• startup_configuration.py (modified) (9 diffs)

guiframe/data_panel.py

@@ -174 +174 @@
         self.vbox.Add(self.sizer1, 0, wx.EXPAND|wx.ALL,0)
         self.vbox.Add(self.sizer2, 0, wx.EXPAND|wx.ALL,1)
-        self.vbox.Add(self.sizer3, 0, wx.EXPAND|wx.ALL,1)
+        self.vbox.Add(self.sizer3, 0, wx.EXPAND|wx.ALL,5)
         self.vbox.Add(self.sizer4, 0, wx.EXPAND|wx.ALL,5)
         

guiframe/startup_configuration.py

@@ -16 +16 @@
 from sans.guiframe.events import StatusEvent  
 from sans.guiframe.gui_style import GUIFRAME
+from sans.guiframe import gui_manager as CURRENT
 # default configuration
 DEFAULT_STRINGS = {'GUIFRAME_WIDTH':1150,
@@ -27 +28 @@
                    'CLEANUP_PLOT':False,
                    'DEFAULT_PERSPECTIVE':'Fitting'}
-
+try:
+    CURRENT_STRINGS = {'GUIFRAME_WIDTH':CURRENT.GUIFRAME_WIDTH,
+                       'GUIFRAME_HEIGHT':CURRENT.GUIFRAME_HEIGHT,
+                       'PLOPANEL_WIDTH':CURRENT.PLOPANEL_WIDTH,
+                       'DATAPANEL_WIDTH':CURRENT.DATAPANEL_WIDTH,
+                       'DATALOADER_SHOW':CURRENT.DATALOADER_SHOW,
+                       'TOOLBAR_SHOW':CURRENT.TOOLBAR_SHOW,
+                       'FIXED_PANEL':CURRENT.FIXED_PANEL,
+                       'WELCOME_PANEL_SHOW':CURRENT.WELCOME_PANEL_SHOW,
+                       'CLEANUP_PLOT':CURRENT.CLEANUP_PLOT,
+                       'DEFAULT_PERSPECTIVE':CURRENT.DEFAULT_PERSPECTIVE}
+except:
+    CURRENT_STRINGS = DEFAULT_STRINGS
+    
 if sys.platform.count("win32") > 0:
     PANEL_WIDTH = 265 
@@ -53 +67 @@
         # font size 
         self.SetWindowVariant(variant=FONT_VARIANT)
-        self.current_string = copy.deepcopy(DEFAULT_STRINGS)
+        self.current_string = copy.deepcopy(CURRENT_STRINGS)
+        self.return_string = {}
         # build layout
         panel = wx.Panel(self, -1)
@@ -91 +106 @@
         event.Skip()
         # event object and selection
-        return DEFAULT_STRINGS
+        self.return_string = copy.deepcopy(DEFAULT_STRINGS)
+        return self.return_string
         
     def OnCurrent(self, event=None):
@@ -110 +126 @@
                         p_size = panel.size
             if p_size == None:
-                p_size = DEFAULT_STRINGS['PLOPANEL_WIDTH']
+                p_size = CURRENT_STRINGS['PLOPANEL_WIDTH']
             self.current_string['PLOPANEL_WIDTH'] = p_size
             
             data_pw, _ = self.parent.panels["data_panel"].GetSizeTuple()
             if data_pw == None:
-                data_pw = DEFAULT_STRINGS['DATAPANEL_WIDTH']
+                data_pw = CURRENT_STRINGS['DATAPANEL_WIDTH']
             self.current_string['DATAPANEL_WIDTH'] = data_pw
             
@@ -147 +163 @@
             raise
         # event object and selection
-        return self.current_string
+        self.return_string = self.current_string
+        return self.return_string
 
     def OnCancel(self, event):
@@ -155 +172 @@
         # clear event
         event.Skip()
-    
+        self.return_string = {}
         self.Destroy()
     
@@ -165 +182 @@
         event.Skip()
         fname = os.path.join(self.path, 'custom_config.py')
-        self.write_string(fname, self.current_string)
+        self.write_string(fname, self.return_string)
     
         self.Destroy()
@@ -186 +203 @@
     
         out_f.close() 
+