From 441cbe953dc9358596f9b616de2f86ecd0510038 Mon Sep 17 00:00:00 2001 From: xu Date: Wed, 22 Apr 2020 02:37:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E5=8C=BA?= =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E7=82=B9=E5=87=BB=EF=BC=8C=E6=88=96=E5=8F=8C?= =?UTF-8?q?=E5=87=BB=EF=BC=8C=E5=8F=B3=E9=94=AE=E4=B9=B1=E7=82=B9=E5=AE=B9?= =?UTF-8?q?=E6=98=93=E5=BC=82=E5=B8=B8=E9=80=80=E5=87=BAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/MapView_CopterDrawing.cs | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/Plane.FormationCreator/Views/MapView_CopterDrawing.cs b/Plane.FormationCreator/Views/MapView_CopterDrawing.cs index 9a5824b..7f4638e 100644 --- a/Plane.FormationCreator/Views/MapView_CopterDrawing.cs +++ b/Plane.FormationCreator/Views/MapView_CopterDrawing.cs @@ -718,11 +718,17 @@ namespace Plane.FormationCreator.Views var wpIndex = taskIndex - 1; // Waypoints 中没有起飞点。 if (wpIndex >= 0 && wpIndex < Waypoints.Count) { + var wp = Waypoints[wpIndex].Shape as ShapesContainer; + //计划航线 + UIElement RouteShape = null; + if ((Route != null) && (Route.Shape != null)) + RouteShape = Route.Shape; if (!flag) { wp.Visibility = Visibility.Hidden; - Route.Shape.Visibility= Visibility.Hidden; + if (RouteShape!=null) + RouteShape.Visibility= Visibility.Hidden; } else { @@ -732,18 +738,22 @@ namespace Plane.FormationCreator.Views if (_copterManager.ShowCopter.Contains(Copter)) { wp.Visibility = Visibility.Visible; - Route.Shape.Visibility = Visibility.Visible; + if (RouteShape != null) + RouteShape.Visibility = Visibility.Visible; } else { wp.Visibility = Visibility.Hidden; - Route.Shape.Visibility = Visibility.Hidden; + if (RouteShape != null) + RouteShape.Visibility = Visibility.Hidden; } } else { wp.Visibility = Visibility.Visible; - Route.Shape.Visibility = Visibility.Visible; + //3d模式Route可能为空 + if (RouteShape != null) + RouteShape.Visibility = Visibility.Visible; } //var info = _flightTaskManager.Tasks[taskIndex].SingleCopterInfos.Find(i => i.Copter == this.Copter);