Skip to content

F
FGOUT
Commit 08c0d247 by 鲁志-悦动
Options

跳水Replay入点即最高点逻辑优化

parent 6c801caa
Showing with 210 additions and 218 deletions
VIZ.FGOUT/VIZ.FGOUT.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.FGOUT/VIZ.FGOUT.Common/obj/x64/Debug/VIZ.FGOUT.Common_MarkupCompile.cache
...@@ -10,11 +10,11 @@ none ...@@ -10,11 +10,11 @@ none
false false
2-725104376 21870986562
3947974750 31364711570
17-1462717611 17-1683084370
Themes\Generic.xaml;Widgets\FootballFieldPanel\FootballFieldPanel.xaml; Themes\Generic.xaml;Widgets\FootballFieldPanel\FootballFieldPanel.xaml;
True False
VIZ.FGOUT/VIZ.FGOUT.Common/obj/x64/Debug/VIZ.FGOUT.Common_MarkupCompile.lref
 C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\obj\x64\Debug\GeneratedInternalTypeHelper.g.cs
FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\Themes\Generic.xaml;; FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\Themes\Generic.xaml;;
FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\Widgets\FootballFieldPanel\FootballFieldPanel.xaml;; FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\Widgets\FootballFieldPanel\FootballFieldPanel.xaml;;
......
VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Algorithm/AlgorithmPackageProvider.cs
...@@ -51,7 +51,7 @@ namespace VIZ.FGOUT.Connection ...@@ -51,7 +51,7 @@ namespace VIZ.FGOUT.Connection
try try
{ {
AlgorithmPackageBase @base = Newtonsoft.Json.JsonConvert.DeserializeObject<AlgorithmPackageBase>(info.Json); AlgorithmPackageBase @base = Newtonsoft.Json.JsonConvert.DeserializeObject<AlgorithmPackageBase>(info.Json);
if(@base.signal == "MaskMsg" || @base.signal == "ReplayResp") if(@base.signal == ClipPackageSignal.MaskMsg || @base.signal == ClipPackageSignal.ReplayResp || @base.signal == AlgorithmPackageSignal.in_point_time_code)
{ {
log.Info(info.Json); log.Info(info.Json);
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/obj/x64/Debug/VIZ.FGOUT.Module.Resource_MarkupCompile.cache
...@@ -10,11 +10,11 @@ none ...@@ -10,11 +10,11 @@ none
false false
DEBUG;TRACE DEBUG;TRACE
22-1578589972 221979955803
1-1441241311 1470602451
11-1602666439 11-350624472
23-2035776870 24-1321085892
Resources\StringResource.zh-CN.xaml;Resources\StringResource.en.xaml;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; Resources\StringResource.zh-CN.xaml;Resources\StringResource.en.xaml;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;
True False
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml
...@@ -1190,6 +1190,7 @@ ...@@ -1190,6 +1190,7 @@
<TextBlock Text="{DynamicResource DynamicIn}" /> <TextBlock Text="{DynamicResource DynamicIn}" />
<TextBox <TextBox
Width="57" Width="57"
PreviewTextInput="OnPreviewTextInputCommon"
InputMethod.IsInputMethodEnabled="False" InputMethod.IsInputMethodEnabled="False"
Style="{StaticResource TextBoxStyle}" Style="{StaticResource TextBoxStyle}"
Text="{Binding DynamicIn, Mode=TwoWay}"> Text="{Binding DynamicIn, Mode=TwoWay}">
...@@ -1205,6 +1206,7 @@ ...@@ -1205,6 +1206,7 @@
<TextBlock Text="{DynamicResource DynamicOut}" /> <TextBlock Text="{DynamicResource DynamicOut}" />
<TextBox <TextBox
Width="57" Width="57"
PreviewTextInput="OnPreviewTextInputCommon"
InputMethod.IsInputMethodEnabled="False" InputMethod.IsInputMethodEnabled="False"
Style="{StaticResource TextBoxStyle}" Style="{StaticResource TextBoxStyle}"
Text="{Binding DynamicOut, Mode=TwoWay}"> Text="{Binding DynamicOut, Mode=TwoWay}">
...@@ -1220,6 +1222,7 @@ ...@@ -1220,6 +1222,7 @@
<TextBlock Text="{DynamicResource StaticFrame}" /> <TextBlock Text="{DynamicResource StaticFrame}" />
<TextBox <TextBox
Width="57" Width="57"
PreviewTextInput="OnPreviewTextInputCommon"
InputMethod.IsInputMethodEnabled="False" InputMethod.IsInputMethodEnabled="False"
Style="{StaticResource TextBoxStyle}" Style="{StaticResource TextBoxStyle}"
Text="{Binding StaticFrame, Mode=TwoWay}"> Text="{Binding StaticFrame, Mode=TwoWay}">
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
...@@ -107,6 +107,8 @@ namespace VIZ.FGOUT.Module ...@@ -107,6 +107,8 @@ namespace VIZ.FGOUT.Module
{ {
try try
{ {
IsIntervalFrame = IsIntervalPixel = false;
var number = ApplicationDomainEx.LiteDbContext.ViewConfig.FindOne(p => p.ViewKey == NDIViewKeys.CAM_1) var number = ApplicationDomainEx.LiteDbContext.ViewConfig.FindOne(p => p.ViewKey == NDIViewKeys.CAM_1)
.GameName; .GameName;
if (!string.IsNullOrEmpty(number)) if (!string.IsNullOrEmpty(number))
...@@ -262,28 +264,51 @@ namespace VIZ.FGOUT.Module ...@@ -262,28 +264,51 @@ namespace VIZ.FGOUT.Module
//回复UI界面Replay结果 //回复UI界面Replay结果
ApplicationDomain.MessageManager.Register<ClipMessage__ReplayResp>(this, this.OnClipMessage__ReplayResp); ApplicationDomain.MessageManager.Register<ClipMessage__ReplayResp>(this, this.OnClipMessage__ReplayResp);
//接收NDIViewModel发来的算法入点时间戳消息 ////接收NDIViewModel发来的算法入点时间戳消息
ApplicationDomain.MessageManager.Register<AlgorithmMessageInPointTimeCodeModel>(this, this.OnAlgorithmMessageInPointTimeCode); //ApplicationDomain.MessageManager.Register<AlgorithmMessageInPointTimeCodeModel>(this, this.OnAlgorithmMessageInPointTimeCode);
}
private void OnAlgorithmMessageInPointTimeCode(AlgorithmMessageInPointTimeCodeModel model) //// 算法入点时间戳消息
{ //ApplicationDomain.MessageManager.Register<AlgorithmMessage__in_point_time_code>(this, this.OnAlgorithmMessage__in_point_time_code);
//在Replay的情况下
if (ReplayIsChecked)
{
var number = ApplicationDomainEx.LiteDbContext.ViewConfig.FindOne(p => p.ViewKey == NDIViewKeys.CAM_1)
.GameName;
if (!string.IsNullOrEmpty(number))
{
//并且在跳水的时候
if (number.Equals("DS") || number.Equals("DT") || number.Equals("SS") || number.Equals("ST"))
{
WPFHelper.BeginInvoke(() => { SliderStartValue = NDIViewModel.SliderStartValue; });
}
}
}
} }
///// <summary>
///// 算法入点时间戳消息
///// </summary>
///// <param name="msg"></param>
//private void OnAlgorithmMessage__in_point_time_code(AlgorithmMessage__in_point_time_code msg)
//{
// var timecode = msg.timecode;
// var startTime = NDIViewModel.StartTime;
// var start = 0;
// if (timecode > startTime)
// {
// start += Convert.ToInt32(timecode - startTime);
// }
// else if(timecode < startTime)
// {
// start -= Convert.ToInt32(startTime - timecode);
// }
// WPFHelper.BeginInvoke(() => { NDIViewModel.SliderStartValue = SliderStartValue = start; });
//}
//private void OnAlgorithmMessageInPointTimeCode(AlgorithmMessageInPointTimeCodeModel model)
//{
// //在Replay的情况下
// if (ReplayIsChecked)
// {
// var number = ApplicationDomainEx.LiteDbContext.ViewConfig.FindOne(p => p.ViewKey == NDIViewKeys.CAM_1)
// .GameName;
// if (!string.IsNullOrEmpty(number))
// {
// //并且在跳水的时候
// if (number.Equals("DS") || number.Equals("DT") || number.Equals("SS") || number.Equals("ST"))
// {
// WPFHelper.BeginInvoke(() => { SliderStartValue = NDIViewModel.SliderStartValue; });
// }
// }
// }
//}
private void OnClipMessage__MaskMsg(ClipMessage__MaskMsg msg) private void OnClipMessage__MaskMsg(ClipMessage__MaskMsg msg)
{ {
if (msg?.data?.status == 1) if (msg?.data?.status == 1)
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.Manual_NDI.cs
...@@ -214,6 +214,25 @@ namespace VIZ.FGOUT.Module ...@@ -214,6 +214,25 @@ namespace VIZ.FGOUT.Module
SliderEndValue = index = SliderValue; SliderEndValue = index = SliderValue;
} }
if (IsTimeCode)
{
IsTimeCode = false;
if (buffer.Count > 0)
{
int startIndex = 0;
foreach (var matExtend in buffer)
{
//遍历队列集合，先遍历到入点帧
if (matExtend.TimeStamp == StartTime)
{
SliderStartValue = startIndex;
break;
}
startIndex++;
}
}
}
#region 公共代码 #region 公共代码
if (index >= (50 * STREAM_CACHEED_TIME)) index = (50 * STREAM_CACHEED_TIME - 1); if (index >= (50 * STREAM_CACHEED_TIME)) index = (50 * STREAM_CACHEED_TIME - 1);
...@@ -267,6 +286,7 @@ namespace VIZ.FGOUT.Module ...@@ -267,6 +286,7 @@ namespace VIZ.FGOUT.Module
var info2 = _cam3BInfos[0]; var info2 = _cam3BInfos[0];
if (info2.BboxType != null && info2.BboxType.Equals(AlgorithmPackageSignal.track)) if (info2.BboxType != null && info2.BboxType.Equals(AlgorithmPackageSignal.track))
{ {
if (ApplicationDomainEx.LiteDbContext == null) return;
var gameName = ApplicationDomainEx.LiteDbContext.ViewConfig var gameName = ApplicationDomainEx.LiteDbContext.ViewConfig
.FindOne(p => p.ViewKey == NDIViewKeys.CAM_1).GameName; .FindOne(p => p.ViewKey == NDIViewKeys.CAM_1).GameName;
//当双人3m跳水,双人10m跳水,双人速度攀岩时，保存2个入点框 //当双人3m跳水,双人10m跳水,双人速度攀岩时，保存2个入点框
...@@ -480,32 +500,37 @@ namespace VIZ.FGOUT.Module ...@@ -480,32 +500,37 @@ namespace VIZ.FGOUT.Module
// 更新画面 // 更新画面
view.video.UpdateVideoFrame(e.Frame); view.video.UpdateVideoFrame(e.Frame);
// 更新手动裁切框 #region 注释的代码
// 仅手动模式下处理 & 居中模式下处理 & 需要进行裁切时才处理
if ((this.StrategyMode == AlgorithmStrategyMode.center_mode || //// 更新手动裁切框
this.StrategyMode == AlgorithmStrategyMode.manual_mode) && this.IsUseClip) //// 仅手动模式下处理 & 居中模式下处理 & 需要进行裁切时才处理
this.UpdateClipBoxWithManualAndCenter(); //if ((this.StrategyMode == AlgorithmStrategyMode.center_mode ||
// 获取将要发送的裁切数据, 无论什么模式均要发送 // this.StrategyMode == AlgorithmStrategyMode.manual_mode) && this.IsUseClip)
Navigation3DSmoothWithSavitzkyGolayResult sendValue = // this.UpdateClipBoxWithManualAndCenter();
this.ManualController.GetSavitzkyGolayValue(e.Frame.TimeStamp, //// 获取将要发送的裁切数据, 无论什么模式均要发送
this.ClipBoxX + ApplicationDomainEx.VIDEO_CLIP_BOX_WIDTH / 2); //Navigation3DSmoothWithSavitzkyGolayResult sendValue =
// 如果当前模式为手动模式或居中模式且处于接收裁切信号状态，并且需要进行裁切，那么发送手动裁切信号 && this.ViewStatus == NDIViewStatus.CropRoi // this.ManualController.GetSavitzkyGolayValue(e.Frame.TimeStamp,
if (e.Frame != null && this.IsUseClip // this.ClipBoxX + ApplicationDomainEx.VIDEO_CLIP_BOX_WIDTH / 2);
&& (this.StrategyMode == AlgorithmStrategyMode.center_mode || //// 如果当前模式为手动模式或居中模式且处于接收裁切信号状态，并且需要进行裁切，那么发送手动裁切信号 && this.ViewStatus == NDIViewStatus.CropRoi
this.StrategyMode == AlgorithmStrategyMode.manual_mode)) //if (e.Frame != null && this.IsUseClip
{ // && (this.StrategyMode == AlgorithmStrategyMode.center_mode ||
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(this.ViewKey); // this.StrategyMode == AlgorithmStrategyMode.manual_mode))
if (manager == null) return; //{
// UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(this.ViewKey);
List<int> roi = this.GetManulRoi(); // if (manager == null) return;
// 向算法发送裁切框
if (this.StrategyMode == AlgorithmStrategyMode.center_mode) // List<int> roi = this.GetManulRoi();
AlgorithmSender.CenterMode(manager, this.ID, this.ViewConfig.IsSendToCrop, roi, // // 向算法发送裁切框
this.AlgorithmConfig.SmoothCoeff); // if (this.StrategyMode == AlgorithmStrategyMode.center_mode)
else if (this.StrategyMode == AlgorithmStrategyMode.manual_mode) // AlgorithmSender.CenterMode(manager, this.ID, this.ViewConfig.IsSendToCrop, roi,
AlgorithmSender.ManualMode(manager, this.ID, this.ViewConfig.IsSendToCrop, roi, // this.AlgorithmConfig.SmoothCoeff);
this.AlgorithmConfig.SmoothCoeff); // else if (this.StrategyMode == AlgorithmStrategyMode.manual_mode)
} // AlgorithmSender.ManualMode(manager, this.ID, this.ViewConfig.IsSendToCrop, roi,
// this.AlgorithmConfig.SmoothCoeff);
//}
#endregion
} }
catch (Exception ex) catch (Exception ex)
{ {
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.Message.cs
...@@ -21,10 +21,19 @@ namespace VIZ.FGOUT.Module ...@@ -21,10 +21,19 @@ namespace VIZ.FGOUT.Module
/// <param name="msg"></param> /// <param name="msg"></param>
private void OnAlgorithmMessage__in_point_time_code(AlgorithmMessage__in_point_time_code msg) private void OnAlgorithmMessage__in_point_time_code(AlgorithmMessage__in_point_time_code msg)
{ {
if (this.ViewKey == NDIViewKeys.CAM_2 || this.ViewKey == NDIViewKeys.CAM_4) return; if (this.ViewKey != NDIViewKeys.CAM_1 ) return;
StartTime = msg.timecode; StartTime = msg.timecode;
var model = new AlgorithmMessageInPointTimeCodeModel(); IsTimeCode = true;
ApplicationDomain.MessageManager.Send(model);
//if (msg.timecode > StartTime)
//{
// SliderStartValue += Convert.ToInt32(msg.timecode - StartTime);
//}
//else if (msg.timecode < StartTime)
//{
// SliderStartValue -= Convert.ToInt32(StartTime - msg.timecode);
//}
} }
/// <summary> /// <summary>
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.cs
...@@ -132,8 +132,8 @@ namespace VIZ.FGOUT.Module ...@@ -132,8 +132,8 @@ namespace VIZ.FGOUT.Module
// 算法跟踪消息--裁切(没有收到这个的消息) // 算法跟踪消息--裁切(没有收到这个的消息)
ApplicationDomain.MessageManager.Register<AlgorithmMessage__crop_roi>(this, this.OnAlgorithmMessage__crop_roi); ApplicationDomain.MessageManager.Register<AlgorithmMessage__crop_roi>(this, this.OnAlgorithmMessage__crop_roi);
// 算法落盘开始、结束时间戳消息 //// 算法落盘开始、结束时间戳消息
ApplicationDomain.MessageManager.Register<AlgorithmMessage__start_end>(this, this.OnAlgorithmMessage__start_end); //ApplicationDomain.MessageManager.Register<AlgorithmMessage__start_end>(this, this.OnAlgorithmMessage__start_end);
// 算法入点时间戳消息 // 算法入点时间戳消息
ApplicationDomain.MessageManager.Register<AlgorithmMessage__in_point_time_code>(this, this.OnAlgorithmMessage__in_point_time_code); ApplicationDomain.MessageManager.Register<AlgorithmMessage__in_point_time_code>(this, this.OnAlgorithmMessage__in_point_time_code);
...@@ -594,9 +594,11 @@ namespace VIZ.FGOUT.Module ...@@ -594,9 +594,11 @@ namespace VIZ.FGOUT.Module
public bool IsEndValue; public bool IsEndValue;
public bool IsSliderStartClicked; public bool IsSliderStartClicked;
public bool IsSliderEndClicked; public bool IsSliderEndClicked;
//public static int SliderStartValue;
public static int SliderStartValue; public static int SliderStartValue;
public static int SliderEndValue; public static int SliderEndValue;
public static long StartTime { get; set; } public static long StartTime { get; set; }
public bool IsTimeCode = false;
public static long EndTime { get; set; } public static long EndTime { get; set; }
public static List<TrackingBoxInfo> _cam3StaticInfos = new List<TrackingBoxInfo>(); public static List<TrackingBoxInfo> _cam3StaticInfos = new List<TrackingBoxInfo>();
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "1DE0210999FB6D9D425EE012438BC7AEE73E7D25C82080294E120D8AE150EEDA" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "94047D76C780C3BFEB6802FFEAB954C420A2E627512B2F25391F2D7BBADBE7A0"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module { ...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1569 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1572 "..\..\..\..\..\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 +82,7 @@ namespace VIZ.FGOUT.Module { ...@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1754 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1757 "..\..\..\..\..\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;
...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module { ...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1769 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1772 "..\..\..\..\..\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 cam3; internal VIZ.FGOUT.Module.NDIView cam3;
...@@ -188,12 +188,36 @@ namespace VIZ.FGOUT.Module { ...@@ -188,12 +188,36 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
return; return;
case 8: case 8:
this.cam1 = ((VIZ.FGOUT.Module.NDIView)(target));
#line 1193 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
#line hidden
return; return;
case 9: case 9:
this.cam2 = ((VIZ.FGOUT.Module.NDIView)(target));
#line 1209 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
#line hidden
return; return;
case 10: case 10:
#line 1225 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
#line hidden
return;
case 11:
this.cam1 = ((VIZ.FGOUT.Module.NDIView)(target));
return;
case 12:
this.cam2 = ((VIZ.FGOUT.Module.NDIView)(target));
return;
case 13:
this.cam3 = ((VIZ.FGOUT.Module.NDIView)(target)); this.cam3 = ((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}" "1DE0210999FB6D9D425EE012438BC7AEE73E7D25C82080294E120D8AE150EEDA" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "94047D76C780C3BFEB6802FFEAB954C420A2E627512B2F25391F2D7BBADBE7A0"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module { ...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1569 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1572 "..\..\..\..\..\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 +82,7 @@ namespace VIZ.FGOUT.Module { ...@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1754 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1757 "..\..\..\..\..\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;
...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module { ...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1769 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1772 "..\..\..\..\..\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 cam3; internal VIZ.FGOUT.Module.NDIView cam3;
...@@ -188,12 +188,36 @@ namespace VIZ.FGOUT.Module { ...@@ -188,12 +188,36 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
return; return;
case 8: case 8:
this.cam1 = ((VIZ.FGOUT.Module.NDIView)(target));
#line 1193 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
#line hidden
return; return;
case 9: case 9:
this.cam2 = ((VIZ.FGOUT.Module.NDIView)(target));
#line 1209 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
#line hidden
return; return;
case 10: case 10:
#line 1225 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
#line hidden
return;
case 11:
this.cam1 = ((VIZ.FGOUT.Module.NDIView)(target));
return;
case 12:
this.cam2 = ((VIZ.FGOUT.Module.NDIView)(target));
return;
case 13:
this.cam3 = ((VIZ.FGOUT.Module.NDIView)(target)); this.cam3 = ((VIZ.FGOUT.Module.NDIView)(target));
return; return;
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/VIZ.FGOUT.Module_MarkupCompile.cache
...@@ -10,11 +10,11 @@ none ...@@ -10,11 +10,11 @@ none
false false
DEBUG;TRACE DEBUG;TRACE
25-429057470 25-1434354873
4-1529606353 4-699044453
99-1491530721 99-439317849
151915249285 151674092382
NDIMainView\View\NDIMainView.xaml;NDIPreviewView\View\NDIPreviewView.xaml;NDISettingView\View\AlgorithmSettingPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmCablewayPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmNearPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmSinglePanelView.xaml;NDISettingView\View\Algorithm\AlgorithmSixteenPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmTacticsPanelView.xaml;NDISettingView\View\NDISettingPanelView.xaml;NDISettingView\View\NDISettingView.xaml;NDIView\View\NDIView.xaml;SystemSetting\View\AboutPanelView.xaml;SystemSetting\View\CheckDataPanelView.xaml;SystemSetting\View\HotkeySettingPanelView.xaml;SystemSetting\View\LanguagePanelView.xaml;SystemSetting\View\MattingImagePanelView.xaml;SystemSetting\View\NewWindowView.xaml;SystemSetting\View\PackageSettingPanelView.xaml;SystemSetting\View\PreviewSettingPanelView.xaml;SystemSetting\View\ReplayPanelView.xaml;SystemSetting\View\StyleSettingPanelView.xaml;SystemSetting\View\SystemSettingView.xaml;SystemSetting\View\UEControlPanelView.xaml;SystemSetting\View\UESettingPanelView.xaml;Themes\SliderArrange.xaml; NDIMainView\View\NDIMainView.xaml;NDIPreviewView\View\NDIPreviewView.xaml;NDISettingView\View\AlgorithmSettingPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmCablewayPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmNearPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmSinglePanelView.xaml;NDISettingView\View\Algorithm\AlgorithmSixteenPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmTacticsPanelView.xaml;NDISettingView\View\NDISettingPanelView.xaml;NDISettingView\View\NDISettingView.xaml;NDIView\View\NDIView.xaml;SystemSetting\View\AboutPanelView.xaml;SystemSetting\View\CheckDataPanelView.xaml;SystemSetting\View\HotkeySettingPanelView.xaml;SystemSetting\View\LanguagePanelView.xaml;SystemSetting\View\MattingImagePanelView.xaml;SystemSetting\View\NewWindowView.xaml;SystemSetting\View\PackageSettingPanelView.xaml;SystemSetting\View\PreviewSettingPanelView.xaml;SystemSetting\View\ReplayPanelView.xaml;SystemSetting\View\StyleSettingPanelView.xaml;SystemSetting\View\SystemSettingView.xaml;SystemSetting\View\UEControlPanelView.xaml;SystemSetting\View\UESettingPanelView.xaml;Themes\SliderArrange.xaml;
True False
VIZ.FGOUT/VIZ.FGOUT/Properties/AssemblyInfo.cs
...@@ -55,5 +55,5 @@ using System.Windows; ...@@ -55,5 +55,5 @@ using System.Windows;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示: //通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.25.0")] [assembly: AssemblyVersion("1.0.26.0")]
[assembly: AssemblyFileVersion("1.0.25.0")] [assembly: AssemblyFileVersion("1.0.26.0")]
VIZ.FGOUT/VIZ.FGOUT/obj/x64/Debug/VIZ.FGOUT_MarkupCompile.cache
...@@ -10,11 +10,11 @@ none ...@@ -10,11 +10,11 @@ none
false false
DEBUG;TRACE DEBUG;TRACE
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\App.xaml C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\App.xaml
21265083526 2-1347366880
6-790135758 6968741766
421356718200 43-1958993781
CloseAlgorithmWindow.xaml;MainWindow.xaml; CloseAlgorithmWindow.xaml;MainWindow.xaml;
True False
VIZ.Framework/VIZ.Framework.Common.Resource/obj/x64/Debug/VIZ.Framework.Common.Resource_MarkupCompile.cache
...@@ -10,10 +10,10 @@ none ...@@ -10,10 +10,10 @@ none
false false
DEBUG;TRACE DEBUG;TRACE
9-721875057 91711917753
3-630027162 3-1719726047
19-1136530284 201914760168
Path\ArrowPathResource.xaml;Style\Button\Button_MessageBox.xaml;Style\Button\Button_Normal.xaml;Style\Button\Button_WindowTop.xaml;Style\GridSplitter\GridSplitter_None.xaml;Style\ListBox\ListBox_None.xaml;Style\ScrollView\ScrollView_Default.xaml;Style\TextBox\TextBox_None.xaml;Themes\Generic.xaml; Path\ArrowPathResource.xaml;Style\Button\Button_MessageBox.xaml;Style\Button\Button_Normal.xaml;Style\Button\Button_WindowTop.xaml;Style\GridSplitter\GridSplitter_None.xaml;Style\ListBox\ListBox_None.xaml;Style\ScrollView\ScrollView_Default.xaml;Style\TextBox\TextBox_None.xaml;Themes\Generic.xaml;
False False
......
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.cache
...@@ -10,11 +10,11 @@ none ...@@ -10,11 +10,11 @@ none
false false
DEBUG;TRACE DEBUG;TRACE
15-721109437 15488264905
121-1133520871 1212046750213
150238613261 150843184444
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; 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;
True False
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\MessageBoxEx.xaml;;
FC:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\MessageBox\MessageBoxExWindow.xaml;; FC:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\MessageBox\MessageBoxExWindow.xaml;;
......
VIZ.Framework/VIZ.Framework.Module/obj/x64/Debug/VIZ.Framework.Module_MarkupCompile.cache
...@@ -10,11 +10,11 @@ none ...@@ -10,11 +10,11 @@ none
false false
DEBUG;TRACE DEBUG;TRACE
1-731644535 11882902973
212002329545 212023628146
25439653939 26-1598261527
Themes\Generic.xaml; Themes\Generic.xaml;
True False
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