Changes in src/sas/sasgui/guiframe/gui_manager.py [d3911e3:62243ae] in sasview

File:

• src/sas/sasgui/guiframe/gui_manager.py (modified) (9 diffs)

src/sas/sasgui/guiframe/gui_manager.py

@@ -152 +152 @@
 SPLASH_SCREEN_HEIGHT = config.SPLASH_SCREEN_HEIGHT
 SS_MAX_DISPLAY_TIME = config.SS_MAX_DISPLAY_TIME
+SAS_OPENCL = config.SAS_OPENCL
 if not WELCOME_PANEL_ON:
     WELCOME_PANEL_SHOW = False
@@ -176 +177 @@
     else:
         DEFAULT_OPEN_FOLDER = PATH_APP
+    SAS_OPENCL = custom_config.SAS_OPENCL
 except:
     DATALOADER_SHOW = True
@@ -190 +192 @@
     CLEANUP_PLOT = False
     DEFAULT_OPEN_FOLDER = PATH_APP
-
+    SAS_OPENCL = None
 DEFAULT_STYLE = config.DEFAULT_STYLE
 
@@ -225 +227 @@
         CHILD_FRAME = wx.Frame
 
+#Initiliaze enviromental variable with custom setting but only if variable not set
+if SAS_OPENCL and not "SAS_OPENCL" in os.environ:
+    os.environ["SAS_OPENCL"] = SAS_OPENCL
 
 class ViewerFrame(PARENT_FRAME):
@@ -1950 +1955 @@
                     item, _, _ = value
                     item.Check(True)
-            self._data_panel.on_remove(None, False)
 
             wx.PostEvent(self, StatusEvent(status="Loading Project file..."))
@@ -1963 +1967 @@
                 # Reset to a base state
                 self._on_reset_state()
+                self._data_panel.on_remove(None, False)
                 # Load the project file
                 self.load_state(path=path, is_project=True)
@@ -1990 +1995 @@
                 wx.PostEvent(self,
                              StatusEvent(status="Completed saving."))
-            except Exception:
+            except:
                 msg = "Error occurred while saving: "
-                msg += traceback.format_exc()
                 msg += "To save, the application panel should have a data set.."
                 wx.PostEvent(self, StatusEvent(status=msg))
@@ -2041 +2045 @@
                 logging.warning(msg)
                 wx.PostEvent(self, StatusEvent(status=msg, info="error"))
-        except Exception:
+        except:
             msg = "Error occurred while saving: "
-            msg += traceback.format_exc()
             msg += "To save, at least one application panel "
             msg += "should have a data set.."
@@ -2458 +2461 @@
                                                 group_id=group_id,
                                                 action='remove'))
-                # remove res plot: Todo: improve
                 wx.CallAfter(self._remove_res_plot, new_plot.id)
         self._data_manager.delete_data(data_id=data_id,