diff --git a/public/img/dashboard/scania-next-gen/menu-area.png b/public/img/dashboard/scania-next-gen/menu-area.png new file mode 100644 index 00000000..eea8cc99 Binary files /dev/null and b/public/img/dashboard/scania-next-gen/menu-area.png differ diff --git a/public/img/dashboard/scania-next-gen/menu-on.png b/public/img/dashboard/scania-next-gen/menu-on.png new file mode 100644 index 00000000..5b4770e6 Binary files /dev/null and b/public/img/dashboard/scania-next-gen/menu-on.png differ diff --git a/public/img/dashboard/scania-next-gen/scania-next-gen-background-debug.png b/public/img/dashboard/scania-next-gen/scania-next-gen-background-debug.png new file mode 100644 index 00000000..9fa17ada Binary files /dev/null and b/public/img/dashboard/scania-next-gen/scania-next-gen-background-debug.png differ diff --git a/public/img/dashboard/scania-next-gen/scania-next-gen-background.png b/public/img/dashboard/scania-next-gen/scania-next-gen-background.png index f504512e..c5903b47 100644 Binary files a/public/img/dashboard/scania-next-gen/scania-next-gen-background.png and b/public/img/dashboard/scania-next-gen/scania-next-gen-background.png differ diff --git a/resources/skins/scania-next-gen-background.psd b/resources/skins/scania-next-gen-background.psd index 19eaa3ba..1ecdf738 100644 Binary files a/resources/skins/scania-next-gen-background.psd and b/resources/skins/scania-next-gen-background.psd differ diff --git a/resources/skins/scania-next-gen-menu.psd b/resources/skins/scania-next-gen-menu.psd new file mode 100644 index 00000000..13a48052 Binary files /dev/null and b/resources/skins/scania-next-gen-menu.psd differ diff --git a/src/assets/scss/dashboard/_scania-next-gen.scss b/src/assets/scss/dashboard/_scania-next-gen.scss index 4746fa54..20b9e8f5 100644 --- a/src/assets/scss/dashboard/_scania-next-gen.scss +++ b/src/assets/scss/dashboard/_scania-next-gen.scss @@ -7,6 +7,8 @@ @import "scania-next-gen/fuel-gauge"; @import "scania-next-gen/water-temperature-gauge"; @import "scania-next-gen/symbols"; + @import "scania-next-gen/menu"; + position: relative; &.wrapper { @@ -15,6 +17,7 @@ .dashboard { background: url("/img/dashboard/scania-next-gen/scania-next-gen-background.png") top left no-repeat; + //background: url("/img/dashboard/scania-next-gen/scania-next-gen-background-debug.png") top left no-repeat; position: absolute; transform-origin: top left; left: 50%; @@ -24,22 +27,24 @@ .truck-speed { position: fixed; background-image: url("/img/dashboard/scania-next-gen/arrow.png"); - transform: rotate(-116.3deg); - transform-origin: 50% 236px; - left: 274px; - top: 142px; - width: 40px; - height: 263px; + background-size: 1.6rem; + background-position: top center; + transform-origin: bottom center; + left: 22.4rem; + top: 13.8rem; + width: 1rem; + height: 9.4rem; } .truck-engineRpm { position: fixed; background-image: url("/img/dashboard/scania-next-gen/arrow.png"); - left: 1411px; - top: 145px; - width: 40px; - height: 263px; - transform: rotate(-117.7deg); - transform-origin: 50% 231px; + background-size: 1.6rem; + background-position: top center; + transform-origin: bottom center; + left: 67.2rem; + top: 13.8rem; + width: 1rem; + height: 9.4rem; } } \ No newline at end of file diff --git a/src/assets/scss/dashboard/scania-next-gen/_ad-blue-bar.scss b/src/assets/scss/dashboard/scania-next-gen/_ad-blue-bar.scss index 8315563d..dc7d9edd 100644 --- a/src/assets/scss/dashboard/scania-next-gen/_ad-blue-bar.scss +++ b/src/assets/scss/dashboard/scania-next-gen/_ad-blue-bar.scss @@ -10,7 +10,10 @@ .adblue{ .adblue-bars { - .labels { font-size: 1.2rem ; line-height: 1.3rem;} + .labels { + font-size: 0.7rem; + line-height: 0.7rem; + } .bar-wrapper { border-bottom: 2px solid $cWhite; diff --git a/src/assets/scss/dashboard/scania-next-gen/_gauge-display.scss b/src/assets/scss/dashboard/scania-next-gen/_gauge-display.scss index 9d5aaf46..14493801 100644 --- a/src/assets/scss/dashboard/scania-next-gen/_gauge-display.scss +++ b/src/assets/scss/dashboard/scania-next-gen/_gauge-display.scss @@ -11,9 +11,9 @@ .gauge-display { position: fixed; color: $cWhite; - width: 13.5rem; - height: 11.5rem; - top: 17.4rem; + width: 7.4rem; + height: 5.1rem; + top: 19.7rem; .value { font-family: "ww-digital"; @@ -21,57 +21,60 @@ } &.left { - left: 11.5rem; + left: 18.8rem; .speed { .value { - line-height: 4rem; - font-size: 4.3rem; + line-height: 2.3rem; + font-size: 3rem; } .unit { - font-size: 1rem; - line-height: 1.2rem; + font-size: .8rem; + line-height: .8rem; margin-left: .5rem; } } .line { .value { - font-size: 2.5rem; - line-height: 2.2rem; + line-height: 1.3rem; + font-size: 1.4rem; } .unit, .trip-label { - font-size: 1rem; - line-height: 1.2rem; + font-size: .8rem; + line-height: .8rem; margin-left: .5rem; } } } &.right { - right: 11.2rem; + right: 18.6rem; + justify-content: flex-start !important; .hour { .value { - line-height: 3rem; - font-size: 3.4rem; + line-height: 1.7rem; + font-size: 2.2rem; } } .exterior-temperature { .value { - font-size: 2.5rem; - line-height: 2.2rem; + font-size: 1.7rem; + line-height: 1.8rem; } .unit { font-size: 1rem; - line-height: 1.2rem; - margin-left: .5rem; + line-height: 1.4rem; + margin-right: .5rem; + font-family: "ww-digital"; + font-weight: normal; } } .adblue { - i { font-size: 2.5rem; } + i { font-size: 1.5rem; } } } } \ No newline at end of file diff --git a/src/assets/scss/dashboard/scania-next-gen/_menu.scss b/src/assets/scss/dashboard/scania-next-gen/_menu.scss new file mode 100644 index 00000000..6d99e025 --- /dev/null +++ b/src/assets/scss/dashboard/scania-next-gen/_menu.scss @@ -0,0 +1,15 @@ +.menu { + position: absolute; + width: 30rem; + height: 17.35rem; + left: 30.25rem; + top: 15.45rem; + + mask-image: url("/img/dashboard/scania-next-gen/menu-area.png"); + mask-size: contain; + mask-repeat: no-repeat; + + &.on { + background: url("/img/dashboard/scania-next-gen/menu-on.png"); + } +} \ No newline at end of file diff --git a/src/assets/scss/dashboard/scania-next-gen/_symbols.scss b/src/assets/scss/dashboard/scania-next-gen/_symbols.scss index 7ec9aed4..d416c914 100644 --- a/src/assets/scss/dashboard/scania-next-gen/_symbols.scss +++ b/src/assets/scss/dashboard/scania-next-gen/_symbols.scss @@ -68,11 +68,11 @@ position: absolute; //font-size: 3.6rem; - &.c2 { left: 16.5rem; top: 35.1rem; } + &.c2 { left: 16.5rem; top: 35rem; } &.c3 { left: 19.2rem; top: 35.25rem; } - &.c12 { right: 18.6rem; top: 35.1rem; } - &.c13 { right: 15.8rem; top: 34.9rem; } - &.c14 { right: 13.3rem; top: 33.6rem; } + &.c12 { right: 18.55rem; top: 35rem; } + &.c13 { right: 15.75rem; top: 34.8rem; } + &.c14 { right: 13.3rem; top: 33.5rem; } } } diff --git a/src/components/dashboards/scania-next-gen/ScaniaNextGenAdBlueBar.vue b/src/components/dashboards/scania-next-gen/ScaniaNextGenAdBlueBar.vue index 9f885dc0..10ada85f 100644 --- a/src/components/dashboards/scania-next-gen/ScaniaNextGenAdBlueBar.vue +++ b/src/components/dashboards/scania-next-gen/ScaniaNextGenAdBlueBar.vue @@ -5,7 +5,9 @@ >
-
+
0 1/2 1 diff --git a/src/components/dashboards/scania-next-gen/ScaniaNextGenDashboard.vue b/src/components/dashboards/scania-next-gen/ScaniaNextGenDashboard.vue index 550a1c47..3a561d43 100644 --- a/src/components/dashboards/scania-next-gen/ScaniaNextGenDashboard.vue +++ b/src/components/dashboards/scania-next-gen/ScaniaNextGenDashboard.vue @@ -9,40 +9,39 @@ height: dashProps.skinData.size.height + 'px' }" > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + +
+ {{ telemetry2.truck.speed.toFixed(0) }} + {{ $unitReadable('unit_speed') }} +
+
+ {{ telemetry2.truck.odometer.toFixed(0) }} + {{ $unitReadable('unit_length', 'km') }} +
+
+ Trip +
+ - + {{ $unitReadable('unit_length', 'km') }} +
+
+
+ +
+ 22:35 +
+
+ 0 + {{ $unitReadable('unit_degrees') }} +
+ +
diff --git a/src/components/dashboards/scania-next-gen/gauges/ScaniaNextGenGauges.vue b/src/components/dashboards/scania-next-gen/gauges/ScaniaNextGenGauges.vue index 3c548291..55afc7d3 100644 --- a/src/components/dashboards/scania-next-gen/gauges/ScaniaNextGenGauges.vue +++ b/src/components/dashboards/scania-next-gen/gauges/ScaniaNextGenGauges.vue @@ -7,8 +7,8 @@ value: telemetry2.truck.speed, min: $convertToUnit(2.77778, 'unit_speed'), max: $convertToUnit(36.1111, 'unit_speed'), - minAngle: -116.3, - maxAngle: 116.8 + minAngle: -114.3, + maxAngle: 114.8 }" />
diff --git a/src/components/dashboards/scania-next-gen/symbols/ScaniaNextGenGeneralWarningSymbols.vue b/src/components/dashboards/scania-next-gen/symbols/ScaniaNextGenGeneralWarningSymbols.vue index 398f91d7..ba8c6640 100644 --- a/src/components/dashboards/scania-next-gen/symbols/ScaniaNextGenGeneralWarningSymbols.vue +++ b/src/components/dashboards/scania-next-gen/symbols/ScaniaNextGenGeneralWarningSymbols.vue @@ -44,12 +44,7 @@ />
-
- -
+