more gui

py/pytelem/bms.py

@@ -1,7 +1,9 @@
+from typing import Dict
 from typing_extensions import TypedDict
 
-from PySide6.QtCore import QObject
+from PySide6.QtCore import QObject, Qt, Slot
-from PySide6.QtWidgets import QDockWidget, QGridLayout, QGroupBox, QHBoxLayout, QLabel, QVBoxLayout, QWidget
+from PySide6.QtGui import QFontDatabase
+from PySide6.QtWidgets import QButtonGroup, QDockWidget, QGridLayout, QGroupBox, QHBoxLayout, QLabel, QRadioButton, QVBoxLayout, QWidget
 
 ContactorStates = TypedDict("ContactorStates", {})
 
@@ -17,42 +19,123 @@ class BMSState(QObject):
         # uhh, take a connection to the upstream?
 
 
-class BMSModuleViewer(QDockWidget):
+class BMSModuleViewer(QWidget):
     """BMS module status viewer (temp and voltage)"""
 
-    layout: QGridLayout
+    # use graphics view for rendering.
-
-    def __init__(self) -> None:
-        super().__init__()
-        self.layout = QGridLayout(self)
-
-
-class BMSOverview(QWidget):
-    layout: QGridLayout
 
+    temps: list[float] = []
+    volts: list[float] = []
 
     def __init__(self, parent = None) -> None:
         super().__init__(parent)
-        self.layout = QGridLayout(self)
+
-        main_voltage_label = QLabel("Main Voltage", self)
+        layout = QGridLayout()
-        self.layout.addWidget(main_voltage_label, row=1, column=0)
+
+        bg = QButtonGroup(self)
+
+        self.volts_btn = QRadioButton("Voltage", self)
+        self.temps_btn = QRadioButton("Temperatures", self)
+        bg.addButton(self.volts_btn)
+        bg.addButton(self.temps_btn)
+
+
+        layout.addWidget(self.volts_btn, 0, 0)
+        layout.addWidget(self.temps_btn, 0, 1)
+
+
+
+
+
+
+class BMSOverview(QWidget):
+
+    current: QLabel
+    main_voltage: QLabel
+    aux_voltage: QLabel
+
+    def __init__(self, parent=None) -> None:
+        super().__init__(parent)
+        self.setMaximumWidth
+        layout = QGridLayout()
+        layout.setRowStretch(0, 80)
+        layout.setRowStretch(1, 20)
+
+        number_font = QFontDatabase.systemFont(QFontDatabase.SystemFont.FixedFont)
+        number_font.setPointSize(18)
+        hcenter = Qt.AlignmentFlag.AlignHCenter
+
+        self.main_voltage = QLabel("0.000", self)
+        self.main_voltage.setAlignment(hcenter)
+        self.main_voltage.setFont(number_font)
+        layout.addWidget(self.main_voltage, 0, 0)
+
+        main_v_label = QLabel("Main Voltage", self)
+        main_v_label.setAlignment(hcenter)
+        layout.addWidget(main_v_label, 1, 0)
+
+
+        self.aux_voltage = QLabel("0.000", self)
+        self.aux_voltage.setAlignment(hcenter)
+        self.aux_voltage.setFont(number_font)
+        layout.addWidget(self.aux_voltage, 0, 1)
+
         aux_v_label = QLabel("Aux Voltage", self)
-        self.layout.addWidget(aux_v_label, row=1, column=1)
+        aux_v_label.setAlignment(hcenter)
+        layout.addWidget(aux_v_label, 1, 1)
+
+        self.current = QLabel("0.000", self)
+        self.current.setAlignment(hcenter)
+        self.current.setFont(number_font)
+        layout.addWidget(self.current, 0, 2)
+
         current_label = QLabel("Battery Current", self)
-        self.layout.addWidget(current_label, row=1, column=2)
+        current_label.setAlignment(hcenter)
+        layout.addWidget(current_label, 1, 2)
 
         # now add widgets that display the numeric values.
         # then make slots that take floats and display them.
+        self.setLayout(layout)
 
-class BMSStatus(QDockWidget):
 
-    layout: QVBoxLayout
+    @Slot(float)
-    contactors: QGroupBox
+    def update_main_v(self, value: float):
+        self.main_voltage.setText(f"{value:.2f}")
 
-    def __init__(self, parent = None):
+    @Slot(float)
-        super().__init__("Battery Status", parent)
+    def set_aux_v(self, value:float):
+        self.aux_voltage.setText(f"{value:.3f}")
+
+    @Slot(float)
+    def set_current(self, value: float):
+        self.current.setText(f"{value:.3f}")
+
+
+
+class BMSStatus(QWidget):
+
+    contactor_items: Dict[str, QLabel] = dict()
+    "A mapping of string names to the label, used to set open/closed"
+
+    def __init__(self, parent: QWidget | None = None, contactors: list[str] = []):
+        super().__init__(parent)
+
+        layout = QVBoxLayout(self)
+
+        self.contactors_grp = QGroupBox("Contactor State", self)
+        contactor_layout = QGridLayout()
+        self.contactors_grp.setLayout(contactor_layout)
+        layout.addWidget(self.contactors_grp)
+
+        for c in contactors:
+            label = QLabel(c, self)
+            
+            self.contactor_items[c] = label
+
+
+
+
+class BMSPlotsWidget(QWidget):
+    pass
 
-        self.layout = QVBoxLayout(self)
-        self.contactors = QGroupBox("Contactor State", self)
-        self.layout.addWidget(self.contactors)
 

py/pytelem/gui.py

@@ -11,14 +11,21 @@ from PySide6.QtWidgets import (
     QDockWidget,
 )
 
+from bms import BMSOverview
+
 
 class MainApp(QMainWindow):
     def __init__(self):
         super().__init__()
         self.setWindowTitle("Hey there")
+        layout = QtWidgets.QVBoxLayout()
+
+        bms = BMSOverview()
+        dw = QDockWidget('bms', self)
+        self.addDockWidget(Qt.DockWidgetArea.LeftDockWidgetArea, dw)
+        dw.setWidget(PacketTree())
+        self.setCentralWidget(bms)
 
-        ptree = PacketTree(self)
-        self.setCentralWidget(ptree)
 
 
 class PacketTree(QWidget):