diff --git a/blipblop/ui/audioblop.py b/blipblop/ui/audioblop.py index 7934ea7..09cc878 100644 --- a/blipblop/ui/audioblop.py +++ b/blipblop/ui/audioblop.py @@ -9,13 +9,11 @@ class AudioBlop(QWidget): super().__init__(parent=parent) vbox = QVBoxLayout() - self.setLayout(vbox) - - main_splitter = QSplitter(Qt.Vertical) - self.layout().addWidget(main_splitter) - - - + + l = QLabel("Auditory task") + vbox.addWidget(l) + + def reset(self): pass diff --git a/blipblop/ui/centralwidget.py b/blipblop/ui/centralwidget.py index 56807bc..49eeb26 100644 --- a/blipblop/ui/centralwidget.py +++ b/blipblop/ui/centralwidget.py @@ -11,6 +11,9 @@ class CentralWidget(QWidget): super().__init__(parent=parent) self._start_screen = StartScreen() + self._start_screen.visual_task_signal.connect(self.on_new_visual_task) + self._start_screen.auditory_task_signal.connect(self.on_new_auditory_task) + self._visual_screen = VisualBlip(self) # self._visual_screen.close_signal.connect(self.on_plot_close) @@ -21,10 +24,10 @@ class CentralWidget(QWidget): #self._results_screen.close_signal.connect(self.on_plot_close) self._stack = QStackedLayout(self) - self._stack.addWidget(self._start_screen) - self._stack.addWidget(self._visual_screen) - self._stack.addWidget(self._auditory_screen) - self._stack.addWidget(self._results_screen) + self._stack.addWidget(self._start_screen) # 0 + self._stack.addWidget(self._visual_screen) # 1 + self._stack.addWidget(self._auditory_screen) # 2 + self._stack.addWidget(self._results_screen) # 3 self.setLayout(self._stack) self._task_results = [] @@ -44,3 +47,9 @@ class CentralWidget(QWidget): def reset(self): self._task_results = [] self._stack.setCurrentIndex(0) + + def on_new_visual_task(self): + self._stack.setCurrentIndex(1) + + def on_new_auditory_task(self): + self._stack.setCurrentIndex(2) diff --git a/blipblop/ui/visualblip.py b/blipblop/ui/visualblip.py index 85fc044..83d27a2 100644 --- a/blipblop/ui/visualblip.py +++ b/blipblop/ui/visualblip.py @@ -1,8 +1,13 @@ -from PyQt5.QtWidgets import QComboBox, QFrame, QGroupBox, QHBoxLayout, QLabel, QSplitter, QTextEdit, QVBoxLayout, QWidget +from PyQt5.QtWidgets import QComboBox, QFrame, QGroupBox, QHBoxLayout, QLabel, QPushButton, QSizePolicy, QSplitter, QTextEdit, QVBoxLayout, QWidget from PyQt5.QtCore import QItemSelectionModel, Qt +from PyQt5.QtGui import QPainter, QBrush, QPen, QPixmap import blipblop.constants as cnst +class SettingsPanel(QWidget): + def __init__(self, parent=None): + super().__init__(parent=parent) + class VisualBlip(QWidget): def __init__(self, parent=None) -> None: @@ -11,12 +16,29 @@ class VisualBlip(QWidget): vbox = QVBoxLayout() self.setLayout(vbox) - main_splitter = QSplitter(Qt.Vertical) - self.layout().addWidget(main_splitter) + l = QLabel("Visual task") + self._draw_area = QLabel() + self._draw_area.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding) + canvas = QPixmap(400, 300) + canvas = QPixmap() + + self._draw_area.setPixmap(canvas) + vbox.addWidget(l) + vbox.addWidget(self._draw_area) + start_btn = QPushButton("start") + start_btn.clicked.connect(self.paint_event) + vbox.addWidget(start_btn) + def paint_event(self): + painter = QPainter(self._draw_area.pixmap()) + painter.setPen(QPen(Qt.red, 1, Qt.SolidLine)) + painter.setBrush(QBrush(Qt.red, Qt.SolidPattern)) + painter.drawEllipse(40, 40, 80, 100) + painter.end() + self._draw_area.update() + - def reset(self): pass