Skip to content

F
FGOUT
Commit e90e9aa0 by 鲁志-悦动
Options

算法清除跟踪框时间写到配置文件里 And 新增CAM_3 Replay窗口

parent c8ae727d
Showing with 262 additions and 124 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.Connection/UDP/Algorithm/Signal/Send/AlgorithmPackage_Figout_sports_model.cs
...@@ -56,6 +56,6 @@ namespace VIZ.FGOUT.Connection ...@@ -56,6 +56,6 @@ namespace VIZ.FGOUT.Connection
/// <summary> /// <summary>
/// 落地后帧间隔 /// 落地后帧间隔
/// </summary> /// </summary>
public int Landing_frame_interval { get; set; } public int Landing_frame_interval { get; set; } = 7;
} }
} }
VIZ.FGOUT/VIZ.FGOUT.Domain/Enum/NDIViewKeys.cs
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
/// <summary> /// <summary>
/// CAM 3 /// CAM 3
///// </summary> ///// </summary>
//public const string CAM_3 = "CAM_3"; public const string CAM_3 = "CAM_3";
///// <summary> ///// <summary>
///// CAM 4 ///// CAM 4
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
<Slider <Slider
Grid.Row="2" Grid.Row="2"
Width="740" Width="740"
Height="90" Height="30"
AutoToolTipPlacement="BottomRight" AutoToolTipPlacement="BottomRight"
AutoToolTipPrecision="0" AutoToolTipPrecision="0"
IsMoveToPointEnabled="True" IsMoveToPointEnabled="True"
...@@ -464,6 +464,9 @@ ...@@ -464,6 +464,9 @@
<b:EventTrigger EventName="Checked"> <b:EventTrigger EventName="Checked">
<b:InvokeCommandAction Command="{Binding StartRegionCommand}" /> <b:InvokeCommandAction Command="{Binding StartRegionCommand}" />
</b:EventTrigger> </b:EventTrigger>
<b:EventTrigger EventName="Unchecked">
<b:InvokeCommandAction Command="{Binding StartRegionUncheckedCommand}" />
</b:EventTrigger>
</b:Interaction.Triggers> </b:Interaction.Triggers>
</ToggleButton> </ToggleButton>
...@@ -481,6 +484,9 @@ ...@@ -481,6 +484,9 @@
<b:EventTrigger EventName="Checked"> <b:EventTrigger EventName="Checked">
<b:InvokeCommandAction Command="{Binding EndRegionCommand}" /> <b:InvokeCommandAction Command="{Binding EndRegionCommand}" />
</b:EventTrigger> </b:EventTrigger>
<b:EventTrigger EventName="Unchecked">
<b:InvokeCommandAction Command="{Binding EndRegionUncheckedCommand}" />
</b:EventTrigger>
</b:Interaction.Triggers> </b:Interaction.Triggers>
</ToggleButton> </ToggleButton>
...@@ -498,6 +504,9 @@ ...@@ -498,6 +504,9 @@
<b:EventTrigger EventName="Checked"> <b:EventTrigger EventName="Checked">
<b:InvokeCommandAction Command="{Binding InvalidRegionCommand}" /> <b:InvokeCommandAction Command="{Binding InvalidRegionCommand}" />
</b:EventTrigger> </b:EventTrigger>
<b:EventTrigger EventName="Unchecked">
<b:InvokeCommandAction Command="{Binding InvalidRegionUncheckedCommand}" />
</b:EventTrigger>
</b:Interaction.Triggers> </b:Interaction.Triggers>
</ToggleButton> </ToggleButton>
...@@ -907,6 +916,15 @@ ...@@ -907,6 +916,15 @@
MouseLeftButtonDown="cam1_MouseLeftButtonDown" MouseLeftButtonDown="cam1_MouseLeftButtonDown"
NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_1}" NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_1}"
VideoBorderBrush="#46AFA0" /> VideoBorderBrush="#46AFA0" />
<local:NDIView
x:Name="cam3"
Grid.Row="3"
Grid.Column="0"
Margin="10"
IsHiddenSetting="True"
NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_3}" />
<StackPanel Grid.Row="1" Grid.Column="1"> <StackPanel Grid.Row="1" Grid.Column="1">
<Button <Button
Width="130" Width="130"
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
...@@ -63,8 +63,11 @@ namespace VIZ.FGOUT.Module ...@@ -63,8 +63,11 @@ namespace VIZ.FGOUT.Module
this.SaveMarkCommand = new VCommand(this.SaveMark); this.SaveMarkCommand = new VCommand(this.SaveMark);
this.UnMarkCommand = new VCommand(this.UnMark); this.UnMarkCommand = new VCommand(this.UnMark);
this.InvalidRegionCommand = new VCommand(this.Invalid); this.InvalidRegionCommand = new VCommand(this.Invalid);
this.InvalidRegionUncheckedCommand = new VCommand(this.InvalidRegionUnchecked);
this.StartRegionCommand = new VCommand(this.StartRegion); this.StartRegionCommand = new VCommand(this.StartRegion);
this.StartRegionUncheckedCommand = new VCommand(this.StartRegionUnchecked);
this.EndRegionCommand = new VCommand(this.EndRegion); this.EndRegionCommand = new VCommand(this.EndRegion);
this.EndRegionUncheckedCommand = new VCommand(this.EndRegionUnchecked);
this.CleanCommand = new VCommand(this.CleanRect); this.CleanCommand = new VCommand(this.CleanRect);
this.SendPlaceCommand = new VCommand(this.SendPlace); this.SendPlaceCommand = new VCommand(this.SendPlace);
this.SavePalceCommand = new VCommand(this.SavePlace); this.SavePalceCommand = new VCommand(this.SavePlace);
...@@ -1011,6 +1014,17 @@ namespace VIZ.FGOUT.Module ...@@ -1011,6 +1014,17 @@ namespace VIZ.FGOUT.Module
} }
/// <summary> /// <summary>
/// 无效区域取消选中命令
/// </summary>
public VCommand InvalidRegionUncheckedCommand { get; set; }
private void InvalidRegionUnchecked()
{
invalidPlaceModel.IsInvalid = false;
ApplicationDomain.MessageManager.Send(invalidPlaceModel);
}
/// <summary>
/// 无效区域命令 /// 无效区域命令
/// </summary> /// </summary>
public VCommand InvalidRegionCommand { get; set; } public VCommand InvalidRegionCommand { get; set; }
...@@ -1029,15 +1043,23 @@ namespace VIZ.FGOUT.Module ...@@ -1029,15 +1043,23 @@ namespace VIZ.FGOUT.Module
} }
/// <summary> /// <summary>
/// 开始位置取消选中命令
/// </summary>
public VCommand StartRegionUncheckedCommand { get; set; }
private void StartRegionUnchecked()
{
startPlaceModel.StartPlace = false;
ApplicationDomain.MessageManager.Send(startPlaceModel);
}
/// <summary>
/// 开始位置命令 /// 开始位置命令
/// </summary> /// </summary>
public VCommand StartRegionCommand { get; set; } public VCommand StartRegionCommand { get; set; }
public StartPlaceModel startPlaceModel = new StartPlaceModel(); public StartPlaceModel startPlaceModel = new StartPlaceModel();
public EndPlaceModel endPlaceModel = new EndPlaceModel(); public EndPlaceModel endPlaceModel = new EndPlaceModel();
/// <summary>
/// 开始位置命令
/// </summary>
private void StartRegion() private void StartRegion()
{ {
//NDIMainView nDIMainView=this.GetView<NDIMainView>(); //NDIMainView nDIMainView=this.GetView<NDIMainView>();
...@@ -1053,6 +1075,17 @@ namespace VIZ.FGOUT.Module ...@@ -1053,6 +1075,17 @@ namespace VIZ.FGOUT.Module
} }
/// <summary> /// <summary>
/// 结束位置取消选中命令
/// </summary>
public VCommand EndRegionUncheckedCommand { get; set; }
private void EndRegionUnchecked()
{
endPlaceModel.EndPlace = false;
ApplicationDomain.MessageManager.Send(endPlaceModel);
}
/// <summary>
/// 结束位置命令 /// 结束位置命令
/// </summary> /// </summary>
public VCommand EndRegionCommand { get; set; } public VCommand EndRegionCommand { get; set; }
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/View/NDIView.xaml
...@@ -415,6 +415,7 @@ ...@@ -415,6 +415,7 @@
</Border>--> </Border>-->
<Border ToolTip="设置"> <Border ToolTip="设置">
<Button <Button
x:Name="_Setting_"
Width="32" Width="32"
Height="32" Height="32"
Command="{Binding Path=SettingCommand, Mode=OneWay}" Command="{Binding Path=SettingCommand, Mode=OneWay}"
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/View/NDIView.xaml.cs
...@@ -153,6 +153,32 @@ namespace VIZ.FGOUT.Module ...@@ -153,6 +153,32 @@ namespace VIZ.FGOUT.Module
#endregion #endregion
#region IsHiddenSetting
public static readonly DependencyProperty IsHiddenSettingProperty =
DependencyProperty.Register(nameof(IsHiddenSetting), typeof(bool), typeof(NDIView), new PropertyMetadata(false, OnIsHiddenSettingPropertyChanged));
public bool IsHiddenSetting
{
get => (bool)GetValue(IsHiddenSettingProperty);
set => SetValue(IsHiddenSettingProperty, value);
}
static void OnIsHiddenSettingPropertyChanged(DependencyObject sender, DependencyPropertyChangedEventArgs args)
{
((NDIView)sender).IsHiddenSettingPropertyChanged(args);
}
protected void IsHiddenSettingPropertyChanged(DependencyPropertyChangedEventArgs e)
{
if ((bool)e.NewValue)
{
_Setting_.Visibility = _RestartBtn_.Visibility = _StopBtn_.Visibility = Visibility.Collapsed;
}
}
#endregion
// 配置文件添加config // 配置文件添加config
//private SetManualConfig manualConfig; //private SetManualConfig manualConfig;
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.Manual_NDI.cs
...@@ -196,8 +196,7 @@ namespace VIZ.FGOUT.Module ...@@ -196,8 +196,7 @@ namespace VIZ.FGOUT.Module
}; };
dsExtend.DataStream.Write(lowResolutionData, 0, newLength); dsExtend.DataStream.Write(lowResolutionData, 0, newLength);
dsExtend.DataStream.Position = 0; dsExtend.DataStream.Position = 0;
// 更新画面 // 更新画面
view.video.UpdateVideoFrame(dsExtend, true); view.video.UpdateVideoFrame(dsExtend, true);
//view.video.UpdateVideoFrame(dse, true); //view.video.UpdateVideoFrame(dse, true);
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.Message.cs
...@@ -30,6 +30,11 @@ namespace VIZ.FGOUT.Module ...@@ -30,6 +30,11 @@ namespace VIZ.FGOUT.Module
ApplicationDomainEx.LiteDbContext.AlgorithmSaveMatImage.Upsert(config); ApplicationDomainEx.LiteDbContext.AlgorithmSaveMatImage.Upsert(config);
} }
/// <summary>
/// 算法清除跟踪框时间
/// </summary>
protected readonly int ALGORITHM_ClearTrackingBox_TIME = ApplicationDomain.IniStorage.GetValue<AlgorithmConfig, int>(p => p.ALGORITHM_ClearTrackingBox_TIME);
//CleanPlaceModel cpModel = new CleanPlaceModel{ CleanPlace = true }; //CleanPlaceModel cpModel = new CleanPlaceModel{ CleanPlace = true };
/// <summary> /// <summary>
/// 处理算法初始化完成消息 /// 处理算法初始化完成消息
...@@ -155,7 +160,7 @@ namespace VIZ.FGOUT.Module ...@@ -155,7 +160,7 @@ namespace VIZ.FGOUT.Module
{ {
time_1s.AutoReset = true; time_1s.AutoReset = true;
time_1s.Enabled = true; time_1s.Enabled = true;
time_1s.Interval = 1000; time_1s.Interval = ALGORITHM_ClearTrackingBox_TIME;
time_1s.Elapsed += UpdateCountDownTimer_Tick; time_1s.Elapsed += UpdateCountDownTimer_Tick;
time_1s.Start(); time_1s.Start();
} }
...@@ -164,7 +169,7 @@ namespace VIZ.FGOUT.Module ...@@ -164,7 +169,7 @@ namespace VIZ.FGOUT.Module
{ {
var nowDt = DateTime.Now; var nowDt = DateTime.Now;
var minus = (nowDt - cropDt).TotalMilliseconds; var minus = (nowDt - cropDt).TotalMilliseconds;
if (minus >= 1000) if (minus >= ALGORITHM_ClearTrackingBox_TIME)
GetView<NDIView>().video.ClearTrackingBox();//清除跟踪(裁切)框 GetView<NDIView>().video.ClearTrackingBox();//清除跟踪(裁切)框
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.cs
...@@ -426,9 +426,12 @@ namespace VIZ.FGOUT.Module ...@@ -426,9 +426,12 @@ namespace VIZ.FGOUT.Module
} }
IsDrawStartPlace = startPlaceModel.StartPlace; IsDrawStartPlace = startPlaceModel.StartPlace;
IsDrawEndPlace = false; if (IsDrawStartPlace)
IsDrawInvalidPlace = false; {
IsCleanPlace = false; IsDrawEndPlace = false;
IsDrawInvalidPlace = false;
IsCleanPlace = false;
}
} }
public bool IsDrawEndPlace; public bool IsDrawEndPlace;
...@@ -443,9 +446,12 @@ namespace VIZ.FGOUT.Module ...@@ -443,9 +446,12 @@ namespace VIZ.FGOUT.Module
return; return;
} }
IsDrawEndPlace = endPlaceModel.EndPlace; IsDrawEndPlace = endPlaceModel.EndPlace;
IsDrawStartPlace = false; if (IsDrawEndPlace)
IsDrawInvalidPlace = false; {
IsCleanPlace = false; IsDrawStartPlace = false;
IsDrawInvalidPlace = false;
IsCleanPlace = false;
}
} }
public bool IsDrawInvalidPlace; public bool IsDrawInvalidPlace;
...@@ -461,9 +467,12 @@ namespace VIZ.FGOUT.Module ...@@ -461,9 +467,12 @@ namespace VIZ.FGOUT.Module
return; return;
} }
IsDrawInvalidPlace = invalidPlaceModel.IsInvalid; IsDrawInvalidPlace = invalidPlaceModel.IsInvalid;
IsDrawStartPlace = false; if (IsDrawInvalidPlace)
IsDrawEndPlace = false; {
IsCleanPlace = false; IsDrawStartPlace = false;
IsDrawEndPlace = false;
IsCleanPlace = false;
}
} }
/// <summary> /// <summary>
......
VIZ.FGOUT/VIZ.FGOUT.Module/Setup/Provider/AppSetup_InitNDI.cs
using log4net; using log4net;
using System; using VIZ.FGOUT.Domain;
using System.Collections.Generic; using VIZ.FGOUT.Storage;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using VIZ.Framework.Core;
using VIZ.Framework.Common; using VIZ.Framework.Common;
using VIZ.Framework.Module; using VIZ.Framework.Module;
using VIZ.FGOUT.Storage;
using VIZ.FGOUT.Domain;
namespace VIZ.FGOUT.Module namespace VIZ.FGOUT.Module
{ {
...@@ -42,7 +34,7 @@ namespace VIZ.FGOUT.Module ...@@ -42,7 +34,7 @@ namespace VIZ.FGOUT.Module
NdiViewConfig config2 = ApplicationDomainEx.LiteDbContext.ViewConfig.FindOne(p => p.ViewKey == NDIViewKeys.CAM_2); NdiViewConfig config2 = ApplicationDomainEx.LiteDbContext.ViewConfig.FindOne(p => p.ViewKey == NDIViewKeys.CAM_2);
//NdiViewConfig config3 = ApplicationDomainEx.LiteDbContext.ViewConfig.FindOne(p => p.ViewKey == NDIViewKeys.CAM_3); NdiViewConfig config3 = ApplicationDomainEx.LiteDbContext.ViewConfig.FindOne(p => p.ViewKey == NDIViewKeys.CAM_3);
//NdiViewConfig config4 = ApplicationDomainEx.LiteDbContext.ViewConfig.FindOne(p => p.ViewKey == NDIViewKeys.CAM_4); //NdiViewConfig config4 = ApplicationDomainEx.LiteDbContext.ViewConfig.FindOne(p => p.ViewKey == NDIViewKeys.CAM_4);
// CAM 1 // CAM 1
...@@ -58,10 +50,10 @@ namespace VIZ.FGOUT.Module ...@@ -58,10 +50,10 @@ namespace VIZ.FGOUT.Module
VideoStreamManager.Append(NDIViewKeys.CAM_2, ndiStream2); VideoStreamManager.Append(NDIViewKeys.CAM_2, ndiStream2);
//// CAM 3 //// CAM 3
//NDIStreamOption option3 = new NDIStreamOption(); NDIStreamOption option3 = new NDIStreamOption();
//option3.DelayFrame = config3?.DelayFrame ?? 0; option3.DelayFrame = config3?.DelayFrame ?? 0;
//NDIStream ndiStream3 = new NDIStream(localrecvname, config3?.StreamName, option3); NDIStream ndiStream3 = new NDIStream(localrecvname, config3?.StreamName, option3);
//VideoStreamManager.Append(NDIViewKeys.CAM_3, ndiStream3); VideoStreamManager.Append(NDIViewKeys.CAM_3, ndiStream3);
//// CAM 4 //// CAM 4
//NDIStreamOption option4 = new NDIStreamOption(); //NDIStreamOption option4 = new NDIStreamOption();
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "7338B9A9110B6BEA8017BAFF6B76EE7E641414F25D3ED9259CD1B7A3FAB9119A" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "28509F9D91F5A23399E667A1F5BE360C922E1FEAAA4CD5088F5422F106107D5F"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <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 903 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 912 "..\..\..\..\..\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,15 @@ namespace VIZ.FGOUT.Module { ...@@ -82,7 +82,15 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 950 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 921 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3;
#line default
#line hidden
#line 968 "..\..\..\..\..\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;
...@@ -151,6 +159,9 @@ namespace VIZ.FGOUT.Module { ...@@ -151,6 +159,9 @@ namespace VIZ.FGOUT.Module {
this.cam1 = ((VIZ.FGOUT.Module.NDIView)(target)); this.cam1 = ((VIZ.FGOUT.Module.NDIView)(target));
return; return;
case 5: case 5:
this.cam3 = ((VIZ.FGOUT.Module.NDIView)(target));
return;
case 6:
this.cam2 = ((VIZ.FGOUT.Module.NDIView)(target)); this.cam2 = ((VIZ.FGOUT.Module.NDIView)(target));
return; return;
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.i.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "7338B9A9110B6BEA8017BAFF6B76EE7E641414F25D3ED9259CD1B7A3FAB9119A" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "28509F9D91F5A23399E667A1F5BE360C922E1FEAAA4CD5088F5422F106107D5F"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <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 903 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 912 "..\..\..\..\..\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,15 @@ namespace VIZ.FGOUT.Module { ...@@ -82,7 +82,15 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 950 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 921 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3;
#line default
#line hidden
#line 968 "..\..\..\..\..\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;
...@@ -151,6 +159,9 @@ namespace VIZ.FGOUT.Module { ...@@ -151,6 +159,9 @@ namespace VIZ.FGOUT.Module {
this.cam1 = ((VIZ.FGOUT.Module.NDIView)(target)); this.cam1 = ((VIZ.FGOUT.Module.NDIView)(target));
return; return;
case 5: case 5:
this.cam3 = ((VIZ.FGOUT.Module.NDIView)(target));
return;
case 6:
this.cam2 = ((VIZ.FGOUT.Module.NDIView)(target)); this.cam2 = ((VIZ.FGOUT.Module.NDIView)(target));
return; return;
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIView/View/NDIView.g.cs
#pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A9A7AFD382FA9DB1A8D5F8933864890F4E2AB6714C56FF0A9183BC8FDC0F57A6" #pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "FD917AFD468A76D70D8AFF41694507D1906B6931E0C04B739524F9FD6AB674CF"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -84,7 +84,15 @@ namespace VIZ.FGOUT.Module { ...@@ -84,7 +84,15 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 438 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 418 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _Setting_;
#line default
#line hidden
#line 439 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _RestartBtn_; internal System.Windows.Controls.Button _RestartBtn_;
...@@ -92,7 +100,7 @@ namespace VIZ.FGOUT.Module { ...@@ -92,7 +100,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 452 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 453 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _StopBtn_; internal System.Windows.Controls.Button _StopBtn_;
...@@ -190,9 +198,12 @@ namespace VIZ.FGOUT.Module { ...@@ -190,9 +198,12 @@ namespace VIZ.FGOUT.Module {
this.canvas1 = ((System.Windows.Controls.Canvas)(target)); this.canvas1 = ((System.Windows.Controls.Canvas)(target));
return; return;
case 5: case 5:
this._RestartBtn_ = ((System.Windows.Controls.Button)(target)); this._Setting_ = ((System.Windows.Controls.Button)(target));
return; return;
case 6: case 6:
this._RestartBtn_ = ((System.Windows.Controls.Button)(target));
return;
case 7:
this._StopBtn_ = ((System.Windows.Controls.Button)(target)); this._StopBtn_ = ((System.Windows.Controls.Button)(target));
return; 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}" "A9A7AFD382FA9DB1A8D5F8933864890F4E2AB6714C56FF0A9183BC8FDC0F57A6" #pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "FD917AFD468A76D70D8AFF41694507D1906B6931E0C04B739524F9FD6AB674CF"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -84,7 +84,15 @@ namespace VIZ.FGOUT.Module { ...@@ -84,7 +84,15 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 438 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 418 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _Setting_;
#line default
#line hidden
#line 439 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _RestartBtn_; internal System.Windows.Controls.Button _RestartBtn_;
...@@ -92,7 +100,7 @@ namespace VIZ.FGOUT.Module { ...@@ -92,7 +100,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 452 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 453 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _StopBtn_; internal System.Windows.Controls.Button _StopBtn_;
...@@ -190,9 +198,12 @@ namespace VIZ.FGOUT.Module { ...@@ -190,9 +198,12 @@ namespace VIZ.FGOUT.Module {
this.canvas1 = ((System.Windows.Controls.Canvas)(target)); this.canvas1 = ((System.Windows.Controls.Canvas)(target));
return; return;
case 5: case 5:
this._RestartBtn_ = ((System.Windows.Controls.Button)(target)); this._Setting_ = ((System.Windows.Controls.Button)(target));
return; return;
case 6: case 6:
this._RestartBtn_ = ((System.Windows.Controls.Button)(target));
return;
case 7:
this._StopBtn_ = ((System.Windows.Controls.Button)(target)); this._StopBtn_ = ((System.Windows.Controls.Button)(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
22-1559853185 22-808211288
4-1529606353 4-699044453
91-1942053010 91-804925372
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\MattingImagePanelView.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; 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\MattingImagePanelView.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;
True False
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\NDIMainView\View\NDIMainView.xaml;;
FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIPreviewView\View\NDIPreviewView.xaml;; FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIPreviewView\View\NDIPreviewView.xaml;;
......
VIZ.FGOUT/VIZ.FGOUT.Storage/Init/Config/AlgorithmConfig.cs
...@@ -29,5 +29,11 @@ namespace VIZ.FGOUT.Storage ...@@ -29,5 +29,11 @@ namespace VIZ.FGOUT.Storage
/// </summary> /// </summary>
[Ini(Section = "Algorithm", DefaultValue = "25", Type = typeof(int))] [Ini(Section = "Algorithm", DefaultValue = "25", Type = typeof(int))]
public string ALGORITHM_TARGET_BOX_LOST_FRAME { get; set; } public string ALGORITHM_TARGET_BOX_LOST_FRAME { get; set; }
/// <summary>
/// ALGORITHM_TARGET_BOX_LOST_FRAME
/// </summary>
[Ini(Section = "Algorithm", DefaultValue = "1000", Type = typeof(int))]
public string ALGORITHM_ClearTrackingBox_TIME { get; set; }
} }
} }
VIZ.FGOUT/VIZ.FGOUT/bin/x64/Debug/Logs/err.log
This source diff could not be displayed because it is too large. You can view the blob instead.
VIZ.FGOUT/VIZ.FGOUT/bin/x64/Debug/config/config.ini
...@@ -94,6 +94,8 @@ ALGORITHM_STOP_TIMEOUT=5000 ...@@ -94,6 +94,8 @@ ALGORITHM_STOP_TIMEOUT=5000
ALGORITHM_IS_SHOW_TARGET_BOX=true ALGORITHM_IS_SHOW_TARGET_BOX=true
;算法目标框连续丢失帧数（如果目标框连续丢失则改变指示灯状态） ;算法目标框连续丢失帧数（如果目标框连续丢失则改变指示灯状态）
ALGORITHM_TARGET_BOX_LOST_FRAME=25 ALGORITHM_TARGET_BOX_LOST_FRAME=25
;算法清除跟踪框时间（单位：毫秒）
ALGORITHM_ClearTrackingBox_TIME=1000
VIZ.FGOUT/VIZ.FGOUT/config/config.ini
...@@ -94,6 +94,8 @@ ALGORITHM_STOP_TIMEOUT=5000 ...@@ -94,6 +94,8 @@ ALGORITHM_STOP_TIMEOUT=5000
ALGORITHM_IS_SHOW_TARGET_BOX=true ALGORITHM_IS_SHOW_TARGET_BOX=true
;算法目标框连续丢失帧数（如果目标框连续丢失则改变指示灯状态） ;算法目标框连续丢失帧数（如果目标框连续丢失则改变指示灯状态）
ALGORITHM_TARGET_BOX_LOST_FRAME=25 ALGORITHM_TARGET_BOX_LOST_FRAME=25
;算法清除跟踪框时间（单位：毫秒）
ALGORITHM_ClearTrackingBox_TIME=1000
VIZ.Framework/VIZ.Framework.Common/VideoControl/Stream/VideoStreamManager.cs
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.Framework.Common namespace VIZ.Framework.Common
{ {
......
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\MessageBoxEx.xaml;;
FC:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\MessageBox\MessageBoxExWindow.xaml;; FC:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\MessageBox\MessageBoxExWindow.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