*__pycache__
Widgets/.vssclient_history
map.html
+test/
+control-panel/
+res_rc.py
\ No newline at end of file
<property name="tabShape">
<enum>QTabWidget::Rounded</enum>
</property>
- <property name="dockOptions">
- <set>QMainWindow::AllowTabbedDocks|QMainWindow::AnimatedDocks</set>
- </property>
<property name="unifiedTitleAndToolBarOnMac">
<bool>true</bool>
</property>
# AGL_Demo_Control_Panel
-A PyQt5 application to simulate CAN Bus signals using Kuksa.val for the AGL Demo platform. This application is to be used in parallel to the relevant AGL Images or any application that subscribes to VSS signals using [Kuksa.val-server](https://github.com/eclipse/kuksa.val/tree/master/kuksa-val-server) or [Kuksa-databroker](https://github.com/eclipse/kuksa.val/tree/master/kuksa_databroker).
+A PyQt6 application to simulate CAN Bus signals using Kuksa.val for the AGL Demo platform. This application is to be used in parallel to the relevant AGL Images or any application that subscribes to VSS signals using [Kuksa.val-server](https://github.com/eclipse/kuksa.val/tree/master/kuksa-val-server) or [Kuksa-databroker](https://github.com/eclipse/kuksa.val/tree/master/kuksa_databroker).
## # Installation
```
- Install the Python dependencies:
- - _Note_:
- If errors occure in Debian based/Rasbian OS during installation:
- ```bash
- $ nano requirements.txt
- # -> Comment pyqt5 dependency using "#"
- $ sudo apt install python3-pyqt5 python3-qtpy pyqt5-dev-tools python3-pyqt5.qtsvg -y
- ```
- and skip to step 2
-
- Step 1
```bash
$ python3 -m venv control-panel
$ source control-panel/bin/activate
- ```
- - Step 2
- ```bash
$ pip3 install -r requirements.txt
- $ pyrcc5 assets/res.qrc -o res_rc.py
+ $ pyside6-rcc assets/res.qrc -o res_rc.py
```
## # Usage
#
# SPDX-License-Identifier: Apache-2.0
-from PyQt5 import QtCore, QtWidgets
import os
import sys
-from PyQt5 import uic
-from PyQt5 import QtWidgets
-from PyQt5.QtWidgets import *
-from PyQt5.QtSvg import *
-from PyQt5.QtCore import pyqtSignal
-from PyQt5.QtGui import QIcon
-from PyQt5 import QtCore
-from PyQt5 import QtSvg
-
-from extras import config
+from PyQt6 import uic
+from PyQt6 import QtCore, QtWidgets
+from PyQt6 import QtWidgets
+from PyQt6.QtWidgets import *
+from PyQt6.QtSvg import *
+from PyQt6.QtCore import pyqtSignal
+from PyQt6.QtGui import QIcon
+from PyQt6.QtGui import QIcon
+from PyQt6.QtCore import QSize
current_dir = os.path.dirname(os.path.abspath(__file__))
# ========================================
+from extras import config
+import res_rc
class Dashboard(Base, Form):
"""
DashboardTiles.addButton(tile)
def set_icon(self, tile, icon_size):
- icon_mapping = {
- self.DB_IC_Tile: ":/Carbon_Icons/carbon_icons/meter.svg",
- self.DB_HVAC_Tile: ":/Carbon_Icons/carbon_icons/windy--strong.svg",
- self.DB_Steering_Tile: ":/Images/Images/steering-wheel.svg",
- self.DB_Settings_Tile: ":/Carbon_Icons/carbon_icons/settings.svg"
- }
- icon_mapping_disabled = {
- self.DB_IC_Tile: ":/Carbon_Icons/carbon_icons/meter-disabled.svg",
- self.DB_HVAC_Tile: ":/Carbon_Icons/carbon_icons/windy--strong-disabled.svg",
- self.DB_Steering_Tile: ":/Images/Images/steering-wheel-disabled.svg",
- self.DB_Settings_Tile: ":/Carbon_Icons/carbon_icons/settings.svg"
+ icon_mappings = {
+ self.DB_IC_Tile: {
+ "normal": ":/Carbon_Icons/carbon_icons/meter.svg",
+ "disabled": ":/Carbon_Icons/carbon_icons/meter-disabled.svg"
+ },
+ self.DB_HVAC_Tile: {
+ "normal": ":/Carbon_Icons/carbon_icons/windy--strong.svg",
+ "disabled": ":/Carbon_Icons/carbon_icons/windy--strong-disabled.svg"
+ },
+ self.DB_Steering_Tile: {
+ "normal": ":/Images/Images/steering-wheel.svg",
+ "disabled": ":/Images/Images/steering-wheel-disabled.svg"
+ },
+ self.DB_Settings_Tile: {
+ "normal": ":/Carbon_Icons/carbon_icons/settings.svg",
+ "disabled": ":/Carbon_Icons/carbon_icons/settings.svg" # Assuming the same icon for simplicity
+ }
}
+ icon_key = "disabled" if not tile.isEnabled() else "normal"
+ file_path = icon_mappings.get(tile, {}).get(icon_key)
- file = icon_mapping.get(tile)
- if file is None:
+ if not file_path:
return
- getsize = QtSvg.QSvgRenderer(file)
- svg_widget = QtSvg.QSvgWidget(file)
- svg_widget.setFixedSize(getsize.defaultSize()*2)
- svg_widget.setStyleSheet("background-color: transparent;")
- icon = QIcon(svg_widget.grab())
-
- file = icon_mapping_disabled.get(tile)
- if file is None:
- return
-
- getsize = QtSvg.QSvgRenderer(file)
- svg_widget = QtSvg.QSvgWidget(file)
- svg_widget.setFixedSize(getsize.defaultSize()*2)
- svg_widget.setStyleSheet("background-color: transparent;")
- icon.addPixmap(svg_widget.grab(), QIcon.Disabled, QIcon.Off)
-
+ icon = QIcon(file_path)
tile.setIcon(icon)
- tile.setIconSize(QtCore.QSize(icon_size, icon_size))
+ tile.setIconSize(QSize(icon_size, icon_size))
def tile_clicked(self, tile):
"""
app = QApplication(sys.argv)
w = Dashboard()
w.show()
- sys.exit(app.exec_())
+ sys.exit(app.exec())
#
# SPDX-License-Identifier: Apache-2.0
-from extras.KuksaClient import KuksaClient
import os
import sys
-from PyQt5 import uic
-from PyQt5.QtWidgets import QApplication, QListWidget, QSlider, QPushButton
+from PyQt6 import uic
+from PyQt6.QtWidgets import QApplication, QListWidget, QSlider, QPushButton
current_dir = os.path.dirname(os.path.abspath(__file__))
# ========================================
+from extras.KuksaClient import KuksaClient
+import res_rc
class HVAC_Paths():
def __init__(self):
def setTemperature(self, list_widget, path):
item = list_widget.currentItem()
if item is not None:
- list_widget.scrollToItem(item, 1)
+ list_widget.scrollToItem(item)
self.kuksa_client.set(path, item.text()[:-2], "targetValue")
print(item.text())
app = QApplication(sys.argv)
w = HVACWidget()
w.show()
- sys.exit(app.exec_())
+ sys.exit(app.exec())
import os
import logging
import sys
-from PyQt5 import uic, QtCore, QtWidgets
-from PyQt5.QtWidgets import QApplication
-from PyQt5.QtGui import QIcon, QPixmap, QPainter
-from PyQt5.QtCore import QObject, pyqtSignal
-from PyQt5.QtWidgets import QWidget
-from qtwidgets import AnimatedToggle
-from extras.KuksaClient import KuksaClient
-from extras.VehicleSimulator import VehicleSimulator
+from PyQt6 import uic, QtCore, QtWidgets
+from PyQt6.QtWidgets import QApplication
+from PyQt6.QtGui import QIcon, QPixmap, QPainter
+from PyQt6.QtCore import QObject, pyqtSignal
+from PyQt6.QtWidgets import QWidget
current_dir = os.path.dirname(os.path.abspath(__file__))
# ========================================
+from extras.KuksaClient import KuksaClient
+from extras.VehicleSimulator import VehicleSimulator
+import res_rc
+from Widgets.animatedToggle import AnimatedToggle
class IC_Paths():
def __init__(self):
"""
hazardIcon = QPixmap(":/Images/Images/hazard.png")
painter = QPainter(hazardIcon)
- painter.setCompositionMode(QPainter.CompositionMode_SourceIn)
+ painter.setCompositionMode(QPainter.CompositionMode.CompositionMode_SourceIn)
if self.hazardBtn.isChecked():
- color = QtCore.Qt.yellow
+ color = QtCore.Qt.GlobalColor.yellow
value = "true"
else:
- color = QtCore.Qt.black
+ color = QtCore.Qt.GlobalColor.black
value = "false"
painter.fillRect(hazardIcon.rect(), color)
"""
leftIndicatorIcon = QPixmap(":/Images/Images/left.png")
painter = QPainter(leftIndicatorIcon)
- painter.setCompositionMode(QPainter.CompositionMode_SourceIn)
+ painter.setCompositionMode(QPainter.CompositionMode.CompositionMode_SourceIn)
if self.leftIndicatorBtn.isChecked():
- color = QtCore.Qt.green
+ color = QtCore.Qt.GlobalColor.green
value = "true"
else:
- color = QtCore.Qt.black
+ color = QtCore.Qt.GlobalColor.black
value = "false"
painter.fillRect(leftIndicatorIcon.rect(), color)
"""
rightIndicatorIcon = QPixmap(":/Images/Images/right.png")
painter = QPainter(rightIndicatorIcon)
- painter.setCompositionMode(QPainter.CompositionMode_SourceIn)
+ painter.setCompositionMode(QPainter.CompositionMode.CompositionMode_SourceIn)
if self.rightIndicatorBtn.isChecked():
- color = QtCore.Qt.green
+ color = QtCore.Qt.GlobalColor.green
value = "true"
else:
- color = QtCore.Qt.black
+ color = QtCore.Qt.GlobalColor.black
value = "false"
painter.fillRect(rightIndicatorIcon.rect(), color)
app = QApplication(sys.argv)
w = ICWidget()
w.show()
- sys.exit(app.exec_())
+ sys.exit(app.exec())
#
# SPDX-License-Identifier: Apache-2.0
-from . import settings
-import extras.FeedCAN as feed_can
-from extras.KuksaClient import KuksaClient
import os
import sys
-from PyQt5 import uic
-from PyQt5.QtWidgets import QApplication, QButtonGroup
+from PyQt6 import uic
+from PyQt6.QtWidgets import QApplication, QButtonGroup
current_dir = os.path.dirname(os.path.abspath(__file__))
# ========================================
+import extras.FeedCAN as feed_can
+from Widgets import settings
+from extras.KuksaClient import KuksaClient
+import res_rc
+
class Steering_Paths():
def __init__(self):
self.switches = {
app = QApplication(sys.argv)
w = SteeringCtrlWidget()
w.show()
- sys.exit(app.exec_())
+ sys.exit(app.exec())
--- /dev/null
+import sys
+from PyQt6.QtCore import (
+ Qt, QSize, QPoint, QPointF, QRectF,
+ QEasingCurve, QPropertyAnimation, QSequentialAnimationGroup,
+ pyqtProperty, QByteArray)
+from PyQt6.QtWidgets import QApplication, QCheckBox
+from PyQt6.QtGui import QColor, QBrush, QPaintEvent, QPen, QPainter
+
+class Toggle(QCheckBox):
+ _transparent_pen = QPen(Qt.GlobalColor.transparent)
+ _light_grey_pen = QPen(Qt.GlobalColor.lightGray)
+
+ def __init__(self,
+ parent=None,
+ bar_color=Qt.GlobalColor.gray,
+ checked_color="#00B0FF",
+ handle_color=Qt.GlobalColor.white,
+ ):
+ super().__init__(parent)
+
+ self._bar_brush = QBrush(bar_color)
+ self._bar_checked_brush = QBrush(QColor(checked_color).lighter())
+
+ self._handle_brush = QBrush(handle_color)
+ self._handle_checked_brush = QBrush(QColor(checked_color))
+
+ self.setContentsMargins(8, 0, 8, 0)
+ self._handle_position = 0
+
+ self.stateChanged.connect(self.handle_state_change)
+
+ def sizeHint(self):
+ return QSize(58, 45)
+
+ def hitButton(self, pos: QPoint):
+ return self.contentsRect().contains(pos)
+
+ def paintEvent(self, e: QPaintEvent):
+ contRect = self.contentsRect()
+ handleRadius = round(0.24 * contRect.height())
+
+ p = QPainter(self)
+ p.setRenderHint(QPainter.RenderHint.Antialiasing)
+
+ p.setPen(self._transparent_pen)
+ barRect = QRectF(
+ 0, 0,
+ contRect.width() - handleRadius, 0.40 * contRect.height()
+ )
+ barRect.moveCenter(contRect.center())
+ rounding = barRect.height() / 2
+
+ trailLength = contRect.width() - 2 * handleRadius
+ xPos = contRect.x() + handleRadius + trailLength * self._handle_position
+
+ if self.isChecked():
+ p.setBrush(self._bar_checked_brush)
+ p.drawRoundedRect(barRect, rounding, rounding)
+ p.setBrush(self._handle_checked_brush)
+
+ else:
+ p.setBrush(self._bar_brush)
+ p.drawRoundedRect(barRect, rounding, rounding)
+ p.setPen(self._light_grey_pen)
+ p.setBrush(self._handle_brush)
+
+ p.drawEllipse(
+ QPointF(xPos, barRect.center().y()),
+ handleRadius, handleRadius)
+
+ p.end()
+
+ def handle_state_change(self, value):
+ self._handle_position = 1 if value else 0
+
+ @pyqtProperty(float)
+ def handle_position(self):
+ return self._handle_position
+
+ @handle_position.setter
+ def handle_position(self, pos):
+ self._handle_position = pos
+ self.update()
+
+ @pyqtProperty(float)
+ def pulse_radius(self):
+ return self._pulse_radius
+
+ @pulse_radius.setter
+ def pulse_radius(self, pos):
+ self._pulse_radius = pos
+ self.update()
+
+
+class AnimatedToggle(Toggle):
+ _transparent_pen = QPen(Qt.GlobalColor.transparent)
+ _light_grey_pen = QPen(Qt.GlobalColor.lightGray)
+
+ def __init__(self, *args, pulse_unchecked_color="#44999999",
+ pulse_checked_color="#4400B0EE", **kwargs):
+ self._pulse_radius = 0
+
+ super().__init__(*args, **kwargs)
+
+ self.animation = QPropertyAnimation(self, QByteArray(b"handle_position"))
+ self.animation.setEasingCurve(QEasingCurve.Type.InOutCubic)
+ self.animation.setDuration(200)
+
+ self.pulse_anim = QPropertyAnimation(self, QByteArray(b"pulse_radius"))
+ self.pulse_anim.setDuration(350)
+ self.pulse_anim.setStartValue(10)
+ self.pulse_anim.setEndValue(20)
+
+ self.animations_group = QSequentialAnimationGroup()
+ self.animations_group.addAnimation(self.animation)
+ self.animations_group.addAnimation(self.pulse_anim)
+
+ self._pulse_unchecked_animation = QBrush(QColor(pulse_unchecked_color))
+ self._pulse_checked_animation = QBrush(QColor(pulse_checked_color))
+
+ def handle_state_change(self, value):
+ self.animations_group.stop()
+ if value:
+ self.animation.setEndValue(1)
+ else:
+ self.animation.setEndValue(0)
+ self.animations_group.start()
+
+ def paintEvent(self, e: QPaintEvent):
+ contRect = self.contentsRect()
+ handleRadius = round(0.24 * contRect.height())
+
+ p = QPainter(self)
+ p.setRenderHint(QPainter.RenderHint.Antialiasing)
+
+ p.setPen(self._transparent_pen)
+ barRect = QRectF(
+ 0, 0,
+ contRect.width() - handleRadius, 0.40 * contRect.height()
+ )
+
+ # Calculate the new top-left position of barRect to center it
+ centerX, centerY = contRect.center().x(), contRect.center().y()
+ barRect.moveTo(centerX - barRect.width() / 2, centerY - barRect.height() / 2)
+
+ rounding = barRect.height() / 2
+
+ trailLength = contRect.width() - 2 * handleRadius
+
+ xPos = contRect.x() + handleRadius + trailLength * self._handle_position
+
+ if self.pulse_anim.state() == QPropertyAnimation.State.Running:
+ p.setBrush(
+ self._pulse_checked_animation if
+ self.isChecked() else self._pulse_unchecked_animation)
+ p.drawEllipse(QPointF(xPos, barRect.center().y()),
+ self._pulse_radius, self._pulse_radius)
+
+ if self.isChecked():
+ p.setBrush(self._bar_checked_brush)
+ p.drawRoundedRect(barRect, rounding, rounding)
+ p.setBrush(self._handle_checked_brush)
+
+ else:
+ p.setBrush(self._bar_brush)
+ p.drawRoundedRect(barRect, rounding, rounding)
+ p.setPen(self._light_grey_pen)
+ p.setBrush(self._handle_brush)
+
+ p.drawEllipse(
+ QPointF(xPos, barRect.center().y()),
+ handleRadius, handleRadius)
+
+ p.end()
+
+if __name__ == "__main__":
+ app = QApplication(sys.argv)
+ window = AnimatedToggle()
+ window.show()
+ sys.exit(app.exec())
#
# SPDX-License-Identifier: Apache-2.0
-from extras import config
-import extras.Kuksa_Instance as kuksa_instance
+
import os
import sys
import time
-from PyQt5 import uic
-from PyQt5.QtWidgets import QApplication, QLineEdit, QPushButton, QLabel, QComboBox, QStyledItemDelegate
-from qtwidgets import AnimatedToggle
-from PyQt5.QtWidgets import QWidget
-from PyQt5.QtCore import QThread
-from PyQt5 import QtGui
+from PyQt6.QtWidgets import QApplication, QLineEdit, QPushButton, QLabel
+from PyQt6 import uic
+from PyQt6.QtWidgets import QWidget
+from PyQt6.QtCore import QThread
+from PyQt6 import QtGui
import logging
import can
sys.path.append(os.path.dirname(current_dir))
+from extras import config
+import extras.Kuksa_Instance as kuksa_instance
+from Widgets.animatedToggle import AnimatedToggle
+import res_rc
+
Form, Base = uic.loadUiType(os.path.join(
current_dir, "../ui/Settings_Window.ui"))
GS_layout.replaceWidget(self.place_holder_toggle_1, self.SSL_toggle)
GS_layout.replaceWidget(
- self.place_holder_toggle_2, self.Protocol_toggle)
+ self.place_holder_toggle_2, self.Protocol_toggle)
self.place_holder_toggle_1.deleteLater()
self.place_holder_toggle_2.deleteLater()
app = QApplication(sys.argv)
w = settings()
w.show()
- sys.exit(app.exec_())
+ sys.exit(app.exec())
# SPDX-License-Identifier: Apache-2.0
import logging
-from PyQt5.QtCore import QThread
-from PyQt5.QtCore import pyqtSignal
+from PyQt6.QtCore import QThread
+from PyQt6.QtCore import pyqtSignal
from . import Kuksa_Instance as kuksa_instance
import threading
logging.error(f"Error sending values to kuksa {e}")
threading.Thread(target=self.set_instance).start()
- def setValues(self, values : dict[str, any] = None):
+ def setValues(self, values: dict[str, any] = None):
"""
Sets VSS values.
"""
from main import *
-from PyQt5 import QtCore
-from PyQt5.QtCore import QPropertyAnimation
-from PyQt5.QtWidgets import QWidget
-from PyQt5.QtCore import QEasingCurve
-from PyQt5.QtWidgets import QGraphicsOpacityEffect
+from PyQt6 import QtCore
+from PyQt6.QtCore import QPropertyAnimation
+from PyQt6.QtWidgets import QWidget
+from PyQt6.QtCore import QEasingCurve
+from PyQt6.QtWidgets import QGraphicsOpacityEffect
from kuksa_client.grpc import Field, SubscribeEntry, View
from kuksa_client.grpc.aio import VSSClient
-from PyQt5.QtCore import pyqtSignal
+from PyQt6.QtCore import pyqtSignal
+from PyQt6.QtCore import QThread
import asyncio
-from PyQt5.QtCore import QThread
import pathlib
import logging
import json
def fullscreen(self):
self.headerContainer.hide()
- self.setAttribute(QtCore.Qt.WA_TranslucentBackground, False)
+ self.setAttribute(QtCore.Qt.WidgetAttribute.WA_TranslucentBackground, False)
self.showFullScreen()
def block_updates():
self.animation.setDuration(400)
self.animation.setStartValue(height)
self.animation.setEndValue(heightExtended)
- self.animation.setEasingCurve(QtCore.QEasingCurve.InOutQuart)
+ self.animation.setEasingCurve(QtCore.QEasingCurve.Type.InOutQuart)
self.animation.start()
def animateSwitch(self, index):
self.animation.setDuration(300)
self.animation.setStartValue(0)
self.animation.setEndValue(1)
- self.animation.setEasingCurve(QEasingCurve.OutCubic)
+ self.animation.setEasingCurve(QEasingCurve.Type.OutCubic)
self.animation.finished.connect(self.close)
self.animate()
import random
import time
import threading
-from PyQt5.QtCore import QObject, pyqtSignal
+from PyQt6.QtCore import QObject, pyqtSignal
from extras.KuksaClient import KuksaClient
class VehicleSimulator(QObject):
limitations under the License.
"""
-from Widgets.Dashboard import Dashboard
-from extras.UI_Handeler import *
import sys
import os
-from PyQt5 import uic, QtCore, QtWidgets
-from PyQt5.QtWidgets import QApplication, QPushButton, QWidget
+from PyQt6 import uic, QtCore, QtWidgets
+from PyQt6.QtWidgets import QApplication, QPushButton, QWidget
from functools import partial
-from PyQt5 import QtGui
-from PyQt5.QtCore import Qt
-from PyQt5 import QtSvg
-from PyQt5.QtSvg import *
-from PyQt5.QtGui import QIcon
-
-import extras.config as config
+from PyQt6 import QtGui
+from PyQt6.QtCore import Qt
current_dir = os.path.dirname(os.path.abspath(__file__))
Form, Base = uic.loadUiType(os.path.join(current_dir, "Main_Window.ui"))
+from Widgets.Dashboard import Dashboard
+from extras.UI_Handeler import *
+import extras.config as config
class MainWindow(Base, Form):
"""
"""
super(self.__class__, self).__init__(parent)
self.setupUi(self)
- self.setWindowFlags(QtCore.Qt.FramelessWindowHint)
- self.setAttribute(QtCore.Qt.WA_TranslucentBackground)
+ self.setWindowFlag(QtCore.Qt.WindowType.FramelessWindowHint)
+ self.setAttribute(QtCore.Qt.WidgetAttribute.WA_TranslucentBackground)
self.setStyle(QtWidgets.QStyleFactory.create('Fusion'))
# set fullscreen mode if enabled in config.ini
self.settingsBtn)
steering_icon = ":/Images/Images/steering-wheel.svg"
- svg_widget = QtSvg.QSvgWidget(steering_icon)
- svg_widget.setFixedSize(QtSvg.QSvgRenderer(steering_icon).defaultSize())
- svg_widget.setStyleSheet("background-color: transparent;")
- self.steeringCtrlButton.setIcon(QIcon(svg_widget.grab()))
+ self.steeringCtrlButton.setIcon(QtGui.QIcon(steering_icon))
if not config.hvac_enabled():
self.hvacButton.hide()
}
""")
self.centralwidget.layout().addWidget(
- self.size_grip, 0, Qt.AlignBottom | Qt.AlignRight)
+ self.size_grip, 0, Qt.AlignmentFlag.AlignBottom | Qt.AlignmentFlag.AlignRight)
def VSS_callback(self, data):
pass
':/Images/Images/Automotive_Grade_Linux_logo.svg'))
window = MainWindow()
window.show()
- sys.exit(app.exec_())
+ sys.exit(app.exec())
-pyqt5==5.15
+PyQt6==6.7.0
+PyQt6-Qt6==6.7.1
+PyQt6-sip==13.6.0
+PySide6==6.7.1
+PySide6_Addons==6.7.1
+PySide6_Essentials==6.7.1
kuksa-client==0.4.0
-python-can>=4.2.2
-qtpy==2.3.1
-qtwidgets==1.1
\ No newline at end of file
+python-can>=4.2.2
\ No newline at end of file
Code Review / src / agl-demo-control-panel.git / commitdiff