Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/change display isuzu #117

Merged
merged 3 commits into from
Aug 29, 2024
Merged

Feat/change display isuzu #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9fe22b3
Add: adding qml for system init
Aug 29, 2024
a9097e7
Modify: change text when autoware is disconnected
Aug 29, 2024
59f46ac
Modify: Adding time to init view
Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions src/signage/resource/page/SystemInitializeView.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
import QtQuick 2.9
import QtQuick.Controls 2.2

import "Common"

Rectangle {
id: systemInitializeView
width: viewController.monitor_width
height: viewController.monitor_height
color: "#ffffff"
CurrentTime {
id: displayCurrentTime
}
Text {
id: systemInitializeTetx

Check warning on line 15 in src/signage/resource/page/SystemInitializeView.qml

View workflow job for this annotation

GitHub Actions / spellcheck 

Unknown word (Tetx)
color: "#000000"
text: qsTr("準備中")
anchors.horizontalCenter: parent.horizontalCenter
anchors.bottom: parent.verticalCenter
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
font.pointSize: 80*viewController.size_ratio
font.bold: true
elide: Text.ElideMiddle
}

Text {
id: systemInitializeEnText
color: "#000000"
text: qsTr("System Initializing")
anchors.top: systemInitializeTetx.bottom

Check warning on line 31 in src/signage/resource/page/SystemInitializeView.qml

View workflow job for this annotation

GitHub Actions / spellcheck 

Unknown word (Tetx)
anchors.horizontalCenter: parent.horizontalCenter
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
font.pointSize: 80*viewController.size_ratio
font.bold: true
elide: Text.ElideMiddle
}
}
5 changes: 5 additions & 0 deletions src/signage/resource/page/main.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@ Window {
visible: viewController.view_mode === "driving"
}

SystemInitializeView {
id: systemInitializeView
visible: viewController.view_mode === "system_initializing"
}

Item {
focus: true
Keys.onPressed: {
Expand Down
2 changes: 1 addition & 1 deletion src/signage/src/signage/route_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

import signage.signage_utils as utils
from tier4_external_api_msgs.msg import DoorStatus
from autoware_adapi_v1_msgs.msg import (

Check warning on line 13 in src/signage/src/signage/route_handler.py

View workflow job for this annotation

GitHub Actions / spellcheck 

Unknown word (adapi)
RouteState,
MrmState,
OperationModeState,
Expand Down Expand Up @@ -404,7 +404,7 @@
self._viewController.display_phrase = self._display_phrase

if self._autoware.is_disconnected:
view_mode = "emergency_stopped"
view_mode = "system_initializing"
elif (
not self._autoware.information.autoware_control
and not self._parameter.ignore_manual_driving
Expand Down
Loading