Minor refactoring of tracked flightplans

Removed deleted pch header import from IASSureTest.cpp
MorpheusXAUT · Aug 2, 2022 · 7456835 · 7456835
1 parent 2fa283a
commit 7456835
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/IASsure/IASsure.cpp b/IASsure/IASsure.cpp
@@ -176,6 +176,7 @@ bool IASsure::IASsure::OnCompileCommand(const char* sCommandLine)
 			this->LogMessage("Resetting plugin state", "Config");
 
 			this->reportedIAS.clear();
+			this->calculatedIASToggled.clear();
 			return true;
 		}
 	}
@@ -278,11 +279,12 @@ void IASsure::IASsure::ClearReportedIAS(const EuroScopePlugIn::CFlightPlan& fp)
 
 void IASsure::IASsure::ToggleCalculatedIAS(const EuroScopePlugIn::CFlightPlan& fp)
 {
-	if (this->calculatedIASToggled.contains(fp.GetCallsign())) {
-		this->calculatedIASToggled.erase(fp.GetCallsign());
+	std::string cs = fp.GetCallsign();
+	if (this->calculatedIASToggled.contains(cs)) {
+		this->calculatedIASToggled.erase(cs);
 	}
 	else {
-		this->calculatedIASToggled.insert({ fp.GetCallsign(), true });
+		this->calculatedIASToggled.insert(cs);
 	}
 }
 

diff --git a/IASsure/IASsure.h b/IASsure/IASsure.h
@@ -2,9 +2,10 @@
 
 #include <cmath>
 #include <iomanip>
-#include <map>
 #include <string>
 #include <sstream>
+#include <unordered_map>
+#include <unordered_set>
 #include <vector>
 #include <windows.h>
 
@@ -29,8 +30,8 @@ namespace IASsure {
 		int minReportedIAS;
 		int maxReportedIAS;
 		int intervalReportedIAS;
-		std::map<std::string, int> reportedIAS;
-		std::map<std::string, bool> calculatedIASToggled;
+		std::unordered_map<std::string, int> reportedIAS;
+		std::unordered_set<std::string> calculatedIASToggled;
 
 		void RegisterTagItems();
 

diff --git a/IASsureTest/IASsureTest.cpp b/IASsureTest/IASsureTest.cpp
@@ -1,4 +1,3 @@
-#include "pch.h"
 #include "CppUnitTest.h"
 
 #include "../IASsure/cas.h"