Merge pull request #21 from AaronPB/gui-tabs-update

Update GUI tabs and internal features

main.py

@@ -2,12 +2,32 @@
 
 import sys
 from src.qtUIs.mainWindow import MainMenu
-from PySide6 import QtWidgets
+from PySide6 import QtWidgets, QtGui
+
+
+def palette() -> QtGui.QPalette:
+    dark_palette = QtGui.QPalette()
+    dark_palette.setColor(QtGui.QPalette.Window, QtGui.QColor(53, 53, 53))
+    dark_palette.setColor(QtGui.QPalette.WindowText, QtGui.QColor(255, 255, 255))
+    dark_palette.setColor(QtGui.QPalette.Base, QtGui.QColor(25, 25, 25))
+    dark_palette.setColor(QtGui.QPalette.AlternateBase, QtGui.QColor(53, 53, 53))
+    dark_palette.setColor(QtGui.QPalette.ToolTipBase, QtGui.QColor(255, 255, 255))
+    dark_palette.setColor(QtGui.QPalette.ToolTipText, QtGui.QColor(255, 255, 255))
+    dark_palette.setColor(QtGui.QPalette.Text, QtGui.QColor(255, 255, 255))
+    dark_palette.setColor(QtGui.QPalette.Button, QtGui.QColor(53, 53, 53))
+    dark_palette.setColor(QtGui.QPalette.ButtonText, QtGui.QColor(255, 255, 255))
+    dark_palette.setColor(QtGui.QPalette.BrightText, QtGui.QColor(255, 0, 0))
+    dark_palette.setColor(QtGui.QPalette.Link, QtGui.QColor(42, 130, 218))
+    dark_palette.setColor(QtGui.QPalette.Highlight, QtGui.QColor(42, 130, 218))
+    dark_palette.setColor(QtGui.QPalette.HighlightedText, QtGui.QColor(0, 0, 0))
+    return dark_palette
 
 
 def main():
     app = QtWidgets.QApplication(sys.argv)
     app.setStyleSheet(open("src/qtUIs/style.qss").read())
+    app.setStyle("Fusion")
+    app.setPalette(palette())
     window = MainMenu()
     window.show()
     sys.exit(app.exec())

src/enums/configPaths.py

@@ -2,39 +2,22 @@
 
 
 class ConfigPaths(Enum):
-    GENERAL_CUSTOM_CONFIG_PATH = "general_settings.custom_config_path"
+    # Settings
+    CUSTOM_CONFIG_PATH = "settings.custom_config_path"
 
-    GENERAL_CALIBRATION_INTERVAL_MS = (
-        "general_settings.calibration_times.data_interval_ms"
-    )
-    GENERAL_CALIBRATION_DURATION_MS = (
-        "general_settings.calibration_times.calibration_time_ms"
-    )
-    GENERAL_TEST_INTERVAL_MS = "general_settings.test_times.data_interval_ms"
-    GENERAL_TARE_DURATION_MS = "general_settings.test_times.tare_time_ms"
+    TEST_NAME = "settings.test.name"
+    TEST_FOLDER_PATH = "settings.test.folder_path"
+    TEST_SAVE_RAW = "settings.test.results.save_raw"
+    TEST_SAVE_CALIB = "settings.test.results.save_calib"
 
-    GENERAL_TEST_FOLDER = "general_settings.test_results.folder"
-    GENERAL_TEST_NAME = "general_settings.test_results.name"
-    GENERAL_TEST_SAVE_CALIB = "general_settings.test_results.save_calib_results"
-    GENERAL_TEST_SAVE_RAW = "general_settings.test_results.save_raw_results"
+    RECORD_INTERVAL_MS = "settings.recording.data_interval_ms"
+    RECORD_TARE_AMOUNT = "settings.recording.tare_data_amount"
 
-    GENERAL_PLOTTERS_ENABLED = "general_settings.tab_plotters.enabled"
-    GENERAL_PLOTTERS_INTERVAL_MS = "general_settings.tab_plotters.update_interval_ms"
-    GENERAL_PLOTTERS_MAX_FORCES = (
-        "general_settings.tab_plotters.plot_max_values.platform_forces"
-    )
-    GENERAL_PLOTTERS_MAX_STABILOGRAM = (
-        "general_settings.tab_plotters.plot_max_values.platform_stabilogram"
-    )
-    GENERAL_PLOTTERS_MAX_ENCODERS = (
-        "general_settings.tab_plotters.plot_max_values.encoders"
-    )
-    GENERAL_PLOTTERS_MAX_IMUS = (
-        "general_settings.tab_plotters.plot_max_values.imu_angles"
-    )
+    CALIBRATION_INTERVAL_MS = "settings.calibration.data_interval_ms"
+    CALIBRATION_DATA_AMOUNT = "settings.calibration.data_amount"
 
-    PHIDGET_P1_LOADCELL_CONFIG_SECTION = "p1_phidget_loadcell_list"
-    PHIDGET_P2_LOADCELL_CONFIG_SECTION = "p2_phidget_loadcell_list"
-    PHIDGET_ENCODER_CONFIG_SECTION = "phidget_encoder_list"
-    TAOBOTICS_IMU_CONFIG_SECTION = "taobotics_imu_list"
-    CALIBRATION_CONFIG_SECTION = "calibration_sensor"
+    # Sensors
+    SENSOR_GROUPS_SECTION = "sensor_groups"
+    SENSORS_SECTION = "sensors"
+    CALIBRATION_LOADCELL_SENSOR = "sensors_calibration.phidget_loadcell_reference"
+    CALIBRATION_PLATFORM_SENSOR = "sensors_calibration.platform_reference"

src/enums/plotTypes.py

@@ -0,0 +1,12 @@
+from enum import Enum, auto
+
+
+class PlotTypes(Enum):
+    GROUP_PLATFORM_COP = auto()
+    GROUP_PLATFORM_FORCES = auto()
+
+    SENSOR_LOADCELL_FORCE = auto()
+    SENSOR_ENCODER_DISTANCE = auto()
+    SENSOR_IMU_ANGLES = auto()
+    SENSOR_IMU_VELOCITY = auto()
+    SENSOR_IMU_ACCELERATION = auto()

src/enums/qssLabels.py

@@ -7,8 +7,20 @@ class QssLabels(Enum):
     CRITICAL_BTN = "critical_btn"
     TITLE_LABEL = "title"
     AUTHOR_COPYRIGHT_LABEL = "author_copy"
+
+    PREVIEW_BOX = "preview_box"
+
     STATUS_LABEL_INFO = "status_info"
     STATUS_LABEL_OK = "status_ok"
     STATUS_LABEL_WARN = "status_warn"
-    SENSOR_CONNECTED = "connected"
-    SENSOR_NOT_CONNECTED = "not_connected"
+
+    SENSOR_GROUP = "sensor_group"
+    SENSOR = "sensor"
+
+    SENSOR_GROUP_IGNORED = "sensor_group_ignored"
+    SENSOR_GROUP_ERROR = "sensor_group_error"
+    SENSOR_GROUP_WARN = "sensor_group_warn"
+    SENSOR_GROUP_OK = "sensor_group_ok"
+    SENSOR_IGNORED = "sensor_ignored"
+    SENSOR_ERROR = "sensor_error"
+    SENSOR_OK = "sensor_ok"