Skip to content

F
FGOUT
Commit 59ed7de6 by 鲁志-悦动
Options

隐藏CAM_2小手、重启、关闭算法按钮 And 修改Exit -> GoOn And 增加开始抠像、结束抠像按钮

parent 50d89196
Showing with 246 additions and 56 deletions
VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Algorithm/Enum/AlgorithmPackageSignal.cs
...@@ -82,11 +82,16 @@ ...@@ -82,11 +82,16 @@
public const string EXIT = "exit"; public const string EXIT = "exit";
/// <summary> /// <summary>
/// 稍等，等一下 /// 挂起
/// </summary> /// </summary>
public const string HOLD_ON = "hold_on"; public const string HOLD_ON = "hold_on";
/// <summary> /// <summary>
/// 继续
/// </summary>
public const string GO_ON = "go_on";
/// <summary>
/// 落盘，开始结束时间戳 /// 落盘，开始结束时间戳
/// </summary> /// </summary>
public const string START_END = "start_end"; public const string START_END = "start_end";
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml
...@@ -216,6 +216,8 @@ ...@@ -216,6 +216,8 @@
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<GroupBox Foreground="White" Header="自动检测"> <GroupBox Foreground="White" Header="自动检测">
<CheckBox <CheckBox
...@@ -234,7 +236,6 @@ ...@@ -234,7 +236,6 @@
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition /> <ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<CheckBox <CheckBox
x:Name="_ManualMode_" x:Name="_ManualMode_"
...@@ -244,15 +245,32 @@ ...@@ -244,15 +245,32 @@
Foreground="White" Foreground="White"
IsChecked="{Binding Path=IsEnableTarget, Mode=TwoWay}" IsChecked="{Binding Path=IsEnableTarget, Mode=TwoWay}"
Style="{StaticResource CheckBox_Setting}" /> Style="{StaticResource CheckBox_Setting}" />
<CheckBox <!--<CheckBox
Grid.Column="1" Grid.Column="1"
Margin="14" Margin="14"
Content="开始抠像" Content="开始抠像"
Foreground="White" Foreground="White"
IsChecked="{Binding Path=IsStartImaget, Mode=TwoWay}" IsChecked="{Binding Path=IsStartImaget, Mode=TwoWay}"
Style="{StaticResource CheckBox_Setting}" /> Style="{StaticResource CheckBox_Setting}" />-->
</Grid> </Grid>
</GroupBox> </GroupBox>
<Button
Grid.Column="2"
Width="100"
Height="40"
Margin="3,10,3,0"
Command="{Binding Path=MattStartCommand}"
Content="开始抠像(S)"
Style="{StaticResource ButtonStyle}" />
<Button
Grid.Column="3"
Width="100"
Height="40"
Margin="0,10,0,0"
Command="{Binding Path=MattEndCommand}"
Content="结束抠像(D)"
Style="{StaticResource ButtonStyle}" />
</Grid> </Grid>
</WrapPanel> </WrapPanel>
<WrapPanel <WrapPanel
...@@ -331,11 +349,13 @@ ...@@ -331,11 +349,13 @@
Style="{StaticResource ButtonStyle}" /> Style="{StaticResource ButtonStyle}" />
<Button <Button
x:Name="_StartPositionBtn_"
Grid.Row="1" Grid.Row="1"
Grid.Column="0" Grid.Column="0"
Width="100" Width="100"
Height="40" Height="40"
Margin="10" Margin="10"
Click="StartPositionBtn_OnClick"
Command="{Binding Path=StartRegionCommand}" Command="{Binding Path=StartRegionCommand}"
Content="开始位置" Content="开始位置"
IsEnabled="{Binding StartEnable}" IsEnabled="{Binding StartEnable}"
...@@ -429,7 +449,7 @@ ...@@ -429,7 +449,7 @@
Height="40" Height="40"
Margin="10" Margin="10"
Command="{Binding Path=ExitCommand}" Command="{Binding Path=ExitCommand}"
Content="Exit" Content="GoOn"
Style="{StaticResource ButtonStyle}" /> Style="{StaticResource ButtonStyle}" />
<Button <Button
...@@ -549,6 +569,7 @@ ...@@ -549,6 +569,7 @@
Grid.Row="1" Grid.Row="1"
Grid.Column="2" Grid.Column="2"
Margin="10" Margin="10"
IsCam2="True"
MouseLeftButtonDown="cam2_MouseLeftButtonDown" MouseLeftButtonDown="cam2_MouseLeftButtonDown"
NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_2}" NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_2}"
VideoBorderBrush="#B85069" /> VideoBorderBrush="#B85069" />
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml.cs
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Input; using System.Windows.Input;
using System.Windows.Media;
using VIZ.FGOUT.Domain; using VIZ.FGOUT.Domain;
using VIZ.Framework.Core; using VIZ.Framework.Core;
...@@ -49,5 +50,11 @@ namespace VIZ.FGOUT.Module ...@@ -49,5 +50,11 @@ namespace VIZ.FGOUT.Module
_AutoMode_.IsChecked = true; _AutoMode_.IsChecked = true;
//_ManualMode_.IsChecked =false; //_ManualMode_.IsChecked =false;
} }
private void StartPositionBtn_OnClick(object sender, RoutedEventArgs e)
{
//if (_StartPositionBtn_.IsEnabled)
// _StartPositionBtn_.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#378CFF"));
}
} }
} }
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
...@@ -92,10 +92,14 @@ namespace VIZ.FGOUT.Module ...@@ -92,10 +92,14 @@ namespace VIZ.FGOUT.Module
this.StopCommand= new VCommand(this.Stop); this.StopCommand= new VCommand(this.Stop);
//视频设置 //视频设置
this.VideoSettingCommand = new VCommand(this.VideoSetting); this.VideoSettingCommand = new VCommand(this.VideoSetting);
//算法Exit //算法GoOn
this.ExitCommand = new VCommand(this.Exit); this.ExitCommand = new VCommand(this.Exit);
//算法Holdon //算法Holdon
this.HoldonCommand = new VCommand(this.Holdon); this.HoldonCommand = new VCommand(this.Holdon);
//算法开始抠图
this.MattStartCommand = new VCommand(this.MattStart);
//算法结束抠图
this.MattEndCommand = new VCommand(this.MattEnd);
} }
/// <summary> /// <summary>
...@@ -505,18 +509,19 @@ namespace VIZ.FGOUT.Module ...@@ -505,18 +509,19 @@ namespace VIZ.FGOUT.Module
#endregion #endregion
#region 算法Exit And Holdon #region 算法GoOn And Holdon And MattStart And MattEnd
public VCommand ExitCommand { get; set; } public VCommand ExitCommand { get; set; }
/// <summary> /// <summary>
/// exit /// GoOn
/// </summary> /// </summary>
private void Exit() private void Exit()
{ {
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1); UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1);
if (manager == null) return; if (manager == null) return;
manager.SendJson(new AlgorithmPackage_Figout_model(){signal = AlgorithmPackageSignal.EXIT}); //manager.SendJson(new AlgorithmPackage_Figout_model(){signal = AlgorithmPackageSignal.EXIT});
manager.SendJson(new AlgorithmPackage_Figout_model() { signal = AlgorithmPackageSignal.GO_ON });
} }
public VCommand HoldonCommand { get; set; } public VCommand HoldonCommand { get; set; }
...@@ -529,6 +534,29 @@ namespace VIZ.FGOUT.Module ...@@ -529,6 +534,29 @@ namespace VIZ.FGOUT.Module
if (manager == null) return; if (manager == null) return;
manager.SendJson(new AlgorithmPackage_Figout_model() { signal = AlgorithmPackageSignal.HOLD_ON }); manager.SendJson(new AlgorithmPackage_Figout_model() { signal = AlgorithmPackageSignal.HOLD_ON });
} }
public VCommand MattStartCommand { get; set; }
private void MattStart()
{
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1);
if (manager == null) return;
var mode = AlgorithmPackageSignal.manual_mode;
if(isAutoEnable)
mode = AlgorithmPackageSignal.manual_mode;
manager.SendJson(new AlgorithmPackage_Figout_model() { signal = AlgorithmPackageSignal.matt_start, mode = mode });
}
public VCommand MattEndCommand { get; set; }
private void MattEnd()
{
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1);
if (manager == null) return;
var mode = AlgorithmPackageSignal.manual_mode;
if (isAutoEnable)
mode = AlgorithmPackageSignal.manual_mode;
manager.SendJson(new AlgorithmPackage_Figout_model() { signal = AlgorithmPackageSignal.matt_end, mode = mode});
}
#endregion #endregion
#region Replay功能 #region Replay功能
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/View/NDIView.xaml
...@@ -262,6 +262,7 @@ ...@@ -262,6 +262,7 @@
<Grid Grid.Row="1"> <Grid Grid.Row="1">
<!-- 单人机位 ===== 目标检测按钮 --> <!-- 单人机位 ===== 目标检测按钮 -->
<Button <Button
x:Name="_DetectBtn_"
Width="32" Width="32"
Height="32" Height="32"
Margin="0,0,0,0" Margin="0,0,0,0"
...@@ -432,6 +433,7 @@ ...@@ -432,6 +433,7 @@
<!-- 重启算法 --> <!-- 重启算法 -->
<Border ToolTip="重启算法"> <Border ToolTip="重启算法">
<Button <Button
x:Name="_RestartBtn_"
Width="32" Width="32"
Height="32" Height="32"
Command="{Binding RestartCommand}" Command="{Binding RestartCommand}"
...@@ -445,6 +447,7 @@ ...@@ -445,6 +447,7 @@
<!-- 关闭算法 --> <!-- 关闭算法 -->
<Border ToolTip="关闭算法"> <Border ToolTip="关闭算法">
<Button <Button
x:Name="_StopBtn_"
Width="32" Width="32"
Height="32" Height="32"
Command="{Binding StopCommand}" Command="{Binding StopCommand}"
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/View/NDIView.xaml.cs
...@@ -4,7 +4,6 @@ using System.Windows.Controls; ...@@ -4,7 +4,6 @@ using System.Windows.Controls;
using System.Windows.Input; using System.Windows.Input;
using System.Windows.Media; using System.Windows.Media;
using System.Windows.Shapes; using System.Windows.Shapes;
using VIZ.FGOUT.Storage;
using VIZ.Framework.Core; using VIZ.Framework.Core;
namespace VIZ.FGOUT.Module namespace VIZ.FGOUT.Module
...@@ -120,6 +119,33 @@ namespace VIZ.FGOUT.Module ...@@ -120,6 +119,33 @@ namespace VIZ.FGOUT.Module
video.BorderBrush = new SolidColorBrush((Color)ColorConverter.ConvertFromString(e.NewValue.ToString())); video.BorderBrush = new SolidColorBrush((Color)ColorConverter.ConvertFromString(e.NewValue.ToString()));
} }
#endregion #endregion
#region IsCam2
public static readonly DependencyProperty IsCam2Property =
DependencyProperty.Register(nameof(IsCam2), typeof(bool), typeof(NDIView), new PropertyMetadata(false, OnIsEnabledChanged));
public bool IsCam2
{
get => (bool)GetValue(IsCam2Property);
set => SetValue(IsCam2Property, value);
}
static void OnIsEnabledChanged(DependencyObject sender, DependencyPropertyChangedEventArgs args)
{
((NDIView)sender).IsEnabledChanged(args);
}
protected void IsEnabledChanged(DependencyPropertyChangedEventArgs e)
{
if ((bool)e.NewValue)
{
_DetectBtn_.Visibility = _RestartBtn_.Visibility = _StopBtn_.Visibility = Visibility.Collapsed;
}
}
#endregion
// 配置文件添加config // 配置文件添加config
//private SetManualConfig manualConfig; //private SetManualConfig manualConfig;
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "9F86C31B17231EAAD42D6D3D0CFC5F468A8C9078E3F06C5CB7B1A7A803A95E65" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "EE25C3BCB9FC7EBF4091D6539AF533F5B17D4964C8313C4EDA49C8812F206263"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module { ...@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 222 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 224 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox _AutoMode_; internal System.Windows.Controls.CheckBox _AutoMode_;
...@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module { ...@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 240 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 241 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox _ManualMode_; internal System.Windows.Controls.CheckBox _ManualMode_;
...@@ -74,7 +74,15 @@ namespace VIZ.FGOUT.Module { ...@@ -74,7 +74,15 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 501 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 352 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _StartPositionBtn_;
#line default
#line hidden
#line 521 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1; internal VIZ.FGOUT.Module.NDIView cam1;
...@@ -82,7 +90,7 @@ namespace VIZ.FGOUT.Module { ...@@ -82,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 548 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 568 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2; internal VIZ.FGOUT.Module.NDIView cam2;
...@@ -132,7 +140,7 @@ namespace VIZ.FGOUT.Module { ...@@ -132,7 +140,7 @@ namespace VIZ.FGOUT.Module {
case 2: case 2:
this._AutoMode_ = ((System.Windows.Controls.CheckBox)(target)); this._AutoMode_ = ((System.Windows.Controls.CheckBox)(target));
#line 224 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 226 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._AutoMode_.Click += new System.Windows.RoutedEventHandler(this.AutoMode_OnClick); this._AutoMode_.Click += new System.Windows.RoutedEventHandler(this.AutoMode_OnClick);
#line default #line default
...@@ -141,16 +149,25 @@ namespace VIZ.FGOUT.Module { ...@@ -141,16 +149,25 @@ namespace VIZ.FGOUT.Module {
case 3: case 3:
this._ManualMode_ = ((System.Windows.Controls.CheckBox)(target)); this._ManualMode_ = ((System.Windows.Controls.CheckBox)(target));
#line 242 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 243 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._ManualMode_.Click += new System.Windows.RoutedEventHandler(this.ManualMode_OnClick); this._ManualMode_.Click += new System.Windows.RoutedEventHandler(this.ManualMode_OnClick);
#line default #line default
#line hidden #line hidden
return; return;
case 4: case 4:
this.cam1 = ((VIZ.FGOUT.Module.NDIView)(target)); this._StartPositionBtn_ = ((System.Windows.Controls.Button)(target));
#line 358 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._StartPositionBtn_.Click += new System.Windows.RoutedEventHandler(this.StartPositionBtn_OnClick);
#line default
#line hidden
return; return;
case 5: case 5:
this.cam1 = ((VIZ.FGOUT.Module.NDIView)(target));
return;
case 6:
this.cam2 = ((VIZ.FGOUT.Module.NDIView)(target)); this.cam2 = ((VIZ.FGOUT.Module.NDIView)(target));
return; return;
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.i.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "9F86C31B17231EAAD42D6D3D0CFC5F468A8C9078E3F06C5CB7B1A7A803A95E65" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "EE25C3BCB9FC7EBF4091D6539AF533F5B17D4964C8313C4EDA49C8812F206263"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module { ...@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 222 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 224 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox _AutoMode_; internal System.Windows.Controls.CheckBox _AutoMode_;
...@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module { ...@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 240 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 241 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox _ManualMode_; internal System.Windows.Controls.CheckBox _ManualMode_;
...@@ -74,7 +74,15 @@ namespace VIZ.FGOUT.Module { ...@@ -74,7 +74,15 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 501 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 352 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _StartPositionBtn_;
#line default
#line hidden
#line 521 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1; internal VIZ.FGOUT.Module.NDIView cam1;
...@@ -82,7 +90,7 @@ namespace VIZ.FGOUT.Module { ...@@ -82,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 548 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 568 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2; internal VIZ.FGOUT.Module.NDIView cam2;
...@@ -132,7 +140,7 @@ namespace VIZ.FGOUT.Module { ...@@ -132,7 +140,7 @@ namespace VIZ.FGOUT.Module {
case 2: case 2:
this._AutoMode_ = ((System.Windows.Controls.CheckBox)(target)); this._AutoMode_ = ((System.Windows.Controls.CheckBox)(target));
#line 224 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 226 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._AutoMode_.Click += new System.Windows.RoutedEventHandler(this.AutoMode_OnClick); this._AutoMode_.Click += new System.Windows.RoutedEventHandler(this.AutoMode_OnClick);
#line default #line default
...@@ -141,16 +149,25 @@ namespace VIZ.FGOUT.Module { ...@@ -141,16 +149,25 @@ namespace VIZ.FGOUT.Module {
case 3: case 3:
this._ManualMode_ = ((System.Windows.Controls.CheckBox)(target)); this._ManualMode_ = ((System.Windows.Controls.CheckBox)(target));
#line 242 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 243 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._ManualMode_.Click += new System.Windows.RoutedEventHandler(this.ManualMode_OnClick); this._ManualMode_.Click += new System.Windows.RoutedEventHandler(this.ManualMode_OnClick);
#line default #line default
#line hidden #line hidden
return; return;
case 4: case 4:
this.cam1 = ((VIZ.FGOUT.Module.NDIView)(target)); this._StartPositionBtn_ = ((System.Windows.Controls.Button)(target));
#line 358 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._StartPositionBtn_.Click += new System.Windows.RoutedEventHandler(this.StartPositionBtn_OnClick);
#line default
#line hidden
return; return;
case 5: case 5:
this.cam1 = ((VIZ.FGOUT.Module.NDIView)(target));
return;
case 6:
this.cam2 = ((VIZ.FGOUT.Module.NDIView)(target)); this.cam2 = ((VIZ.FGOUT.Module.NDIView)(target));
return; return;
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIView/View/NDIView.g.cs
#pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A9AB39A00947E81D9A46C56A4286D0D5BBCA4954EE5B4388A904314B90E9E7F4" #pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "84C68D3FB0DFBE0619EDC64BD6ED76FDDE4DD0E8E7FFA91EAFC4445A46456537"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -60,7 +60,15 @@ namespace VIZ.FGOUT.Module { ...@@ -60,7 +60,15 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 304 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 265 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _DetectBtn_;
#line default
#line hidden
#line 305 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Border Border; internal System.Windows.Controls.Border Border;
...@@ -68,7 +76,7 @@ namespace VIZ.FGOUT.Module { ...@@ -68,7 +76,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 324 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 325 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.Framework.Common.VideoControl video; internal VIZ.Framework.Common.VideoControl video;
...@@ -76,13 +84,29 @@ namespace VIZ.FGOUT.Module { ...@@ -76,13 +84,29 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 330 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 331 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Canvas canvas1; internal System.Windows.Controls.Canvas canvas1;
#line default #line default
#line hidden #line hidden
#line 436 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _RestartBtn_;
#line default
#line hidden
#line 450 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _StopBtn_;
#line default
#line hidden
private bool _contentLoaded; private bool _contentLoaded;
/// <summary> /// <summary>
...@@ -117,62 +141,71 @@ namespace VIZ.FGOUT.Module { ...@@ -117,62 +141,71 @@ namespace VIZ.FGOUT.Module {
this.uc = ((VIZ.FGOUT.Module.NDIView)(target)); this.uc = ((VIZ.FGOUT.Module.NDIView)(target));
return; return;
case 2: case 2:
this._DetectBtn_ = ((System.Windows.Controls.Button)(target));
return;
case 3:
this.Border = ((System.Windows.Controls.Border)(target)); this.Border = ((System.Windows.Controls.Border)(target));
#line 306 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 307 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.KeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyDown); this.Border.KeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyDown);
#line default #line default
#line hidden #line hidden
#line 307 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 308 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.KeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyUp); this.Border.KeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyUp);
#line default #line default
#line hidden #line hidden
#line 308 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 309 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewKeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyDown); this.Border.PreviewKeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyDown);
#line default #line default
#line hidden #line hidden
#line 309 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 310 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewKeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyUp); this.Border.PreviewKeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyUp);
#line default #line default
#line hidden #line hidden
#line 310 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 311 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonDown); this.Border.PreviewMouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonDown);
#line default #line default
#line hidden #line hidden
#line 311 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 312 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonUp); this.Border.PreviewMouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonUp);
#line default #line default
#line hidden #line hidden
#line 312 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 313 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseMove += new System.Windows.Input.MouseEventHandler(this.Border_MouseMove); this.Border.PreviewMouseMove += new System.Windows.Input.MouseEventHandler(this.Border_MouseMove);
#line default #line default
#line hidden #line hidden
#line 313 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 314 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseRightButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_OnPreviewMouseRightButtonDown); this.Border.PreviewMouseRightButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_OnPreviewMouseRightButtonDown);
#line default #line default
#line hidden #line hidden
return; return;
case 3: case 4:
this.video = ((VIZ.Framework.Common.VideoControl)(target)); this.video = ((VIZ.Framework.Common.VideoControl)(target));
return; return;
case 4: case 5:
this.canvas1 = ((System.Windows.Controls.Canvas)(target)); this.canvas1 = ((System.Windows.Controls.Canvas)(target));
return; return;
case 6:
this._RestartBtn_ = ((System.Windows.Controls.Button)(target));
return;
case 7:
this._StopBtn_ = ((System.Windows.Controls.Button)(target));
return;
} }
this._contentLoaded = true; this._contentLoaded = true;
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIView/View/NDIView.g.i.cs
#pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A9AB39A00947E81D9A46C56A4286D0D5BBCA4954EE5B4388A904314B90E9E7F4" #pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "84C68D3FB0DFBE0619EDC64BD6ED76FDDE4DD0E8E7FFA91EAFC4445A46456537"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -60,7 +60,15 @@ namespace VIZ.FGOUT.Module { ...@@ -60,7 +60,15 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 304 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 265 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _DetectBtn_;
#line default
#line hidden
#line 305 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Border Border; internal System.Windows.Controls.Border Border;
...@@ -68,7 +76,7 @@ namespace VIZ.FGOUT.Module { ...@@ -68,7 +76,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 324 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 325 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.Framework.Common.VideoControl video; internal VIZ.Framework.Common.VideoControl video;
...@@ -76,13 +84,29 @@ namespace VIZ.FGOUT.Module { ...@@ -76,13 +84,29 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 330 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 331 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Canvas canvas1; internal System.Windows.Controls.Canvas canvas1;
#line default #line default
#line hidden #line hidden
#line 436 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _RestartBtn_;
#line default
#line hidden
#line 450 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _StopBtn_;
#line default
#line hidden
private bool _contentLoaded; private bool _contentLoaded;
/// <summary> /// <summary>
...@@ -117,62 +141,71 @@ namespace VIZ.FGOUT.Module { ...@@ -117,62 +141,71 @@ namespace VIZ.FGOUT.Module {
this.uc = ((VIZ.FGOUT.Module.NDIView)(target)); this.uc = ((VIZ.FGOUT.Module.NDIView)(target));
return; return;
case 2: case 2:
this._DetectBtn_ = ((System.Windows.Controls.Button)(target));
return;
case 3:
this.Border = ((System.Windows.Controls.Border)(target)); this.Border = ((System.Windows.Controls.Border)(target));
#line 306 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 307 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.KeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyDown); this.Border.KeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyDown);
#line default #line default
#line hidden #line hidden
#line 307 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 308 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.KeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyUp); this.Border.KeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyUp);
#line default #line default
#line hidden #line hidden
#line 308 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 309 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewKeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyDown); this.Border.PreviewKeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyDown);
#line default #line default
#line hidden #line hidden
#line 309 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 310 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewKeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyUp); this.Border.PreviewKeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyUp);
#line default #line default
#line hidden #line hidden
#line 310 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 311 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonDown); this.Border.PreviewMouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonDown);
#line default #line default
#line hidden #line hidden
#line 311 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 312 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonUp); this.Border.PreviewMouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonUp);
#line default #line default
#line hidden #line hidden
#line 312 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 313 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseMove += new System.Windows.Input.MouseEventHandler(this.Border_MouseMove); this.Border.PreviewMouseMove += new System.Windows.Input.MouseEventHandler(this.Border_MouseMove);
#line default #line default
#line hidden #line hidden
#line 313 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 314 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseRightButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_OnPreviewMouseRightButtonDown); this.Border.PreviewMouseRightButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_OnPreviewMouseRightButtonDown);
#line default #line default
#line hidden #line hidden
return; return;
case 3: case 4:
this.video = ((VIZ.Framework.Common.VideoControl)(target)); this.video = ((VIZ.Framework.Common.VideoControl)(target));
return; return;
case 4: case 5:
this.canvas1 = ((System.Windows.Controls.Canvas)(target)); this.canvas1 = ((System.Windows.Controls.Canvas)(target));
return; return;
case 6:
this._RestartBtn_ = ((System.Windows.Controls.Button)(target));
return;
case 7:
this._StopBtn_ = ((System.Windows.Controls.Button)(target));
return;
} }
this._contentLoaded = true; this._contentLoaded = true;
} }
......
VIZ.FGOUT/VIZ.FGOUT.Storage/LiteDB/System/HotkeyConfig.cs
...@@ -12,12 +12,12 @@ ...@@ -12,12 +12,12 @@
public int Id { get; set; } public int Id { get; set; }
/// <summary> /// <summary>
/// 算法裁切 视图1 /// 开始命令
/// </summary> /// </summary>
public string StartCmd { get; set; } = "Alt + S"; public string StartCmd { get; set; } = "Alt + S";
/// <summary> /// <summary>
/// 算法裁切 视图2 /// 结束命令
/// </summary> /// </summary>
public string EncCmd { get; set; } = "Alt + D"; public string EncCmd { get; set; } = "Alt + D";
......
VIZ.FGOUT/VIZ.FGOUT/bin/x64/Debug/Logs/err.log
This source diff could not be displayed because it is too large. You can view the blob instead.
VIZ.FGOUT/VIZ.FGOUT/bin/x64/Debug/Logs/info.log
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment