Skip to content

F
FGOUT
Commit 02481b14 by 鲁志-悦动
Options

新增勾选按钮，"保留最高点"

parent 8c6c6250
Showing with 113 additions and 230 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
false
2-725104376
21870986562
3947974750
17-1462717611
31364711570
17-1683084370
Themes\Generic.xaml;Widgets\FootballFieldPanel\FootballFieldPanel.xaml;
True
False
VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Algorithm/Signal/Send/AlgorithmPackage_Figout_sports_model.cs
......@@ -61,7 +61,6 @@
/// </summary>
public int Landing_frame_interval { get; set; } = 7;
/// <summary>
/// 用来过滤框的高
/// </summary>
......@@ -73,6 +72,11 @@
public int Bbox_min_w { get; set; } = 0;
/// <summary>
/// 是否保留最高点
/// </summary>
public bool Keep_highest { get; set; } = false;
/// <summary>
/// 是否是大模型
/// </summary>
public bool Is_Big_Model { get; set; } = false;
......
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/obj/x64/Debug/VIZ.FGOUT.Module.Resource_MarkupCompile.cache
......@@ -10,11 +10,11 @@ none
false
DEBUG;TRACE
22-1578589972
1-1441241311
11-1602666439
23-2035776870
221979955803
1470602451
11-350624472
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;
True
False
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml
......@@ -930,16 +930,10 @@
BorderThickness="1">
<Grid>
<Grid.ColumnDefinitions>
<!--<ColumnDefinition Width="1.5*" />
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition Width="1.1*" />
<ColumnDefinition Width="1.1*" />-->
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
......@@ -1041,14 +1035,26 @@
Grid.Column="4"
Margin="0,12"
HorizontalAlignment="Center"
Command="{Binding KeepHighestCommand}"
Content="保留最高点"
FontSize="14"
Foreground="White"
IsChecked="{Binding Path=IsKeepHighest, Mode=TwoWay}"
Style="{StaticResource CheckBox_Setting}" />
<CheckBox
Grid.Column="5"
Margin="0,12"
HorizontalAlignment="Center"
Command="{Binding BigModelCommand}"
Content="{DynamicResource LargeModel}"
FontSize="14"
Foreground="White"
IsChecked="{Binding Path=IsBigModel, Mode=TwoWay}"
Style="{StaticResource CheckBox_Setting}" />
<Button
Grid.Column="5"
Grid.Column="6"
Width="100"
Height="40"
HorizontalAlignment="Center"
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
......@@ -198,10 +198,12 @@ namespace VIZ.FGOUT.Module
//算法发送参数
this.AlgorithmSendCommand = new VCommand(this.AlgorithmSend);
//两个算法参数回车命令
//三个算法参数回车命令
this.Matting_intervalKeyDownCommand = new VCommand<KeyEventArgs>(this.Matting_intervalKeyDown);
this.Moving_pixelKeyDownCommand = new VCommand<KeyEventArgs>(this.Moving_pixelKeyDown);
this.Remove_out_point_pixelKeyDownCommand = new VCommand<KeyEventArgs>(Remove_out_point_pixelKeyDown);
this.KeepHighestCommand = new VCommand(this.KeepHighest);
this.BigModelCommand = new VCommand(this.BigModel);
//裁切区域
......@@ -409,9 +411,23 @@ namespace VIZ.FGOUT.Module
}
}
private bool _isKeepHighest;
/// <summary>
/// 是否保留最高点
/// </summary>
public bool IsKeepHighest
{
get => _isKeepHighest;
set
{
_isKeepHighest = value;
this.RaisePropertyChanged(nameof(IsKeepHighest));
}
}
private bool _isBigModel;
/// <summary>
/// 是否是大模型
/// 是否用大模型
/// </summary>
public bool IsBigModel
{
......@@ -439,6 +455,7 @@ namespace VIZ.FGOUT.Module
Matting_interval = alPackage.Matting_interval;
Moving_pixel = alPackage.Moving_pixel;
Remove_out_point_pixel = alPackage.Remove_out_point_pixel;
IsKeepHighest = alPackage.Keep_highest;
IsBigModel = alPackage.Is_Big_Model;
}
}
......@@ -479,6 +496,7 @@ namespace VIZ.FGOUT.Module
alPackage.Matting_interval = Matting_interval;
alPackage.Moving_pixel = Moving_pixel;
alPackage.Remove_out_point_pixel = Remove_out_point_pixel;
alPackage.Keep_highest = IsKeepHighest;
alPackage.Is_Big_Model = IsBigModel;
//发送给算法
......@@ -1115,6 +1133,13 @@ namespace VIZ.FGOUT.Module
}
}
public VCommand KeepHighestCommand { get; set; }
private void KeepHighest()
{
AlgorithmSendCommon();
}
public VCommand BigModelCommand { get; set; }
private void BigModel()
......@@ -2003,7 +2028,8 @@ namespace VIZ.FGOUT.Module
SystemSettingView view = new SystemSettingView();
//NoneWindow window = new NoneWindow(1200, 800, view);
//window.Owner = this.GetWindow();
view.Show();
//view.Show();
view.ShowDialog();
}
#endregion
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.Command.cs
......@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using VIZ.FGOUT.Domain;
using VIZ.FGOUT.Module.SystemSetting.View;
using VIZ.FGOUT.Storage;
using VIZ.Framework.Common;
using VIZ.Framework.Core;
......@@ -28,14 +27,12 @@ namespace VIZ.FGOUT.Module
/// </summary>
private void Loaded()
{
if (this.IsAlreadyLoaded)
return;
if (this.IsAlreadyLoaded) return;
this.IsAlreadyLoaded = true;
NDIView view = this.GetView<NDIView>();
if (view == null)
return;
if (view == null) return;
// 视图键
this.ViewKey = view.NDIKey;
......@@ -135,7 +132,7 @@ namespace VIZ.FGOUT.Module
{
// 注册视频控件插件
//CAM_1、CAM_2都会调用这个方法，在CAM_1的时候注册一次就可以
//CAM_1、CAM_2都会调用这个方法，在CAM_1和CAM_3的时候注册就可以
if (view.NDIKey == NDIViewKeys.CAM_1 || view.NDIKey == NDIViewKeys.CAM_3)
{
// 跟踪框插件
......@@ -181,13 +178,10 @@ namespace VIZ.FGOUT.Module
private void TrackingBoxPlugin_TrackingBoxClick(object sender, TrackingBoxClickEventArgs e)
{
//Replay时，不发送坐标
if (IsReplay)
return;
if (IsReplay) return;
//无效位置按钮按下时，不发送坐标
if (IsDrawInvalidPlace)
return;
if (e.HitTrackingBoxInfo == null)
return;
if (IsDrawInvalidPlace) return;
if (e.HitTrackingBoxInfo == null) return;
this.AlgorithmControllerDic[this.StrategyType].Tracking(e.VideoPointCenter);
}
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.Manual_NDI.cs
......@@ -175,7 +175,6 @@ namespace VIZ.FGOUT.Module
EndTime = e.Frame.TimeStamp;
view.vm.IsSliderEndClicked = false;
}
//在Replay状态下
if (view.vm.IsReplay)
{
......@@ -185,13 +184,11 @@ namespace VIZ.FGOUT.Module
{
view.vm.IsReplayStarted = false;
if (buffer.Count > 0)
{
foreach (var matExtend in buffer)
{
//遍历队列集合，先遍历到入点帧
if (matExtend.TimeStamp == StartTime)
{
SliderStartValue = index;
......@@ -202,11 +199,7 @@ namespace VIZ.FGOUT.Module
index++;
}
SliderEndValue = index;
}
}
//如果是Start滑块在动
......@@ -222,7 +215,6 @@ namespace VIZ.FGOUT.Module
#region 公共代码
//var index = view.vm.SliderValue;
if (index >= (50 * STREAM_CACHEED_TIME)) index = (50 * STREAM_CACHEED_TIME - 1);
if ((buffer.Count - 1) >= index && index >= 0)
{
......@@ -256,7 +248,6 @@ namespace VIZ.FGOUT.Module
_cam3Infos.Add(info);
}
}
//匹配的时候只匹配BBox下的
if (infoBBuffers.Count > 0)
{
......@@ -341,7 +332,6 @@ namespace VIZ.FGOUT.Module
//清除点选跟踪框的数据
NDIView.saveInfo = new TrackingBoxInfo();
//清除拖框的数据
//view.rectsReplay.Clear();
NDIView.rectsReplay.Clear();
}
......@@ -366,7 +356,6 @@ namespace VIZ.FGOUT.Module
{
// 更新视频流
view3.video.UpdateVideoFrame(dsExtend, true);
// 更新视频控件跟踪框信息，现在_cam3BInfos里是缓存的跟踪框信息
if (_cam3BInfos.Count > 0)
{
......@@ -379,7 +368,6 @@ namespace VIZ.FGOUT.Module
gameName.Equals(SportsProjectCodes.SP))
{
foreach (var saveInfo in NDIView.saveInfos)
//foreach (var saveInfo in view3.saveInfos)
{
//更新红色点中框
if (saveInfo.SrcRect.Left > 0)
......@@ -387,7 +375,6 @@ namespace VIZ.FGOUT.Module
saveInfo.DrawingBorderColor = this.TRACKING_BOX_BORDER_COLOR;
//把选中框的信息也加到这个集合里
_cam3Infos.Add(saveInfo);
//记录标红框时入点时间戳
_RecordStartTime = saveInfo.TimeCode;
}
......@@ -403,12 +390,10 @@ namespace VIZ.FGOUT.Module
info.DrawingBorderColor = this.TRACKING_BOX_BORDER_COLOR;
//把选中框的信息也加到这个集合里
_cam3Infos.Add(info);
//记录标红框时入点时间戳
_RecordStartTime = info.TimeCode;
}
}
//再更新跟踪框信息
view3.video.UpdateTrackingBox(_cam3Infos);
}
......@@ -429,10 +414,8 @@ namespace VIZ.FGOUT.Module
else
{
index = 0;
//缓存策略2
// 将视频帧转换为Mat对象
var mat = new Mat(e.Frame.Height, e.Frame.Width, MatType.CV_8UC4, e.Frame.DataStream.DataPointer);
// 将帧缩放到低分辨率
var resizedFrame = new Mat();
......@@ -442,7 +425,6 @@ namespace VIZ.FGOUT.Module
_frameBuffer.AddFrame(new MatExtend() { Mat = resizedFrame, TimeStamp = timecode });
// 释放视频帧资源
mat.Dispose();
}
// 更新画面
......@@ -453,12 +435,10 @@ namespace VIZ.FGOUT.Module
if ((this.StrategyMode == AlgorithmStrategyMode.center_mode ||
this.StrategyMode == AlgorithmStrategyMode.manual_mode) && this.IsUseClip)
this.UpdateClipBoxWithManualAndCenter();
// 获取将要发送的裁切数据, 无论什么模式均要发送
Navigation3DSmoothWithSavitzkyGolayResult sendValue =
this.ManualController.GetSavitzkyGolayValue(e.Frame.TimeStamp,
this.ClipBoxX + ApplicationDomainEx.VIDEO_CLIP_BOX_WIDTH / 2);
// 如果当前模式为手动模式或居中模式且处于接收裁切信号状态，并且需要进行裁切，那么发送手动裁切信号 && this.ViewStatus == NDIViewStatus.CropRoi
if (e.Frame != null && this.IsUseClip
&& (this.StrategyMode == AlgorithmStrategyMode.center_mode ||
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.cs
......@@ -379,7 +379,8 @@ namespace VIZ.FGOUT.Module
{
if (this.ViewKey != NDIViewKeys.CAM_1) return;
NewWindowView newWindowView = new NewWindowView();
newWindowView.Show();
//newWindowView.Show();
newWindowView.ShowDialog();
}
private void ReconfirmAbandon(ReconfirmAbandonModel reconfirmAbandonModel)
......
VIZ.FGOUT/VIZ.FGOUT.Module/SystemSetting/View/SystemSettingView.xaml
......@@ -16,14 +16,6 @@
WindowState="Normal"
WindowStyle="None"
mc:Ignorable="d">
<!--<Window.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/RadioButton/RadioButton_Setting.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/Button/Button_Setting.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Window.Resources>-->
<behaviors:Interaction.Triggers>
<behaviors:EventTrigger EventName="Loaded">
<behaviors:InvokeCommandAction Command="{Binding LoadedCommand}" />
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "DF8F2E79D23947B44BD9000227F1F5DCF5F472D806DDA5CFF0D9C2107E91B291"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C3550BEED45BB1BC0138F61A55E3DD7167F45B363988F253B8A523E28F38FE59"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 965 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 959 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox _Matting_interval_;
......@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 994 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 988 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox _Moving_pixel_;
......@@ -98,7 +98,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1023 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1017 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox _Remove_out_point_pixel_;
......@@ -106,7 +106,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1435 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1441 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1;
......@@ -114,7 +114,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1620 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1626 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2;
......@@ -122,7 +122,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1635 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1641 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3;
......@@ -199,7 +199,7 @@ namespace VIZ.FGOUT.Module {
case 5:
this._Matting_interval_ = ((System.Windows.Controls.TextBox)(target));
#line 968 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 962 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._Matting_interval_.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.Matting_interval_OnPreviewTextInput);
#line default
......@@ -208,7 +208,7 @@ namespace VIZ.FGOUT.Module {
case 6:
this._Moving_pixel_ = ((System.Windows.Controls.TextBox)(target));
#line 997 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 991 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._Moving_pixel_.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.Moving_pixel_OnPreviewTextInput);
#line default
......@@ -217,7 +217,7 @@ namespace VIZ.FGOUT.Module {
case 7:
this._Remove_out_point_pixel_ = ((System.Windows.Controls.TextBox)(target));
#line 1026 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1020 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._Remove_out_point_pixel_.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.Moving_pixel_OnPreviewTextInput);
#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}" "DF8F2E79D23947B44BD9000227F1F5DCF5F472D806DDA5CFF0D9C2107E91B291"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C3550BEED45BB1BC0138F61A55E3DD7167F45B363988F253B8A523E28F38FE59"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 965 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 959 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox _Matting_interval_;
......@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 994 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 988 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox _Moving_pixel_;
......@@ -98,7 +98,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1023 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1017 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox _Remove_out_point_pixel_;
......@@ -106,7 +106,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1435 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1441 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1;
......@@ -114,7 +114,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1620 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1626 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2;
......@@ -122,7 +122,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1635 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1641 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3;
......@@ -199,7 +199,7 @@ namespace VIZ.FGOUT.Module {
case 5:
this._Matting_interval_ = ((System.Windows.Controls.TextBox)(target));
#line 968 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 962 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._Matting_interval_.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.Matting_interval_OnPreviewTextInput);
#line default
......@@ -208,7 +208,7 @@ namespace VIZ.FGOUT.Module {
case 6:
this._Moving_pixel_ = ((System.Windows.Controls.TextBox)(target));
#line 997 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 991 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._Moving_pixel_.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.Moving_pixel_OnPreviewTextInput);
#line default
......@@ -217,7 +217,7 @@ namespace VIZ.FGOUT.Module {
case 7:
this._Remove_out_point_pixel_ = ((System.Windows.Controls.TextBox)(target));
#line 1026 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1020 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._Remove_out_point_pixel_.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.Moving_pixel_OnPreviewTextInput);
#line default
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/SystemSetting/View/SystemSettingView.g.cs
#pragma checksum "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0DB3FE72B38F49C927DF9E679198BF62937B7DC1BCAB0C1DB3971494740791AF"
#pragma checksum "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "AE23B96C574DD8801056B76283EF4595FA7773C9BAB5C1162A5769F32E5E2AC0"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -48,7 +48,7 @@ namespace VIZ.FGOUT.Module {
public partial class SystemSettingView : System.Windows.Window, System.Windows.Markup.IComponentConnector {
#line 83 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
#line 75 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbLanguage;
......@@ -56,7 +56,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 92 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
#line 84 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbHotkey;
......@@ -64,7 +64,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 100 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
#line 92 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbAbout;
......@@ -103,7 +103,7 @@ namespace VIZ.FGOUT.Module {
{
case 1:
#line 32 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
#line 24 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
((System.Windows.Controls.Grid)(target)).MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.Grid_MouseDown);
#line default
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/SystemSetting/View/SystemSettingView.g.i.cs
#pragma checksum "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0DB3FE72B38F49C927DF9E679198BF62937B7DC1BCAB0C1DB3971494740791AF"
#pragma checksum "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "AE23B96C574DD8801056B76283EF4595FA7773C9BAB5C1162A5769F32E5E2AC0"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -48,7 +48,7 @@ namespace VIZ.FGOUT.Module {
public partial class SystemSettingView : System.Windows.Window, System.Windows.Markup.IComponentConnector {
#line 83 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
#line 75 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbLanguage;
......@@ -56,7 +56,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 92 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
#line 84 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbHotkey;
......@@ -64,7 +64,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 100 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
#line 92 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbAbout;
......@@ -103,7 +103,7 @@ namespace VIZ.FGOUT.Module {
{
case 1:
#line 32 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
#line 24 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
((System.Windows.Controls.Grid)(target)).MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.Grid_MouseDown);
#line default
......
VIZ.FGOUT/VIZ.FGOUT/Properties/AssemblyInfo.cs
......@@ -55,5 +55,5 @@ using System.Windows;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.11.0")]
[assembly: AssemblyFileVersion("1.0.11.0")]
[assembly: AssemblyVersion("1.0.12.0")]
[assembly: AssemblyFileVersion("1.0.12.0")]
VIZ.FGOUT/VIZ.FGOUT/obj/x64/Debug/VIZ.FGOUT_MarkupCompile.cache
......@@ -10,11 +10,11 @@ none
false
DEBUG;TRACE
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\App.xaml
21265083526
2-1347366880
6-790135758
421356718200
6968741766
43-1958993781
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
false
DEBUG;TRACE
9-721875057
91711917753
3-630027162
19-1136530284
3-1719726047
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;
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
false
DEBUG;TRACE
15-721109437
15488264905
121-1133520871
150238613261
1212046750213
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;
True
False
VIZ.Framework/VIZ.Framework.Module/obj/x64/Debug/VIZ.Framework.Module_MarkupCompile.cache
......@@ -10,11 +10,11 @@ none
false
DEBUG;TRACE
1-731644535
11882902973
212002329545
25439653939
212023628146
26-1598261527
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