Changeset 914ba0a in sasview for src/sas/sasgui/guiframe/startup_configuration.py

Timestamp:

May 2, 2017 1:58:01 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

d66dbcc

Parents:

74d9780 (diff), 658dd57 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge with master

File:

• src/sas/sasgui/guiframe/startup_configuration.py (modified) (15 diffs)

src/sas/sasgui/guiframe/startup_configuration.py

@@ -1 @@
-
 ################################################################################
 #This software was developed by the University of Tennessee as part of the
 #Distributed Data Analysis of Neutron Scattering Experiments (DANSE)
-#project funded by the US National Science Foundation. 
+#project funded by the US National Science Foundation.
 #
 #See the license text in license.txt
@@ -14 +13 @@
 import wx
 
-from sas.sasgui.customdir import get_custom_config_path
+from sas.sasgui import get_custom_config_path
+from sas.sasgui.guiframe.events import StatusEvent
 from sas.sasgui.guiframe.gui_style import GUIFRAME
 from sas.sasgui.guiframe import gui_manager as CURRENT
@@ -32 +32 @@
                    'CLEANUP_PLOT':False,
                    'DEFAULT_PERSPECTIVE':'Fitting',
-                   'DEFAULT_OPEN_FOLDER': None}
+                   'DEFAULT_OPEN_FOLDER': None,
+                   'SAS_OPENCL': None}
 try:
     CURRENT_STRINGS = {'GUIFRAME_WIDTH':CURRENT.GUIFRAME_WIDTH,
@@ -46 +47 @@
                        'CLEANUP_PLOT':CURRENT.CLEANUP_PLOT,
                        'DEFAULT_PERSPECTIVE':CURRENT.DEFAULT_PERSPECTIVE,
-                       'DEFAULT_OPEN_FOLDER':CURRENT.DEFAULT_OPEN_FOLDER}
+                       'DEFAULT_OPEN_FOLDER':CURRENT.DEFAULT_OPEN_FOLDER,
+                       'SAS_OPENCL': None}
 except:
     CURRENT_STRINGS = DEFAULT_STRINGS
@@ -61 +63 @@
     """
     def __init__(self, parent, gui, id=-1, title="Startup Setting"):
-        wx.Dialog.__init__(self, parent, id, title, 
+        wx.Dialog.__init__(self, parent, id, title,
                            size=(PANEL_WIDTH, PANEL_HEIGHT))
         # parent
         self.parent = parent
         self._gui = gui
-        # font size 
+        # font size
         self.SetWindowVariant(variant=FONT_VARIANT)
         self.current_string = copy.deepcopy(CURRENT_STRINGS)
@@ -74 +76 @@
         title_text = wx.StaticText(self, id=wx.NewId(), label='Set interface configuration')
 
-        default_bt = wx.RadioButton(self, -1, 'Default View', (15, 30), 
+        default_bt = wx.RadioButton(self, -1, 'Default View', (15, 30),
                                     style=wx.RB_GROUP)
         default_bt.Bind(wx.EVT_RADIOBUTTON, self.OnDefault)
@@ -85 +87 @@
         note_txt = wx.StaticText(self, -1, msg, (15, 75))
         note_txt.SetForegroundColour("black")
-        
+
         hbox = wx.BoxSizer(wx.HORIZONTAL)
         okButton = wx.Button(self, wx.ID_OK, 'Set', size=(70, 25))
-        closeButton = wx.Button(self,wx.ID_CANCEL, 'Cancel', size=(70, 25))
+        closeButton = wx.Button(self, wx.ID_CANCEL, 'Cancel', size=(70, 25))
         hbox.Add(closeButton, 1, wx.RIGHT, 5)
         hbox.Add(okButton, 1, wx.RIGHT, 5)
@@ -100 +102 @@
         self.SetSizer(vbox)
 
-        
+
     def OnDefault(self, event=None):
         """
@@ -109 +111 @@
         self.return_string = copy.deepcopy(DEFAULT_STRINGS)
         return self.return_string
-        
+
     def OnCurrent(self, event=None):
         """
@@ -127 +129 @@
                 width, _ = panel.frame.GetSizeTuple()
                 if panel.frame.IsShown():
-                    if p_size == None or width > p_size:
+                    if p_size is None or width > p_size:
                         p_size = width
-            if p_size == None:
+            if p_size is None:
                 p_size = CURRENT_STRINGS['PLOPANEL_WIDTH']
             self.current_string['PLOPANEL_WIDTH'] = p_size
-            
+
             try:
                 control_frame = self.parent.get_current_perspective().frame
@@ -141 +143 @@
                 self.current_string['CONTROL_WIDTH'] = -1
                 self.current_string['CONTROL_HEIGHT'] = -1
-                
+
             data_pw, _ = self.parent.panels["data_panel"].frame.GetSizeTuple()
-            if data_pw == None:
+            if data_pw is None:
                 data_pw = CURRENT_STRINGS['DATAPANEL_WIDTH']
             self.current_string['DATAPANEL_WIDTH'] = data_pw
-            
+
             #label = self.parent._data_panel_menu.GetText()
             label = self.parent.panels['data_panel'].frame.IsShown()
@@ -153 +155 @@
             else:
                 self.current_string['DATALOADER_SHOW'] = False
-                
+
             if self.parent._toolbar.IsShown():
                 self.current_string['TOOLBAR_SHOW'] = True
             else:
                 self.current_string['TOOLBAR_SHOW'] = False
-                
+
             style = self._gui & GUIFRAME.FLOATING_PANEL
-            if style == GUIFRAME.FLOATING_PANEL: 
+            if style == GUIFRAME.FLOATING_PANEL:
                 self.current_string['FIXED_PANEL'] = False
             else:
                 self.current_string['FIXED_PANEL'] = True
-                
+
             if self.parent.panels['default'].frame.IsShown():
                 self.current_string['WELCOME_PANEL_SHOW'] = True
@@ -180 +182 @@
             self.current_string['DEFAULT_OPEN_FOLDER'] = location
                         #self.parent._default_save_location.ascii_letters
-            
+
         except:
             raise
@@ -186 +188 @@
         self.return_string = self.current_string
         return self.return_string
-    
+
+
     def write_custom_config(self):
         """
@@ -193 +196 @@
         path = get_custom_config_path()
         with open(path, 'w') as out_f:
-            out_f.write("#Application appearance custom configuration\n" )
+            out_f.write("#Application appearance custom configuration\n")
             for key, item in self.return_string.iteritems():
                 if (key == 'DEFAULT_PERSPECTIVE') or \
                     (key == 'DEFAULT_OPEN_FOLDER' and item != None):
-                    out_f.write("%s = \"%s\"\n" % (key,str(item)))
+                    out_f.write("%s = \"%s\"\n" % (key, str(item)))
                 else:
-                    out_f.write("%s = %s\n" % (key,str(item)))
+                    out_f.write("%s = %s\n" % (key, str(item)))