Merge branch 'dev'

Author: ThomasAkam

config/gui_settings.py

@@ -7,6 +7,7 @@
 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.

config/user_variable_dialogs/blinker_gui.json

@@ -21,7 +21,7 @@
         "green_count": {
             "label": "\ud83d\udfe2Green count",
             "widget": "spinbox",
-            "min": 0,
+            "min": 1,
             "max": 10,
             "step": 1,
             "suffix": "blinks",
@@ -39,7 +39,7 @@
         "red_count": {
             "label": "\ud83d\udd34Red count",
             "widget": "spinbox",
-            "min": 0,
+            "min": 1,
             "max": 10,
             "step": 1,
             "suffix": "blinks",

config/user_variable_dialogs/blinker_gui_from_py.py

@@ -0,0 +1,162 @@
+# This is an example custom dialog for more advanced users.
+# Complex custom dialogs can be directly coded using the PyQt framework
+
+from pyqtgraph.Qt import QtGui, QtCore
+from gui.custom_variables_dialog import Slider_var, Spin_var
+
+# Custom Variable dialog
+class Custom_variables_dialog(QtGui.QDialog):
+    # Dialog for setting and getting task variables.
+    def __init__(self, parent, board):
+        super(QtGui.QDialog, self).__init__(parent)
+        self.setWindowTitle("Blink Variable GUI")
+        self.layout = QtGui.QVBoxLayout(self)
+        self.variables_grid = Variables_grid(self, board)
+        self.layout.addWidget(self.variables_grid)
+        self.layout.setContentsMargins(0, 0, 0, 0)
+        self.setLayout(self.layout)
+
+
+class Variables_grid(QtGui.QWidget):
+    def __init__(self, parent, board):
+        super(QtGui.QWidget, self).__init__(parent)
+        variables = board.sm_info["variables"]
+        self.grid_layout = QtGui.QGridLayout()
+        initial_variables_dict = {v_name: v_value_str for (v_name, v_value_str) in sorted(variables.items())}
+        self.variables_gui = Variables_gui(self, self.grid_layout, board, initial_variables_dict)
+        self.setLayout(self.grid_layout)
+
+
+class Variables_gui(QtGui.QWidget):
+    def __init__(self, parent, grid_layout, board, init_vars):
+        super(QtGui.QWidget, self).__init__(parent)
+        self.board = board
+
+        # create widgets
+        widget = QtGui.QWidget()
+        layout = QtGui.QGridLayout()
+        row = 0
+
+        # blink rate controls
+        self.blink_rate = Slider_var(init_vars, "⏱️ <b>Blink Rate</b>", 1, 15, 0.5, "blink_rate")
+        self.blink_rate.setSuffix(" Hz")
+        self.blink_rate.setHint("Frequency of alternating LED blinks")
+        self.blink_rate.setBoard(board)
+        self.blink_rate.add_to_grid(layout, row)
+        row += 1
+        self.min_btn = QtGui.QPushButton("min")
+        self.mid_btn = QtGui.QPushButton("50%")
+        self.max_btn = QtGui.QPushButton("max")
+        for col,btn in enumerate([self.min_btn,self.mid_btn,self.max_btn]):
+            layout.addWidget(btn, row,col, QtCore.Qt.AlignCenter)
+            btn.setFocusPolicy(QtCore.Qt.NoFocus)
+            btn.setMaximumWidth(70)
+        row += 1
+
+        # separator
+        layout.addWidget(QtGui.QLabel("<hr>"), row, 0, 1, 4)
+        row += 1
+
+        # radio buttons
+        red_is_enabled = eval(init_vars["red_enabled"])
+        green_is_enabled = eval(init_vars["green_enabled"])
+        self.both_radio = QtGui.QRadioButton()
+        self.both_lbl = QtGui.QLabel("🔴Both🟢")
+        self.red_radio = QtGui.QRadioButton()
+        self.red_lbl = QtGui.QLabel("Red")
+        self.red_lbl.setStyleSheet("border:3px solid red;background:red;border-radius:3px;")  # you can use css styling
+        self.green_radio = QtGui.QRadioButton()
+        self.green_lbl = QtGui.QLabel("Green")
+        self.green_lbl.setStyleSheet("border-radius:3px;border:3px solid green;background:green;color:white")
+        if red_is_enabled and green_is_enabled:
+            self.both_radio.setChecked(True)
+            self.red_radio.setChecked(False)
+            self.green_radio.setChecked(False)
+        else:
+            self.both_radio.setChecked(False)
+            if red_is_enabled:
+                self.red_radio.setChecked(True)
+                self.green_radio.setChecked(False)
+            elif green_is_enabled:
+                self.red_radio.setChecked(False)
+                self.green_radio.setChecked(True)
+            else:
+                self.red_radio.setChecked(False)
+                self.green_radio.setChecked(False)
+
+        layout.addWidget(self.both_lbl, row, 0, QtCore.Qt.AlignCenter)
+        layout.addWidget(self.red_lbl, row, 1, QtCore.Qt.AlignCenter)
+        layout.addWidget(self.green_lbl, row, 2, QtCore.Qt.AlignCenter)
+        row += 1
+        layout.addWidget(self.both_radio, row, 0, QtCore.Qt.AlignCenter)
+        layout.addWidget(self.red_radio, row, 1, QtCore.Qt.AlignCenter)
+        layout.addWidget(self.green_radio, row, 2, QtCore.Qt.AlignCenter)
+        row += 1
+
+        # counts
+        self.red_count = Spin_var(init_vars, "<b>Red count</b>", 1, 10, 1, "red_count")
+        self.red_count.setBoard(board)
+        self.red_count.add_to_grid(layout, row)
+        row += 1
+        self.green_count = Spin_var(init_vars, "<b>Green count</b>", 1, 10, 1, "green_count")
+        self.green_count.setBoard(board)
+        self.green_count.add_to_grid(layout, row)
+        row += 1
+
+        # image
+        self.picture = QtGui.QLabel()
+        image = QtGui.QPixmap("config/user_variable_dialogs/example_image.png")
+        self.picture.setPixmap(image)
+        layout.addWidget(self.picture, row, 0, 1, 4)
+        row += 1
+
+        # gif
+        self.gif = QtGui.QLabel()
+        self.movie = QtGui.QMovie("config/user_variable_dialogs/example_movie.gif")
+        self.gif.setMovie(self.movie)
+        self.movie.start()
+        layout.addWidget(self.gif, row, 0, 1, 4)
+        row += 1
+
+        layout.setRowStretch(row, 1)
+        widget.setLayout(layout)
+        grid_layout.addWidget(widget, 0, 0, QtCore.Qt.AlignLeft)
+
+        # connect some buttons to functions
+        self.min_btn.clicked.connect(self.slide_to_min)
+        self.mid_btn.clicked.connect(self.slide_to_mid)
+        self.max_btn.clicked.connect(self.slide_to_max)
+        self.both_radio.clicked.connect(self.update_count_options)
+        self.red_radio.clicked.connect(self.update_count_options)
+        self.green_radio.clicked.connect(self.update_count_options)
+
+        # add close shortcut
+        self.close_shortcut = QtGui.QShortcut(QtGui.QKeySequence("Ctrl+W"), self)
+        self.close_shortcut.activated.connect(self.close)
+
+    def update_count_options(self):
+        red_val = self.red_radio.isChecked() | self.both_radio.isChecked()
+        green_val = self.green_radio.isChecked() | self.both_radio.isChecked()
+        self.board.set_variable("red_enabled", red_val)  # update variable
+        self.board.set_variable("green_enabled", green_val)
+        self.red_count.setEnabled(red_val)  # enable or disable control
+        self.green_count.setEnabled(green_val)
+        if not self.board.framework_running:  # Value returned later.
+            msg = QtGui.QMessageBox()
+            msg.setText("Variable Changed")
+            msg.exec()
+
+    def slide_to_min(self):
+        self.blink_rate.slider.setValue(1)
+        self.blink_rate.update_val_lbl()
+        self.blink_rate.set()
+
+    def slide_to_mid(self):
+        self.blink_rate.slider.setValue(7.5)
+        self.blink_rate.update_val_lbl()
+        self.blink_rate.set()
+
+    def slide_to_max(self):
+        self.blink_rate.slider.setValue(15)
+        self.blink_rate.update_val_lbl()
+        self.blink_rate.set()

config/user_variable_dialogs/blinker_gui_tabs.json

@@ -12,7 +12,7 @@
         "green_count": {
             "label": "count",
             "widget": "spinbox",
-            "min": 0,
+            "min": 1,
             "max": 10,
             "step": 1,
             "suffix": "blinks",

config/user_variable_dialogs/example_image.png

@@ -393,7 +393,7 @@ def add_subject(self, setup=None, subject=None, do_run=None):
         remove_button.setIcon(QtGui.QIcon("gui/icons/remove.svg"))
         ind = QtCore.QPersistentModelIndex(self.model().index(self.n_subjects, 2))
         remove_button.clicked.connect(lambda :self.remove_subject(ind.row()))
-        add_button = QtGui.QPushButton('add')
+        add_button = QtGui.QPushButton('   add   ')
         add_button.setIcon(QtGui.QIcon("gui/icons/add.svg"))
         add_button.clicked.connect(self.add_subject)
         run_checkbox = TableCheckbox()