cleaned up and consolidated code

Author: alustig3

gui/configure_experiment_tab.py

@@ -5,7 +5,7 @@
 
 from config.paths import dirs
 from gui.dialogs import invalid_run_experiment_dialog, invalid_save_experiment_dialog,unrun_subjects_dialog
-from gui.utility import TableCheckbox, cbox_update_options, cbox_set_item, null_resize, variable_constants, init_keyboard_shortcuts
+from gui.utility import TableCheckbox, cbox_update_options, cbox_set_item, null_resize, variable_constants, init_keyboard_shortcuts,menuSelect
 
 # --------------------------------------------------------------------------------
 # Experiments_tab
@@ -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 = QtGui.QPushButton('select task')
+        self.task_select = menuSelect(dirs['tasks'],'select task')
         self.hardware_test_label = QtGui.QLabel('Hardware test:')
-        self.hardware_test_select = QtGui.QPushButton('no hardware test')
+        self.hardware_test_select = menuSelect(dirs['tasks'],'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('')
@@ -85,6 +85,7 @@ def __init__(self, parent=None):
         self.variables_groupbox = QtGui.QGroupBox('Variables')
         self.variablesbox_layout = QtGui.QHBoxLayout(self.variables_groupbox)
         self.variables_table = VariablesTable(self)
+        self.task_select.set_callback(self.variables_table.task_changed)
         self.variablesbox_layout.addWidget(self.variables_table)
 
         # Initialise widgets
@@ -132,50 +133,11 @@ def experiment_changed(self, experiment_name):
                 return
             self.load_experiment(experiment_name)
 
-    def create_callback(self,btn,text):
-        def fxn():
-            if btn.text() != text:
-                btn.setText(text)
-                btn.adjustSize()
-                self.variables_table.task_changed(text)
-        return fxn
-
-    def create_menu(self,menuButton):
-        taskMenu = QtGui.QMenu()
-        task_root = dirs['tasks']
-
-        if menuButton is self.hardware_test_select:
-            taskMenu.addAction('no hardware test',self.create_callback(menuButton,'no hardware test'))
-            taskMenu.addSeparator()
-        previous_menu = taskMenu
-        current_menu = taskMenu
-        for dirName, subdirList, fileList in os.walk(task_root):
-            subfolder = dirName.split(task_root)[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])
-                    for filename in fileList:
-                        if filename.endswith('.py'):
-                            menuItem = filename[:-3]
-                            sub_menu.addAction(menuItem,self.create_callback(menuButton,os.path.join(subfolder,menuItem)))
-                    if subdirList: # continue down to next level
-                        previous_menu = current_menu
-                        current_menu = sub_menu
-                    else: # return up to previous level
-                        current_menu = previous_menu
-            else: # list top level files
-                for filename in fileList:
-                    if filename.endswith('.py'):
-                        menuItem = filename[:-3]
-                        taskMenu.addAction(menuItem,self.create_callback(menuButton,menuItem))
-        return taskMenu
-
-
     def refresh(self):
         '''Called periodically when not running to update available task, ports, experiments.'''
         if self.GUI_main.available_tasks_changed:
-            self.task_select.setMenu(self.create_menu(self.task_select))
-            self.hardware_test_select.setMenu(self.create_menu(self.hardware_test_select))
+            self.task_select.update_menu()
+            self.hardware_test_select.update_menu()
             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

@@ -12,7 +12,7 @@
 
 from gui.dialogs import Variables_dialog
 from gui.plotting import Task_plot
-from gui.utility import init_keyboard_shortcuts
+from gui.utility import init_keyboard_shortcuts,menuSelect
 
 # Run_task_gui ------------------------------------------------------------------------
 
@@ -105,7 +105,8 @@ def __init__(self, parent=None):
         self.task_groupbox = QtGui.QGroupBox('Task')
 
         self.task_label = QtGui.QLabel('Task:')
-        self.task_select = QtGui.QPushButton('select task')
+        self.task_select = menuSelect(dirs['tasks'],'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"))
         self.variables_button = QtGui.QPushButton('Variables')
@@ -186,13 +187,6 @@ def __init__(self, parent=None):
 
         self.disconnect() # Set initial state as disconnected.
 
-    def create_callback(self,text):
-        def fxn():
-            if self.task_select.text() != text:
-                self.task_changed()
-                self.task_select.setText(text)
-        return fxn
-
     # General methods
 
     def print_to_log(self, print_string, end='\n'):
@@ -225,30 +219,7 @@ def refresh(self):
             else: # No setups available to connect to.
                     self.connect_button.setEnabled(False)
         if self.GUI_main.available_tasks_changed:
-            taskMenu = QtGui.QMenu()
-            task_root = dirs['tasks']
-            previous_menu = taskMenu
-            current_menu = taskMenu
-            for dirName, subdirList, fileList in os.walk(task_root):
-                subfolder = dirName.split(task_root)[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])
-                        for filename in fileList:
-                            if filename.endswith('.py'):
-                                menuItem = filename[:-3]
-                                sub_menu.addAction(menuItem,self.create_callback(os.path.join(subfolder,menuItem)))
-                        if subdirList: # continue down to next level
-                            previous_menu = current_menu
-                            current_menu = sub_menu
-                        else: # return up to previous level
-                            current_menu = previous_menu
-                else: # list top level files
-                    for filename in fileList:
-                        if filename.endswith('.py'):
-                            menuItem = filename[:-3]
-                            taskMenu.addAction(menuItem,self.create_callback(menuItem))
-            self.task_select.setMenu(taskMenu)
+            self.task_select.update_menu()
         if self.GUI_main.data_dir_changed and not self.custom_dir:
             self.data_dir_text.setText(dirs['data'])
         if self.task:
@@ -315,7 +286,7 @@ def disconnect(self):
         self.task_changed()
         self.connected = False
 
-    def task_changed(self):
+    def task_changed(self,task=None):
         self.uploaded = False
         self.upload_button.setText('Upload')
         self.upload_button.setIcon(QtGui.QIcon("gui/icons/circle-arrow-up.svg"))

gui/utility.py

@@ -1,4 +1,5 @@
 from pyqtgraph.Qt import QtGui, QtCore, QtWidgets
+import os
 
 # --------------------------------------------------------------------------------
 # GUI utility functions, classes, variables.
@@ -291,3 +292,50 @@ def dropEvent(self, event):
          '''
         self.dragDropedPos = event.pos()
         QtWidgets.QTabBar.dropEvent(self, event)
+
+class menuSelect(QtGui.QPushButton):
+    def __init__(self,root_folder,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)
+
+    def set_callback(self,callback_fxn):
+        self.callback = callback_fxn
+
+    def create_action(self,text):
+        def fxn():
+            if self.text() != text:
+                self.callback(text)
+                self.setText(text)
+        return fxn
+    
+    def update_menu(self):
+        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:]
+            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])
+                    for filename in fileList:
+                        if filename.endswith('.py'):
+                            menuItem = filename[:-3]
+                            sub_menu.addAction(menuItem,self.create_action(os.path.join(subfolder,menuItem)))
+                    if subdirList: # continue down to next level
+                        previous_menu = current_menu
+                        current_menu = sub_menu
+                    else: # return up to previous level
+                        current_menu = previous_menu
+            else: # list top level files
+                for filename in fileList:
+                    if filename.endswith('.py'):
+                        menuItem = filename[:-3]
+                        self.menu.addAction(menuItem,self.create_action(menuItem))
+        self.setMenu(self.menu)