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

hotfix: 切断時の表示を専用の表示に変える #140

Draft
wants to merge 4 commits into
base: beta/v4.0.0
Choose a base branch
from
Draft

hotfix: 切断時の表示を専用の表示に変える #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
437be3f
add new view
yabuta Oct 29, 2024
d8dd254
fix conflict
yabuta Nov 27, 2024
08815ec
add view
yabuta Nov 27, 2024
efbefc7
fix message
yabuta Dec 5, 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
56 changes: 56 additions & 0 deletions src/signage/resource/page/Disconnected.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
import QtQuick 2.9
import QtQuick.Controls 2.2

import "Common"

Rectangle {
id: disconnectedView
width: viewController.monitor_width
height: viewController.monitor_height
color: "#ffffff"

CurrentTime {
id: displayCurrentTime
}

Text {
id: disconnectedText1
color: "#000000"
text: qsTr("通信不良が発生しています。")
anchors.horizontalCenter: parent.horizontalCenter
anchors.bottom: parent.verticalCenter
anchors.bottomMargin: 50*viewController.size_ratio
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
font.pointSize: 40*viewController.size_ratio
font.bold: true
elide: Text.ElideMiddle
}

Text {
id: disconnectedText2
color: "#000000"
text: qsTr("急な停車にご注意ください。")
anchors.top: disconnectedText1.bottom
anchors.horizontalCenter: parent.horizontalCenter
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
font.pointSize: 40*viewController.size_ratio
font.bold: true
elide: Text.ElideMiddle
}

Text {
id: disconnectedEnText
color: "#000000"
text: qsTr("Communication with the autonomous system is delayed.")
anchors.top: disconnectedText2.bottom
anchors.topMargin: 20*viewController.size_ratio
anchors.horizontalCenter: parent.horizontalCenter
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
font.pointSize: 30*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 @@ -19,6 +19,11 @@ Window {
visible: viewController.view_mode === "emergency_stopped"
}

Disconnected {
id: disconnectedView
visible: viewController.view_mode === "disconnected"
}

SlowStopView {
id: slowStopView
visible: viewController.view_mode === "slow_stop"
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 @@ -8,7 +8,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 11 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 @@ -432,7 +432,7 @@
and not self._parameter.ignore_disconnected
and not self._parameter.ignore_emergency
):
view_mode = "emergency_stopped"
view_mode = "disconnected"
elif (
not self._autoware.information.autoware_control
and not self._parameter.ignore_manual_driving
Expand Down
Loading