Skip to content

F
FGOUT
Commit 7406b747 by 鲁志-悦动
Options

调试算法红绿状态灯 And 修复Replay时选框不灵敏选不中人的缺陷

parent 7594f49a
Showing with 45 additions and 45 deletions
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/obj/x64/Debug/VIZ.FGOUT.Module.Resource_MarkupCompile.cache
......@@ -10,11 +10,11 @@ none
false
DEBUG;TRACE
201334349489
1-1441241311
11-1602666439
23-2035776870
20-1486193684
1470602451
11-350624472
24-1321085892
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/ViewModel/NDIMainViewModel.cs
......@@ -2073,7 +2073,7 @@ namespace VIZ.FGOUT.Module
// 快捷键
string hotkey = HotkeyHelper.GetHotkey(e);
log.Info("快捷键：" + hotkey);
//log.Info("快捷键：" + hotkey);
this.hotkeyController.Execute(hotkey);
});
}
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/Controller/Algorithm/Strategy/AlgoritmController_FiguerOut.cs
......@@ -62,6 +62,7 @@ namespace VIZ.FGOUT.Module
{
//this.Detect();
this.Support.ViewStatus = NDIViewStatus.Detect;
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1);
//算法重启后，向算法发送保存在数据库的相关体育项目的算法数据
var ndiViewConfig =
......@@ -166,24 +167,19 @@ namespace VIZ.FGOUT.Module
private SetManualConfig manualConfig;
/// <summary>
/// /跟踪
/// 跟踪
/// </summary>
/// <param name="box"></param>
public override void Tracking(TrackingBoxInfo box)
{
// throw new NotImplementedException();
//this.Support.ViewStatus = NDIViewStatus.CropRoi;
this.Support.ViewStatus = NDIViewStatus.CropRoi;
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1);
AlgorithmSenderOption option = new AlgorithmSenderOption();
option.id = this.Support.ID;
AlgorithmSender.AutoMode(manager,this.bulidPackage(AlgorithmPackageSignal.manual_mode, box),option);
// this.Detect();
}
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/View/NDIView.xaml
......@@ -93,11 +93,13 @@
</Grid.ColumnDefinitions>
<!-- 调试 -->
<!-- =================================================================================================== -->
<fcommon:DebugBorder Grid.ColumnSpan="2" VerticalAlignment="Top">
<!--<fcommon:DebugBorder Grid.ColumnSpan="2" VerticalAlignment="Top">
<StackPanel Orientation="Horizontal">
<!--<TextBlock Text="裁切FPS:" Foreground="Red" FontSize="16" Margin="0,0,0,0" Opacity="0.86" VerticalAlignment="Center"></TextBlock>
-->
<!--<TextBlock Text="裁切FPS:" Foreground="Red" FontSize="16" Margin="0,0,0,0" Opacity="0.86" VerticalAlignment="Center"></TextBlock>
<TextBlock Foreground="Red" FontSize="16" Margin="10,0,0,0" VerticalAlignment="Center"
Text="{Binding ClipFPS.FPS}" Width="30"></TextBlock>-->
<!--
<TextBlock
Margin="10,0,0,0"
VerticalAlignment="Center"
......@@ -154,7 +156,7 @@
Foreground="Red"
Text="{Binding DebugLog}" />
</StackPanel>
</fcommon:DebugBorder>
</fcommon:DebugBorder>-->
<!-- =================================================================================================== -->
<!-- 标题 -->
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.Manual_NDI.cs
......@@ -32,7 +32,7 @@ namespace VIZ.FGOUT.Module
private readonly TrackingBoxInfoBuffer _trackingBBoxInfoBuffer =
new TrackingBoxInfoBuffer(TimeSpan.FromSeconds(50 * STREAM_CACHEED_TIME));
public List<TrackingBoxInfo> _cam3UpdateInfos = new List<TrackingBoxInfo>();
//public List<TrackingBoxInfo> _cam3UpdateInfos = new List<TrackingBoxInfo>();
public List<TrackingBoxInfo> _cam3Infos = new List<TrackingBoxInfo>();
public List<TrackingBoxInfo> _cam3BInfos = new List<TrackingBoxInfo>();
......@@ -272,7 +272,8 @@ namespace VIZ.FGOUT.Module
Queue<TrackingBoxInfo> infoBuffers = _trackingBoxInfoBuffer.GetInfos();
Queue<TrackingBoxInfo> infoBBuffers = _trackingBBoxInfoBuffer.GetInfos();
_cam3Infos = new List<TrackingBoxInfo>();
_cam3UpdateInfos = new List<TrackingBoxInfo>();
_cam3BInfos = new List<TrackingBoxInfo>();
//_cam3UpdateInfos = new List<TrackingBoxInfo>();
//跟踪框全显示
if (infoBuffers.Count > 0)
{
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.cs
......@@ -420,7 +420,8 @@ namespace VIZ.FGOUT.Module
public static long StartTime { get; set; }
public static long EndTime { get; set; }
public static List<TrackingBoxInfo> _cam3StaticInfos;
//public static List<TrackingBoxInfo> _cam3StaticInfos;
public static List<TrackingBoxInfo> _cam3StaticInfos = new List<TrackingBoxInfo>();
/// <summary>
/// Replay选中和SliderValueChanged传值共用这一个方法
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIView/View/NDIView.g.cs
#pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C450EE29EC525622F0D2E6CA98B38DAB038375C2C8A4508EB8689748A7FF81A8"
#pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "024E8EBC9F6EA75546E95DDB73958A56E28DCB79CC4FD50C8207ADCF6E2D9678"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -60,7 +60,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 216 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 218 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox _CheckBoxIsAlgorithmTargetBoxExists_;
......@@ -68,7 +68,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 304 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 306 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Border Border;
......@@ -76,7 +76,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 324 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 326 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.Framework.Common.VideoControl video;
......@@ -84,7 +84,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 332 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 334 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Canvas canvas1;
......@@ -92,7 +92,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 419 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 421 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _Setting_;
......@@ -100,7 +100,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 440 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 442 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _NewWindowBtn_;
......@@ -108,7 +108,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 455 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 457 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _RestartBtn_;
......@@ -116,7 +116,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 469 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 471 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _StopBtn_;
......@@ -162,25 +162,25 @@ namespace VIZ.FGOUT.Module {
case 3:
this.Border = ((System.Windows.Controls.Border)(target));
#line 306 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 308 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonDown);
#line default
#line hidden
#line 307 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 309 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonUp);
#line default
#line hidden
#line 308 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 310 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseMove += new System.Windows.Input.MouseEventHandler(this.Border_MouseMove);
#line default
#line hidden
#line 309 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 311 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseRightButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_OnPreviewMouseRightButtonDown);
#line default
......
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}" "C450EE29EC525622F0D2E6CA98B38DAB038375C2C8A4508EB8689748A7FF81A8"
#pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "024E8EBC9F6EA75546E95DDB73958A56E28DCB79CC4FD50C8207ADCF6E2D9678"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -60,7 +60,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 216 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 218 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox _CheckBoxIsAlgorithmTargetBoxExists_;
......@@ -68,7 +68,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 304 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 306 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Border Border;
......@@ -76,7 +76,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 324 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 326 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.Framework.Common.VideoControl video;
......@@ -84,7 +84,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 332 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 334 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Canvas canvas1;
......@@ -92,7 +92,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 419 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 421 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _Setting_;
......@@ -100,7 +100,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 440 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 442 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _NewWindowBtn_;
......@@ -108,7 +108,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 455 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 457 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _RestartBtn_;
......@@ -116,7 +116,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 469 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 471 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _StopBtn_;
......@@ -162,25 +162,25 @@ namespace VIZ.FGOUT.Module {
case 3:
this.Border = ((System.Windows.Controls.Border)(target));
#line 306 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 308 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonDown);
#line default
#line hidden
#line 307 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 309 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonUp);
#line default
#line hidden
#line 308 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 310 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseMove += new System.Windows.Input.MouseEventHandler(this.Border_MouseMove);
#line default
#line hidden
#line 309 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 311 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseRightButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_OnPreviewMouseRightButtonDown);
#line default
......
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