临时修改航点时间

修改通道信息为飞机经纬度

Plane.FormationCreator/ViewModels/ControlPanelViewModel.cs

@@ -626,19 +626,23 @@ namespace Plane.FormationCreator.ViewModels
                                 case FlightTaskType.TakeOff:
                                     //计算起飞需要的时间,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].TargetLng,
                                      _flightTaskManager.Tasks[j+1].SingleCopterInfos[i].TargetAlt);
+                                    
                                     //要起飞任务
              
                                     break;
+
                                 case FlightTaskType.FlyTo:
 
                                     missions[missindex++] = Mission.CreateWaypointMission(
                                         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].TargetLng, 
                                         _flightTaskManager.Tasks[j].SingleCopterInfos[i].TargetAlt);
@@ -654,7 +658,7 @@ namespace Plane.FormationCreator.ViewModels
                                     //返航
                                     missions[missindex++] = Mission.CreateReturnToLaunchMission();
                                     break;
-
+   
                                 default:
                                     break;
 

Plane.FormationCreator/Views/CopterInfoView.xaml

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