Merge pull request #80 from hpeter2/nofpl_color

Departure Label background_color goes over nosid_color #57
pierr3 · Sep 14, 2020 · 61f873f · 61f873f
2 parents 6413abc + 27e45c2
commit 61f873f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/vSMR/InsetWindow.cpp b/vSMR/InsetWindow.cpp
@@ -515,13 +515,12 @@ void CInsetWindow::render(HDC hDC, CSMRRadar * radar_screen, Graphics* gdi, POIN
 				definedBackgroundColor = radar_screen->CurrentConfig->getSidColor(TagReplacingMap["sid"], radar_screen->getActiveAirport());
 			}
 
-			if (fp.GetFlightPlanData().GetPlanType() == "I" && TagReplacingMap["asid"].empty() && LabelsSettings[Utils::getEnumString(ColorTagType).c_str()].HasMember("nosid_color")) {
+			if (fp.GetFlightPlanData().GetPlanType()[0] == 'I' && TagReplacingMap["asid"].empty() && LabelsSettings[Utils::getEnumString(ColorTagType).c_str()].HasMember("nosid_color")) {
 				definedBackgroundColor = radar_screen->CurrentConfig->getConfigColor(LabelsSettings[Utils::getEnumString(ColorTagType).c_str()]["nosid_color"]);
 			}
-
+		}
 			if (TagReplacingMap["actype"] == "NoFPL" && LabelsSettings[Utils::getEnumString(ColorTagType).c_str()].HasMember("nofpl_color")) {
 				definedBackgroundColor = radar_screen->CurrentConfig->getConfigColor(LabelsSettings[Utils::getEnumString(ColorTagType).c_str()]["nofpl_color"]);
-			}
 		}
 
 		Color TagBackgroundColor = radar_screen->RimcasInstance->GetAircraftColor(rt.GetCallsign(),

diff --git a/vSMR/SMRRadar.cpp b/vSMR/SMRRadar.cpp
@@ -2175,14 +2175,12 @@ void CSMRRadar::OnRefresh(HDC hDC, int Phase)
 			if (!TagReplacingMap["asid"].empty() && CurrentConfig->isSidColorAvail(TagReplacingMap["asid"], getActiveAirport())) {
 				definedBackgroundColor = CurrentConfig->getSidColor(TagReplacingMap["asid"], getActiveAirport());
 			}
-
-			if (fp.GetFlightPlanData().GetPlanType() == "I" && TagReplacingMap["asid"].empty() && LabelsSettings[Utils::getEnumString(ColorTagType).c_str()].HasMember("nosid_color")) {
+			if (fp.GetFlightPlanData().GetPlanType()[0] == 'I' && TagReplacingMap["asid"].empty() && LabelsSettings[Utils::getEnumString(ColorTagType).c_str()].HasMember("nosid_color")) {
 				definedBackgroundColor = CurrentConfig->getConfigColor(LabelsSettings[Utils::getEnumString(ColorTagType).c_str()]["nosid_color"]);
 			}
-
+		}
 			if (TagReplacingMap["actype"] == "NoFPL" && LabelsSettings[Utils::getEnumString(ColorTagType).c_str()].HasMember("nofpl_color")) {
 				definedBackgroundColor = CurrentConfig->getConfigColor(LabelsSettings[Utils::getEnumString(ColorTagType).c_str()]["nofpl_color"]);
-			}
 		}
 
 		Color TagBackgroundColor = RimcasInstance->GetAircraftColor(rt.GetCallsign(),

diff --git a/vSMR/vSMR_Profiles.json b/vSMR/vSMR_Profiles.json
@@ -71,12 +71,6 @@
                 "b": 200,
                 "a": 255
             },
-            "nofpl_color": {
-                "r": 170,
-                "g": 50,
-                "b": 50,
-                "a": 255
-            },
             "nosid_color": {
                 "r": 104,
                 "g": 50,
@@ -157,6 +151,12 @@
                 "r": 255,
                 "g": 255,
                 "b": 255
+            },
+            "nofpl_color": {
+               "r": 170,
+               "g": 50,
+               "b": 50,
+               "a": 255
             }
         }
     },