start screen

This commit is contained in:
Jan Grewe 2021-03-04 20:01:34 +01:00
parent 1a53050174
commit af3f9c5171
4 changed files with 15 additions and 14 deletions

View File

@ -7,26 +7,28 @@ from blipblop.ui.resultsscreen import ResultsScreen
class CentralWidget(QWidget):
def __init__(self, parent=None) -> None:
def __init__(self, parent=None):
super().__init__(parent=parent)
self._splash = StartScreen()
self._start_screen = StartScreen()
self._visual_screen = VisualBlip(self)
self._visual_screen.close_signal.connect(self.on_plot_close)
# self._visual_screen.close_signal.connect(self.on_plot_close)
self._auditory_screen = AudioBlop(self)
self._auditory_screen.close_signal.connect(self.on_plot_close)
#self._auditory_screen.close_signal.connect(self.on_plot_close)
self._results_screen = AudioBlop(self)
self._results_screen.close_signal.connect(self.on_plot_close)
self._results_screen = ResultsScreen(self)
#self._results_screen.close_signal.connect(self.on_plot_close)
self._stack = QStackedLayout(self)
self._stack.addWidget(self._splash)
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.setLayout(self._stack)
self._task_results = []
self._stack.setCurrentIndex(0)
def show_file_content(self):
self._stack.setCurrentIndex(1)
@ -40,6 +42,5 @@ class CentralWidget(QWidget):
self._stack.setCurrentIndex(1)
def reset(self):
self._visual_stims_screen.reset()
self._splash.reset()
self._task_results = []
self._stack.setCurrentIndex(0)

View File

@ -6,6 +6,7 @@ from PyQt5.QtCore import QSize, QSettings, Qt
import blipblop.constants as cnst
from blipblop.ui.help import HelpDialog
from blipblop.ui.about import AboutDialog
from blipblop.ui.centralwidget import CentralWidget
class BlipBlop(QMainWindow):
@ -19,7 +20,8 @@ class BlipBlop(QMainWindow):
self.setMenuBar(QMenuBar(self))
self.create_actions()
self._task_results = []
self._cw = CentralWidget()
self.setCentralWidget(self._cw)
self.show()
def create_actions(self):
@ -119,9 +121,8 @@ class BlipBlop(QMainWindow):
sys.exit()
def on_new(self):
self._task_results = []
self.__
pass
self._cw.reset()
def on_about(self):
about = AboutDialog(self)

View File

@ -37,7 +37,6 @@ class StartScreen(QWidget):
l.addWidget(QLabel("Recently opened files:"))
self._file_list = QListWidget(self)
self._file_list.setSelectionMode(QAbstractItemView.SingleSelection)
self._file_list.itemClicked.connect(self._on_file_clicked)
self._file_list.setFrameShape(QFrame.NoFrame)
self.keyPressed.connect(self._on_key_pressed)
l.addWidget(self._file_list)