Skip to content

Commit

Permalink
🚧 [feat/scania-next-gen] #78 prepare menu for scania next gen
Browse files Browse the repository at this point in the history 
Signed-off-by: JAGFx <[email protected]>
  • Loading branch information
@JAGFx
JAGFx committed Apr 10, 2022
1 parent 8b87593 commit 75a712c
Show file tree
Hide file tree
Showing 15 changed files with 104 additions and 82 deletions.
Binary file added public/img/dashboard/scania-next-gen/menu-area.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/img/dashboard/scania-next-gen/menu-on.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/img/dashboard/scania-next-gen/scania-next-gen-background-debug.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/img/dashboard/scania-next-gen/scania-next-gen-background.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/skins/scania-next-gen-background.psd
View file
Binary file not shown.
Binary file added resources/skins/scania-next-gen-menu.psd
View file
Binary file not shown.
29 changes: 17 additions & 12 deletions src/assets/scss/dashboard/_scania-next-gen.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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%;
Expand All @@ -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;
}
}
5 changes: 4 additions & 1 deletion src/assets/scss/dashboard/scania-next-gen/_ad-blue-bar.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
43 changes: 23 additions & 20 deletions src/assets/scss/dashboard/scania-next-gen/_gauge-display.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,67 +11,70 @@
.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";
font-weight: normal;
}

&.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; }
}
}
}
15 changes: 15 additions & 0 deletions src/assets/scss/dashboard/scania-next-gen/_menu.scss
View file
Original file line number Diff line number Diff line change
@@ -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");
}
}
8 changes: 4 additions & 4 deletions src/assets/scss/dashboard/scania-next-gen/_symbols.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
}
}

Expand Down
4 changes: 3 additions & 1 deletion src/components/dashboards/scania-next-gen/ScaniaNextGenAdBlueBar.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
>
<i class="icon-scania-ad-blue-low_yellow mr-2"></i>
<div class="adblue-bars w-100">
<div class="labels d-flex justify-content-between align-items-center">
<div
class="labels d-flex justify-content-between align-items-center mb-1"
>
<span>0</span>
<span>1/2</span>
<span>1</span>
Expand Down
67 changes: 33 additions & 34 deletions src/components/dashboards/scania-next-gen/ScaniaNextGenDashboard.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,40 +9,39 @@
height: dashProps.skinData.size.height + 'px'
}"
>
<!-- <ScaniaNextGenGauges />-->
<!-- <ScaniaNextGenGaugeDisplay class="left">-->
<!-- <div-->
<!-- class="speed d-flex w-100 justify-content-end align-items-end mb-2"-->
<!-- >-->
<!-- <span class="value">{{ telemetry2.truck.speed.toFixed(0) }}</span>-->
<!-- <span class="unit">{{ $unitReadable('unit_speed') }}</span>-->
<!-- </div>-->
<!-- <div class="line d-flex w-100 justify-content-end align-items-end mb-2">-->
<!-- <span class="value">{{ telemetry2.truck.odometer.toFixed(0) }}</span>-->
<!-- <span class="unit">{{ $unitReadable('unit_length', 'km') }}</span>-->
<!-- </div>-->
<!-- <div class="line d-flex w-100 justify-content-between align-items-end">-->
<!-- <span class="trip-label">Trip</span>-->
<!-- <div class="d-flex justify-content-end align-items-end">-->
<!-- <span class="value">-</span>-->
<!-- <span class="unit">{{ $unitReadable('unit_length', 'km') }}</span>-->
<!-- </div>-->
<!-- </div>-->
<!-- </ScaniaNextGenGaugeDisplay>-->
<!-- <ScaniaNextGenGaugeDisplay class="right">-->
<!-- <div-->
<!-- class="hour d-flex w-100 justify-content-center align-items-end mb-2"-->
<!-- >-->
<!-- <span class="value">22:35</span>-->
<!-- </div>-->
<!-- <div-->
<!-- class="exterior-temperature d-flex w-100 justify-content-end align-items-end mb-2"-->
<!-- >-->
<!-- <span class="value">-</span>-->
<!-- <span class="unit">{{ $unitReadable('unit_degrees') }}</span>-->
<!-- </div>-->
<!-- <ScaniaNextGenAdBlueBar />-->
<!-- </ScaniaNextGenGaugeDisplay>-->
<ScaniaNextGenGauges />
<div class="menu on">Plop</div>
<ScaniaNextGenGaugeDisplay class="left">
<div
class="speed d-flex w-100 justify-content-end align-items-end mb-1"
>
<span class="value">{{ telemetry2.truck.speed.toFixed(0) }}</span>
<span class="unit">{{ $unitReadable('unit_speed') }}</span>
</div>
<div class="line d-flex w-100 justify-content-end align-items-end">
<span class="value">{{ telemetry2.truck.odometer.toFixed(0) }}</span>
<span class="unit">{{ $unitReadable('unit_length', 'km') }}</span>
</div>
<div class="line d-flex w-100 justify-content-between align-items-end">
<span class="trip-label">Trip</span>
<div class="d-flex justify-content-end align-items-end">
<span class="value">-</span>
<span class="unit">{{ $unitReadable('unit_length', 'km') }}</span>
</div>
</div>
</ScaniaNextGenGaugeDisplay>
<ScaniaNextGenGaugeDisplay class="right">
<div class="hour d-flex w-100 justify-content-center align-items-end">
<span class="value">22:35</span>
</div>
<div
class="exterior-temperature d-flex w-100 justify-content-end align-items-end"
>
<span class="value">0</span>
<span class="unit">{{ $unitReadable('unit_degrees') }}</span>
</div>
<ScaniaNextGenAdBlueBar class="mt-2" />
</ScaniaNextGenGaugeDisplay>
<!-- <Bars-->
<!-- class="fuel-gauge"-->
<!-- :level="telemetry2.truck.fuelLevel"-->
Expand Down
8 changes: 4 additions & 4 deletions src/components/dashboards/scania-next-gen/gauges/ScaniaNextGenGauges.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}"
/>
<Cadran
Expand All @@ -18,8 +18,8 @@
value: telemetry2.truck.rpm,
min: 300,
max: 2700,
minAngle: -117.7,
maxAngle: 118
minAngle: -115,
maxAngle: 113.6
}"
/>
</div>
Expand Down
7 changes: 1 addition & 6 deletions src/components/dashboards/scania-next-gen/symbols/ScaniaNextGenGeneralWarningSymbols.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,7 @@
/>
</div>
<div class="symbol"></div>
<div class="symbol red">
<i
v-if="telemetry2.truck.ignitionStart"
class="icon-scania-driver-safty-belt_red"
/>
</div>
<div class="symbol"></div>
<div class="symbol"></div>
</div>
</div>
Expand Down

0 comments on commit 75a712c

Please sign in to comment.