From 475993d357333dff3ec5eba9c2428635d2affa12 Mon Sep 17 00:00:00 2001
From: panxu <pxzleo@126.com>
Date: Sun, 13 May 2018 17:17:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E9=9D=A2=E7=9A=84=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=B0=86=E4=B8=8D=E8=83=BD=E7=94=A8=E4=BA=8E=E5=AE=9E=E6=97=B6?=
 =?UTF-8?q?=E8=88=AA=E7=82=B9=20=E5=87=86=E5=A4=87=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E9=A3=9E=E6=8E=A7=E8=88=AA=E7=82=B9=E4=B8=93=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

加入飞行时间和悬停时间设置（未完成）
---
 Plane.FormationCreator.sln                    |  3 ---
 .../FlightTaskSingleCopterInfo_FlyTo.cs       | 17 ++++++++++++++++-
 .../Views/ModifyTaskView.xaml                 | 19 ++++++++++++-------
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/Plane.FormationCreator.sln b/Plane.FormationCreator.sln
index 902217f..adcb603 100644
--- a/Plane.FormationCreator.sln
+++ b/Plane.FormationCreator.sln
@@ -24,9 +24,6 @@ EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "PlaneGcsSdk.Contract_Shared", "..\Plane.Sdk3\PlaneGcsSdk.Contract_Shared\PlaneGcsSdk.Contract_Shared.shproj", "{695733D7-99FF-4707-8C89-474E949CADCB}"
 EndProject
 Global
-	GlobalSection(Performance) = preSolution
-		HasPerformanceSessions = true
-	EndGlobalSection
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		..\Plane.Sdk3\PlaneGcsSdk_Shared\PlaneGcsSdk_Shared.projitems*{0111eb6e-72e3-499c-a3ba-022f5bbc4caf}*SharedItemsImports = 4
 		..\Plane.Sdk3\PlaneGcsSdk_Shared\PlaneGcsSdk_Shared.projitems*{2be393dc-21a4-48b3-83fd-f21cbe8b038b}*SharedItemsImports = 13
diff --git a/Plane.FormationCreator/Formation/FlightTaskSingleCopterInfo_FlyTo.cs b/Plane.FormationCreator/Formation/FlightTaskSingleCopterInfo_FlyTo.cs
index 0587f65..ce65b73 100644
--- a/Plane.FormationCreator/Formation/FlightTaskSingleCopterInfo_FlyTo.cs
+++ b/Plane.FormationCreator/Formation/FlightTaskSingleCopterInfo_FlyTo.cs
@@ -16,7 +16,9 @@ namespace Plane.FormationCreator.Formation
                 TargetLat = targetLat,
                 TargetLng = targetLng,
                 TargetAlt = targetAlt,
-                FlytoShowLED= showLED
+                FlytoShowLED= showLED,
+               // FlytoTime= flytoTime,
+               // LoiterTime = loiterTime
             };
             return info;
         }
@@ -38,6 +40,19 @@ namespace Plane.FormationCreator.Formation
             set { Set(nameof(FlytoShowLED), ref _FlytoShowLED, value); }
         }
 
+        private int _FlytoTime = 10;
+        public int FlytoTime
+        {
+            get { return _FlytoTime; }
+            set { Set(nameof(FlytoTime), ref _FlytoTime, value); }
+        }
+        private int _LoiterTime = 0;
+        public int LoiterTime
+        {
+            get { return _LoiterTime; }
+            set { Set(nameof(LoiterTime), ref _LoiterTime, value); }
+        }
+
 
     }
 }
diff --git a/Plane.FormationCreator/Views/ModifyTaskView.xaml b/Plane.FormationCreator/Views/ModifyTaskView.xaml
index 72790f4..0407576 100644
--- a/Plane.FormationCreator/Views/ModifyTaskView.xaml
+++ b/Plane.FormationCreator/Views/ModifyTaskView.xaml
@@ -216,14 +216,19 @@
                                 <ColumnDefinition />
                                 <ColumnDefinition />
                             </Grid.ColumnDefinitions>
-                            <TextBlock Grid.Row="0" Text="错开路线: " />
-                            <CheckBox Grid.Row="0" Grid.Column="1" 
-                                      IsChecked="{Binding StaggerRoutes}" />
-                            <TextBlock Grid.Row="1" Text="垂直升降: " />
-                            <CheckBox Grid.Row="1" Grid.Column="1"
-                                      IsChecked="{Binding VerticalLift}" />
+                            <TextBlock Grid.Row="0" Text="飞行时间: " />
+                            <TextBox Grid.Column="1"
+                                      Margin="0,5,10,0"
+                                     Text="{Binding FlytoTime, UpdateSourceTrigger=PropertyChanged}" />
 
-                            <TextBlock Grid.Row="2" Text="开灯: " />
+                            <TextBlock Grid.Row="1" Text="悬停时间: " />
+                            <TextBox  Grid.Row="1" Grid.Column="1"
+                                      Margin="0,5,10,0"
+                                     Text="{Binding LoiterTime, UpdateSourceTrigger=PropertyChanged}" />
+
+
+
+                            <TextBlock Grid.Row="2" Text="灯光控制: " />
                             <CheckBox Grid.Row="2" Grid.Column="1" 
                                       DataContext="{Binding ModifyingSingleCopterInfo}"
                                       IsChecked="{Binding FlytoShowLED}" />