Skip to content

F
FGOUT
Commit 7594f49a by 鲁志-悦动
Options

加上算法红绿状态灯 And 空格设置成快捷键

parent 213d03ee
Showing with 218 additions and 165 deletions
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/Converter/AlgorithmTargetBoxLostFrameConverter.cs
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Data;
using VIZ.FGOUT.Domain;
using VIZ.FGOUT.Storage;
......
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/obj/x64/Debug/VIZ.FGOUT.Module.Resource_MarkupCompile.cache
......@@ -10,11 +10,11 @@ none
false
DEBUG;TRACE
20-1486193684
1470602451
11-350624472
24-1321085892
201334349489
1-1441241311
11-1602666439
23-2035776870
Style\Button\Button_NdiView.xaml;Style\Button\Button_Setting.xaml;Style\Button\Button_WindowTop.xaml;Style\CheckBox\CheckBox_NdiView.xaml;Style\CheckBox\CheckBox_RaidoButtonStyle.xaml;Style\CheckBox\CheckBox_Setting.xaml;Style\CheckBox\CheckBox_WindowTop.xaml;Style\ComboBox\ComboBox_Setting.xaml;Style\HotkeyBox\HotkeyBox_Setting.xaml;Style\MessageBox\MessageBoxEx.xaml;Style\RadioButton\RadioButton_FootballSide.xaml;Style\RadioButton\RadioButton_NdiMainViewBlue.xaml;Style\RadioButton\RadioButton_NdiView.xaml;Style\RadioButton\RadioButton_Setting.xaml;Style\Slider\Slider_Setting.xaml;Style\TextBlock\TextBlock_Setting.xaml;Style\TextBox\TextBox_Setting.xaml;Style\ToogleButton\ToogleButton_Setting.xaml;Themes\Generic.xaml;Toolkit\NumericUpDown\NumericUpDown.xaml;
False
True
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/Controller/Loop/ILoopSupport.cs
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Module
namespace VIZ.FGOUT.Module
{
/// <summary>
/// 循环支持
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/Controller/Loop/LoopController.cs
......@@ -6,6 +6,7 @@ using System.Threading.Tasks;
using VIZ.FGOUT.Domain;
using VIZ.FGOUT.Storage;
using VIZ.Framework.Core;
using VIZ.Framework.Domain;
namespace VIZ.FGOUT.Module
......@@ -74,8 +75,9 @@ namespace VIZ.FGOUT.Module
{
try
{
//20240410注释
// 检测3D鼠标值
this.Check3DNavigation();
//this.Check3DNavigation();
// 更新算法目标框连续丢失次数
this.UpdateAlgorithmTargetBoxLostFrame();
......@@ -149,6 +151,14 @@ namespace VIZ.FGOUT.Module
services.ForEach(p => p.UpdateAlgorithmTargetBoxLostFrame());
}
//private void UpdateAlgorithmTargetBoxLostFrame()
//{
// var service = ApplicationDomain.ServiceManager.GetService<INDIMainViewService>(NDIMainViewKeys.MainView);
// if (service == null) return;
// service.UpdateAlgorithmTargetBoxLostFrame();
//}
/// <summary>
/// 销毁
/// </summary>
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/Service/INDIMainViewService.cs
......@@ -25,5 +25,10 @@ namespace VIZ.FGOUT.Module
/// </summary>
/// <param name="context"></param>
void NDIMainViewHotkeyMode(NDIMainViewHotkeyContext context);
/// <summary>
/// 更新算法是否拥有目标框
/// </summary>
//void UpdateAlgorithmTargetBoxLostFrame();
}
}
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml
......@@ -38,6 +38,8 @@
NormalVisibility="Collapsed"
WarningThreshold="20"
WarningVisibility="Visible" />
<!-- 目标框丢失指示灯 -->
<resource:AlgorithmTargetBoxLostFrameConverter x:Key="AlgorithmTargetBoxLostFrameConverter" />
</ResourceDictionary>
</UserControl.Resources>
<behaviors:Interaction.Triggers>
......@@ -1303,8 +1305,21 @@
BorderBrush="Gray"
BorderThickness="1">
<StackPanel Orientation="Horizontal">
<!-- 算法目标丢失指示灯, 不可点击 -->
<!--<CheckBox
Margin="20,0,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Style="{StaticResource CheckBox_IsAlgorithmTargetBoxExists}">
<CheckBox.IsChecked>
<MultiBinding Converter="{StaticResource AlgorithmTargetBoxLostFrameConverter}">
<Binding Path="AlgorithmTargetBoxLostFrame" />
<Binding Path="ViewStatus" />
</MultiBinding>
</CheckBox.IsChecked>
</CheckBox>-->
<TextBlock
Margin="35,0,0,0"
Margin="25,0,0,0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="14"
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
......@@ -258,6 +258,58 @@ namespace VIZ.FGOUT.Module
});
}
/// <summary>
/// 更新算法是否拥有目标框
/// </summary>
//public void UpdateAlgorithmTargetBoxLostFrame()
//{
// if (this.AlgorithmTargetBoxLostFrame == this.algorithmTargetBoxLostFrame_cache)
// return;
// this.AlgorithmTargetBoxLostFrame = this.algorithmTargetBoxLostFrame_cache;
//}
#region AlgorithmTargetBoxLostFrame -- 算法目标框连续丢失帧数
///// <summary>
///// 算法目标框连续丢失帧数 缓存
///// </summary>
///// <remarks>
///// 算法目标框连续丢失帧数 值首先记录在cache中
///// 真实值更新则在 NDIMainViewModel 的 LoopController 中
///// </remarks>
//private int algorithmTargetBoxLostFrame_cache;
//private int algorithmTargetBoxLostFrame;
///// <summary>
///// 算法目标框连续丢失帧数
///// </summary>
//public int AlgorithmTargetBoxLostFrame
//{
// get { return algorithmTargetBoxLostFrame; }
// set { algorithmTargetBoxLostFrame = value; this.RaisePropertyChanged(nameof(AlgorithmTargetBoxLostFrame)); }
//}
#endregion
#region ViewStatus -- NDI视图状态
//private NDIViewStatus viewStatus = NDIViewStatus.Stop;
///// <summary>
///// NDI视图状态
///// </summary>
//public NDIViewStatus ViewStatus
//{
// get { return viewStatus; }
// set
// {
// viewStatus = value;
// this.RaisePropertySaveChanged(nameof(ViewStatus));
// }
//}
#endregion
#region 自动发送倒计时器
//private System.Timers.Timer _autoSend_Timer = new System.Timers.Timer();
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/View/NDIView.xaml
......@@ -77,11 +77,13 @@
</behaviors:EventTrigger>
</behaviors:Interaction.Triggers>
<Grid>
<Grid.RowDefinitions>
<!--<Grid.RowDefinitions>
-->
<!--<RowDefinition Height="70" />-->
<!--
<RowDefinition Height="0" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
</Grid.RowDefinitions>-->
<Grid.ColumnDefinitions>
<ColumnDefinition Width="72" />
<!--<ColumnDefinition Width="120" />-->
......@@ -210,19 +212,19 @@
</Grid.RowDefinitions>
-->
<!-- 算法目标丢失指示灯, 不可点击 -->
<!--<CheckBox Style="{StaticResource CheckBox_IsAlgorithmTargetBoxExists}"
IsHitTestVisible="False"
HorizontalAlignment="Left" VerticalAlignment="Center" Margin="25,0,0,0" Grid.ColumnSpan="2">
<CheckBox
x:Name="_CheckBoxIsAlgorithmTargetBoxExists_"
Margin="25,0,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
Style="{StaticResource CheckBox_IsAlgorithmTargetBoxExists}">
<CheckBox.IsChecked>
<MultiBinding Converter="{StaticResource AlgorithmTargetBoxLostFrameConverter}">
<Binding Path="AlgorithmTargetBoxLostFrame"></Binding>
<Binding Path="ViewStatus"></Binding>
<Binding Path="AlgorithmTargetBoxLostFrame" />
<Binding Path="ViewStatus" />
</MultiBinding>
</CheckBox.IsChecked>
</CheckBox>-->
</CheckBox>
<!-- 算法模式 -->
<!--
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/View/NDIView.xaml.cs
......@@ -162,7 +162,7 @@ namespace VIZ.FGOUT.Module
if ((bool)e.NewValue)
{
//_DetectBtn_.Visibility =
_RestartBtn_.Visibility = _StopBtn_.Visibility = Visibility.Collapsed;
_CheckBoxIsAlgorithmTargetBoxExists_.Visibility = _RestartBtn_.Visibility = _StopBtn_.Visibility = Visibility.Collapsed;
_NewWindowBtn_.Visibility = Visibility.Visible;
}
}
......@@ -189,7 +189,7 @@ namespace VIZ.FGOUT.Module
{
if ((bool)e.NewValue)
{
_RestartBtn_.Visibility = _StopBtn_.Visibility = Visibility.Collapsed;
_CheckBoxIsAlgorithmTargetBoxExists_.Visibility = _RestartBtn_.Visibility = _StopBtn_.Visibility = Visibility.Collapsed;
}
}
......@@ -215,7 +215,7 @@ namespace VIZ.FGOUT.Module
{
if ((bool)e.NewValue)
{
_Setting_.Visibility = _RestartBtn_.Visibility = _StopBtn_.Visibility = Visibility.Collapsed;
_CheckBoxIsAlgorithmTargetBoxExists_.Visibility = _Setting_.Visibility = _RestartBtn_.Visibility = _StopBtn_.Visibility = Visibility.Collapsed;
}
}
......
VIZ.FGOUT/VIZ.FGOUT.Module/SystemSetting/View/HotkeySettingPanelView.xaml.cs
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using System.Windows.Controls;
using VIZ.Framework.Core;
namespace VIZ.FGOUT.Module
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "3AE56A5E80B0D3376E90D3FCCC96344D84255D7E5D7899D93FAD020FE782E930"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "DA4AE3596DB2F347F4E62727DC1BB54BBBEED395B8899988D5C697E43E17977F"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -50,7 +50,7 @@ namespace VIZ.FGOUT.Module {
public partial class NDIMainView : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
#line 55 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 57 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox tbFocus;
......@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 256 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 258 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton _AutoMode_;
......@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 321 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 323 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton _ManualMode_;
......@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1261 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1263 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1;
......@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1390 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1405 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2;
......@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1405 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1420 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3;
......@@ -140,7 +140,7 @@ namespace VIZ.FGOUT.Module {
case 2:
this._AutoMode_ = ((System.Windows.Controls.RadioButton)(target));
#line 261 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 263 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._AutoMode_.Click += new System.Windows.RoutedEventHandler(this.AutoMode_OnClick);
#line default
......@@ -149,7 +149,7 @@ namespace VIZ.FGOUT.Module {
case 3:
this._ManualMode_ = ((System.Windows.Controls.RadioButton)(target));
#line 325 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 327 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._ManualMode_.Click += new System.Windows.RoutedEventHandler(this.ManualMode_OnClick);
#line default
......
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}" "3AE56A5E80B0D3376E90D3FCCC96344D84255D7E5D7899D93FAD020FE782E930"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "DA4AE3596DB2F347F4E62727DC1BB54BBBEED395B8899988D5C697E43E17977F"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -50,7 +50,7 @@ namespace VIZ.FGOUT.Module {
public partial class NDIMainView : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
#line 55 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 57 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox tbFocus;
......@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 256 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 258 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton _AutoMode_;
......@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 321 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 323 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton _ManualMode_;
......@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1261 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1263 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1;
......@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1390 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1405 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2;
......@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1405 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1420 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3;
......@@ -140,7 +140,7 @@ namespace VIZ.FGOUT.Module {
case 2:
this._AutoMode_ = ((System.Windows.Controls.RadioButton)(target));
#line 261 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 263 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._AutoMode_.Click += new System.Windows.RoutedEventHandler(this.AutoMode_OnClick);
#line default
......@@ -149,7 +149,7 @@ namespace VIZ.FGOUT.Module {
case 3:
this._ManualMode_ = ((System.Windows.Controls.RadioButton)(target));
#line 325 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 327 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._ManualMode_.Click += new System.Windows.RoutedEventHandler(this.ManualMode_OnClick);
#line default
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIView/View/NDIView.g.cs
#pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "18EC0AAB488F408F99345878E03BD10BC03FB9C42B926B3C11A07DBCD9CB00C5"
#pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C450EE29EC525622F0D2E6CA98B38DAB038375C2C8A4508EB8689748A7FF81A8"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -60,7 +60,15 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 302 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 216 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox _CheckBoxIsAlgorithmTargetBoxExists_;
#line default
#line hidden
#line 304 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Border Border;
......@@ -68,7 +76,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 322 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 324 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.Framework.Common.VideoControl video;
......@@ -76,7 +84,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 330 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 332 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Canvas canvas1;
......@@ -84,7 +92,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 417 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 419 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _Setting_;
......@@ -92,7 +100,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 438 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 440 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _NewWindowBtn_;
......@@ -100,7 +108,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 453 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 455 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _RestartBtn_;
......@@ -108,7 +116,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 467 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 469 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _StopBtn_;
......@@ -149,48 +157,51 @@ namespace VIZ.FGOUT.Module {
this.uc = ((VIZ.FGOUT.Module.NDIView)(target));
return;
case 2:
this._CheckBoxIsAlgorithmTargetBoxExists_ = ((System.Windows.Controls.CheckBox)(target));
return;
case 3:
this.Border = ((System.Windows.Controls.Border)(target));
#line 304 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 306 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonDown);
#line default
#line hidden
#line 305 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 307 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonUp);
#line default
#line hidden
#line 306 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 308 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseMove += new System.Windows.Input.MouseEventHandler(this.Border_MouseMove);
#line default
#line hidden
#line 307 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 309 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseRightButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_OnPreviewMouseRightButtonDown);
#line default
#line hidden
return;
case 3:
case 4:
this.video = ((VIZ.Framework.Common.VideoControl)(target));
return;
case 4:
case 5:
this.canvas1 = ((System.Windows.Controls.Canvas)(target));
return;
case 5:
case 6:
this._Setting_ = ((System.Windows.Controls.Button)(target));
return;
case 6:
case 7:
this._NewWindowBtn_ = ((System.Windows.Controls.Button)(target));
return;
case 7:
case 8:
this._RestartBtn_ = ((System.Windows.Controls.Button)(target));
return;
case 8:
case 9:
this._StopBtn_ = ((System.Windows.Controls.Button)(target));
return;
}
......
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}" "18EC0AAB488F408F99345878E03BD10BC03FB9C42B926B3C11A07DBCD9CB00C5"
#pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C450EE29EC525622F0D2E6CA98B38DAB038375C2C8A4508EB8689748A7FF81A8"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -60,7 +60,15 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 302 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 216 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox _CheckBoxIsAlgorithmTargetBoxExists_;
#line default
#line hidden
#line 304 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Border Border;
......@@ -68,7 +76,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 322 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 324 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.Framework.Common.VideoControl video;
......@@ -76,7 +84,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 330 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 332 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Canvas canvas1;
......@@ -84,7 +92,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 417 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 419 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _Setting_;
......@@ -92,7 +100,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 438 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 440 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _NewWindowBtn_;
......@@ -100,7 +108,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 453 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 455 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _RestartBtn_;
......@@ -108,7 +116,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 467 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 469 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _StopBtn_;
......@@ -149,48 +157,51 @@ namespace VIZ.FGOUT.Module {
this.uc = ((VIZ.FGOUT.Module.NDIView)(target));
return;
case 2:
this._CheckBoxIsAlgorithmTargetBoxExists_ = ((System.Windows.Controls.CheckBox)(target));
return;
case 3:
this.Border = ((System.Windows.Controls.Border)(target));
#line 304 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 306 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonDown);
#line default
#line hidden
#line 305 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 307 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonUp);
#line default
#line hidden
#line 306 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 308 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseMove += new System.Windows.Input.MouseEventHandler(this.Border_MouseMove);
#line default
#line hidden
#line 307 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 309 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseRightButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_OnPreviewMouseRightButtonDown);
#line default
#line hidden
return;
case 3:
case 4:
this.video = ((VIZ.Framework.Common.VideoControl)(target));
return;
case 4:
case 5:
this.canvas1 = ((System.Windows.Controls.Canvas)(target));
return;
case 5:
case 6:
this._Setting_ = ((System.Windows.Controls.Button)(target));
return;
case 6:
case 7:
this._NewWindowBtn_ = ((System.Windows.Controls.Button)(target));
return;
case 7:
case 8:
this._RestartBtn_ = ((System.Windows.Controls.Button)(target));
return;
case 8:
case 9:
this._StopBtn_ = ((System.Windows.Controls.Button)(target));
return;
}
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/VIZ.FGOUT.Module_MarkupCompile.lref

C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\obj\x64\Debug\GeneratedInternalTypeHelper.g.cs
FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIMainView\View\NDIMainView.xaml;;
FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIPreviewView\View\NDIPreviewView.xaml;;
......
VIZ.Framework/VIZ.Framework.Common/Widgets/HotkeyBox/HotkeyHelper.cs
......@@ -61,6 +61,36 @@ namespace VIZ.Framework.Common
sb.Append($"{e.Key}");
}
// Space空格
if (e.SystemKey == Key.Space)
{
sb.Append($"{e.SystemKey}");
}
if (e.Key == Key.Space)
{
sb.Append($"{e.Key}");
}
// Return回车
if (e.SystemKey == Key.Return)
{
sb.Append($"{e.SystemKey}");
}
if (e.Key == Key.Return)
{
sb.Append($"{e.Key}");
}
// Esc
if (e.SystemKey == Key.Escape)
{
sb.Append($"{e.SystemKey}");
}
if (e.Key == Key.Escape)
{
sb.Append($"{e.Key}");
}
// Up
if (e.SystemKey == Key.Up)
{
......
VIZ.Framework/VIZ.Framework.Common/obj/x64/Debug/GeneratedInternalTypeHelper.g.cs
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
// 运行时版本:4.0.30319.42000
//
// 对此文件的更改可能会导致不正确的行为，并且如果
// 重新生成代码，这些更改将会丢失。
// </auto-generated>
//------------------------------------------------------------------------------
namespace XamlGeneratedNamespace {
/// <summary>
/// GeneratedInternalTypeHelper
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
/// <summary>
/// CreateInstance
/// </summary>
protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic)
| (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
}
/// <summary>
/// GetPropertyValue
/// </summary>
protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
}
/// <summary>
/// SetPropertyValue
/// </summary>
protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
}
/// <summary>
/// CreateDelegate
/// </summary>
protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod
| (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
delegateType,
handler}, null)));
}
/// <summary>
/// AddEventHandler
/// </summary>
protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
eventInfo.AddEventHandler(target, handler);
}
}
}

VIZ.Framework/VIZ.Framework.Common/obj/x64/Debug/VIZ.Framework.Common_MarkupCompile.lref

C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\obj\x64\Debug\GeneratedInternalTypeHelper.g.cs
FC:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\MessageBox\MessageBoxEx.xaml;;
FC:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\MessageBox\MessageBoxExWindow.xaml;;
......
VIZ.Framework/VIZ.Framework.Common/obj/x64/Release/VIZ.Framework.Common.csproj.CoreCompileInputs.cache
fdc742c74c78e8cedbc468852e1373ddd0f9d9017d1562d22ed1ae78b714181f
b3d9ab6bd9d828906c905c88d597346e8821250eb12ca55b8d29c191d33bf901
VIZ.Framework/VIZ.Framework.Common/obj/x64/Release/VIZ.Framework.Common_MarkupCompile.cache
......@@ -12,7 +12,7 @@ TRACE
15-721109437
120150095399
121-1133520871
44928538216
MessageBox\MessageBoxEx.xaml;MessageBox\MessageBoxExWindow.xaml;Themes\Generic.xaml;VideoControl\Control\VideoControl.xaml;Widgets\ColorPickButton\ColorPickButton.xaml;Widgets\ColorPickButton\ColorPickWindow.xaml;Widgets\GPIOPinTestControl\GPIOPinTestControl.xaml;Widgets\HotkeyBox\HotkeyBox.xaml;Widgets\IconButton\IconButton.xaml;Widgets\LabelValue\LabelValue.xaml;Widgets\NavigationControl\NavigationControl.xaml;Widgets\ResizeImageControl\ResizeImageControl.xaml;Widgets\ShowMessageControl\ShowMessageControl.xaml;Widgets\VideoTimeBar\VideoTimeBar.xaml;Widgets\ViewLoader\ViewLoader.xaml;
......
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