Skip to content

F
FGOUT
Commit b3130b3a by 鲁志-悦动
Options

由于缓存帧可配置，Replay滑块最大值改成动态计算 And Replay页面显示所有框信息，只关联跟踪框的信息

parent 9799ba05
Showing with 94 additions and 72 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/View/NDIMainView.xaml
......@@ -811,7 +811,7 @@
Foreground="Black"
IsEnabled="False"
Style="{StaticResource TextBoxStyle}"
Text="{Binding AutoSendCount, Mode=TwoWay}" />
Text="{Binding AutoSendCount}" />
</StackPanel>
</Border>
......@@ -1448,7 +1448,7 @@
Visibility="{Binding SliderVisibility}">
<local:SliderArrange
EndValue="{Binding SliderEndValue, Mode=TwoWay}"
Maximum="500"
Maximum="{Binding SliderMaximum}"
Minimum="0"
SliderHeight="30"
SliderWidth="810"
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
......@@ -60,6 +60,12 @@ namespace VIZ.FGOUT.Module
//初始化算法数据
//InitAlgorithmData();
/// <summary>
/// 音视频流缓存时间
/// </summary>
int STREAM_CACHEED_TIME = ApplicationDomain.IniStorage.GetValue<StreamConfig, int>(p => p.STREAM_CACHEED_TIME);
SliderMaxValue = STREAM_CACHEED_TIME * 50;
}
/// <summary>
......@@ -151,6 +157,10 @@ namespace VIZ.FGOUT.Module
ApplicationDomain.MessageManager.Register<AutoSendModel>(this, this.AutoSendIntervalTimeChanged);
}
#region 自动发送倒计时器
private System.Timers.Timer _autoSend_Timer = new System.Timers.Timer();
private int _tempAutoSendCount = 4;
private void AutoSendIntervalTimeChanged(AutoSendModel model)
{
......@@ -159,9 +169,6 @@ namespace VIZ.FGOUT.Module
_autoSend_Timer.Start();
}
#region 自动发送倒计时器
private System.Timers.Timer _autoSend_Timer = new System.Timers.Timer();
public void InitAutoSendTimer()
{
_autoSend_Timer.Interval = 1000;
......@@ -1542,7 +1549,7 @@ namespace VIZ.FGOUT.Module
private int _sliderEndValue = 500;
public int SliderEndValue
{
get => (int)_sliderEndValue;
get => _sliderEndValue;
set
{
if (!_isReplayChecked)
......@@ -1562,10 +1569,22 @@ namespace VIZ.FGOUT.Module
}
}
private int _sliderMaximum = 500;
public int SliderMaximum
{
get => _sliderMaximum;
set
{
_sliderMaximum = value;
this.RaisePropertyChanged(nameof(SliderMaximum));
}
}
private int _sliderValue2 = 150;
public int SliderValue2
{
get => (int)_sliderValue2;
get => _sliderValue2;
set { _sliderValue2 = value; this.RaisePropertyChanged(nameof(SliderValue2)); }
}
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.Manual_NDI.cs
......@@ -21,7 +21,6 @@ namespace VIZ.FGOUT.Module
/// </summary>
public partial class NDIViewModel
{
/// <summary>
/// 音视频流缓存时间
/// </summary>
......@@ -30,8 +29,11 @@ namespace VIZ.FGOUT.Module
private readonly TrackingBoxInfoBuffer _trackingBoxInfoBuffer =
new TrackingBoxInfoBuffer(TimeSpan.FromSeconds(50 * STREAM_CACHEED_TIME));
private readonly TrackingBoxInfoBuffer _trackingBBoxInfoBuffer =
new TrackingBoxInfoBuffer(TimeSpan.FromSeconds(50 * STREAM_CACHEED_TIME));
public List<TrackingBoxInfo> _cam3Infos = new List<TrackingBoxInfo>();
public List<TrackingBoxInfo> _cam3BInfos = new List<TrackingBoxInfo>();
/// <summary>
/// 重置3D鼠标
......@@ -267,16 +269,28 @@ namespace VIZ.FGOUT.Module
//遍历跟踪框队列
Queue<TrackingBoxInfo> infoBuffers = _trackingBoxInfoBuffer.GetInfos();
Queue<TrackingBoxInfo> infoBBuffers = _trackingBBoxInfoBuffer.GetInfos();
_cam3Infos = new List<TrackingBoxInfo>();
//跟踪框全显示
if (infoBuffers.Count > 0)
{
foreach (var info in infoBuffers)
{
if(info == null) continue;
if (info == null) continue;
if (info.TimeCode == dse.TimeStamp)
_cam3Infos.Add(info);
}
}
//匹配的时候只匹配BBox下的
if (infoBBuffers.Count > 0)
{
foreach (var info in infoBBuffers)
{
if (info == null) continue;
if (info.TimeCode == dse.TimeStamp)
_cam3BInfos.Add(info);
}
}
//如果是Start滑块在动
if (view.vm.IsStartValue)
......@@ -292,15 +306,47 @@ namespace VIZ.FGOUT.Module
var view3 = this.FindChild<NDIView>(Application.Current.MainWindow, NDIViewKeys.cam3);
if (view3 != null)
{
//WPFHelper.Invoke(() =>
//{
// 更新视频流
view3.video.UpdateVideoFrame(dsExtend, true);
//});
// 更新视频控件跟踪框信息，现在_cam3Infos里是缓存的跟踪框信息
if (_cam3Infos.Count > 0)
//// 更新视频控件跟踪框信息，现在_cam3Infos里是缓存的跟踪框信息
//if (_cam3Infos.Count > 0)
//{
// _cam3StaticInfos = _cam3Infos;
// var gameName = ApplicationDomainEx.LiteDbContext.ViewConfig.FindOne(p => p.ViewKey == NDIViewKeys.CAM_1).GameName;
// //当双人3m跳水,双人10m跳水,双人速度攀岩时，保存2个入点框
// if (gameName.Equals("SS") || gameName.Equals("ST") || gameName.Equals("SP"))
// {
// foreach (var saveInfo in view3.saveInfos)
// {
// //更新红色点中框
// if (saveInfo.SrcRect.Left > 0)
// {
// saveInfo.DrawingBorderColor = this.TRACKING_BOX_BORDER_COLOR;
// _cam3Infos.Add(saveInfo);//把选中框的信息也加到这个集合里
// }
// }
// }
// else
// {
// //更新红色点中框
// if (view3.saveInfo.SrcRect.Left > 0)
// {
// view3.saveInfo.DrawingBorderColor = this.TRACKING_BOX_BORDER_COLOR;
// _cam3Infos.Add(view3.saveInfo);//把选中框的信息也加到这个集合里
// }
// }
// //先清除跟踪框
// //view3.video.ClearTrackingBox();
// //再更新跟踪框信息
// view3.video.UpdateTrackingBox(_cam3Infos);
//}
// 更新视频控件跟踪框信息，现在_cam3BInfos里是缓存的跟踪框信息
if (_cam3BInfos.Count > 0)
{
_cam3StaticInfos = _cam3Infos;
_cam3StaticInfos = _cam3BInfos;
var gameName = ApplicationDomainEx.LiteDbContext.ViewConfig.FindOne(p => p.ViewKey == NDIViewKeys.CAM_1).GameName;
//当双人3m跳水,双人10m跳水,双人速度攀岩时，保存2个入点框
if (gameName.Equals("SS") || gameName.Equals("ST") || gameName.Equals("SP"))
......@@ -324,13 +370,10 @@ namespace VIZ.FGOUT.Module
_cam3Infos.Add(view3.saveInfo);//把选中框的信息也加到这个集合里
}
}
//WPFHelper.Invoke(() =>
//{
//先清除跟踪框
//view3.video.ClearTrackingBox();
//再更新跟踪框信息
view3.video.UpdateTrackingBox(_cam3Infos);
//});
}
}
}
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.Message.cs
......@@ -175,7 +175,10 @@ namespace VIZ.FGOUT.Module
info.TimeCode = msg.timecode;
infos.Add(info);
if (!view.vm.IsReplay)
{
_trackingBoxInfoBuffer.AddInfo(info);
_trackingBBoxInfoBuffer.AddInfo(info);
}
}
}
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "FD60C86EDEF9C45F9803679FC06039AD232FC37A2DDD6CD90E06C4B3EB42E44C"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "FD6FEB4A1234E343D80E54B3EE80FF88EB2FB86A0313D55A86DD54CD510C8F08"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......
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}" "FD60C86EDEF9C45F9803679FC06039AD232FC37A2DDD6CD90E06C4B3EB42E44C"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "FD6FEB4A1234E343D80E54B3EE80FF88EB2FB86A0313D55A86DD54CD510C8F08"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......
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/Logs/info.log
2024-03-28 11:06:34,419 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"auto","signal":"detect","timecode":0}
2024-03-28 11:06:35,654 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"manual","signal":"detect","timecode":0}
2024-03-28 11:06:38,645 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"auto","signal":"detect","timecode":0}
2024-03-28 11:06:42,719 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"manual","signal":"detect","timecode":0}
2024-03-28 11:06:43,374 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"auto","signal":"detect","timecode":0}
2024-03-28 11:06:50,284 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"manual","signal":"detect","timecode":0}
2024-03-28 11:06:51,495 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"auto","signal":"detect","timecode":0}
2024-03-28 11:06:52,704 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"manual","signal":"detect","timecode":0}
2024-03-28 11:06:53,910 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"auto","signal":"detect","timecode":0}
2024-03-28 11:07:34,108 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"manual","signal":"detect","timecode":0}
2024-03-28 11:07:35,390 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"auto","signal":"detect","timecode":0}
2024-03-28 11:07:37,237 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"manual","signal":"detect","timecode":0}
2024-03-28 11:07:40,199 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"auto","signal":"detect","timecode":0}
2024-03-28 11:07:41,996 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"manual","signal":"detect","timecode":0}
2024-03-28 11:07:43,190 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"auto","signal":"detect","timecode":0}
2024-03-28 11:23:48,480 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"manual","signal":"detect","timecode":0}
2024-03-28 11:23:49,759 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"auto","signal":"detect","timecode":0}
2024-03-28 11:23:54,979 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"manual","signal":"detect","timecode":0}
2024-03-28 11:23:56,161 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"auto","signal":"detect","timecode":0}
2024-03-28 11:23:58,642 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"manual","signal":"detect","timecode":0}
2024-03-28 11:23:59,894 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"auto","signal":"detect","timecode":0}
2024-03-28 11:24:01,170 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"manual","signal":"detect","timecode":0}
2024-03-28 11:24:03,897 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"auto","signal":"detect","timecode":0}
2024-03-28 11:24:04,779 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"manual","signal":"detect","timecode":0}
2024-03-28 11:24:06,485 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"auto","signal":"detect","timecode":0}
2024-03-28 11:24:07,701 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"manual","signal":"detect","timecode":0}
2024-03-28 11:24:08,885 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"auto","signal":"detect","timecode":0}
2024-03-28 11:25:23,207 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"manual","signal":"detect","timecode":0}
2024-03-28 11:25:24,528 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"auto","signal":"detect","timecode":0}
2024-03-28 11:25:25,761 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"manual","signal":"detect","timecode":0}
2024-03-28 11:25:26,972 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"auto","signal":"detect","timecode":0}
2024-03-28 11:25:29,379 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"manual","signal":"detect","timecode":0}
2024-03-28 11:25:31,865 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"auto","signal":"detect","timecode":0}
2024-03-28 11:25:33,719 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"manual","signal":"detect","timecode":0}
2024-03-28 11:25:34,966 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"auto","signal":"detect","timecode":0}
2024-03-28 14:21:46,967 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"manual","signal":"detect","timecode":0}
2024-03-28 14:21:52,470 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"auto","signal":"detect","timecode":0}
2024-03-28 14:27:00,321 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"manual","signal":"detect","timecode":0}
2024-03-28 14:27:02,138 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"auto","signal":"detect","timecode":0}
2024-03-28 14:27:06,895 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"manual","signal":"detect","timecode":0}
2024-03-28 14:27:07,609 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"auto","signal":"detect","timecode":0}
2024-03-28 15:27:45,000 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"manual","signal":"detect","timecode":0}
2024-03-28 15:27:47,471 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"auto","signal":"detect","timecode":0}
2024-03-28 15:27:48,727 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"manual","signal":"detect","timecode":0}
2024-03-28 15:27:49,682 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"auto","signal":"detect","timecode":0}

\ No newline at end of file
VIZ.FGOUT/VIZ.FGOUT/bin/x64/Debug/config/config.ini
......@@ -104,6 +104,6 @@ ALGORITHM_ClearTrackingBox_TIME=1000
ALGORITHM_ReconfirmAutoSend_TIME=3000
[Stream]
;音视频流的缓存时间（单位：秒）
STREAM_CACHEED_TIME=10
STREAM_CACHEED_TIME=20
VIZ.FGOUT/VIZ.FGOUT/config/config.ini
......@@ -104,6 +104,6 @@ ALGORITHM_ClearTrackingBox_TIME=1000
ALGORITHM_ReconfirmAutoSend_TIME=3000
[Stream]
;音视频流的缓存时间（单位：秒）
STREAM_CACHEED_TIME=10
STREAM_CACHEED_TIME=20
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