From 4fd3dd9a6471eb2338e9d8bee81f536edf3ddeca Mon Sep 17 00:00:00 2001 From: BravoMike99 <119708186+BravoMike99@users.noreply.github.com> Date: Mon, 27 Nov 2023 21:19:34 +0000 Subject: [PATCH 1/5] fix(fma): make : align to bottom in presel text --- .../src/fonts/ECAMFontRegular_Source.sfd | 54 ++++++++++++++----- .../src/systems/instruments/src/PFD/FMA.tsx | 9 ++-- 2 files changed, 47 insertions(+), 16 deletions(-) diff --git a/fbw-a32nx/src/fonts/ECAMFontRegular_Source.sfd b/fbw-a32nx/src/fonts/ECAMFontRegular_Source.sfd index 8da42327246..b9d81553789 100644 --- a/fbw-a32nx/src/fonts/ECAMFontRegular_Source.sfd +++ b/fbw-a32nx/src/fonts/ECAMFontRegular_Source.sfd @@ -22,7 +22,7 @@ OS2Version: 4 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 CreationTime: 1630565342 -ModificationTime: 1685715111 +ModificationTime: 1701114684 PfmFamily: 17 TTFWeight: 400 TTFWidth: 5 @@ -428,7 +428,7 @@ LayerCount: 2 Fore SplineSet 1267 2253 m 2,0,1 - 1267 1729 l 1,2,-1 + 1267 2253 1267 2253 1267 1729 c 1,2,-1 1638 2100 l 2,3,4 1679 2141 1679 2141 1737.5 2141 c 128,-1,5 1796 2141 1796 2141 1837.5 2099.5 c 128,-1,6 @@ -489,7 +489,7 @@ LayerCount: 2 Fore SplineSet 1070 2091 m 2,0,1 - 1070 1564 l 1,2,-1 + 1070 2091 1070 2091 1070 1564 c 1,2,-1 1597 1564 l 2,3,4 1656 1564 1656 1564 1697 1523 c 128,-1,5 1738 1482 1738 1482 1738 1423 c 128,-1,6 @@ -1186,7 +1186,7 @@ SplineSet 1739 1147 l 1,2,-1 1127 2605 l 1,0,-1 1890 129 m 2,3,4 - 1823 865 l 1,5,-1 + 1890 129 1890 129 1823 865 c 1,5,-1 431 865 l 1,6,-1 364 129 l 2,7,8 359 71 359 71 314 33.5 c 128,-1,9 @@ -1360,7 +1360,7 @@ SplineSet 1391 284 1391 284 1573 515 c 0,24,25 1667 633 1667 633 1718 815.5 c 128,-1,26 1769 998 1769 998 1769 1243 c 2,27,28 - 1769 1871 l 2,29,30 + 1769 1243 1769 1243 1769 1871 c 2,29,30 1769 2115 1769 2115 1718 2297.5 c 128,-1,31 1667 2480 1667 2480 1573 2599 c 0,32,33 1391 2830 1391 2830 1046 2830 c 2,34,-1 @@ -1450,7 +1450,7 @@ LayerCount: 2 Fore SplineSet 284 2095 m 6,0,1 - 284 1142 l 6,2,3 + 284 2095 284 2095 284 1142 c 6,2,3 284 1072 284 1072 286 1016 c 4,4,5 287 976 287 976 297 883 c 4,6,7 305 805 305 805 325 731 c 132,-1,8 @@ -1901,7 +1901,7 @@ SplineSet 804 344 804 344 902 314 c 128,-1,14 1000 284 1000 284 1109 284 c 0,15,16 1370 284 1370 284 1554 448 c 1,17,18 - 1088 906 l 2,19,20 + 1554 448 1554 448 1088 906 c 2,19,20 1046 947 1046 947 1045.5 1005.5 c 128,-1,21 1045 1064 1045 1064 1086 1106 c 128,-1,22 1127 1148 1127 1148 1186 1148.5 c 128,-1,23 @@ -2203,7 +2203,7 @@ LayerCount: 2 Fore SplineSet 2130 2964 m 2,0,1 - 1973 141 l 2,2,3 + 2130 2964 2130 2964 1973 141 c 2,2,3 1972 104 1972 104 1954 72 c 128,-1,4 1936 40 1936 40 1903 21 c 0,5,6 1864 -2 1864 -2 1820 2 c 0,7,8 @@ -2307,7 +2307,7 @@ SplineSet 2052 3029 2052 3029 2052 2971 c 2,12,-1 2052 2669 l 2,13,14 2052 2609 2052 2609 2016 2561 c 2,15,16 - 1227 1509 l 1,17,-1 + 2016 2561 2016 2561 1227 1509 c 1,17,-1 1227 142 l 2,18,19 1227 83 1227 83 1185.5 42 c 128,-1,20 1144 1 1144 1 1085.5 1 c 128,-1,21 @@ -2936,12 +2936,12 @@ EndChar StartChar: greater Encoding: 62 62 96 Width: 2568 -Flags: WO +Flags: W LayerCount: 2 Fore SplineSet 315 2829 m 6,0,1 - 1787 1667 l 6,2,3 + 315 2829 315 2829 1787 1667 c 6,2,3 1795 1661 1795 1661 1802 1654 c 4,4,5 1819 1637 1819 1637 1829 1615 c 4,6,7 1843 1585 1843 1585 1843 1555 c 4,8,9 @@ -3291,10 +3291,38 @@ EndChar StartChar: bar Encoding: 124 124 130 Width: 2568 -Flags: W +VWidth: 3780 +Flags: WO LayerCount: 2 Fore -Validated: 1 +SplineSet +473 1728 m 2,0,1 + 473 1793 473 1793 519.5 1839 c 128,-1,2 + 566 1885 566 1885 631 1885 c 2,3,-1 + 945 1885 l 2,4,5 + 1010 1885 1010 1885 1056 1839 c 128,-1,6 + 1102 1793 1102 1793 1102 1728 c 2,7,-1 + 1102 1414 l 2,8,9 + 1102 1349 1102 1349 1056 1303 c 128,-1,10 + 1010 1257 1010 1257 945 1257 c 2,11,-1 + 631 1257 l 2,12,13 + 566 1257 566 1257 519.5 1303 c 128,-1,14 + 473 1349 473 1349 473 1414 c 2,15,-1 + 473 1728 l 2,0,1 +473 471 m 2,16,17 + 473 536 473 536 519.5 582 c 128,-1,18 + 566 628 566 628 631 628 c 2,19,-1 + 945 628 l 2,20,21 + 1010 628 1010 628 1056 582 c 128,-1,22 + 1102 536 1102 536 1102 471 c 2,23,-1 + 1102 157 l 2,24,25 + 1102 92 1102 92 1056 46 c 128,-1,26 + 1010 0 1010 0 945 0 c 2,27,-1 + 631 0 l 2,28,29 + 566 0 566 0 519.5 46 c 128,-1,30 + 473 92 473 92 473 157 c 2,31,-1 + 473 471 l 2,16,17 +EndSplineSet EndChar StartChar: braceright diff --git a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx index c4be51535a0..13bcd803355 100644 --- a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx +++ b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx @@ -632,11 +632,14 @@ class AB3Cell extends DisplayComponent { private getText() { if (this.athrModeMessage === 0) { + /* use vertical bar instead of : for PRESEL text since : is not aligned to the bottom as the other fonts and the font file is used on ECAM, ND etc. + vertical bar is mapped to ":" aligned to bottom in font file + */ if (this.speedPreselVal !== -1 && this.machPreselVal === -1) { const text = Math.round(this.speedPreselVal); - this.textSub.set(`SPEED SEL ${text}`); + this.textSub.set(`SPEED SEL|${text}`); } else if (this.machPreselVal !== -1 && this.speedPreselVal === -1) { - this.textSub.set(`MACH SEL ${this.machPreselVal.toFixed(2)}`); + this.textSub.set(`MACH SEL|${this.machPreselVal.toFixed(2)}`); } else if (this.machPreselVal === -1 && this.speedPreselVal === -1) { this.textSub.set(''); } @@ -668,7 +671,7 @@ class AB3Cell extends DisplayComponent { render(): VNode { return ( - {this.textSub} + {this.textSub} ); } } From 12ec13a7c659a63fc01369f1097a8e40541fab70 Mon Sep 17 00:00:00 2001 From: BravoMike99 <119708186+BravoMike99@users.noreply.github.com> Date: Sat, 2 Dec 2023 17:08:00 +0000 Subject: [PATCH 2/5] seperate presel speed and preselt text in fma --- .../src/systems/instruments/src/PFD/FMA.tsx | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx index 13bcd803355..385d7796e75 100644 --- a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx +++ b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx @@ -630,6 +630,10 @@ class AB3Cell extends DisplayComponent { private textSub = Subject.create(''); + private text2Sub = Subject.create(''); + + private textXPosSub= Subject.create(0); + private getText() { if (this.athrModeMessage === 0) { /* use vertical bar instead of : for PRESEL text since : is not aligned to the bottom as the other fonts and the font file is used on ECAM, ND etc. @@ -637,14 +641,20 @@ class AB3Cell extends DisplayComponent { */ if (this.speedPreselVal !== -1 && this.machPreselVal === -1) { const text = Math.round(this.speedPreselVal); - this.textSub.set(`SPEED SEL|${text}`); + this.textSub.set('SPEED SEL| '); + this.text2Sub.set(`${text}`); + this.textXPosSub.set(35.434673); } else if (this.machPreselVal !== -1 && this.speedPreselVal === -1) { - this.textSub.set(`MACH SEL|${this.machPreselVal.toFixed(2)}`); + this.textSub.set('MACH SEL| '); + this.text2Sub.set(`${this.machPreselVal.toFixed(2)}`); + this.textXPosSub.set(33.834673); } else if (this.machPreselVal === -1 && this.speedPreselVal === -1) { this.textSub.set(''); + this.text2Sub.set(''); } } else { this.textSub.set(''); + this.text2Sub.set(''); } } @@ -671,7 +681,11 @@ class AB3Cell extends DisplayComponent { render(): VNode { return ( - {this.textSub} + + {this.textSub} + {this.text2Sub} + + ); } } From 7d59d05869de714c6bc9d6d13af58f01cc4da072 Mon Sep 17 00:00:00 2001 From: BravoMike99 <119708186+BravoMike99@users.noreply.github.com> Date: Mon, 4 Dec 2023 19:25:49 +0000 Subject: [PATCH 3/5] Update ECAMFontRegular.ttf --- .../Fonts/fbw-a32nx/ECAMFontRegular.ttf | Bin 14056 -> 13400 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/fbw-a32nx/src/base/flybywire-aircraft-a320-neo/html_ui/Fonts/fbw-a32nx/ECAMFontRegular.ttf b/fbw-a32nx/src/base/flybywire-aircraft-a320-neo/html_ui/Fonts/fbw-a32nx/ECAMFontRegular.ttf index a206331f0b6231840f0783f63ed1dff290a8c81e..2f1dbd0203205dc8fecd1deffdb83f734a487adb 100644 GIT binary patch delta 1171 zcmaEndn2QsfsuiMfsdhqftew}%`L=t-uB5p3=AeVKv5ZY7gsk1b;hMYz6g-7<{zwY z)UjagYX%0!3?M%tIXAH&{&lky0|Uzi1_q|I#6fhoRSO}E&0IFBWOUzAuz3Ff}1B1pE zpo97f@{3EhNhBvSFlf5~?LP+gEYQOuc~=(2^V@u7kQWjF>SJKI8>SKmq91lG-m_VN zaStOCvBwdK~CW5MYG! z7#Wyu-@bkB_I9v7uq24sEWt6IseTjNJ9Z!TUF<(N)HotI{&DJYMscp;e8k1T<-k?I zb%dLRJBNE0PZ&=H&o-WSyjHv|yxVx6kqY^;FyI_MFsz4AG$fDk;e++~BD54^QB}r_equTb1>cnW>`P=*vV#+YLkCRNJ+3A zaEys@{C5mQ{s}~|H~-V@W#s2)oCr1`WoAo8M_q rU=&~oOD!tS%+FIWFfi0JFff=rQP+9%Ro(v_BKNPIHU#Af%at{QnM(k_^2Nf~|1KlP8yG}GmK=gc|J^PKN} zzUQ2o_e8KO6h;6$k7Htn-#>N2+LpyVklUu%)bYMNKbf*c;W~wf7fiWrWc9{|OCUjo zXB343<)a#oJ_d2eAbxVuyh<0A_HC)!38H3kn|slewgxVJsCZl9#R71T0c}NjSw-dUl%fE5jw}Dx{;(==hq65vMeZG07B+j50Nf&y=r>Vjn4$IFoWlClL)z=4aGqY|l8T0;=`r zb2J)lkM2=B^cdg2#He@gGp@yt4L`|KJk3HDv6yO>@C-|NmgiW;^DJitFJQ2e7g@z> z*07eBc$syqX9G2CR5>@XnL4)c3a|1STdC)Dw$VT%+j)aG*+GPz>|!^2XyPsQ@;1%9 z!#?)&F7JhD;e9^f0IeM45Fc`wBeZdpc0S@59em6u9OqL$<8w~%1t*Deiqo9oOFH?A zvz+5R7xE<#&afKePa*dz)h3oY4E5C7r-{})X6EPlf-(duE zd}-p7Jn_qT$(K9jF1cIokqI(U3S^QL%4C@$Q;lVw6ruB02G^weU`Jcf!Pk z=7iqFti<~*SiF`8ERB})x~7lQ=jyFV=A_c3X6t>{1=c2Ow{5g-k*&$r^>@o&ax{r`X>dL87%FFJv-0gl1F3nBhI3@EUAk;oV{F9T`;Y9ZpECkQkT~|;#RNM hs~A7yxEGJnk)39E+$o!VZp+|k+uqXH2>I)L`UB^3v}FJQ From bcdbbfa0055decf641a4b2f6175338accc5ff17b Mon Sep 17 00:00:00 2001 From: BravoMike99 <119708186+BravoMike99@users.noreply.github.com> Date: Thu, 7 Dec 2023 23:17:57 +0000 Subject: [PATCH 4/5] update changelog --- .github/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index 4e48e7bdabb..2145b92c155 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -21,6 +21,7 @@ 1. [HOPPIE] Remove ATSU/AOC source checks - @auroraisluna (alepouna) 1. [PFD] Graphical improvements and updates to the FMA - @BravoMike99 (bruno_pt99) 1. [PFD] Hide '+' sign on V/S & FPA FMA if selected value is 0 - @BravoMike99 (bruno_pt99) +1. [PFD] Improve FMA preselect speed & mach text @aaronschweig(aaronschweig) @BravoMike99 (bruno_pt99) ## 0.11.0 From 6f11b8e24dcff81bd320bb23064463a8c17d2730 Mon Sep 17 00:00:00 2001 From: BravoMike99 <119708186+BravoMike99@users.noreply.github.com> Date: Sat, 16 Dec 2023 15:57:38 +0000 Subject: [PATCH 5/5] formatting fixes Co-authored-by: Michael Corcoran --- fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx index 385d7796e75..f1dc3a9e4d7 100644 --- a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx +++ b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx @@ -632,7 +632,7 @@ class AB3Cell extends DisplayComponent { private text2Sub = Subject.create(''); - private textXPosSub= Subject.create(0); + private textXPosSub = Subject.create(0); private getText() { if (this.athrModeMessage === 0) {