Skip to content

F
FGOUT
Commit 0f309791 by 鲁志-悦动
Options

Replay优化选中框显示逻辑

parent b3130b3a
Showing with 29 additions and 10 deletions
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.Manual_NDI.cs
......@@ -32,6 +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> _cam3Infos = new List<TrackingBoxInfo>();
public List<TrackingBoxInfo> _cam3BInfos = new List<TrackingBoxInfo>();
......@@ -271,6 +272,7 @@ namespace VIZ.FGOUT.Module
Queue<TrackingBoxInfo> infoBuffers = _trackingBoxInfoBuffer.GetInfos();
Queue<TrackingBoxInfo> infoBBuffers = _trackingBBoxInfoBuffer.GetInfos();
_cam3Infos = new List<TrackingBoxInfo>();
_cam3UpdateInfos = new List<TrackingBoxInfo>();
//跟踪框全显示
if (infoBuffers.Count > 0)
{
......@@ -310,6 +312,8 @@ namespace VIZ.FGOUT.Module
// 更新视频流
view3.video.UpdateVideoFrame(dsExtend, true);
#region 注释的代码
//// 更新视频控件跟踪框信息，现在_cam3Infos里是缓存的跟踪框信息
//if (_cam3Infos.Count > 0)
//{
......@@ -343,6 +347,8 @@ namespace VIZ.FGOUT.Module
// view3.video.UpdateTrackingBox(_cam3Infos);
//}
#endregion
// 更新视频控件跟踪框信息，现在_cam3BInfos里是缓存的跟踪框信息
if (_cam3BInfos.Count > 0)
{
......@@ -357,17 +363,24 @@ namespace VIZ.FGOUT.Module
if (saveInfo.SrcRect.Left > 0)
{
saveInfo.DrawingBorderColor = this.TRACKING_BOX_BORDER_COLOR;
_cam3Infos.Add(saveInfo);//把选中框的信息也加到这个集合里
//把选中框的信息也加到这个集合里
_cam3Infos.Add(saveInfo);
//_cam3UpdateInfos.Add(saveInfo);
}
}
//view3.video.UpdateTrackingBox(_cam3UpdateInfos);
}
else
{
var info = view3.saveInfo;
//更新红色点中框
if (view3.saveInfo.SrcRect.Left > 0)
if (info.SrcRect.Left > 0)
{
view3.saveInfo.DrawingBorderColor = this.TRACKING_BOX_BORDER_COLOR;
_cam3Infos.Add(view3.saveInfo);//把选中框的信息也加到这个集合里
info.DrawingBorderColor = this.TRACKING_BOX_BORDER_COLOR;
//把选中框的信息也加到这个集合里
_cam3Infos.Add(info);
//_cam3Infos.Add(view3.saveInfo);
view3.video.UpdateTrackingBox(new List<TrackingBoxInfo>(){ info });
}
}
//先清除跟踪框
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.cs
......@@ -320,8 +320,8 @@ namespace VIZ.FGOUT.Module
ndiView.rectsReplay.Clear();
ndiView.canvas1.Children.Clear();
//清除跟踪框的数据
//ndiView.saveInfo = new TrackingBoxInfo();
//ndiView.saveInfos = new List<TrackingBoxInfo>();
ndiView.saveInfo = new TrackingBoxInfo();
ndiView.saveInfos = new List<TrackingBoxInfo>();
//清除跟踪框
//ndiView.video.ClearTrackingBox();
}
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "FD6FEB4A1234E343D80E54B3EE80FF88EB2FB86A0313D55A86DD54CD510C8F08"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "BF2B615BB0F0CB14CC9FFFCBA7C280946754091792A1EA6C47FC789E2765BA67"
//------------------------------------------------------------------------------
// <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}" "FD6FEB4A1234E343D80E54B3EE80FF88EB2FB86A0313D55A86DD54CD510C8F08"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "BF2B615BB0F0CB14CC9FFFCBA7C280946754091792A1EA6C47FC789E2765BA67"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......
VIZ.FGOUT/VIZ.FGOUT/bin/x64/Debug/Logs/info.log

\ No newline at end of file
2024-03-29 16:50:49,392 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"type":"REPLAY","start_time":0,"end_time":0,"status":1}
2024-03-29 16:51:33,066 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"manual","signal":"detect","timecode":0}
2024-03-29 16:51:34,294 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"auto","signal":"detect","timecode":0}
2024-03-29 16:51:35,532 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"manual","signal":"detect","timecode":0}
2024-03-29 16:51:36,177 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"auto","signal":"detect","timecode":0}
2024-03-29 16:51:36,825 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"manual","signal":"detect","timecode":0}
2024-03-29 16:51:38,055 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"auto","signal":"detect","timecode":0}
2024-03-29 16:51:39,843 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"manual","signal":"detect","timecode":0}
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