Added facility to hide plugin autoWP options in flight planner

ArduPilot · Nov 28, 2017 · c7ece1a · c7ece1a
1 parent 801d327
commit c7ece1a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 18 deletions.
diff --git a/ExtLibs/Utilities/DisplayView.cs b/ExtLibs/Utilities/DisplayView.cs
@@ -50,6 +50,7 @@ public class DisplayView
         public Boolean displayPoiMenu { get; set; }
         public Boolean displayTrackerHomeMenu { get; set; }
         public Boolean displayCheckHeightBox { get; set; }
+        public Boolean displayPluginAutoWp { get; set; }
 
         //initial setup
         public Boolean displayInstallFirmware { get; set; }
@@ -126,6 +127,7 @@ public DisplayView()
             displayPoiMenu = true;
             displayTrackerHomeMenu = true;
             displayCheckHeightBox = true;
+            displayPluginAutoWp = true;
 
             //initial setup
             displayInstallFirmware = true;
@@ -223,14 +225,15 @@ public static DisplayView Basic(this DisplayView v)
                 displayMessagesTab = true,
 
                 //flight plan
-                displayRallyPointsMenu = false,
-                displayGeoFenceMenu = false,
-                displaySplineCircleAutoWp = false,
-                displayCircleSurveyAutoWp = false,
-                displayTextAutoWp = false,
-                displayPoiMenu = false,
-                displayTrackerHomeMenu = false,
-                displayCheckHeightBox = false,
+                displayRallyPointsMenu = true,
+                displayGeoFenceMenu = true,
+                displaySplineCircleAutoWp = true,
+                displayCircleSurveyAutoWp = true,
+                displayTextAutoWp = true,
+                displayPoiMenu = true,
+                displayTrackerHomeMenu = true,
+                displayCheckHeightBox = true,
+                displayPluginAutoWp = true,
 
                 //initial setup
                 displayInstallFirmware = true,
@@ -306,6 +309,7 @@ public static DisplayView Advanced(this DisplayView v)
                 displayPoiMenu = true,
                 displayTrackerHomeMenu = true,
                 displayCheckHeightBox = true,
+                displayPluginAutoWp = true,
 
                 //initial setup
                 displayInstallFirmware = true,

diff --git a/GCSViews/FlightPlanner.cs b/GCSViews/FlightPlanner.cs
@@ -943,16 +943,7 @@ private void FlightPlanner_Load(object sender, EventArgs e)
             }
 
             Visible = true;
-
-            //hide menu items 
-            rallyPointsToolStripMenuItem.Visible = MainV2.DisplayConfiguration.displayRallyPointsMenu;
-            geoFenceToolStripMenuItem.Visible = MainV2.DisplayConfiguration.displayGeoFenceMenu;
-            createSplineCircleToolStripMenuItem.Visible = MainV2.DisplayConfiguration.displaySplineCircleAutoWp;
-            textToolStripMenuItem.Visible = MainV2.DisplayConfiguration.displayTextAutoWp;
-            createCircleSurveyToolStripMenuItem.Visible = MainV2.DisplayConfiguration.displayCircleSurveyAutoWp;
-            pOIToolStripMenuItem.Visible = MainV2.DisplayConfiguration.displayPoiMenu;
-            trackerHomeToolStripMenuItem.Visible = MainV2.DisplayConfiguration.displayTrackerHomeMenu;
-            CHK_verifyheight.Visible = MainV2.DisplayConfiguration.displayCheckHeightBox;
+            updateDisplayView();
 
             timer1.Start();
         }
@@ -968,6 +959,15 @@ public void updateDisplayView()
             pOIToolStripMenuItem.Visible = MainV2.DisplayConfiguration.displayPoiMenu;
             trackerHomeToolStripMenuItem.Visible = MainV2.DisplayConfiguration.displayTrackerHomeMenu;
             CHK_verifyheight.Visible = MainV2.DisplayConfiguration.displayCheckHeightBox;
+
+            //hide dynamically generated toolstrip items in the auto WP dropdown (these do not have name objects populated)
+            foreach (ToolStripItem item in autoWPToolStripMenuItem.DropDownItems)
+            {
+                if (item.Name.Equals(""))
+                {
+                    item.Visible = MainV2.DisplayConfiguration.displayPluginAutoWp;
+                }
+            }
         }
 
         void POI_POIModified(object sender, EventArgs e)