From 714bf2892d92ef04a88d46e2697f256ad37a9fca Mon Sep 17 00:00:00 2001 From: JayPiKay Date: Sun, 19 Jan 2020 17:08:43 +0100 Subject: [PATCH] Added more gui widgets --- .python-version | 1 + src/um24clab.py | 30 ++++++++++++++++++++++++------ 2 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 .python-version diff --git a/.python-version b/.python-version new file mode 100644 index 0000000..bebc4ba --- /dev/null +++ b/.python-version @@ -0,0 +1 @@ +py3um24c diff --git a/src/um24clab.py b/src/um24clab.py index 51f3614..3251dab 100644 --- a/src/um24clab.py +++ b/src/um24clab.py @@ -1,7 +1,8 @@ #!/usr/bin/env python import sys from PyQt5.QtWidgets import ( - QApplication, QWidget, QMainWindow, QLabel, QFrame, QComboBox, QPushButton + QApplication, QWidget, QMainWindow, QLabel, QFrame, QComboBox, QPushButton, + QButtonGroup, QRadioButton ) import PyQt5.QtGui as QtGui import pyqtgraph as pg @@ -24,7 +25,7 @@ class UM24Lab(QMainWindow): +---------+-----------------------+ |(1) |(3) | | (1.1) | | - | | PLOTS | + | (1.2) | PLOTS | | | | +---------+ | |(2) +------+------+---------+ @@ -57,10 +58,27 @@ class UM24Lab(QMainWindow): layout.addWidget(self.btnDeviceConnect) centralLayout.addWidget(deviceWidget) - # TODO: Status current page - # TODO: Rotate Screen - # TODO: Next Page - # TODO: Screen Brightness + # (1.2) Screen Control + screenWidget = QWidget() + layout = QtGui.QGridLayout() + screenWidget.setLayout(layout) + self.screenIndicator = QWidget() + screenManagementButtons = QButtonGroup() + group = QWidget() + groupLayout = QtGui.QHBoxLayout() + group.setLayout(groupLayout) + for i in range(7): + btn = QRadioButton() + screenManagementButtons.addButton(btn) + groupLayout.addWidget(btn) + layout.addWidget(group, 0, 0, 0, 1) + # TODO: Select initial screen + self.btnRotateScreen = QPushButton('Rotate') + layout.addWidget(self.btnRotateScreen, 1, 0) + self.btnNextPage = QPushButton('Next') + layout.addWidget(self.btnNextPage, 1, 1,) + centralLayout.addWidget(screenWidget) + # TODO: Screen Timeout # (2) Group Memory