Skip to content
This repository has been archived by the owner on May 16, 2024. It is now read-only.

Commit

Permalink
Added new Baro Settings popup to the G3X Touch.
Browse files Browse the repository at this point in the history 
This is activated by clicking on the baro reference value under the altimeter.
In order to bring this popup up, an ID was required to be added to the baro reference text and container rect in the shared Altimeter.js.
Input is validated against maximum and minimum pressure values of 32.01 and 27.99 respectively.
  • Loading branch information
@arron-h
arron-h committed Dec 31, 2020
1 parent 8afd49c commit 4ecedd1
Show file tree
Hide file tree
Showing 4 changed files with 281 additions and 10 deletions.
66 changes: 57 additions & 9 deletions ...s-gx/html_ui/WorkingTitle/Pages/VCockpit/Instruments/NavSystems/AS3X_Touch/AS3X_Touch.css
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
:root {
:root {
--bodyHeightScale: 1; }

@keyframes TemporaryShow {
Expand Down Expand Up @@ -1610,11 +1610,11 @@ as3x-touch-element {
top: 0%;
left: 30%;
width: 39%; }
as3x-touch-element #MFD #timeKeyboard #TK_Bksp, as3x-touch-element #MFD #timeKeyboard #SK_Bksp, as3x-touch-element #MFD #timeKeyboard #AK_Bksp, as3x-touch-element #MFD #speedKeyboard #TK_Bksp, as3x-touch-element #MFD #speedKeyboard #SK_Bksp, as3x-touch-element #MFD #speedKeyboard #AK_Bksp, as3x-touch-element #MFD #altitudeKeyboard #TK_Bksp, as3x-touch-element #MFD #altitudeKeyboard #SK_Bksp, as3x-touch-element #MFD #altitudeKeyboard #AK_Bksp {
as3x-touch-element #MFD #timeKeyboard #TK_Bksp, as3x-touch-element #MFD #timeKeyboard #SK_Bksp, as3x-touch-element #MFD #timeKeyboard #AK_Bksp, as3x-touch-element #MFD #speedKeyboard #TK_Bksp, as3x-touch-element #MFD #speedKeyboard #SK_Bksp, as3x-touch-element #MFD #speedKeyboard #AK_Bksp, as3x-touch-element #MFD #altitudeKeyboard #TK_Bksp, as3x-touch-element #MFD #altitudeKeyboard #SK_Bksp, as3x-touch-element #MFD #altitudeKeyboard #AK_Bksp, as3x-touch-element #MFD #BaroSetting #BARO_Bksp {
position: absolute;
width: 20%;
right: 5%; }
as3x-touch-element #MFD #timeKeyboard #TK_TimeDisplay, as3x-touch-element #MFD #timeKeyboard #SK_Display, as3x-touch-element #MFD #timeKeyboard #AK_Display, as3x-touch-element #MFD #speedKeyboard #TK_TimeDisplay, as3x-touch-element #MFD #speedKeyboard #SK_Display, as3x-touch-element #MFD #speedKeyboard #AK_Display, as3x-touch-element #MFD #altitudeKeyboard #TK_TimeDisplay, as3x-touch-element #MFD #altitudeKeyboard #SK_Display, as3x-touch-element #MFD #altitudeKeyboard #AK_Display {
as3x-touch-element #MFD #timeKeyboard #TK_TimeDisplay, as3x-touch-element #MFD #timeKeyboard #SK_Display, as3x-touch-element #MFD #timeKeyboard #AK_Display, as3x-touch-element #MFD #speedKeyboard #TK_TimeDisplay, as3x-touch-element #MFD #speedKeyboard #SK_Display, as3x-touch-element #MFD #speedKeyboard #AK_Display, as3x-touch-element #MFD #altitudeKeyboard #TK_TimeDisplay, as3x-touch-element #MFD #altitudeKeyboard #SK_Display, as3x-touch-element #MFD #altitudeKeyboard #AK_Display, as3x-touch-element #MFD #BaroSetting #BARO_Display {
position: absolute;
width: 30%;
left: 35%;
Expand All @@ -1624,26 +1624,26 @@ as3x-touch-element {
padding-top: 0.6vh;
text-align: center;
font-size: 4.2vh; }
as3x-touch-element #MFD #timeKeyboard #TK_TimeDisplay .Writed, as3x-touch-element #MFD #timeKeyboard #SK_Display .Writed, as3x-touch-element #MFD #timeKeyboard #AK_Display .Writed, as3x-touch-element #MFD #speedKeyboard #TK_TimeDisplay .Writed, as3x-touch-element #MFD #speedKeyboard #SK_Display .Writed, as3x-touch-element #MFD #speedKeyboard #AK_Display .Writed, as3x-touch-element #MFD #altitudeKeyboard #TK_TimeDisplay .Writed, as3x-touch-element #MFD #altitudeKeyboard #SK_Display .Writed, as3x-touch-element #MFD #altitudeKeyboard #AK_Display .Writed {
as3x-touch-element #MFD #timeKeyboard #TK_TimeDisplay .Writed, as3x-touch-element #MFD #timeKeyboard #SK_Display .Writed, as3x-touch-element #MFD #timeKeyboard #AK_Display .Writed, as3x-touch-element #MFD #speedKeyboard #TK_TimeDisplay .Writed, as3x-touch-element #MFD #speedKeyboard #SK_Display .Writed, as3x-touch-element #MFD #speedKeyboard #AK_Display .Writed, as3x-touch-element #MFD #altitudeKeyboard #TK_TimeDisplay .Writed, as3x-touch-element #MFD #altitudeKeyboard #SK_Display .Writed, as3x-touch-element #MFD #altitudeKeyboard #AK_Display .Writed, as3x-touch-element #MFD #BaroSetting #BARO_Display .Writed {
background-color: none;
color: aqua; }
as3x-touch-element #MFD #timeKeyboard #TK_TimeDisplay .ToWrite, as3x-touch-element #MFD #timeKeyboard #SK_Display .ToWrite, as3x-touch-element #MFD #timeKeyboard #AK_Display .ToWrite, as3x-touch-element #MFD #speedKeyboard #TK_TimeDisplay .ToWrite, as3x-touch-element #MFD #speedKeyboard #SK_Display .ToWrite, as3x-touch-element #MFD #speedKeyboard #AK_Display .ToWrite, as3x-touch-element #MFD #altitudeKeyboard #TK_TimeDisplay .ToWrite, as3x-touch-element #MFD #altitudeKeyboard #SK_Display .ToWrite, as3x-touch-element #MFD #altitudeKeyboard #AK_Display .ToWrite {
as3x-touch-element #MFD #timeKeyboard #TK_TimeDisplay .ToWrite, as3x-touch-element #MFD #timeKeyboard #SK_Display .ToWrite, as3x-touch-element #MFD #timeKeyboard #AK_Display .ToWrite, as3x-touch-element #MFD #speedKeyboard #TK_TimeDisplay .ToWrite, as3x-touch-element #MFD #speedKeyboard #SK_Display .ToWrite, as3x-touch-element #MFD #speedKeyboard #AK_Display .ToWrite, as3x-touch-element #MFD #altitudeKeyboard #TK_TimeDisplay .ToWrite, as3x-touch-element #MFD #altitudeKeyboard #SK_Display .ToWrite, as3x-touch-element #MFD #altitudeKeyboard #AK_Display .ToWrite, as3x-touch-element #MFD #BaroSetting #BARO_Display .ToWrite {
background-color: none;
color: dimgray; }
as3x-touch-element #MFD #timeKeyboard #TK_TimeDisplay .Writing, as3x-touch-element #MFD #timeKeyboard #SK_Display .Writing, as3x-touch-element #MFD #timeKeyboard #AK_Display .Writing, as3x-touch-element #MFD #speedKeyboard #TK_TimeDisplay .Writing, as3x-touch-element #MFD #speedKeyboard #SK_Display .Writing, as3x-touch-element #MFD #speedKeyboard #AK_Display .Writing, as3x-touch-element #MFD #altitudeKeyboard #TK_TimeDisplay .Writing, as3x-touch-element #MFD #altitudeKeyboard #SK_Display .Writing, as3x-touch-element #MFD #altitudeKeyboard #AK_Display .Writing {
as3x-touch-element #MFD #timeKeyboard #TK_TimeDisplay .Writing, as3x-touch-element #MFD #timeKeyboard #SK_Display .Writing, as3x-touch-element #MFD #timeKeyboard #AK_Display .Writing, as3x-touch-element #MFD #speedKeyboard #TK_TimeDisplay .Writing, as3x-touch-element #MFD #speedKeyboard #SK_Display .Writing, as3x-touch-element #MFD #speedKeyboard #AK_Display .Writing, as3x-touch-element #MFD #altitudeKeyboard #TK_TimeDisplay .Writing, as3x-touch-element #MFD #altitudeKeyboard #SK_Display .Writing, as3x-touch-element #MFD #altitudeKeyboard #AK_Display .Writing, as3x-touch-element #MFD #BaroSetting #BARO_Display .Writing {
animation: SelectedCharBlinkFreqEdit 1s infinite;
min-width: 0.5vw;
min-height: 3.6vh;
display: inline-block; }
as3x-touch-element #MFD #timeKeyboard #TK_TimeDisplay .Fixed, as3x-touch-element #MFD #timeKeyboard #SK_Display .Fixed, as3x-touch-element #MFD #timeKeyboard #AK_Display .Fixed, as3x-touch-element #MFD #speedKeyboard #TK_TimeDisplay .Fixed, as3x-touch-element #MFD #speedKeyboard #SK_Display .Fixed, as3x-touch-element #MFD #speedKeyboard #AK_Display .Fixed, as3x-touch-element #MFD #altitudeKeyboard #TK_TimeDisplay .Fixed, as3x-touch-element #MFD #altitudeKeyboard #SK_Display .Fixed, as3x-touch-element #MFD #altitudeKeyboard #AK_Display .Fixed {
as3x-touch-element #MFD #timeKeyboard #TK_TimeDisplay .Fixed, as3x-touch-element #MFD #timeKeyboard #SK_Display .Fixed, as3x-touch-element #MFD #timeKeyboard #AK_Display .Fixed, as3x-touch-element #MFD #speedKeyboard #TK_TimeDisplay .Fixed, as3x-touch-element #MFD #speedKeyboard #SK_Display .Fixed, as3x-touch-element #MFD #speedKeyboard #AK_Display .Fixed, as3x-touch-element #MFD #altitudeKeyboard #TK_TimeDisplay .Fixed, as3x-touch-element #MFD #altitudeKeyboard #SK_Display .Fixed, as3x-touch-element #MFD #altitudeKeyboard #AK_Display .Fixed, as3x-touch-element #MFD #BaroSetting #BARO_Display .Fixed {
background-color: aqua; }
as3x-touch-element #MFD #timeKeyboard #KeyBoard, as3x-touch-element #MFD #speedKeyboard #KeyBoard, as3x-touch-element #MFD #altitudeKeyboard #KeyBoard {
as3x-touch-element #MFD #timeKeyboard #KeyBoard, as3x-touch-element #MFD #speedKeyboard #KeyBoard, as3x-touch-element #MFD #altitudeKeyboard #KeyBoard, as3x-touch-element #MFD #BaroSetting #KeyBoard {
position: absolute;
top: 20%;
height: 60%;
width: 60%;
left: 23%; }
as3x-touch-element #MFD #timeKeyboard #KeyBoard .roundButton, as3x-touch-element #MFD #speedKeyboard #KeyBoard .roundButton, as3x-touch-element #MFD #altitudeKeyboard #KeyBoard .roundButton {
as3x-touch-element #MFD #timeKeyboard #KeyBoard .roundButton, as3x-touch-element #MFD #speedKeyboard #KeyBoard .roundButton, as3x-touch-element #MFD #altitudeKeyboard #KeyBoard .roundButton, as3x-touch-element #MFD #BaroSetting #KeyBoard .roundButton {
width: 9vh;
height: 9vh;
line-height: 9vh;
Expand All @@ -1661,6 +1661,42 @@ as3x-touch-element {
position: absolute;
bottom: 2%;
right: 2%; }

as3x-touch-element #MFD #BaroSetting .gradientButton #BARO_STD .mainText {
position: absolute;
top: 45%;
height: 12vh;
margin-top: -3vh;
font-size: 2.4vh;
}

as3x-touch-element #MFD #BaroSetting .BottomButtons .gradientButton {
position: absolute;
bottom: 2%;
width: 30%;
}

as3x-touch-element #MFD #BaroSetting .BottomButtons #BARO_Enter {
right: 2%;
}

as3x-touch-element #MFD #BaroSetting .BottomButtons #BARO_Cancel {
left: 2%;
}

as3x-touch-element #MFD #BaroSetting #BARO_STD {
position: absolute;
left: 6%;
top: 7%;
width: 20%;
}

as3x-touch-element #MFD #BaroSetting #BARO_Bksp {
position: absolute;
right: 6%;
top: 7%;
}

as3x-touch-element #MFD #fullKeyboard #Keyboard_LetterTable,
as3x-touch-element #MFD #fullKeyboard #Keyboard_NumberTable {
display: none; }
Expand Down Expand Up @@ -2161,6 +2197,18 @@ as3x-touch-element {
line-height: 3.5vh;
background: none;
vertical-align: bottom; }
as3x-touch-element .gradientButton .small-title {
position: absolute;
height: 20%;
width: 100%;
bottom: 4%;
text-align: center;
color: white;
font-size: 2.0vh;
line-height: 2.0vh;
background: none;
vertical-align: bottom;
}
as3x-touch-element .gradientButton .topText {
color: white;
text-align: left;
Expand Down
47 changes: 46 additions & 1 deletion ...-gx/html_ui/WorkingTitle/Pages/VCockpit/Instruments/NavSystems/AS3X_Touch/AS3X_Touch.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<script type="text/html" id="AS3X_Touch">
<script type="text/html" id="AS3X_Touch">
<glasscockpit-highlight id="highlight"></glasscockpit-highlight>
<div id="Mainframe">
<div id="Electricity" state="off">
Expand Down Expand Up @@ -1456,6 +1456,51 @@
</div>
</div>
</div>
<div class="popup" id="BaroSetting">
<div class="WindowTitle">Baro Setting</div>
<div class="gradientButton" id="BARO_STD">
<div class="mainText">Set Standard</div>
</div>
<div id="BARO_Display">
__.__IN
</div>
<div class="gradientButton" id="BARO_Bksp">
<img class="img" src="/Pages/VCockpit/Instruments/NavSystems/Shared/Images/TSC/Icons/ICON_MAP_BKSP.png" />
<div class="small-title">Backspace</div>
</div>
<table id="KeyBoard">
<tr>
<td> <div class="roundButton" id="BARO_1">1</div> </td>
<td> <div class="roundButton" id="BARO_2">2</div> </td>
<td> <div class="roundButton" id="BARO_3">3</div> </td>
</tr>
<tr>
<td> <div class="roundButton" id="BARO_4">4</div> </td>
<td> <div class="roundButton" id="BARO_5">5</div> </td>
<td> <div class="roundButton" id="BARO_6">6</div> </td>
</tr>
<tr>
<td> <div class="roundButton" id="BARO_7">7</div> </td>
<td> <div class="roundButton" id="BARO_8">8</div> </td>
<td> <div class="roundButton" id="BARO_9">9</div> </td>
</tr>
<tr>
<td></td>
<td> <div class="roundButton" id="BARO_0">0</div> </td>
<td></td>
</tr>
</table>
<div class="BottomButtons">
<div class="gradientButton" id="BARO_Cancel">
<img class="img" src="/Pages/VCockpit/Instruments/NavSystems/Shared/Images/TSC/Icons/ICON_MAP_BUTTONBAR_BACK_1.png" />
<div class="small-title">Cancel</div>
</div>
<div class="gradientButton" id="BARO_Enter" state="Greyed">
<img class="img" src="/Pages/VCockpit/Instruments/NavSystems/Shared/Images/TSC/Icons/ICON_MAP_ENTER.png" />
<div class="small-title">Enter</div>
</div>
</div>
</div>
<div class="popup" id="PFD_Menu">
<div class="title">PFD Options</div>
<div id="cdi_source" class="subpart">
Expand Down
Loading

0 comments on commit 4ecedd1

Please sign in to comment.