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.

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

v1.3.1 #44

Merged
merged 3 commits into from
Apr 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
CMAKE_MINIMUM_REQUIRED(VERSION 3.14)

PROJECT(vACDM VERSION "1.3.0")
PROJECT(vACDM VERSION "1.3.1")
SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
SET(CMAKE_CXX_STANDARD 20)
SET(CMAKE_CXX_STANDARD_REQUIRED ON)
Expand Down
11 changes: 8 additions & 3 deletions src/core/TagItems.h
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ void displayTagItem(EuroScopePlugIn::CFlightPlan FlightPlan, EuroScopePlugIn::CR
case itemType::EXOT:
if (pilot.exot.time_since_epoch().count() > 0) {
outputText << std::format("{:%M}", pilot.exot);
*pRGB = Color::colorizeExot(pilot);
*pColorCode = Color::colorizeExot(pilot);
}
break;
case itemType::ASAT:
Expand Down Expand Up @@ -120,8 +120,13 @@ void displayTagItem(EuroScopePlugIn::CFlightPlan FlightPlan, EuroScopePlugIn::CR
*pRGB = Color::colorizeCtot(pilot);
break;
case itemType::ECFMP_MEASURES:
outputText << "";
*pRGB = Color::colorizeEcfmpMeasure(pilot);
if (false == pilot.measures.empty()) {
const std::int64_t measureMinutes = pilot.measures[0].value / 60;
const std::int64_t measureSeconds = pilot.measures[0].value % 60;

outputText << std::format("{:02}:{:02}", measureMinutes, measureSeconds);
*pRGB = Color::colorizeEcfmpMeasure(pilot);
}
break;
case itemType::EVENT_BOOKING:
outputText << (pilot.hasBooking ? "B" : "");
Expand Down
2 changes: 1 addition & 1 deletion src/core/TagItemsColor.h
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ class Color {
return pluginConfig.debug;
}

static COLORREF colorizeExot(const types::Pilot &pilot) {
static int colorizeExot(const types::Pilot &pilot) {
std::ignore = pilot;
return EuroScopePlugIn::TAG_COLOR_DEFAULT;
}
Expand Down
Loading