From 6a2c2b12b30bd3cfd32d181dd93501f44080b423 Mon Sep 17 00:00:00 2001 From: BravoMike99 <119708186+BravoMike99@users.noreply.github.com> Date: Sun, 26 Jan 2025 21:06:35 +0000 Subject: [PATCH] chore: change imports & styles to widgets --- .../FMS/POSITION/MfdFmsPositionMonitor.tsx | 377 ++++++++++-------- .../src/MFD/pages/common/style.scss | 2 - .../src/MFD/pages/common/widget-style.scss | 6 + 3 files changed, 211 insertions(+), 174 deletions(-) diff --git a/fbw-a380x/src/systems/instruments/src/MFD/pages/FMS/POSITION/MfdFmsPositionMonitor.tsx b/fbw-a380x/src/systems/instruments/src/MFD/pages/FMS/POSITION/MfdFmsPositionMonitor.tsx index 44d03326960..bccad10f67f 100644 --- a/fbw-a380x/src/systems/instruments/src/MFD/pages/FMS/POSITION/MfdFmsPositionMonitor.tsx +++ b/fbw-a380x/src/systems/instruments/src/MFD/pages/FMS/POSITION/MfdFmsPositionMonitor.tsx @@ -5,14 +5,14 @@ import { FmsPage } from '../../common/FmsPage'; import { Arinc429Register, coordinateToString, Fix } from '@flybywiresim/fbw-sdk'; import { Coordinates } from '@fmgc/flightplanning/data/geo'; import { Footer } from '../../common/Footer'; -import { InputField } from '../../common/InputField'; import { RnpFormat, WaypointFormat } from '../../common/DataEntryFormats'; import './MfdFmsPositionMonitor.scss'; import { distanceTo } from 'msfs-geo'; -import { Button } from '../../common/Button'; import { WaypointEntryUtils } from '@fmgc/flightplanning/WaypointEntryUtils'; import { FmsErrorType } from '@fmgc/FmsError'; import { getEtaFromUtcOrPresent } from 'instruments/src/MFD/shared/utils'; +import { Button } from 'instruments/src/MsfsAvionicsCommon/UiWidgets/Button'; +import { InputField } from 'instruments/src/MsfsAvionicsCommon/UiWidgets/InputField'; interface MfdFmsPositionMonitorPageProps extends AbstractMfdPageProps {} @@ -65,17 +65,17 @@ export class MfdFmsPositionMonitor extends FmsPage v? 'UNFREEZE' : 'FREEZE'); + private readonly positionFrozenLabel = this.positionFrozen.map((v) => (v ? 'UNFREEZE' : 'FREEZE')); private readonly positionFrozenText = Subject.create(''); private readonly positionFrozenTimeText = Subject.create(''); - private readonly gpsCoordinates: Coordinates = {lat : 0, long: 0} + private readonly gpsCoordinates: Coordinates = { lat: 0, long: 0 }; private readonly gpsPositionText = Subject.create(''); - private monitorWaypoint : Fix | null = null; + private monitorWaypoint: Fix | null = null; private readonly waypointIdent = Subject.create(''); @@ -90,10 +90,10 @@ export class MfdFmsPositionMonitor extends FmsPage(); this.monitorWaypoint = this.props.mfd.positionMonitorFix; - if(this.monitorWaypoint) { + if (this.monitorWaypoint) { this.waypointIdent.set(this.monitorWaypoint.ident); this.waypointEntered.set(true); } @@ -116,18 +116,43 @@ export class MfdFmsPositionMonitor extends FmsPage 9999 ? 0 : 1; this.distanceToWaypoint.set(distanceToWaypointNm.toFixed(distDigits).padStart(6)); - this.bearingToWaypoint.set(A32NX_Util.trueToMagnetic(Avionics.Utils.computeGreatCircleHeading(fmCoordinates, this.monitorWaypoint.location)).toFixed(0).padStart(3,"0")); + this.bearingToWaypoint.set( + A32NX_Util.trueToMagnetic( + Avionics.Utils.computeGreatCircleHeading(fmCoordinates, this.monitorWaypoint.location), + ) + .toFixed(0) + .padStart(3, '0'), + ); } else { this.distanceToWaypoint.set('----.-'); this.bearingToWaypoint.set('---'); } - } private fillIrData( - irIndex : number, + irIndex: number, latitude: Arinc429Register, longitude: Arinc429Register, coordinates: Coordinates, - fmPosition : Coordinates | null, - irPositionSubject : Subject, - irFmPositionDeviationSubject : Subject + fmPosition: Coordinates | null, + irPositionSubject: Subject, + irFmPositionDeviationSubject: Subject, ): void { - latitude.setFromSimVar(`L:A32NX_ADIRS_IR_${irIndex}_LATITUDE`); - longitude.setFromSimVar(`L:A32NX_ADIRS_IR_${irIndex}_LONGITUDE`) + longitude.setFromSimVar(`L:A32NX_ADIRS_IR_${irIndex}_LONGITUDE`); if ( !latitude.isNormalOperation() || latitude.isNoComputedData() || @@ -172,21 +201,21 @@ export class MfdFmsPositionMonitor extends FmsPage -
+
ACCURACY {this.fmsAccuracy}
-
+
EPU @@ -214,7 +243,7 @@ export class MfdFmsPositionMonitor extends FmsPage GPS PRIMARY
-
+
RNP dataEntryFormat={new RnpFormat()} @@ -231,183 +260,187 @@ export class MfdFmsPositionMonitor extends FmsPage
-
-
- {this.onSideFms} - {this.fmPosition} -
-
-
- {this.positionFrozenText} -
-
-
- RADIO - {this.noPositionImplemented} -
-
-
-
-
- MIXIRS - {this.noPositionImplemented} -
-
- GPIRS - {this.noPositionImplemented} +
+
+ {this.onSideFms} + {this.fmPosition} +
+
+ {this.positionFrozenText}
-
-
{this.positionFrozenTimeText}
-
, - )} - onClick={() => this.togglePositonFrozen()} - selected={this.positionFrozen} - buttonStyle="width: 172px; margin-right:44px" - /> +
+
+ RADIO + {this.noPositionImplemented} +
-
- -
-
- {this.offSideFms} - {this.fmPosition} +
+
+
+ MIXIRS + {this.noPositionImplemented} +
+
+ GPIRS + {this.noPositionImplemented} +
+
+
+
+ {this.positionFrozenTimeText} +
+
, + )} + onClick={() => this.togglePositonFrozen()} + selected={this.positionFrozen} + buttonStyle="width: 172px; margin-right:44px" + /> +
-
-
- - DEVIATION FROM {this.onSideFms} - -
-
+ +
- IRS1 - {this.ir1Position} + {this.offSideFms} + {this.fmPosition}
-
- {this.ir1PositionDeviation} - NM +
+
+ DEVIATION FROM {this.onSideFms}
+
+
+ IRS1 + {this.ir1Position} +
+
+ {this.ir1PositionDeviation} + NM +
-
- IRS2 - {this.ir2Position} -
-
- {this.ir2PositionDeviation} - NM -
+
+ IRS2 + {this.ir2Position} +
+
+ {this.ir2PositionDeviation} + NM +
-
- IRS3 - {this.ir3Position} -
-
- {this.ir3PositionDeviation} - NM -
+
+ IRS3 + {this.ir3Position} +
+
+ {this.ir3PositionDeviation} + NM +
- GPS1 - {this.gpsPositionText} + GPS1 + {this.gpsPositionText}
- GPS2 - {this.gpsPositionText} + GPS2 + {this.gpsPositionText}
-
-
{/* fill space vertically */} -
-
- ) + ); } } diff --git a/fbw-a380x/src/systems/instruments/src/MFD/pages/common/style.scss b/fbw-a380x/src/systems/instruments/src/MFD/pages/common/style.scss index 93332ba25a8..5e5990d0587 100644 --- a/fbw-a380x/src/systems/instruments/src/MFD/pages/common/style.scss +++ b/fbw-a380x/src/systems/instruments/src/MFD/pages/common/style.scss @@ -125,8 +125,6 @@ flex-direction: column; } - - .aic { align-items: center; } diff --git a/fbw-a380x/src/systems/instruments/src/MFD/pages/common/widget-style.scss b/fbw-a380x/src/systems/instruments/src/MFD/pages/common/widget-style.scss index ea72f521f6c..432ee48f16b 100644 --- a/fbw-a380x/src/systems/instruments/src/MFD/pages/common/widget-style.scss +++ b/fbw-a380x/src/systems/instruments/src/MFD/pages/common/widget-style.scss @@ -4,6 +4,7 @@ font-size: 20px; color: $display-white; font-family: "FBW-Display-EIS-A380-SlashedZero", monospace; + white-space: pre; } .mfd-label.green { @@ -29,6 +30,7 @@ .mfd-label-unit { color: $display-dark-blue; font-size: 20px; + white-space: pre; } .mfd-value { @@ -252,6 +254,10 @@ flex-direction: column; } +.mfd-spacing-right-small { + margin-right: 10px; +} + .mfd-spacing-right { margin-right: 15px; }