BciPy report action, offline analysis updates, Intertask GUI. (#354)

.coveragerc

@@ -17,4 +17,4 @@ exclude_lines =
     raise NotImplementedError
     @abstract
     if __name__ == .__main__.:
-    log = logging.getLogger(__name__)
+    logging.getLogger(__name__)

bcipy/config.py

@@ -28,6 +28,7 @@
 TASK_SEPERATOR = '->'
 
 DEFAULT_PARAMETER_FILENAME = 'parameters.json'
+DEFAULT_DEVICES_PATH = f"{BCIPY_ROOT}/parameters"
 DEFAULT_PARAMETERS_PATH = f'{BCIPY_ROOT}/parameters/{DEFAULT_PARAMETER_FILENAME}'
 DEFAULT_DEVICE_SPEC_FILENAME = 'devices.json'
 DEVICE_SPEC_PATH = f'{BCIPY_ROOT}/parameters/{DEFAULT_DEVICE_SPEC_FILENAME}'

bcipy/gui/BCInterface.py

@@ -1,9 +1,10 @@
 import subprocess
 import sys
+import logging
 from typing import List
 
 from bcipy.config import (BCIPY_ROOT, DEFAULT_PARAMETERS_PATH,
-                          STATIC_IMAGES_PATH)
+                          STATIC_IMAGES_PATH, PROTOCOL_LOG_FILENAME)
 from bcipy.gui.main import (AlertMessageResponse, AlertMessageType,
                             AlertResponse, BCIGui, app,
                             contains_special_characters, contains_whitespaces,
@@ -12,6 +13,8 @@
                                 load_json_parameters, load_users)
 from bcipy.task import TaskRegistry
 
+logger = logging.getLogger(PROTOCOL_LOG_FILENAME)
+
 
 class BCInterface(BCIGui):
     """BCI Interface.
@@ -29,7 +32,7 @@ class BCInterface(BCIGui):
     max_length = 25
     min_length = 1
     timeout = 3
-    font = 'Consolas'
+    font = 'Courier New'
 
     def __init__(self, *args, **kwargs):
         super(BCInterface, self).__init__(*args, **kwargs)
@@ -420,7 +423,13 @@ def start_experiment(self) -> None:
                 )
             if self.alert:
                 cmd += ' -a'
-            subprocess.Popen(cmd, shell=True)
+            output = subprocess.run(cmd, shell=True)
+            if output.returncode != 0:
+                self.throw_alert_message(
+                    title='BciPy Alert',
+                    message=f'Error: {output.stderr.decode()}',
+                    message_type=AlertMessageType.CRIT,
+                    message_response=AlertMessageResponse.OTE)
 
             if self.autoclose:
                 self.close()
@@ -431,7 +440,7 @@ def offline_analysis(self) -> None:
         Run offline analysis as a script in a new process.
         """
         if not self.action_disabled():
-            cmd = f'python {BCIPY_ROOT}/signal/model/offline_analysis.py --alert --p "{self.parameter_location}"'
+            cmd = f'bcipy-train --alert --p "{self.parameter_location}" -v -s'
             subprocess.Popen(cmd, shell=True)
 
     def action_disabled(self) -> bool:

bcipy/gui/alert.py

@@ -15,12 +15,13 @@ def confirm(message: str) -> bool:
     -------
         users selection : True for selecting Ok, False for Cancel.
     """
-    app = QApplication(sys.argv)
+    app = QApplication(sys.argv).instance()
+    if not app:
+        app = QApplication(sys.argv)
     dialog = alert_message(message,
                            message_type=AlertMessageType.INFO,
                            message_response=AlertMessageResponse.OCE)
     button = dialog.exec()
-
     result = bool(button == AlertResponse.OK.value)
     app.quit()
     return result

bcipy/gui/bcipy_stylesheet.css

@@ -1,44 +1,87 @@
 /* This stylesheet uses the QSS syntax, but is named as a CSS file to take advantage of IDE CSS tooling */
-* {
-    background-color: white;
+
+QWidget[class="experiment-registry"] {
+    background-color: black;
+}
+
+QWidget[class="inter-task"] {
+    background-color: black;
 }
-QWidget {
+
+QLabel {
     background-color: black;
     color: white;
-    font-size: 14px;
 }
 
-QWidget > * {
-    background-color: none;
+QLabel[class="task-label"] {
+    background-color: transparent;
+    color: black;
 }
 
 QPushButton {
-    background-color: green;
+    background-color: rgb(16, 173, 39);
+    color: white;
     padding: 10px;
     border-radius: 10px;
 }
 
+QPushButton[class="remove-button"] {
+    background-color:  rgb(243, 58, 58);
+}
+
+QPushButton[class="remove-button"]:hover {
+    background-color: rgb(255, 0, 0);
+}
 
 QPushButton[class="small-button"] {
+    background-color: darkslategray;
+    color: white;
     padding: 5px;
     border-radius: 5px;
 }
 
-QPushButton:hover {
+QPushButton[class="small-button"]:hover {
     background-color: darkgreen;
 }
 
+
 QPushButton:pressed {
     background-color: darkslategrey;
 }
 
-QComboBox, QLineEdit {
+QComboBox {
+    background-color: white;
+    color: black;
+    padding: 4px;
+    border-radius: 1px;
+}
+
+QComboBox:hover {
+    background-color: #e6f5ea;
+    color: black;
+}
+
+QComboBox:on {
+    background-color: #e6f5ea;
+    color: black;
+}
+
+QListView {
+    background-color: white;
+    color: black;
+    padding: 5px;
+}
+
+QLineEdit {
     background-color: white;
     color: black;
     padding: 5px;
     border: none;
+    border-radius: 1px;
 }
 
 QScrollArea {
     background-color: white;
-}
+    color: black;
+    border-radius: 1px;
+}

bcipy/gui/bciui.py

@@ -1,4 +1,4 @@
-from typing import Callable
+from typing import Callable, Type
 from PyQt6.QtCore import pyqtSignal
 from PyQt6.QtWidgets import (
     QWidget,
@@ -9,9 +9,11 @@
     QLayout,
     QSizePolicy,
     QMessageBox,
+    QApplication,
 )
 from typing import Optional, List
 from bcipy.config import BCIPY_ROOT
+import sys
 
 
 class BCIUI(QWidget):
@@ -68,7 +70,6 @@ def centered(widget: QWidget) -> QHBoxLayout:
 
     @staticmethod
     def make_list_scroll_area(widget: QWidget) -> QScrollArea:
-        widget.setStyleSheet("background-color: transparent;")
         scroll_area = QScrollArea()
         scroll_area.setWidget(widget)
         scroll_area.setWidgetResizable(True)
@@ -107,6 +108,10 @@ def toggle_on():
         on_button.clicked.connect(toggle_off)
         off_button.clicked.connect(toggle_on)
 
+    def hide(self) -> None:
+        """Close the UI window"""
+        self.hide()
+
 
 class SmallButton(QPushButton):
     """A small button with a fixed size"""
@@ -221,3 +226,13 @@ def list_property(self, prop: str):
             A list of values for the given property.
         """
         return [widget.data[prop] for widget in self.widgets]
+
+
+def run_bciui(ui: Type[BCIUI], *args, **kwargs):
+    # add app to kwargs
+    app = QApplication(sys.argv).instance()
+    if not app:
+        app = QApplication(sys.argv)
+    ui_instance = ui(*args, **kwargs)
+    ui_instance.display()
+    return app.exec()

bcipy/gui/experiments/ExperimentRegistry.py

@@ -1,4 +1,4 @@
-from typing import List, Optional, Type
+from typing import List, Optional
 from PyQt6.QtWidgets import (
     QComboBox,
     QVBoxLayout,
@@ -7,9 +7,8 @@
     QLineEdit,
     QPushButton,
     QScrollArea,
-    QApplication,
 )
-from bcipy.gui.bciui import BCIUI, DynamicItem, DynamicList, SmallButton
+from bcipy.gui.bciui import BCIUI, DynamicItem, DynamicList, SmallButton, run_bciui
 from bcipy.helpers.load import load_fields, load_experiments
 from bcipy.helpers.save import save_experiment_data
 from bcipy.config import (
@@ -33,9 +32,14 @@ class ExperimentRegistry(BCIUI):
     def __init__(self):
         super().__init__("Experiment Registry", 600, 700)
         self.task_registry = TaskRegistry()
+        self.setProperty("class", "experiment-registry")
 
     def format_experiment_combobox(
-        self, label_text: str, combobox: QComboBox, buttons: Optional[List[QPushButton]]
+        self,
+        label_text: str,
+        combobox: QComboBox,
+        buttons: Optional[List[QPushButton]],
+        class_name: str = 'default',
     ) -> QVBoxLayout:
         """
         Create a formatted widget for a the experiment comboboxes with optional buttons.
@@ -51,11 +55,11 @@ def format_experiment_combobox(
             A QVBoxLayout with the label, combobox, and buttons.
         """
         label = QLabel(label_text)
-        label.setStyleSheet("font-size: 18px")
         area = QVBoxLayout()
         input_area = QHBoxLayout()
         input_area.setContentsMargins(15, 0, 0, 15)
         area.addWidget(label)
+        combobox.setProperty("class", class_name)
         input_area.addWidget(combobox, 1)
         if buttons:
             for button in buttons:
@@ -77,7 +81,7 @@ def make_task_entry(self, name: str) -> DynamicItem:
         """
         layout = QHBoxLayout()
         label = QLabel(name)
-        label.setStyleSheet("color: black;")
+        label.setProperty("class", "task-label")
         layout.addWidget(label)
         widget = DynamicItem()
 
@@ -102,7 +106,7 @@ def make_task_entry(self, name: str) -> DynamicItem:
         layout.addWidget(move_down_button)
 
         remove_button = SmallButton("Remove")
-        remove_button.setStyleSheet("background-color: red;")
+        remove_button.setProperty("class", "remove-button")
         remove_button.clicked.connect(
             lambda: layout.deleteLater()
         )  # This may not be needed
@@ -127,7 +131,7 @@ def make_field_entry(self, name: str) -> DynamicItem:
         """
         layout = QHBoxLayout()
         label = QLabel(name)
-        label.setStyleSheet("color: black;")
+        label.setProperty("class", "task-label")
         layout.addWidget(label)
         widget = DynamicItem()
 
@@ -277,7 +281,10 @@ def add_task():
         add_task_button = QPushButton("Add")
         add_task_button.clicked.connect(add_task)
         experiment_protocol_box = self.format_experiment_combobox(
-            "Protocol", self.experiment_protocol_input, [add_task_button]
+            "Protocol",
+            self.experiment_protocol_input,
+            [add_task_button],
+            "protocol",
         )
         form_area.addLayout(experiment_protocol_box)
 
@@ -288,7 +295,10 @@ def add_task():
         new_field_button.clicked.connect(self.create_experiment_field)
         form_area.addLayout(
             self.format_experiment_combobox(
-                "Fields", self.field_input, [add_field_button, new_field_button]
+                "Fields",
+                self.field_input,
+                [add_field_button, new_field_button],
+                "fields",
             )
         )
 
@@ -317,12 +327,5 @@ def add_task():
         self.contents.addWidget(create_experiment_button)
 
 
-def run_bciui(ui: Type[BCIUI], *args, **kwargs):
-    app = QApplication([])
-    ui_instance = ui(*args, **kwargs)
-    ui_instance.display()
-    app.exec()
-
-
 if __name__ == "__main__":
     run_bciui(ExperimentRegistry)