Commit 0dbd2eb5 by 鲁志-悦动

裁切框在结束位置停留一秒后清除

parent ede380a0
......@@ -18,7 +18,6 @@ namespace VIZ.FGOUT.Connection
public AlgorithmPackageProvider()
{
// AlgorithmRecvPackage__detect package = Newtonsoft.Json.JsonConvert.DeserializeObject<AlgorithmRecvPackage__detect>("{\"signal\": \"detect\", \"bboxes\": [[3392, 576, 3834, 1421], [755, 916, 1195, 1292], [3675, 710, 3839, 1103]]}");
// 算法初始化完成
this.providers.Add(new AlgorithmProvider__checked_ok());
......@@ -44,13 +43,11 @@ namespace VIZ.FGOUT.Connection
try
{
AlgorithmPackageBase @base = Newtonsoft.Json.JsonConvert.DeserializeObject<AlgorithmPackageBase>(info.Json);
foreach (IAlgorithmPackageProvider provider in this.providers)
{
if (string.Equals(provider.Signal, @base.signal))
{
provider.Execute(info);
break;
}
}
......
......@@ -21,7 +21,6 @@ namespace VIZ.FGOUT.Connection
public void Execute(ConnSingleJsonInfo info)
{
AlgorithmRecvPackage__checked_ok package = Newtonsoft.Json.JsonConvert.DeserializeObject<AlgorithmRecvPackage__checked_ok>(info.Json);
AlgorithmMessage__checked_ok message = new AlgorithmMessage__checked_ok();
message.AlgorithmID = package.id;
ApplicationDomainEx.MessageManager.Send(message);
......
......@@ -50,7 +50,8 @@ namespace VIZ.FGOUT.Connection
AlgorithmRecvPackage__detect package = Newtonsoft.Json.JsonConvert.DeserializeObject<AlgorithmRecvPackage__detect>(info.Json);
AlgorithmMessage__detect message = new AlgorithmMessage__detect();
AlgorithmMessage__crop_roi message = new AlgorithmMessage__crop_roi();
//AlgorithmMessage__detect message = new AlgorithmMessage__detect();
message.AlgorithmID = package.id;
message.timecode = package.timecode;
// message.timecode = package.timecode;
......@@ -63,7 +64,6 @@ namespace VIZ.FGOUT.Connection
message.bboxes.Add(target);
}
}
ApplicationDomainEx.MessageManager.Send(message);
}
}
......
......@@ -10,6 +10,11 @@ namespace VIZ.FGOUT.Domain
public class AlgorithmMessage__crop_roi : AlgorithmMessageBase, IAlgorithmMessage__roi
{
/// <summary>
/// 裁剪框
/// </summary>
public List<RawRectangleF> bboxes { get; set; } = new List<RawRectangleF>();
/// <summary>
/// 裁切坐标
/// </summary>
public RawRectangleF? roi { get; set; }
......
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Domain
namespace VIZ.FGOUT.Domain
{
/// <summary>
/// 发送位置命令
/// </summary>
......
......@@ -652,20 +652,17 @@ namespace VIZ.FGOUT.Module
InvalidEnable = true;
}
/// <summary>
/// 发送位置命令
/// </summary>
public VCommand SendPlaceCommand { get; set; }
public SendPlaceModel sendPlaceModel = new SendPlaceModel();
private void sendPlace()
{
ApplicationDomainEx.MessageManager.Send(sendPlaceModel);
}
public VCommand SavePalceCommand { get; set; }
public SavePlaceModel savePlaceModel = new SavePlaceModel();
......
......@@ -454,8 +454,8 @@ namespace VIZ.FGOUT.Module
private bool ExecuteRestartAlgorithm_StartUDP()
{
// 添加新的UDP管理器
string clientIP = ApplicationDomainEx.IniStorage.GetValue<UdpConfig, string>(p => p.UDP_BINDING_IP);
// UDP本机绑定IP, 如果该值不配置,那么会获取本机的第一个IPV4地址
string clientIP = ApplicationDomainEx.IniStorage.GetValue<UdpConfig, string>(p => p.UDP_Algorithm_IP);
// UDP算法IP, 如果该值不配置,那么会获取本机的第一个IPV4地址
if (string.IsNullOrWhiteSpace(clientIP))
{
clientIP = NetHelper.GetLocalFirstIPv4Address();
......@@ -493,8 +493,8 @@ namespace VIZ.FGOUT.Module
{
string ip = clientIP;
//string ip = "192.168.31.70";
int port = 8001;
//NetHelper.GetAvailableUdpPort(8200, 9200, GlobalUsedPorts);
int port = ApplicationDomainEx.IniStorage.GetValue<UdpConfig, int>(p => p.UDP_Algorithm_PORT);
//NetHelper.GetAvailableUdpPort(8200, 9200, GlobalUsedPorts);
GlobalUsedPorts.Add(port);
ConnectionManager.UdpConnection.AddEndpointManager(new UdpEndpointManager("CAM_1", ip, port));
......
using System;
using SharpDX.Mathematics.Interop;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using log4net;
using SharpDX.Mathematics.Interop;
using VIZ.Framework.Common;
using VIZ.Framework.Core;
using VIZ.Framework.Storage;
using VIZ.FGOUT.Domain;
using VIZ.FGOUT.Storage;
using VIZ.Framework.Common;
using VIZ.Framework.Core;
namespace VIZ.FGOUT.Module
{
......@@ -69,12 +63,14 @@ namespace VIZ.FGOUT.Module
//====================================================================
}
private DateTime cropDt = DateTime.Now;
/// <summary>
/// 处理算法跟踪消息
/// </summary>
/// <param name="msg">消息</param>
private void OnAlgorithmMessage__detect(AlgorithmMessage__detect msg)
{
cropDt = DateTime.Now;
// 算法ID与视图绑定一一对应
//if (msg.AlgorithmID != this.ID)
// return;
......@@ -124,6 +120,28 @@ namespace VIZ.FGOUT.Module
this.AlgorithmFPS.CalcFps();
}
#region 定时器
private System.Timers.Timer time_1s = new System.Timers.Timer();
public void InitTimer()
{
time_1s.AutoReset = true;
time_1s.Enabled = true;
time_1s.Interval = 1000;
time_1s.Elapsed += UpdateCountDownTimer_Tick;
time_1s.Start();
}
private void UpdateCountDownTimer_Tick(object sender, EventArgs e)
{
var nowDt = DateTime.Now;
var minus = (nowDt - cropDt).TotalMilliseconds;
if (minus >= 1000)
GetView<NDIView>().video.ClearTrackingBox();//清除跟踪(裁切)框
}
#endregion
/// <summary>
/// 处理算法裁剪消息
/// </summary>
......@@ -215,6 +233,7 @@ namespace VIZ.FGOUT.Module
//////////////////////////////////////////////////////////////////////////////
}
private int? temp_center_x = 0;
/// <summary>
/// 裁切信息更新 -- 更新跟踪框
/// </summary>
......@@ -237,7 +256,6 @@ namespace VIZ.FGOUT.Module
if (msg.target_bbox == null || !this.IsShowAlgorithmTargetBox)
{
view.video.ClearTrackingBox();
return;
}
......@@ -245,7 +263,6 @@ namespace VIZ.FGOUT.Module
if (this.StrategyType == AlgorithmStrategyType.Single && (this.StrategyMode == AlgorithmStrategyMode.center_mode || this.StrategyMode == AlgorithmStrategyMode.manual_mode))
{
view.video.ClearTrackingBox();
return;
}
......@@ -254,10 +271,17 @@ namespace VIZ.FGOUT.Module
if (!RawRectangleFExpand.IsEffective(rect))
{
view.video.ClearTrackingBox();
return;
}
//跟踪框到结束区域后坐标值不变化则消失
//if (msg.center_x == temp_center_x)
//{
// view.video.ClearTrackingBox();
// return;
//}
//temp_center_x = msg.center_x;
TrackingBoxInfo info = new TrackingBoxInfo();
info.Type = TrackingBoxStyle.Rectangle_Corner;
info.SrcRect = msg.target_bbox.Value;
......
using log4net;
using OpenCvSharp;
using SharpDX.Mathematics.Interop;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Windows;
using System.Windows.Media;
using System.Windows.Shapes;
using VIZ.FGOUT.Connection;
......@@ -67,10 +65,13 @@ namespace VIZ.FGOUT.Module
this.InitController();
// 初始化手动模式
// this.InitManual();
// this.InitManual();
//初始化算法
// this.InitAlgorithm();
// this.InitAlgorithm();
//初始化定时器
InitTimer();
}
/// <summary>
......@@ -116,9 +117,9 @@ namespace VIZ.FGOUT.Module
{
// 算法初始化完成消息
ApplicationDomainEx.MessageManager.Register<AlgorithmMessage__checked_ok>(this, this.OnAlgorithmMessage__checked_ok);
// 算法跟踪消息
// 算法跟踪消息--检测
ApplicationDomainEx.MessageManager.Register<AlgorithmMessage__detect>(this, this.OnAlgorithmMessage__detect);
// 算法跟踪消息
// 算法跟踪消息--裁切
ApplicationDomainEx.MessageManager.Register<AlgorithmMessage__crop_roi>(this, this.OnAlgorithmMessage__crop_roi);
NDIView nDIView = this.GetView<NDIView>();
......@@ -180,13 +181,11 @@ namespace VIZ.FGOUT.Module
//rePlayPanelViewModel.timecode = timecode;
//replayPanelView.Show();
}
public bool IsDrawStartPlace = false;
/// <summary>
/// 开始位置命令
/// </summary>
public bool IsDrawStartPlace = false;
private void StartPlace(StartPlaceModel startPlaceModel)
{
if (this.ViewKey != "CAM_1")
......@@ -200,49 +199,41 @@ namespace VIZ.FGOUT.Module
IsCleanPlace = false;
}
public bool IsDrawEndPlace = false;
/// <summary>
/// 结束位置命令
/// </summary>
public bool IsDrawEndPlace = false;
private void EndPlace(EndPlaceModel endPlaceModel)
{
if (this.ViewKey != "CAM_1")
{
IsDrawEndPlace = false;
return;
}
IsDrawEndPlace = endPlaceModel.EndPlace;
IsDrawStartPlace = false;
IsDrawInvalidPlace = false;
IsCleanPlace = false;
}
public bool IsDrawInvalidPlace = false;
/// <summary>
/// 无效位置
/// </summary>
/// <param name="invalidPlaceModel"></param>
private void InvalidPlaceModel(InvalidPlaceModel invalidPlaceModel)
{
if (this.ViewKey != "CAM_1")
{
IsDrawInvalidPlace = false;
return;
}
IsDrawInvalidPlace = invalidPlaceModel.IsInvalid;
IsDrawStartPlace = false;
IsDrawEndPlace = false;
IsCleanPlace = false;
}
public bool IsCleanPlace = false;
private void CleanPlace(CleanPlaceModel cleanPlaceModel)
{
......@@ -274,7 +265,6 @@ namespace VIZ.FGOUT.Module
/// 发送位置命令
/// </summary>
/// <param name="sendPlaceModel"></param>
private void SendPlace(SendPlaceModel sendPlaceModel)
{
// 对结束值进行组装
......@@ -395,11 +385,8 @@ namespace VIZ.FGOUT.Module
/// <summary>
/// 保存配置命令
/// </summary>
///
private SetPlaceConfig setPlaceConfig;
SetPlaceNewConfig setPlaceNewConfig;
private SetPlaceNewConfig setPlaceNewConfig;
private SetManualConfig manualConfig;
private void SavePlace(SavePlaceModel savePlaceModel)
{
......@@ -598,7 +585,6 @@ namespace VIZ.FGOUT.Module
int top = 0;
int right = left + ApplicationDomainEx.VIDEO_CLIP_BOX_WIDTH;
int bottom = 1080;
return new List<int> { left, top, right, bottom };
}
......@@ -613,7 +599,6 @@ namespace VIZ.FGOUT.Module
int top = 0;
int right = center + ApplicationDomainEx.VIDEO_CLIP_BOX_WIDTH / 2;
int bottom = 1080;
return new List<int> { left, top, right, bottom };
}
......
using Newtonsoft.Json;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.Remoting.Contexts;
using System.Windows;
using VIZ.FGOUT.Connection;
using VIZ.FGOUT.Connection.UDP.Clip.Signal.Send;
using VIZ.FGOUT.Domain;
using VIZ.FGOUT.Storage;
......@@ -29,6 +26,8 @@ namespace VIZ.FGOUT.Module
HideHeightCommand = new VCommand(this.HideHeight);
EnableZoomCommand = new VCommand(this.EnableZoom);
CloseZoomCommand = new VCommand(this.CloseZoom);
ShowLineCommand = new VCommand(this.ShowLine);
HideLineCommand = new VCommand(this.HideLine);
BeforeDrawingLinePositionCommand = new VCommand(this.BeforeDrawingLinePosition);
AfterDrawingTheLinePositionCommand = new VCommand(this.AfterDrawingTheLinePosition);
SendPresetCommand = new VCommand(this.SendPreset);
......@@ -41,9 +40,13 @@ namespace VIZ.FGOUT.Module
SaveCommand = new VCommand(this.Save);
//ConnectionManager.UdpConnection.AddEndpointManager(new UdpEndpointManager(_endpointKey, "127.0.0.1", 8888));
string clientIP = ApplicationDomainEx.IniStorage.GetValue<UdpConfig, string>(p => p.UDP_BINDING_IP);
//ConnectionManager.UdpConnection.AddEndpointManager(new UdpEndpointManager(_endpointKey, clientIP, 8888));
ConnectionManager.UdpConnection.AddEndpointManager(new UdpEndpointManager(_endpointKey, "192.168.31.70", 8888));
string clientIP = ApplicationDomainEx.IniStorage.GetValue<UdpConfig, string>(p => p.UDP_UESETTING_IP);
// UDP UE设置IP, 如果该值不配置,那么会获取本机的第一个IPV4地址
if (string.IsNullOrWhiteSpace(clientIP))
clientIP = NetHelper.GetLocalFirstIPv4Address();
int port = ApplicationDomainEx.IniStorage.GetValue<UdpConfig, int>(p => p.UDP_UESETTING_PORT);
ConnectionManager.UdpConnection.AddEndpointManager(new UdpEndpointManager(_endpointKey, clientIP, port));
//ConnectionManager.UdpConnection.AddEndpointManager(new UdpEndpointManager(_endpointKey, "192.168.31.70", 8888));
javelinThrowConfig = ApplicationDomainEx.LiteDbContext.JavelinThrowConfig.FindAll().FirstOrDefault();
if (javelinThrowConfig == null) return;
......
D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\obj\x64\Debug\GeneratedInternalTypeHelper.g.cs

FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIMainView\View\NDIMainView.xaml;;
FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIPreviewView\View\NDIPreviewView.xaml;;
......
......@@ -19,5 +19,29 @@ namespace VIZ.FGOUT.Storage
/// </summary>
[Ini(Section = "UDP", DefaultValue = "8100", Type = typeof(int))]
public string UDP_BINDING_PORT { get; set; }
/// <summary>
/// UDP UE控制IP
/// </summary>
[Ini(Section = "UDP", DefaultValue = "", Type = typeof(string))]
public string UDP_UESETTING_IP { get; set; }
/// <summary>
/// UDP UE控制端口
/// </summary>
[Ini(Section = "UDP", DefaultValue = "8888", Type = typeof(int))]
public string UDP_UESETTING_PORT { get; set; }
/// <summary>
/// UDP算法IP
/// </summary>
[Ini(Section = "UDP", DefaultValue = "", Type = typeof(string))]
public string UDP_Algorithm_IP { get; set; }
/// <summary>
/// UDP算法端口
/// </summary>
[Ini(Section = "UDP", DefaultValue = "8001", Type = typeof(int))]
public string UDP_Algorithm_PORT { get; set; }
}
}
2023-09-21 10:45:01,512 [3] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-09-21 11:31:04,805 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-09-21 11:44:16,460 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-09-21 14:16:24,772 [9] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-09-21 14:16:36,919 [9] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-09-21 14:50:31,750 [4] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-09-21 14:50:32,136 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-09-21 14:59:22,046 [4] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-09-21 15:05:49,933 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-09-21 16:21:08,918 [10] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-09-21 16:21:58,493 [9] ERROR VIZ.Framework.Connection.UdpConnection - System.Net.Sockets.SocketException (0x80004005): 远程主机强迫关闭了一个现有的连接。
在 System.Net.Sockets.Socket.ReceiveFrom(Byte[] buffer, Int32 offset, Int32 size, SocketFlags socketFlags, EndPoint& remoteEP)
在 System.Net.Sockets.UdpClient.Receive(IPEndPoint& remoteEP)
在 VIZ.Framework.Connection.UdpConnection.ReceiveMessage() 位置 D:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\Protocol\UDP\UdpConnection.cs:行号 163
2023-09-21 16:22:12,883 [9] ERROR VIZ.Framework.Connection.UdpConnection - System.Net.Sockets.SocketException (0x80004005): 远程主机强迫关闭了一个现有的连接。
在 System.Net.Sockets.Socket.ReceiveFrom(Byte[] buffer, Int32 offset, Int32 size, SocketFlags socketFlags, EndPoint& remoteEP)
在 System.Net.Sockets.UdpClient.Receive(IPEndPoint& remoteEP)
在 VIZ.Framework.Connection.UdpConnection.ReceiveMessage() 位置 D:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\Protocol\UDP\UdpConnection.cs:行号 163
2023-09-21 16:30:21,704 [10] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-09-21 17:18:23,147 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-09-21 17:21:10,625 [13] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-09-21 17:25:09,774 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-09-21 17:34:59,500 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-09-21 17:35:56,078 [13] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-09-21 17:38:34,636 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-09-21 17:43:56,666 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-09-26 10:26:05,535 [10] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-09-26 10:41:23,812 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-09-26 11:17:40,811 [10] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-09-26 11:19:36,669 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-09-26 14:26:19,241 [4] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-09-26 16:27:53,182 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - System.InvalidOperationException: 集合已修改;可能无法执行枚举操作。
在 System.ThrowHelper.ThrowInvalidOperationException(ExceptionResource resource)
在 System.Collections.Generic.List`1.Enumerator.MoveNextRare()
在 System.Linq.Enumerable.FirstOrDefault[TSource](IEnumerable`1 source, Func`2 predicate)
在 VIZ.FGOUT.Module.AlgorithmControllerBase.ExecuteRestartAlgorithm_StartUDP() 位置 D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIView\Controller\Algorithm\AlgorithmControllerBase.cs:行号 471
在 VIZ.FGOUT.Module.AlgorithmControllerBase.ExecuteRestartAlgorithm() 位置 D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIView\Controller\Algorithm\AlgorithmControllerBase.cs:行号 254
在 VIZ.FGOUT.Module.AlgorithmControllerBase.<RestartAlgorithm>b__14_0() 位置 D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIView\Controller\Algorithm\AlgorithmControllerBase.cs:行号 84
2023-09-26 16:39:07,728 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
......@@ -73,6 +73,14 @@ NAVIGATION3D_PROFILE_NAME=VIZ.H2V
;UDP_BINDING_IP=192.168.31.33
;UDP本机绑定端口
UDP_BINDING_PORT=8100
;UDP UE控制IP, 如果该值不配置,那么会获取本机的第一个IPV4地址
UDP_UESETTING_IP=192.168.31.70
;UDP UE控制端口
UDP_UESETTING_PORT=8888
;UDP算法IP, 如果该值不配置,那么会获取本机的第一个IPV4地址
;UDP_Algorithm_IP=192.168.31.33
;UDP算法端口
UDP_Algorithm_PORT=8001
; ============================================================
; === Algorithm ===
; ============================================================
......
......@@ -73,6 +73,14 @@ NAVIGATION3D_PROFILE_NAME=VIZ.H2V
;UDP_BINDING_IP=192.168.31.33
;UDP本机绑定端口
UDP_BINDING_PORT=8100
;UDP UE控制IP, 如果该值不配置,那么会获取本机的第一个IPV4地址
UDP_UESETTING_IP=192.168.31.70
;UDP UE控制端口
UDP_UESETTING_PORT=8888
;UDP算法IP, 如果该值不配置,那么会获取本机的第一个IPV4地址
;UDP_Algorithm_IP=192.168.31.33
;UDP算法端口
UDP_Algorithm_PORT=8001
; ============================================================
; === Algorithm ===
; ============================================================
......
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.Framework.Common
{
......@@ -36,11 +33,9 @@ namespace VIZ.Framework.Common
{
if (videoControl.videoRender == null)
return;
TrackingBoxPlugin plugin = videoControl.GetPlugin<TrackingBoxPlugin>(VideoControlPluginNames.TrackingBox);
if (plugin == null)
return;
plugin.Update(null);
}
......
......@@ -186,11 +186,7 @@ namespace VIZ.Framework.Common
/// </summary>
private void VideoRender_PreviewMouseLeftButtonDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
{
// SetManualConfig manualConfig;
// SetManualConfig manualConfig;
if (this.TrackingBoxClick == null || !this.IsEnabled)
return;
......@@ -208,8 +204,6 @@ namespace VIZ.Framework.Common
args.VideoPointCenter = bmpPoint;
args.HitTrackingBoxInfo = TrackingBoxExpand.HitTest(this.trackingBoxInfos, bmpPoint);
if (args.HitTrackingBoxInfo == null)
return;
......
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