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-05-13 17:17:59 +08:00
parent 71f2870968
commit 475993d357
3 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Plane.FormationCreator.sln
View File

@ -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}" Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "PlaneGcsSdk.Contract_Shared", "..\Plane.Sdk3\PlaneGcsSdk.Contract_Shared\PlaneGcsSdk.Contract_Shared.shproj", "{695733D7-99FF-4707-8C89-474E949CADCB}"
EndProject EndProject
Global Global
GlobalSection(Performance) = preSolution
HasPerformanceSessions = true
EndGlobalSection
GlobalSection(SharedMSBuildProjectFiles) = preSolution GlobalSection(SharedMSBuildProjectFiles) = preSolution
..\Plane.Sdk3\PlaneGcsSdk_Shared\PlaneGcsSdk_Shared.projitems*{0111eb6e-72e3-499c-a3ba-022f5bbc4caf}*SharedItemsImports = 4 ..\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 ..\Plane.Sdk3\PlaneGcsSdk_Shared\PlaneGcsSdk_Shared.projitems*{2be393dc-21a4-48b3-83fd-f21cbe8b038b}*SharedItemsImports = 13

17
Plane.FormationCreator/Formation/FlightTaskSingleCopterInfo_FlyTo.cs
View File

@ -16,7 +16,9 @@ namespace Plane.FormationCreator.Formation
TargetLat = targetLat, TargetLat = targetLat,
TargetLng = targetLng, TargetLng = targetLng,
TargetAlt = targetAlt, TargetAlt = targetAlt,
FlytoShowLED= showLED FlytoShowLED= showLED,
// FlytoTime= flytoTime,
// LoiterTime = loiterTime
}; };
return info; return info;
} }
@ -38,6 +40,19 @@ namespace Plane.FormationCreator.Formation
set { Set(nameof(FlytoShowLED), ref _FlytoShowLED, value); } 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); }
}
} }
} }

19
Plane.FormationCreator/Views/ModifyTaskView.xaml
View File

@ -216,14 +216,19 @@
<ColumnDefinition /> <ColumnDefinition />
<ColumnDefinition /> <ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Grid.Row="0" Text="错开路线: " /> <TextBlock Grid.Row="0" Text="飞行时间: " />
<CheckBox Grid.Row="0" Grid.Column="1" <TextBox Grid.Column="1"
IsChecked="{Binding StaggerRoutes}" /> Margin="0,5,10,0"
<TextBlock Grid.Row="1" Text="垂直升降: " /> Text="{Binding FlytoTime, UpdateSourceTrigger=PropertyChanged}" />
<CheckBox Grid.Row="1" Grid.Column="1"
IsChecked="{Binding VerticalLift}" />
<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" <CheckBox Grid.Row="2" Grid.Column="1"
DataContext="{Binding ModifyingSingleCopterInfo}" DataContext="{Binding ModifyingSingleCopterInfo}"
IsChecked="{Binding FlytoShowLED}" /> IsChecked="{Binding FlytoShowLED}" />