Skip to content

F
FGOUT
Commit 1b842e9b by 鲁志-悦动
Options

算法跟踪到人逻辑优化

parent c589ffb2
Showing with 38 additions and 34 deletions
VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Algorithm/Enum/AlgorithmAutoModeCmd.cs
......@@ -11,7 +11,7 @@
/// <remarks>
/// 1. 单人机位 Single
/// </remarks>
public const string detect = "detect";
public const string detect = AlgorithmPackageSignal.detect;
/// <summary>
/// 跟踪
......@@ -58,6 +58,6 @@
/// <summary>
/// 取消错误标记
/// </summary>
public const string reset = "reset";
public const string reset = AlgorithmPackageSignal.Reset;
}
}
VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Algorithm/Provider/AlgorithmProvider__crop_roi..cs
......@@ -56,7 +56,7 @@ namespace VIZ.FGOUT.Connection
message.timecode = package.timecode;
// message.timecode = package.timecode;
if (package.signal == "track")
if (package.signal == AlgorithmPackageSignal.track)
{
if (package.box != null)
{
......
VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Algorithm/Provider/AlgorithmProvider__detect.cs
......@@ -28,8 +28,9 @@ namespace VIZ.FGOUT.Connection
message.AlgorithmID = package.id;
message.timecode = package.timecode;
// message.timecode = package.timecode;
message.bbox_type = package.bbox_type;
if (package.signal == "detect")
if (package.signal == AlgorithmPackageSignal.detect)
{
if (package.bboxes != null && package.bboxes.Count > 0)
{
......@@ -66,7 +67,7 @@ namespace VIZ.FGOUT.Connection
}
Signal = AlgorithmPackageSignal.detect;
}
else if (package.signal == "track")
else if (package.signal == AlgorithmPackageSignal.track)
{
if (package.box != null)
{
......
VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Algorithm/Signal/Recv/AlgorithmRecvPackage__detect.cs
......@@ -47,5 +47,7 @@ namespace VIZ.FGOUT.Connection
/// </summary>
public List<int> box { get; set; }
public string bbox_type { get; set; }
}
}
VIZ.FGOUT/VIZ.FGOUT.Domain/Message/Algorithm/Implementation/AlgorithmMessage__detect.cs
......@@ -37,7 +37,7 @@ namespace VIZ.FGOUT.Domain
/// </summary>
public long timecode { get; set; }
public string bbox_type { get; set; } = "detect";
public string bbox_type { get; set; }
}
}
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/obj/x64/Debug/VIZ.FGOUT.Module.Resource_MarkupCompile.cache
......@@ -10,11 +10,11 @@ none
false
DEBUG;TRACE
221979955803
1470602451
11-350624472
24-1321085892
22-1578589972
1-1441241311
11-1602666439
23-2035776870
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;
False
True
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.Manual_NDI.cs
......@@ -296,8 +296,10 @@ namespace VIZ.FGOUT.Module
#region 算法track到人的情况下跟踪框标红
if (_cam3BInfos.Count > 0)
{
var info2 = _cam3BInfos[0];
if (info2.BboxType.Equals("track"))
if (info2.BboxType != null && info2.BboxType.Equals(AlgorithmPackageSignal.track))
{
var gameName = ApplicationDomainEx.LiteDbContext.ViewConfig
.FindOne(p => p.ViewKey == NDIViewKeys.CAM_1).GameName;
......@@ -330,6 +332,7 @@ namespace VIZ.FGOUT.Module
_singleInfo = info2;
}
}
}
#endregion
}
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.Message.cs
......@@ -120,8 +120,7 @@ namespace VIZ.FGOUT.Module
// return;
NDIView view = this.GetView<NDIView>();
if (view == null)
return;
if (view == null) return;
//20231122 由于下面的更新裁切框信息注释掉，所以先注释
//VideoRenderInfo renderInfo = view.video.GetRenderInfo();
......
VIZ.FGOUT/VIZ.FGOUT.Module/SystemSetting/View/HotkeySettingPanelView.xaml
......@@ -348,9 +348,21 @@
InputMethod.IsInputMethodEnabled="False"
Style="{StaticResource HotkeyBox_Setting}" />
<Button
Grid.Row="9"
Grid.Column="2"
Grid.ColumnSpan="2"
Width="105"
Height="40"
Margin="0,0,20,0"
HorizontalAlignment="Right"
Command="{Binding Path=ResetCommand}"
Content="{DynamicResource DefaultHotkey}"
Style="{StaticResource ButtonStyle}" />
<!-- 快左 -->
<TextBlock
Grid.Row="9"
Grid.Row="10"
Grid.Column="0"
VerticalAlignment="Center"
FontSize="18"
......@@ -358,7 +370,7 @@
Text="快左"
Visibility="Hidden" />
<fcommon:HotkeyBox
Grid.Row="9"
Grid.Row="10"
Grid.Column="1"
Height="30"
Margin="0,0,20,0"
......@@ -368,7 +380,7 @@
<!-- 快右 -->
<TextBlock
Grid.Row="9"
Grid.Row="10"
Grid.Column="2"
VerticalAlignment="Center"
FontSize="18"
......@@ -376,7 +388,7 @@
Text="快右"
Visibility="Hidden" />
<fcommon:HotkeyBox
Grid.Row="9"
Grid.Row="10"
Grid.Column="3"
Height="30"
Margin="0,0,20,0"
......@@ -385,19 +397,6 @@
Style="{StaticResource HotkeyBox_Setting}"
Visibility="Hidden" />
<Button
Grid.Row="10"
Grid.Column="2"
Grid.ColumnSpan="2"
Width="105"
Height="40"
Margin="0,0,20,0"
HorizontalAlignment="Right"
Command="{Binding Path=ResetCommand}"
Content="{DynamicResource DefaultHotkey}"
Style="{StaticResource ButtonStyle}" />
<!-- CAM 3 -->
<!--<TextBlock Text="CAM 3" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="1"></TextBlock>
<fcommon:HotkeyBox Grid.Column="1" Hotkey="{Binding Path=AutoCAM3,Mode=TwoWay}" Height="30" Grid.Row="1"
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/SystemSetting/View/HotkeySettingPanelView.g.cs
#pragma checksum "..\..\..\..\..\SystemSetting\View\HotkeySettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "1FB38020B98170E44D648CD4DA22B97409411A50CD8E7510F0556A994E6B72DA"
#pragma checksum "..\..\..\..\..\SystemSetting\View\HotkeySettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "725F92D6D061C34E0D64FEB5BF1DE93BA7C9ECCCB30D43D95378E39B4D0B13A5"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/SystemSetting/View/HotkeySettingPanelView.g.i.cs
#pragma checksum "..\..\..\..\..\SystemSetting\View\HotkeySettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "1FB38020B98170E44D648CD4DA22B97409411A50CD8E7510F0556A994E6B72DA"
#pragma checksum "..\..\..\..\..\SystemSetting\View\HotkeySettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "725F92D6D061C34E0D64FEB5BF1DE93BA7C9ECCCB30D43D95378E39B4D0B13A5"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......
VIZ.Framework/VIZ.Framework.Common/VideoControl/Control/Plugin/TrackingBox/Info/TrackingBoxInfo.cs
......@@ -37,6 +37,6 @@ namespace VIZ.Framework.Common
/// </summary>
public long TimeCode { get; set; }
public string BboxType { get; set; } = "detect";
public string BboxType { get; set; }
}
}
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