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-10-21 18:12:09 +08:00
parent b836322a15
commit a8eb01bfb3
7 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plane.FormationCreator/Formation/CopterManager.cs
View File

@ -21,7 +21,7 @@ namespace Plane.FormationCreator.Formation
public int AddCopter(ICopter entityObject) public int AddCopter(ICopter entityObject)
{ {
////给第三方时候限制数量和时间用 ////给第三方时候限制数量和时间用
DateTime dateTime2019 = DateTime.Parse("2019-09-20"); DateTime dateTime2019 = DateTime.Parse("2020-01-20");
//新增飞机区域限制：内蒙 //新增飞机区域限制：内蒙
// if (entityObject.Latitude < 37.4307185218 || entityObject.Latitude > 45.6754821756 // if (entityObject.Latitude < 37.4307185218 || entityObject.Latitude > 45.6754821756

18
Plane.FormationCreator/ModifyParam.xaml.cs
View File

@ -24,15 +24,15 @@ namespace Plane.FormationCreator
public ModifyParam() public ModifyParam()
{ {
InitializeComponent(); InitializeComponent();
if (!VersionControl.IsFullVersion) // if (!VersionControl.IsFullVersion)
{ // {
hide_panel.Visibility = Visibility.Collapsed; // hide_panel.Visibility = Visibility.Collapsed;
textParamName.IsReadOnly = true; // textParamName.IsReadOnly = true;
btnLoad.Visibility = Visibility.Collapsed; // btnLoad.Visibility = Visibility.Collapsed;
//
label.Visibility = Visibility.Collapsed; // label.Visibility = Visibility.Collapsed;
textParamName.Visibility = Visibility.Collapsed; // textParamName.Visibility = Visibility.Collapsed;
} // }
} }
private void btnModify_Click(object sender, RoutedEventArgs e) private void btnModify_Click(object sender, RoutedEventArgs e)

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

@ -54,6 +54,12 @@ namespace Plane.FormationCreator.ViewModels
set { Set(nameof(AltP), ref _AltP, value); } set { Set(nameof(AltP), ref _AltP, value); }
} }
private float _TaskOffAlt = 10;
public float TaskOffAlt
{
get { return _TaskOffAlt; }
set { Set(nameof(TaskOffAlt), ref _TaskOffAlt, value); }
}
private string _RTKState = "RTK未发送"; private string _RTKState = "RTK未发送";
public string RTKState public string RTKState
@ -365,8 +371,9 @@ namespace Plane.FormationCreator.ViewModels
{ {
return _GuidAsyncCommand ?? (_GuidAsyncCommand = new RelayCommand(async () => return _GuidAsyncCommand ?? (_GuidAsyncCommand = new RelayCommand(async () =>
{ {
if (TaskOffAlt <= 0) return;
if (_copterManager.AcceptingControlCopters != null && _copterManager.AcceptingControlCopters.Count() > 0) if (_copterManager.AcceptingControlCopters != null && _copterManager.AcceptingControlCopters.Count() > 0)
await _commModuleManager.TakeOffAsync(10, _copterManager.AcceptingControlCopters); await _commModuleManager.TakeOffAsync(TaskOffAlt, _copterManager.AcceptingControlCopters);
/* /*
await Task.WhenAll(_copterManager.AcceptingControlCopters.Select(async c => await Task.WhenAll(_copterManager.AcceptingControlCopters.Select(async c =>
{ {

4
Plane.FormationCreator/Views/ControlPanelView.xaml
View File

@ -89,6 +89,8 @@
<Button Content="正式灯光" <Button Content="正式灯光"
Command="{Binding TurnOffTestLightsCommand}" Command="{Binding TurnOffTestLightsCommand}"
Visibility="Collapsed"/> Visibility="Collapsed"/>
<TextBox Width="30" Text="{Binding TaskOffAlt}"
/>
<Label Visibility="Collapsed">Lat</Label> <Label Visibility="Collapsed">Lat</Label>
<TextBox Visibility="Collapsed" Text="{Binding LatOffset}" Width="50"/> <TextBox Visibility="Collapsed" Text="{Binding LatOffset}" Width="50"/>
<Label Visibility="Collapsed">Lng</Label> <Label Visibility="Collapsed">Lng</Label>
@ -140,7 +142,7 @@
<Button Content="{Binding Path=NTRIPbtntxt}" <Button Content="{Binding Path=NTRIPbtntxt}"
Command="{Binding SendRTCMCommand}" Command="{Binding SendRTCMCommand}"
Visibility="Collapsed"/> />
<TextBlock <TextBlock
Margin="5,5,5,5" Margin="5,5,5,5"
Text="{Binding Path=RTKState}" Text="{Binding Path=RTKState}"

2
Plane.FormationCreator/Views/MapView.xaml.cs
View File

@ -51,7 +51,7 @@ namespace Plane.FormationCreator.Views
gmap.MaxZoom = 30; //最大缩放 gmap.MaxZoom = 30; //最大缩放
gmap.Zoom = 19; //当前缩放 gmap.Zoom = 19; //当前缩放
gmap.ShowCenter = false; //不显示中心十字点 gmap.ShowCenter = false; //不显示中心十字点
gmap.DragButton = MouseButton.Left; //左键拖拽地图 gmap.DragButton = MouseButton.Middle; //左键拖拽地图
gmap.Position = new LatLng(40.07734857737275, 116.34323845862502).ToGCJ02(); gmap.Position = new LatLng(40.07734857737275, 116.34323845862502).ToGCJ02();
_mapManager.MapView = this; _mapManager.MapView = this;

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

@ -305,19 +305,22 @@
<StackPanel x:Name="lightDesign"> <StackPanel x:Name="lightDesign">
<StackPanel Orientation="Horizontal" Margin="0,5,0,5" > <StackPanel Orientation="Horizontal" Margin="0,5,0,5" >
<TextBlock Margin="5,7,0,0" Text="变换颜色"/>
<TextBox Margin="5,5,40,3" Width="60" Text="{Binding ChangeRGB}"/>
<TextBlock Margin="5,7,0,0" Text="起始时间"/> <TextBlock Margin="5,7,0,0" Text="起始时间"/>
<TextBox Margin="5,5,0,3" Width="30" Text="{Binding BeginTime}"/> <TextBox Margin="5,5,0,3" Width="30" Text="{Binding BeginTime}"/>
<TextBlock Margin="5,7,0,0" Text="结束时间"/> <TextBlock Margin="5,7,0,0" Text="结束时间"/>
<TextBox Margin="5,5,0,3" Width="30" Text="{Binding EndTime}"/> <TextBox Margin="5,5,0,3" Width="30" Text="{Binding EndTime}"/>
<TextBlock Margin="5,7,0,0" Text="分层"/> <TextBlock Margin="5,7,0,0" Text="分层"/>
<TextBox Margin="5,5,0,3" Width="30" Text="{Binding AverageSum}"/> <TextBox Margin="5,5,0,3" Width="30" Text="{Binding AverageSum}"/>
<TextBlock Margin="5,7,0,0" Text="变换颜色"/> <Button Width="80" Content="灯带" Margin="10,0,0,0"
<TextBox Margin="5,5,0,3" Width="60" Text="{Binding ChangeRGB}"/> Command="{Binding SetHorseRaceLampCommand}" HorizontalAlignment="Right"/>
<TextBlock Margin="5,7,0,0" Text="结束颜色"/>
<TextBox Margin="5,5,0,3" Width="60" Text="{Binding EndRGB}"/>
</StackPanel> </StackPanel>
<Grid > <Grid >
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal" Margin="0,2,0,0">
<TextBlock Margin="5,7,0,0" Text="结束颜色"/>
<TextBox Margin="5,5,40,3" Width="60" Text="{Binding EndRGB}" ToolTip="设置为0，表示变换后回到原色"/>
<TextBlock Margin="5,7,0,0" Text="起始时间"/> <TextBlock Margin="5,7,0,0" Text="起始时间"/>
<TextBox Margin="5,5,0,3" Width="30" Text="{Binding StrokesTime}"/> <TextBox Margin="5,5,0,3" Width="30" Text="{Binding StrokesTime}"/>
<TextBlock Margin="5,7,0,0" Text="频率•"/> <TextBlock Margin="5,7,0,0" Text="频率•"/>
@ -325,11 +328,10 @@
<TextBlock Margin="5,7,0,0" Text="œ˜变换数量"/> <TextBlock Margin="5,7,0,0" Text="œ˜变换数量"/>
<TextBox Margin="5,5,0,3" Width="30" Text="{Binding SingleNum}"/> <TextBox Margin="5,5,0,3" Width="30" Text="{Binding SingleNum}"/>
<Button Width="70" Content="灯光" <Button Width="80" Content="跑马灯" Margin="10,0,0,0"
Command="{Binding SetStrokesLampCommamd}" HorizontalAlignment="Right"/> Command="{Binding SetStrokesLampCommamd}" HorizontalAlignment="Right"/>
</StackPanel> </StackPanel>
<Button Width="80" Content="跑马灯"
Command="{Binding SetHorseRaceLampCommand}" HorizontalAlignment="Right"/>
</Grid> </Grid>
<Separator/> <Separator/>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">

2
Plane.FormationCreator/Views/ModifyTaskView.xaml.cs
View File

@ -33,7 +33,7 @@ namespace Plane.FormationCreator.Views
this.DataContext = _modifyTaskViewModel; this.DataContext = _modifyTaskViewModel;
if (!VersionControl.IsFullVersion) if (!VersionControl.IsFullVersion)
{ {
lightDesign.Visibility = Visibility.Collapsed; //lightDesign.Visibility = Visibility.Collapsed;
} }
} }