- Fixed bug where changing task folder using dialog did not change task select menus.

- Fixed bug where serial communication glitch could crash a box with "ValueError: bad typecode" in pycboard.process_data

Author: ThomasAkam

com/pycboard.py

@@ -352,7 +352,10 @@ def process_data(self):
             new_byte = self.serial.read(1)  
             if new_byte == b'A': # Analog data, 13 byte header + variable size content.
                 data_header = self.serial.read(13)
-                typecode      = data_header[0:1].decode()             
+                typecode      = data_header[0:1].decode() 
+                if typecode not in ('b','B','h','H','l','L'):
+                    new_data.append(('!','bad typecode A'))
+                    continue   
                 ID            = int.from_bytes(data_header[1:3], 'little')
                 sampling_rate = int.from_bytes(data_header[3:5], 'little')
                 data_len      = int.from_bytes(data_header[5:7], 'little')

gui/configure_experiment_tab.py

@@ -46,9 +46,9 @@ def __init__(self, parent=None):
         self.name_label = QtGui.QLabel('Experiment name:')
         self.name_text = QtGui.QLineEdit()
         self.task_label = QtGui.QLabel('Task:')
-        self.task_select = TaskSelectMenu(dirs['tasks'],'select task')
+        self.task_select = TaskSelectMenu('select task')
         self.hardware_test_label = QtGui.QLabel('Hardware test:')
-        self.hardware_test_select = TaskSelectMenu(dirs['tasks'],'no hardware test',add_default=True)
+        self.hardware_test_select = TaskSelectMenu('no hardware test',add_default=True)
         self.data_dir_label = QtGui.QLabel('Data dir:')
         self.data_dir_text = QtGui.QLineEdit(dirs['data'])
         self.data_dir_button = QtGui.QPushButton('')
@@ -136,8 +136,8 @@ def experiment_changed(self, experiment_name):
     def refresh(self):
         '''Called periodically when not running to update available task, ports, experiments.'''
         if self.GUI_main.available_tasks_changed:
-            self.task_select.update_menu()
-            self.hardware_test_select.update_menu()
+            self.task_select.update_menu(dirs['tasks'])
+            self.hardware_test_select.update_menu(dirs['tasks'])
             self.GUI_main.available_tasks_changed = False
         if self.GUI_main.available_experiments_changed:
             cbox_update_options(self.experiment_select, self.GUI_main.available_experiments)

gui/run_task_tab.py

@@ -105,7 +105,7 @@ def __init__(self, parent=None):
         self.task_groupbox = QtGui.QGroupBox('Task')
 
         self.task_label = QtGui.QLabel('Task:')
-        self.task_select = TaskSelectMenu(dirs['tasks'],'select task')
+        self.task_select = TaskSelectMenu('select task')
         self.task_select.set_callback(self.task_changed)
         self.upload_button = QtGui.QPushButton('Upload')
         self.upload_button.setIcon(QtGui.QIcon("gui/icons/circle-arrow-up.svg"))
@@ -219,7 +219,7 @@ def refresh(self):
             else: # No setups available to connect to.
                     self.connect_button.setEnabled(False)
         if self.GUI_main.available_tasks_changed:
-            self.task_select.update_menu()
+            self.task_select.update_menu(dirs['tasks'])
         if self.GUI_main.data_dir_changed and not self.custom_dir:
             self.data_dir_text.setText(dirs['data'])
         if self.task:

gui/utility.py

@@ -305,10 +305,9 @@ class TaskSelectMenu(QtGui.QPushButton):
     is True, initial_text is included as a menu option.
     Adapted from: https://stackoverflow.com/questions/35924235
     '''
-    def __init__(self, root_folder, initial_text, add_default=False):
+    def __init__(self, initial_text, add_default=False):
         self.callback = lambda task: None
         self.menu = QtGui.QMenu()
-        self.menu_root = root_folder
         self.add_default = add_default
         self.default_text = initial_text
         super().__init__(initial_text)
@@ -323,15 +322,15 @@ def fxn():
                 self.setText(text)
         return fxn
 
-    def update_menu(self):
+    def update_menu(self, root_folder):
         self.menu.clear()
         if self.add_default:
             self.menu.addAction(self.default_text,self.create_action(self.default_text))
             self.menu.addSeparator() 
         previous_menu = self.menu
         current_menu = self.menu
-        for dirName, subdirList, fileList in os.walk(self.menu_root):
-            subfolder = dirName.split(self.menu_root)[1][1:]
+        for dirName, subdirList, fileList in os.walk(root_folder):
+            subfolder = dirName.split(root_folder)[1][1:]
             if subfolder:
                 if any(".py" in filename for filename in fileList): # only add submenu if there are .py files inside
                     sub_menu = current_menu.addMenu(subfolder.split(os.path.sep)[-1])