Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added basic tag items #23

Merged
merged 15 commits into from
Jul 4, 2024
Merged

Added basic tag items #23

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9cd07ae
Update compiler config
arthuwu Jun 29, 2024
654e649
Adjust target icon shape
arthuwu Jun 29, 2024
e96e98e
Revert "Adjust target icon shape"
arthuwu Jun 29, 2024
770a0ca
Merge branch 'dev' of https://github.com/arthuwu/HKCP into dev
arthuwu Jun 29, 2024
f65ce96
Reapply "Adjust target icon shape"
arthuwu Jun 29, 2024
6e4b881
Update AT3RadarTargetDisplay.cpp
arthuwu Jun 29, 2024
de2ad83
Added custom tag items for lines 2/3
arthuwu Jun 30, 2024
4e33e18
Misc fixes
arthuwu Jun 30, 2024
c4a2dec
Update AT3Tags.cpp
arthuwu Jul 1, 2024
e987ecc
Merge remote-tracking branch 'upstream/dev' into dev
arthuwu Jul 1, 2024
8940cb4
Merge remote-tracking branch 'upstream/dev' into dev
arthuwu Jul 2, 2024
21d86fb
Update AT3Tags.cpp
arthuwu Jul 2, 2024
729049b
Update AT3Tags.cpp
arthuwu Jul 2, 2024
3a30458
Added TopSky high speed and +, - conditions
arthuwu Jul 3, 2024
d583f42
formatting fixes
arthuwu Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
257 changes: 239 additions & 18 deletions AT3/AT3Tags.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include "AT3Tags.hpp"
#include "Constant.hpp"
#include "EuroScopePlugIn.h"
#include <string>

using namespace EuroScopePlugIn;

Expand All @@ -11,19 +12,50 @@ AT3Tags::AT3Tags() : CPlugIn(EuroScopePlugIn::COMPATIBILITY_CODE, MY_PLUGIN_NAME
RegisterTagItemType("AT3 Assigned Altitude", TAG_ITEM_AT3_ALTITUDE_ASSIGNED);
RegisterTagItemType("AT3 Track", TAG_ITEM_AT3_TRACK);
RegisterTagItemType("AT3 Assigned Heading", TAG_ITEM_AT3_HEADING_ASSIGNED);
RegisterTagItemType("AT3 Groundspeed", TAG_ITEM_AT3_SPEED);
RegisterTagItemType("AT3 Ground Speed", TAG_ITEM_AT3_SPEED);
RegisterTagItemType("AT3 Assigned Speed (IAS)", TAG_ITEM_AT3_SPEED_ASSIGNED);
RegisterTagItemType("AT3 TMA Entry Point", TAG_ITEM_AT3_TMA_ENTRY);
RegisterTagItemType("AT3 Approach Type", TAG_ITEM_AT3_APP_TYPE);
RegisterTagItemType("AT3 Route Code", TAG_ITEM_AT3_ROUTE_CODE);
RegisterTagItemType("AT3 APP/DEP Line 4", TAG_ITEM_AT3_APPDEP_LINE4);
RegisterTagItemType("AT3 AMC Line 4", TAG_ITEM_AT3_AMC_LINE4);
RegisterTagItemType("AT3 Slot", TAG_ITEM_AT3_SLOT);
RegisterTagItemType("AT3 Callsign", TAG_ITEM_AT3_CALLSIGN);
RegisterTagItemType("AT3 ATYP + WTC", TAG_ITEM_AT3_ATYPWTC);
RegisterTagItemType("AT3 VS Indicator", TAG_ITEM_AT3_VS_INDICATOR);
RegisterTagItemType("AT3 Arrival Runway", TAG_ITEM_AT3_ARRIVAL_RWY);
}


void AT3Tags::OnGetTagItem(CFlightPlan FlightPlan, CRadarTarget RadarTarget, int ItemCode, int TagData, char sItemString[16], int* pColorCode, COLORREF* pRGB, double* pFontSize)
{
if (!FlightPlan.IsValid() || !RadarTarget.IsValid()) {
return;
}

*pColorCode = TAG_COLOR_RGB_DEFINED;
switch (FlightPlan.GetState()) {
case FLIGHT_PLAN_STATE_NON_CONCERNED:
*pRGB = RGB(117, 132, 142);
break;
case FLIGHT_PLAN_STATE_NOTIFIED:
*pRGB = RGB(117, 132, 142);
break;
case FLIGHT_PLAN_STATE_COORDINATED:
*pRGB = RGB(117, 132, 142);
break;
case FLIGHT_PLAN_STATE_TRANSFER_TO_ME_INITIATED:
*pRGB = RGB(229, 214, 130);
break;
case FLIGHT_PLAN_STATE_TRANSFER_FROM_ME_INITIATED:
*pRGB = RGB(241, 246, 255);
break;
case FLIGHT_PLAN_STATE_ASSUMED:
*pRGB = RGB(241, 246, 255);
break;
case FLIGHT_PLAN_STATE_REDUNDANT:
*pRGB = RGB(229, 214, 130);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These colors shouldn't be hardcoded in the future, but I think we need to redefine all the colors as member variables anyway so can save for future release

break;
}

string tagOutput;

switch (ItemCode) {
Expand All @@ -45,15 +77,30 @@ void AT3Tags::OnGetTagItem(CFlightPlan FlightPlan, CRadarTarget RadarTarget, int
case TAG_ITEM_AT3_SPEED_ASSIGNED:
tagOutput = GetFormattedSpeedAssigned(FlightPlan, RadarTarget);
break;
case TAG_ITEM_AT3_TMA_ENTRY:
tagOutput = GetFormattedEntryPoint(FlightPlan, RadarTarget);
case TAG_ITEM_AT3_ROUTE_CODE:
tagOutput = GetRouteCode(FlightPlan, RadarTarget);
break;
case TAG_ITEM_AT3_APPDEP_LINE4:
tagOutput = GetAPPDEPLine4(FlightPlan, RadarTarget);
break;
case TAG_ITEM_AT3_APP_TYPE:
tagOutput = GetFormattedApproachType(FlightPlan, RadarTarget);
case TAG_ITEM_AT3_AMC_LINE4:
tagOutput = GetAMCLine4(FlightPlan, RadarTarget);
break;
case TAG_ITEM_AT3_SLOT:
tagOutput = GetFormattedSlot(FlightPlan, RadarTarget);
break;
case TAG_ITEM_AT3_CALLSIGN:
tagOutput = GetCallsign(FlightPlan, RadarTarget);
break;
case TAG_ITEM_AT3_ATYPWTC:
tagOutput = GetATYPWTC(FlightPlan, RadarTarget);
break;
case TAG_ITEM_AT3_VS_INDICATOR:
tagOutput = GetVSIndicator(FlightPlan, RadarTarget);
break;
case TAG_ITEM_AT3_ARRIVAL_RWY:
tagOutput = GetArrivalRwy(FlightPlan, RadarTarget);
break;
default:
tagOutput = "";
}
Expand All @@ -62,47 +109,221 @@ void AT3Tags::OnGetTagItem(CFlightPlan FlightPlan, CRadarTarget RadarTarget, int
strcpy_s(sItemString, 16, tagOutput.substr(0, 15).c_str());
}

void OnFunctionCall(int FunctionId, const char* sItemString, POINT Pt, RECT Area) {
CFlightPlan FlightPlan = AT3Tags().FlightPlanSelectASEL();
arthuwu marked this conversation as resolved.
Show resolved Hide resolved
if (!FlightPlan.IsValid()) {
return;
}

string origin = FlightPlan.GetFlightPlanData().GetOrigin();
string SID = FlightPlan.GetFlightPlanData().GetSidName();
string dest = FlightPlan.GetFlightPlanData().GetDestination();
string destRunway = FlightPlan.GetFlightPlanData().GetArrivalRwy();
string STAR = FlightPlan.GetFlightPlanData().GetStarName();

string APPMenuName = dest + destRunway + "APPs";

switch (FunctionId) {
case TAG_FUNC_APP_SEL_MENU:
AT3Tags().OpenPopupList(Area, APPMenuName.c_str(), 1);
}
}

string AT3Tags::GetFormattedAltitude(CFlightPlan& FlightPlan, CRadarTarget& RadarTarget)
{
return string();
int altitude = RadarTarget.GetPosition().GetPressureAltitude();
int transAlt = AT3Tags().GetTransitionAltitude();
arthuwu marked this conversation as resolved.
Show resolved Hide resolved
string formattedAlt;

if (altitude > transAlt) {
int flightLevel = RadarTarget.GetPosition().GetFlightLevel();
formattedAlt = to_string((flightLevel + 50) / 100); //rough rounding, +50 to force round up
if (formattedAlt.length() < 3)
{
formattedAlt.insert(0, 3 - formattedAlt.length(), '0');
}
formattedAlt.insert(0, "F");
} else {
formattedAlt = to_string((altitude + 50) / 100);
if (formattedAlt.length() < 3)
{
formattedAlt.insert(0, 3 - formattedAlt.length(), '0');
}
formattedAlt.insert(0, "A");
}

return formattedAlt;
}

string AT3Tags::GetFormattedAltitudedAssigned(CFlightPlan& FlightPlan, CRadarTarget& RadarTarget)
{
return string();
int altAssigned = FlightPlan.GetControllerAssignedData().GetClearedAltitude();
int transAlt = AT3Tags().GetTransitionAltitude();
int finalAltAssigned = FlightPlan.GetFinalAltitude();
string formattedAltAssigned;

if (altAssigned > 2) {
if (altAssigned > transAlt) {
formattedAltAssigned = to_string((altAssigned + 50) / 100);
if (to_string((RadarTarget.GetPosition().GetFlightLevel() + 50) / 100) == formattedAltAssigned) {
formattedAltAssigned = " ";
}
else if (formattedAltAssigned.length() <= 3 && formattedAltAssigned != "") {
formattedAltAssigned.insert(0, 3 - formattedAltAssigned.length(), '0');
formattedAltAssigned.insert(0, "F");
}
}
else {
formattedAltAssigned = to_string((altAssigned + 50) / 100);
if (to_string((RadarTarget.GetPosition().GetPressureAltitude() + 50) / 100) == formattedAltAssigned) {
formattedAltAssigned = " ";
}
else if (formattedAltAssigned.length() <= 3 && formattedAltAssigned != "") {
formattedAltAssigned.insert(0, 3 - formattedAltAssigned.length(), '0');
formattedAltAssigned.insert(0, "A");
}
}
}
else if (altAssigned >= 0 && altAssigned <= 2) {
switch (altAssigned) {
case 0:
formattedAltAssigned = to_string((finalAltAssigned + 50) / 100);
if (finalAltAssigned != 0 && !(to_string((RadarTarget.GetPosition().GetPressureAltitude() + 50) / 100) == formattedAltAssigned || to_string((RadarTarget.GetPosition().GetFlightLevel() + 50) / 100) == formattedAltAssigned)) {
if (formattedAltAssigned.length() <= 3 && formattedAltAssigned != "") {
formattedAltAssigned.insert(0, 3 - formattedAltAssigned.length(), '0');
}
if (finalAltAssigned > transAlt) {
formattedAltAssigned.insert(0, "F");
}
else {
formattedAltAssigned.insert(0, "A");
}
}
else {
formattedAltAssigned = " ";
}
break;
case 1:
formattedAltAssigned = "A ";
break;
case 2:
formattedAltAssigned = "V ";
break;

}
}
else {
formattedAltAssigned = "999";
}

return formattedAltAssigned;
}

string AT3Tags::GetFormattedTrack(CFlightPlan& FlightPlan, CRadarTarget& RadarTarget)
{
return string();
string track = to_string(static_cast<int>(trunc(RadarTarget.GetTrackHeading())));
if (track.length() <= 3) {
track.insert(0, 3 - track.length(), '0');
}
return track;
}

string AT3Tags::GetFormattedHeadingAssigned(CFlightPlan& FlightPlan, CRadarTarget& RadarTarget)
{
return string();
string headingAssigned = to_string(FlightPlan.GetControllerAssignedData().GetAssignedHeading());
if (headingAssigned == "0") {
headingAssigned = " ";
} else if (headingAssigned.length() <= 3) {
headingAssigned.insert(0, 3 - headingAssigned.length(), '0');
headingAssigned.insert(0, "H");
} else {
headingAssigned = "999";
}
return headingAssigned;
}

string AT3Tags::GetFormattedGroundspeed(CFlightPlan& FlightPlan, CRadarTarget& RadarTarget)
{
return string();
string groundSpeed = to_string((RadarTarget.GetGS() + 5) / 10);
if (groundSpeed.length() <= 2) {
groundSpeed.insert(0, 2 - groundSpeed.length(), '0');
}
return groundSpeed;
}

string AT3Tags::GetFormattedSpeedAssigned(CFlightPlan& FlightPlan, CRadarTarget& RadarTarget)
{
return string();
string speedAssigned;

if (FlightPlan.GetControllerAssignedData().GetAssignedMach() != 0) {
speedAssigned = to_string(FlightPlan.GetControllerAssignedData().GetAssignedMach());
if (speedAssigned.length() <= 2) {
speedAssigned.insert(0, 2 - speedAssigned.length(), '0');
speedAssigned.insert(0, "M");
}
} else if (FlightPlan.GetControllerAssignedData().GetAssignedMach() == 0 && FlightPlan.GetControllerAssignedData().GetAssignedSpeed() > 0) {
speedAssigned = to_string((FlightPlan.GetControllerAssignedData().GetAssignedSpeed() + 5) / 10);
if (speedAssigned.length() <= 2) {
speedAssigned.insert(0, 2 - speedAssigned.length(), '0');
speedAssigned.insert(0, "S");
}
}
else if (FlightPlan.GetControllerAssignedData().GetAssignedSpeed() == 0) {
speedAssigned = " ";
}
else {
speedAssigned = "999";
}
return speedAssigned;
}

string AT3Tags::GetRouteCode(CFlightPlan& FlightPlan, CRadarTarget& RadarTarget)
{
return "ABC"; //Placeholder
}

string AT3Tags::GetFormattedEntryPoint(CFlightPlan& FlightPlan, CRadarTarget& RadarTarget)
string AT3Tags::GetAPPDEPLine4(CFlightPlan& FlightPlan, CRadarTarget& RadarTarget)
{
return string();
return "APP RTE >"; //Placeholder
}

string AT3Tags::GetFormattedApproachType(CFlightPlan& FlightPlan, CRadarTarget& RadarTarget)
string AT3Tags::GetAMCLine4(CFlightPlan& FlightPlan, CRadarTarget& RadarTarget)
{
return string();
return "APP RTE >"; //Placeholder
}

string AT3Tags::GetFormattedSlot(CFlightPlan& FlightPlan, CRadarTarget& RadarTarget)
{
return string();
return "D00"; //Placeholder
}

string AT3Tags::GetCallsign(CFlightPlan& FlightPlan, CRadarTarget& RadarTarget)
{
return FlightPlan.GetCallsign();
}

string AT3Tags::GetATYPWTC(CFlightPlan& FlightPlan, CRadarTarget& RadarTarget)
{
string ATYPWTC = "";
ATYPWTC += FlightPlan.GetFlightPlanData().GetAircraftFPType();
ATYPWTC += FlightPlan.GetFlightPlanData().GetAircraftWtc();
return ATYPWTC;
}

string AT3Tags::GetVSIndicator(CFlightPlan& FlightPlan, CRadarTarget& RadarTarget)
{
string vsIndicator;
if (RadarTarget.GetVerticalSpeed() > 200) {
vsIndicator = "^";
} else if (RadarTarget.GetVerticalSpeed() < -200) {
vsIndicator = "|";
} else {
vsIndicator = " ";
}
return vsIndicator;
}

string AT3Tags::GetArrivalRwy(CFlightPlan& FlightPlan, CRadarTarget& RadarTarget)
{
return FlightPlan.GetFlightPlanData().GetArrivalRwy();
}
14 changes: 12 additions & 2 deletions AT3/AT3Tags.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,19 @@ class AT3Tags :

string GetFormattedSpeedAssigned(CFlightPlan& FlightPlan, CRadarTarget& RadarTarget);

string GetFormattedEntryPoint(CFlightPlan& FlightPlan, CRadarTarget& RadarTarget);
string GetRouteCode(CFlightPlan& FlightPlan, CRadarTarget& RadarTarget);

string GetFormattedApproachType(CFlightPlan& FlightPlan, CRadarTarget& RadarTarget);
string GetAPPDEPLine4(CFlightPlan& FlightPlan, CRadarTarget& RadarTarget);

string GetAMCLine4 (CFlightPlan& FlightPlan, CRadarTarget& RadarTarget);

string GetFormattedSlot(CFlightPlan& FlightPlan, CRadarTarget& RadarTarget);

string GetCallsign(CFlightPlan& FlightPlan, CRadarTarget& RadarTarget);

string GetATYPWTC(CFlightPlan& FlightPlan, CRadarTarget& RadarTarget);

string GetVSIndicator(CFlightPlan& FlightPlan, CRadarTarget& RadarTarget);

string GetArrivalRwy(CFlightPlan& FlightPlan, CRadarTarget& RadarTarget);
};
21 changes: 18 additions & 3 deletions Constant.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,24 @@ const int TAG_ITEM_AT3_TRACK = 12;
const int TAG_ITEM_AT3_HEADING_ASSIGNED = 13;
const int TAG_ITEM_AT3_SPEED = 14;
const int TAG_ITEM_AT3_SPEED_ASSIGNED = 15;
const int TAG_ITEM_AT3_TMA_ENTRY = 16;
const int TAG_ITEM_AT3_APP_TYPE = 17;
const int TAG_ITEM_AT3_SLOT = 18;
const int TAG_ITEM_AT3_ROUTE_CODE = 16;
const int TAG_ITEM_AT3_APPDEP_LINE4 = 17;
const int TAG_ITEM_AT3_AMC_LINE4 = 18;
const int TAG_ITEM_AT3_SLOT = 19;
const int TAG_ITEM_AT3_CALLSIGN = 20;
const int TAG_ITEM_AT3_ATYPWTC = 21;
const int TAG_ITEM_AT3_VS_INDICATOR = 22;
const int TAG_ITEM_AT3_ARRIVAL_RWY = 23;

const int TAG_FUNC_APP_SEL_MENU = 200;
const int TAG_FUNC_APP_SEL_ITEM_1 = 201;
const int TAG_FUNC_APP_SEL_ITEM_2 = 202;
const int TAG_FUNC_APP_SEL_ITEM_3 = 203;
const int TAG_FUNC_APP_SEL_ITEM_4 = 204;
const int TAG_FUNC_APP_SEL_ITEM_5 = 205;
const int TAG_FUNC_APP_SEL_ITEM_6 = 206;
const int TAG_FUNC_APP_SEL_ITEM_7 = 207;
const int TAG_FUNC_APP_SEL_ITEM_8 = 208;

const int TAG_FUNC_CHECKFP_MENU = 100;
const int TAG_FUNC_CHECKFP_CHECK = 101;
Expand Down
Loading