Merge branch 'dev'

Author: ThomasAkam

config/gui_settings.py

@@ -7,7 +7,6 @@
 event_history_len  = 200  # Length of event history to plot (# events).
 state_history_len  = 100  # Length of state history to plot (# states). 
 analog_history_dur = 12   # Duration of analog signal history to plot (seconds).
-active_cerebros = ["1","23"]
 
 ui_font_size  = 11  # Font size of UI elements (button text, label text etc.).
 log_font_size = 9   # Font size of the data log.

gui/GUI_main.py

@@ -1,6 +1,8 @@
 import os
 import sys
+import ctypes
 import traceback
+import logging
 
 from serial.tools import list_ports
 from pyqtgraph.Qt import QtGui, QtCore
@@ -13,6 +15,9 @@
 from gui.run_experiment_tab import Run_experiment_tab
 from gui.setups_tab import Setups_tab
 
+if os.name == 'nt': # Needed on windows to get taskbar icon to display correctly.
+    ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(u'pyControl')
+
 # --------------------------------------------------------------------------------
 # GUI_main
 # --------------------------------------------------------------------------------
@@ -179,7 +184,7 @@ def excepthook(self, ex_type, ex_value, ex_traceback):
         '''Called whenever an uncaught exception occurs.'''
         if hasattr(self.tab_widget.currentWidget(), 'excepthook'):
            self.tab_widget.currentWidget().excepthook(ex_type, ex_value, ex_traceback)
-        traceback.print_exception(ex_type, ex_value, ex_traceback)
+        logging.error(''.join(traceback.format_exception(ex_type, ex_value, ex_traceback)))
 
 # --------------------------------------------------------------------------------
 # Launch GUI.
@@ -189,6 +194,7 @@ def launch_GUI():
     '''Launch the pyControl GUI.'''
     app = QtGui.QApplication(sys.argv)
     app.setStyle('Fusion')
+    app.setWindowIcon(QtGui.QIcon("gui/icons/logo.svg"))
     font = QtGui.QFont()
     font.setPixelSize(ui_font_size)
     app.setFont(font)

gui/configure_experiment_tab.py

@@ -597,7 +597,7 @@ def available_subjects(self, v_name, s_name=None):
 
     def task_changed(self, task):
         '''Remove variables that are not defined in the new task.'''
-        pattern = "[\n\r]v\.(?P<vname>\w+)\s*\="
+        pattern = "[\n\r\.]v\.(?P<vname>\w+)\s*\="
         try:
             with open(os.path.join(dirs['tasks'], task+'.py'), "r") as file:
                 file_content = file.read()

gui/icons/logo.svg

@@ -1,16 +1,20 @@
 # Check that depndencies are installed then launch the pyControl GUI.
 
 import sys
-import os
+import logging
+
+# Setup error logging.
+logging.basicConfig(level=logging.ERROR, 
+    handlers=[logging.FileHandler('ErrorLog.txt', delay=True)],
+    format='%(asctime)s %(message)s')
 
 # Check dependencies are installed.
 try:
     import numpy
     import serial
     import pyqtgraph
 except Exception as e:
-    print('Unable to import dependencies:\n\n'+str(e))
-    input('\nPress enter to close.')
+    logging.error('  Unable to import dependencies:\n\n'+str(e)+'\n\n')
     sys.exit()
 
 # Launch the GUI.