summaryrefslogtreecommitdiffstats
path: root/app/cluster-gauges.qml
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2020-01-03 18:13:33 -0500
committerScott Murray <scott.murray@konsulko.com>2020-01-03 18:20:12 -0500
commit6095052818bdee3e467f3674837d9279e0d697d0 (patch)
treea15d8d4f1efea632ba13130d582a796c78364f65 /app/cluster-gauges.qml
parent4dc183bf09c0f4b27cf7327937721f3b57e55c12 (diff)
Add signal-composer speed and steering wheel event supporthalibut_8.0.6halibut_8.0.5halibut/8.0.6halibut/8.0.58.0.68.0.5halibut
Changes include: - Pull in signal-composer support from libqtappfw - Add a configuration file that controls whether the existing canned animation behavior should be used, or events from signal-composer should drive speeds and indicators. - Add new icons provided by LF graphics team for cruise control and lane departure warning, and drive their state based on appropriate steering wheel events. - Hide/show the digital vehicle/engine speed values in the gauges based on the steering wheel info event. This is intended to work in sync with changes to tbtnavi to have it display larger speed indicators via an alternate page. Bug-AGL: SPEC-3045, SPEC-3049 Change-Id: I77249f65b80596fe7f2af9fe29b3ed86b63a8a45 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Diffstat (limited to 'app/cluster-gauges.qml')
-rw-r--r--app/cluster-gauges.qml52
1 files changed, 45 insertions, 7 deletions
diff --git a/app/cluster-gauges.qml b/app/cluster-gauges.qml
index 76f5027..e4c299b 100644
--- a/app/cluster-gauges.qml
+++ b/app/cluster-gauges.qml
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
-** Copyright (C) 2018 Konsulko Group
+** Copyright (C) 2018, 2019 Konsulko Group
** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
@@ -81,7 +81,7 @@ ApplicationWindow {
id: statusFrame
x: (parent.width - width) / 2
y: 40
- width: 1152
+ width: 1280
height: 96
radius: height / 5
@@ -92,13 +92,13 @@ ApplicationWindow {
Row {
width: parent.width
height: parent.height * 0.75
- spacing: (parent.width - (12 * parent.height * 0.75)) / 13
+ spacing: (parent.width - (14 * parent.height * 0.75)) / 15
anchors.fill: parent
anchors.topMargin: (parent.height - height) /2
anchors.bottomMargin: (parent.height - height) /2
- anchors.leftMargin: (parent.width - (12 * parent.height * 0.75)) / 13
- anchors.rightMargin: (parent.width - (12 * parent.height * 0.75)) / 13
+ anchors.leftMargin: (parent.width - (14 * parent.height * 0.75)) / 15
+ anchors.rightMargin: (parent.width - (14 * parent.height * 0.75)) / 15
Rectangle {
width: height
@@ -169,6 +169,25 @@ ApplicationWindow {
border.color: "grey"
Image {
+ source: valueSource.startUp ? './images/AGL_Icons_Battery_red.svg' : './images/AGL_Icons_Battery.svg'
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.horizontalCenter: parent.horizontalCenter
+ width: height
+ height: parent.height * 0.75
+ fillMode: Image.PreserveAspectFit
+ }
+ }
+
+ Rectangle {
+ width: height
+ height: parent.height
+ radius: height / 5
+
+ color: "black"
+ border.width: 2
+ border.color: "grey"
+
+ Image {
source: valueSource.startUp ? './images/AGL_Icons_ABS_red.svg' : './images/AGL_Icons_ABS.svg'
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
@@ -188,7 +207,7 @@ ApplicationWindow {
border.color: "grey"
Image {
- source: valueSource.startUp ? './images/AGL_Icons_Battery_red.svg' : './images/AGL_Icons_Battery.svg'
+ source: valueSource.startUp ? './images/AGL_Icons_ParkingBrake_red.svg' : './images/AGL_Icons_ParkingBrake.svg'
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
width: height
@@ -307,7 +326,26 @@ ApplicationWindow {
border.color: "grey"
Image {
- source: valueSource.startUp ? './images/AGL_Icons_ParkingBrake_red.svg' : './images/AGL_Icons_ParkingBrake.svg'
+ source: valueSource.cruiseEnabled ? (valueSource.cruiseSet ? './images/AGL_Icons_CruiseControl_green.svg' : './images/AGL_Icons_CruiseControl_yellow.svg') : './images/AGL_Icons_CruiseControl.svg'
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.horizontalCenter: parent.horizontalCenter
+ width: height
+ height: parent.height * 0.75
+ fillMode: Image.PreserveAspectFit
+ }
+ }
+
+ Rectangle {
+ width: height
+ height: parent.height
+ radius: height / 5
+
+ color: "black"
+ border.width: 2
+ border.color: "grey"
+
+ Image {
+ source: valueSource.laneDepartureWarnEnabled ? './images/AGL_Icons_LaneDeparture_green.svg' : './images/AGL_Icons_LaneDeparture.svg'
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
width: height