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:
panxu 2018-07-11 10:34:52 +08:00
parent bc8373363d
commit db8059a265
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Plane.FormationCreator/ViewModels/ControlPanelViewModel.cs
View File

@ -626,19 +626,23 @@ namespace Plane.FormationCreator.ViewModels
case FlightTaskType.TakeOff: case FlightTaskType.TakeOff:
//计算起飞需要的时间,5秒是上升加速和最后稳定时间 //计算起飞需要的时间,5秒是上升加速和最后稳定时间
int takeofftime = (int)(_flightTaskManager.Tasks[j + 1].SingleCopterInfos[i].TargetAlt / 2.5 + 5); int takeofftime = (int)(_flightTaskManager.Tasks[j + 1].SingleCopterInfos[i].TargetAlt / 2.5 + 5);
missions[missindex++] = Mission.CreateTakeoffMission(1,
takeofftime, missions[missindex++] = Mission.CreateTakeoffMission(
1,//1,
5,//takeofftime,
_flightTaskManager.Tasks[j + 1].SingleCopterInfos[i].TargetLat, _flightTaskManager.Tasks[j + 1].SingleCopterInfos[i].TargetLat,
_flightTaskManager.Tasks[j + 1].SingleCopterInfos[i].TargetLng, _flightTaskManager.Tasks[j + 1].SingleCopterInfos[i].TargetLng,
_flightTaskManager.Tasks[j+1].SingleCopterInfos[i].TargetAlt); _flightTaskManager.Tasks[j+1].SingleCopterInfos[i].TargetAlt);
//要起飞任务 //要起飞任务
break; break;
case FlightTaskType.FlyTo: case FlightTaskType.FlyTo:
missions[missindex++] = Mission.CreateWaypointMission( missions[missindex++] = Mission.CreateWaypointMission(
5,//_flightTaskManager.Tasks[j].SingleCopterInfos[i].LoiterTime, 5,//_flightTaskManager.Tasks[j].SingleCopterInfos[i].LoiterTime,
20,// _flightTaskManager.Tasks[j].SingleCopterInfos[i].FlytoTime, 5,// _flightTaskManager.Tasks[j].SingleCopterInfos[i].FlytoTime,
_flightTaskManager.Tasks[j].SingleCopterInfos[i].TargetLat, _flightTaskManager.Tasks[j].SingleCopterInfos[i].TargetLat,
_flightTaskManager.Tasks[j].SingleCopterInfos[i].TargetLng, _flightTaskManager.Tasks[j].SingleCopterInfos[i].TargetLng,
_flightTaskManager.Tasks[j].SingleCopterInfos[i].TargetAlt); _flightTaskManager.Tasks[j].SingleCopterInfos[i].TargetAlt);

10
Plane.FormationCreator/Views/CopterInfoView.xaml
View File

@ -33,7 +33,7 @@
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="180" /> <ColumnDefinition Width="180" />
<ColumnDefinition Width="100" /> <ColumnDefinition Width="120" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
@ -142,12 +142,12 @@
<TextBlock Text="{Binding Path=State}" /> <TextBlock Text="{Binding Path=State}" />
</StackPanel> </StackPanel>
<StackPanel> <StackPanel>
<TextBlock Text="通道1：" /> <TextBlock Text="纬度：" />
<TextBlock Text="{Binding Channel1}" /> <TextBlock Text="{Binding Latitude}" />
</StackPanel> </StackPanel>
<StackPanel> <StackPanel>
<TextBlock Text="通道2：" /> <TextBlock Text="经度：" />
<TextBlock Text="{Binding Channel2}" /> <TextBlock Text="{Binding Longitude}" />
</StackPanel> </StackPanel>
<StackPanel> <StackPanel>
<TextBlock Text="通道3：" /> <TextBlock Text="通道3：" />