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

添加导入导出航点的自定义名

Browse Source
This commit is contained in:
zxd 2019-07-17 17:17:06 +08:00
parent 6da2a6f7a6
commit 3f9317a6bd
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Plane.FormationCreator/Formation/FlightTaskManager.cs
View File

@ -515,7 +515,7 @@ namespace Plane.FormationCreator.Formation
} }
} }
public void RestoreFlyToTask(bool staggerRoutes, int flytoTime, int loiterTime, dynamic singleCopterInfos) public void RestoreFlyToTask(bool staggerRoutes, int flytoTime, int loiterTime, string taskName, dynamic singleCopterInfos)
{ {
var copters = _copterManager.Copters; var copters = _copterManager.Copters;
float tagalt = 15; float tagalt = 15;
@ -526,7 +526,7 @@ namespace Plane.FormationCreator.Formation
if (nullableCenter == null) return; if (nullableCenter == null) return;
var center = nullableCenter.Value; var center = nullableCenter.Value;
var newTask = new FlightTask(FlightTaskType.FlyTo) { StaggerRoutes = staggerRoutes, FlytoTime = flytoTime, LoiterTime = loiterTime }; var newTask = new FlightTask(FlightTaskType.FlyTo) { StaggerRoutes = staggerRoutes, FlytoTime = flytoTime, LoiterTime = loiterTime };
if(taskName != null) newTask.TaskCnName = taskName;
// TODO: 林俊清, 20150801, 处理实际飞行器数目与记录中数目不一致的情况。 // TODO: 林俊清, 20150801, 处理实际飞行器数目与记录中数目不一致的情况。
for (int i = 0; i < copters.Count; i++) for (int i = 0; i < copters.Count; i++)
{ {
@ -846,7 +846,7 @@ namespace Plane.FormationCreator.Formation
case FlightTaskType.TakeOff: case FlightTaskType.TakeOff:
return new { return new {
type = type, type = type,
takeoffnumber = TakeOffNumAttr, takeoffnumber = TakeOffNumAttr,
takeoffTime = task.TakeOffTime, takeoffTime = task.TakeOffTime,
singleCopterInfos = task.SingleCopterInfos.Select(info => singleCopterInfos = task.SingleCopterInfos.Select(info =>
{ {
@ -864,6 +864,7 @@ namespace Plane.FormationCreator.Formation
staggerRoutes = task.StaggerRoutes, staggerRoutes = task.StaggerRoutes,
flytoTime = task.FlytoTime, flytoTime = task.FlytoTime,
loiterTime = task.LoiterTime, loiterTime = task.LoiterTime,
taskname = task.TaskCnName,
singleCopterInfos = task.SingleCopterInfos.Select(info => singleCopterInfos = task.SingleCopterInfos.Select(info =>
{ {
var offset = info.LatLngOffset; var offset = info.LatLngOffset;
@ -1017,7 +1018,7 @@ namespace Plane.FormationCreator.Formation
RestoreTakeOffTask((byte)task.takeoffTime, task.singleCopterInfos); RestoreTakeOffTask((byte)task.takeoffTime, task.singleCopterInfos);
break; break;
case FlightTaskType.FlyTo: case FlightTaskType.FlyTo:
RestoreFlyToTask((bool)task.staggerRoutes, (int)task.flytoTime, (int)task.loiterTime, task.singleCopterInfos); RestoreFlyToTask((bool)task.staggerRoutes, (int)task.flytoTime, (int)task.loiterTime, (string)task.taskname, task.singleCopterInfos);
break; break;
case FlightTaskType.Turn: case FlightTaskType.Turn:
RestoreTurnTask(task.singleCopterInfos); RestoreTurnTask(task.singleCopterInfos);
@ -1204,7 +1205,7 @@ namespace Plane.FormationCreator.Formation
RestoreTakeOffTask((byte)task.takeoffTime, task.singleCopterInfos); RestoreTakeOffTask((byte)task.takeoffTime, task.singleCopterInfos);
break; break;
case FlightTaskType.FlyTo: case FlightTaskType.FlyTo:
RestoreFlyToTask((bool)task.staggerRoutes, (int)task.flytoTime, (int)task.loiterTime, task.singleCopterInfos); RestoreFlyToTask((bool)task.staggerRoutes, (int)task.flytoTime, (int)task.loiterTime, (string)task.taskname, task.singleCopterInfos);
break; break;
case FlightTaskType.Turn: case FlightTaskType.Turn:
RestoreTurnTask(task.singleCopterInfos); RestoreTurnTask(task.singleCopterInfos);