group/Plane.FormationCreator
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

修改任务区多次点击，或双击，右键乱点容易异常退出bug

Browse Source
This commit is contained in:
xu 2020-04-22 02:37:45 +08:00
parent 23c1390758
commit 441cbe953d
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Plane.FormationCreator/Views/MapView_CopterDrawing.cs
View File

@ -718,11 +718,17 @@ namespace Plane.FormationCreator.Views
var wpIndex = taskIndex - 1; // Waypoints 中没有起飞点。 var wpIndex = taskIndex - 1; // Waypoints 中没有起飞点。
if (wpIndex >= 0 && wpIndex < Waypoints.Count) if (wpIndex >= 0 && wpIndex < Waypoints.Count)
{ {
var wp = Waypoints[wpIndex].Shape as ShapesContainer; var wp = Waypoints[wpIndex].Shape as ShapesContainer;
//计划航线
UIElement RouteShape = null;
if ((Route != null) && (Route.Shape != null))
RouteShape = Route.Shape;
if (!flag) if (!flag)
{ {
wp.Visibility = Visibility.Hidden; wp.Visibility = Visibility.Hidden;
Route.Shape.Visibility= Visibility.Hidden; if (RouteShape!=null)
RouteShape.Visibility= Visibility.Hidden;
} }
else else
{ {
@ -732,18 +738,22 @@ namespace Plane.FormationCreator.Views
if (_copterManager.ShowCopter.Contains(Copter)) if (_copterManager.ShowCopter.Contains(Copter))
{ {
wp.Visibility = Visibility.Visible; wp.Visibility = Visibility.Visible;
Route.Shape.Visibility = Visibility.Visible; if (RouteShape != null)
RouteShape.Visibility = Visibility.Visible;
} }
else else
{ {
wp.Visibility = Visibility.Hidden; wp.Visibility = Visibility.Hidden;
Route.Shape.Visibility = Visibility.Hidden; if (RouteShape != null)
RouteShape.Visibility = Visibility.Hidden;
} }
} }
else else
{ {
wp.Visibility = Visibility.Visible; 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); //var info = _flightTaskManager.Tasks[taskIndex].SingleCopterInfos.Find(i => i.Copter == this.Copter);