Added display of MSA diagrams on map similar to range rings set by us…

…er to map, flight plan table, airport search and navaid search context menu.

Added saving of user selected MSA diagrams.
Adjusted MSA icon display on map.
MSA now also removed in the Reset all for new flight dialog.
Added option for MSA diagram transparency and text size.
Cleanup in flight plan table and search tables context menus.
#498

littlenavmap.qrc

@@ -292,5 +292,6 @@
         <file>resources/icons/gls.svg</file>
         <file>resources/icons/enroutehold.svg</file>
         <file>resources/icons/msa.svg</file>
+        <file>resources/icons/msaoff.svg</file>
     </qresource>
 </RCC>

src/common/constants.h

@@ -136,6 +136,7 @@ const QLatin1String MAP_DETAILFACTOR("Map/DetailFactor");
 const QLatin1String MAP_DISTANCEMARKERS("Map/DistanceMarkers");
 const QLatin1String MAP_TRAFFICPATTERNS("Map/TrafficPatterns");
 const QLatin1String MAP_HOLDINGS("Map/Holdings");
+const QLatin1String MAP_AIRPORT_MSA("Map/AirportMsa");
 const QLatin1String MAP_AIRSPACES("Map/AirspaceFilter");
 const QLatin1String MAP_USERDATA("Map/Userdata");
 const QLatin1String MAP_USERDATA_UNKNOWN("Map/UserdataUnknown");

src/common/htmlinfobuilder.cpp

@@ -1772,6 +1772,9 @@ void HtmlInfoBuilder::airportMsaText(const map::MapAirportMsa& msa, atools::util
     html.row2(tr("No altitude"));
   else if(msa.altitudes.size() == 1)
     html.row2(tr("Minimum altitude:"), Unit::altFeet(msa.altitudes.at(0)));
+
+  if(msa.user)
+    html.row2(tr("Diagram added by user"), QString());
   html.tableEnd();
 
   if(verbose)

src/common/mapcolors.cpp

@@ -59,10 +59,18 @@ QColor glsTextColor(20, 20, 20);
 QPen glsCenterPen(Qt::darkGray, 1.5, Qt::DashLine);
 QColor glsSymbolColor(Qt::darkGray);
 
-QColor msaFillColor("#d0ffffff");
+QColor msaFillColor("#a0ffffff");
 QColor msaTextColor(Qt::darkGray);
 QColor msaSymbolColor(Qt::darkGray);
 
+QPen msaDiagramLinePen(QColor("#000000"), 2.);
+QColor msaDiagramNumberColor("#70000000");
+QPen msaDiagramLinePenDark(QColor("#808080"), 2.);
+QColor msaDiagramNumberColorDark("#70a0a0a0");
+
+QColor msaDiagramFillColor("#10000000");
+QColor msaDiagramFillColorDark("#10ffffff");
+
 QColor waypointSymbolColor(200, 0, 200);
 
 QColor airwayVictorColor("#969696"); // 1.
@@ -647,6 +655,13 @@ void syncColors()
   syncColorArgb(colorSettings, "MsaFillColor", msaFillColor);
   syncColor(colorSettings, "MsaSymbolColor", msaSymbolColor);
 
+  syncPen(colorSettings, "MsaDiagramLinePen", msaDiagramLinePen);
+  syncColorArgb(colorSettings, "MsaDiagramNumberColor", msaDiagramNumberColor);
+  syncPen(colorSettings, "MsaDiagramLinePenDark", msaDiagramLinePenDark);
+  syncColorArgb(colorSettings, "MsaDiagramNumberColorDark", msaDiagramNumberColorDark);
+  syncColorArgb(colorSettings, "MsaDiagramFillColor", msaDiagramFillColor);
+  syncColorArgb(colorSettings, "MsaDiagramFillColorDark", msaDiagramFillColorDark);
+
   syncColor(colorSettings, "WaypointColor", waypointSymbolColor);
   syncColor(colorSettings, "HoldingColor", holdingColor);
   colorSettings.endGroup();

src/common/mapcolors.h

@@ -79,10 +79,19 @@ extern QColor compassRoseColor;
 extern QColor compassRoseTextColor;
 extern QColor distanceColor;
 
+/* MSA symbol */
 extern QColor msaFillColor;
 extern QColor msaTextColor;
 extern QColor msaSymbolColor;
 
+/* MSA large diagram */
+extern QPen msaDiagramLinePen;
+extern QColor msaDiagramNumberColor;
+extern QPen msaDiagramLinePenDark;
+extern QColor msaDiagramNumberColorDark;
+extern QColor msaDiagramFillColor;
+extern QColor msaDiagramFillColorDark;
+
 /* Weather icon colors */
 extern QColor weatherBackgoundColor;
 extern QColor weatherWindColor;

src/common/mapflags.h

@@ -153,11 +153,12 @@ enum MapObjectQueryType
   QUERY_NONE = 0,
   QUERY_PROC_POINTS = 1 << 0, /* Procedure points */
   QUERY_PROC_MISSED_POINTS = 1 << 1, /* Missed procedure points */
-  QUERY_HOLDS = 1 << 2, /* Used defined holdings */
+  QUERY_HOLDS = 1 << 2, /* User defined holdings */
   QUERY_PATTERNS = 1 << 3, /* Traffic patterns */
   QUERY_PROCEDURES = 1 << 4, /* Procedures when querying route */
   QUERY_PROCEDURES_MISSED = 1 << 5, /* Missed procedures when querying route */
-  QUERY_RANGEMARKER = 1 << 6 /* Range rings */
+  QUERY_RANGEMARKER = 1 << 6, /* Range rings */
+  QUERY_MSA = 1 << 7 /* Airport MSA sectors */
 };
 
 Q_DECLARE_FLAGS(MapObjectQueryTypes, MapObjectQueryType);
@@ -304,7 +305,8 @@ enum MapMarkType
   MARK_MEASUREMENT = 1 << 1, /* All measurement lines */
   MARK_HOLDS = 1 << 2, /* Holdings */
   MARK_PATTERNS = 1 << 3, /* Traffic patterns */
-  MARK_ALL = MARK_RANGE_RINGS | MARK_MEASUREMENT | MARK_HOLDS | MARK_PATTERNS
+  MARK_AIRPORT_MSA = 1 << 4, /* Airport MSA */
+  MARK_ALL = MARK_RANGE_RINGS | MARK_MEASUREMENT | MARK_HOLDS | MARK_PATTERNS | MARK_AIRPORT_MSA
 };
 
 Q_DECLARE_FLAGS(MapMarkTypes, MapMarkType);