Commit ede380a0 by 鲁志-悦动

目标裁切框不在窗口2显示

parent 43a791ad
using System; namespace VIZ.FGOUT.Connection
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Connection
{ {
/// <summary> /// <summary>
/// 算法数据包基类 /// 算法数据包基类
......
using System; using log4net;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using log4net;
using VIZ.Framework.Connection; using VIZ.Framework.Connection;
namespace VIZ.FGOUT.Connection namespace VIZ.FGOUT.Connection
......
using System; namespace VIZ.FGOUT.Connection
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Connection
{ {
/// <summary> /// <summary>
/// 算法自动模式 命令 /// 算法自动模式 命令
......
using System; namespace VIZ.FGOUT.Connection
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Connection
{ {
/// <summary> /// <summary>
/// 算法数据包场景 /// 算法数据包场景
......
using System; namespace VIZ.FGOUT.Connection
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Connection
{ {
/// <summary> /// <summary>
/// 算法数据包信号 /// 算法数据包信号
......
using System; using VIZ.Framework.Connection;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VIZ.Framework.Core;
using VIZ.Framework.Connection;
namespace VIZ.FGOUT.Connection namespace VIZ.FGOUT.Connection
{ {
......
using System; using VIZ.FGOUT.Domain;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VIZ.Framework.Core;
using VIZ.Framework.Connection; using VIZ.Framework.Connection;
using VIZ.FGOUT.Domain;
namespace VIZ.FGOUT.Connection namespace VIZ.FGOUT.Connection
{ {
......
using System; using log4net;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VIZ.Framework.Core;
using VIZ.Framework.Connection;
using VIZ.FGOUT.Domain;
using SharpDX.Mathematics.Interop; using SharpDX.Mathematics.Interop;
using log4net; using VIZ.FGOUT.Domain;
using VIZ.Framework.Connection;
namespace VIZ.FGOUT.Connection namespace VIZ.FGOUT.Connection
{ {
......
using System; using SharpDX.Mathematics.Interop;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VIZ.Framework.Core;
using VIZ.Framework.Connection;
using VIZ.FGOUT.Domain; using VIZ.FGOUT.Domain;
using SharpDX.Mathematics.Interop; using VIZ.Framework.Connection;
using VIZ.Framework.Storage;
namespace VIZ.FGOUT.Connection namespace VIZ.FGOUT.Connection
{ {
......
using System; using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VIZ.Framework.Domain;
using VIZ.Framework.Connection; using VIZ.Framework.Connection;
using log4net;
using Newtonsoft.Json;
namespace VIZ.FGOUT.Connection namespace VIZ.FGOUT.Connection
{ {
......
using System; using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VIZ.FGOUT.Domain;
namespace VIZ.FGOUT.Connection namespace VIZ.FGOUT.Connection
{ {
......
using System; namespace VIZ.FGOUT.Connection
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Connection
{ {
/// <summary> /// <summary>
/// 算法数据包 -- 算法初始化完成 /// 算法数据包 -- 算法初始化完成
......
using System; using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VIZ.FGOUT.Domain; using VIZ.FGOUT.Domain;
namespace VIZ.FGOUT.Connection namespace VIZ.FGOUT.Connection
......
using System; using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Connection namespace VIZ.FGOUT.Connection
{ {
......
using System; using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Connection namespace VIZ.FGOUT.Connection
{ {
......
using System; using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Connection namespace VIZ.FGOUT.Connection
{ {
......
using System; namespace VIZ.FGOUT.Connection
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Connection
{ {
/// <summary> /// <summary>
/// 算法数据包 -- 不裁切 /// 算法数据包 -- 不裁切
......
using System; namespace VIZ.FGOUT.Domain
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Domain
{ {
/// <summary> /// <summary>
/// NDI视图状态 /// NDI视图状态
......
using System; using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Domain namespace VIZ.FGOUT.Domain
{ {
......
using System; using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Domain namespace VIZ.FGOUT.Domain
{ {
......
using System; namespace VIZ.FGOUT.Domain
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Domain
{ {
/// <summary> /// <summary>
/// 算法消息基类 /// 算法消息基类
......
using System; namespace VIZ.FGOUT.Domain
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Domain
{ {
/// <summary> /// <summary>
/// 算法消息 -- 初始化完成 /// 算法消息 -- 初始化完成
......
using SharpDX.Mathematics.Interop; using SharpDX.Mathematics.Interop;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Domain namespace VIZ.FGOUT.Domain
......
using SharpDX.Mathematics.Interop; using SharpDX.Mathematics.Interop;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Domain namespace VIZ.FGOUT.Domain
{ {
......
using SharpDX.Mathematics.Interop; using SharpDX.Mathematics.Interop;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Domain namespace VIZ.FGOUT.Domain
{ {
......
using System; using VIZ.Framework.Core;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VIZ.Framework.Core;
namespace VIZ.FGOUT.Domain namespace VIZ.FGOUT.Domain
{ {
......
using System; using System.Collections.Generic;
using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VIZ.Framework.Core; using VIZ.Framework.Core;
namespace VIZ.FGOUT.Domain namespace VIZ.FGOUT.Domain
......
using System; using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VIZ.Framework.Core; using VIZ.Framework.Core;
......
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VIZ.FGOUT.Storage; using VIZ.FGOUT.Storage;
using VIZ.Framework.Core; using VIZ.Framework.Core;
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using VIZ.FGOUT.Domain; using VIZ.FGOUT.Domain;
using VIZ.FGOUT.Storage; using VIZ.FGOUT.Storage;
......
...@@ -403,9 +403,6 @@ namespace VIZ.FGOUT.Module ...@@ -403,9 +403,6 @@ namespace VIZ.FGOUT.Module
private bool isEnbaleTarget=false; private bool isEnbaleTarget=false;
// ApplicationDomainEx.LiteDbContext.SetManualConfig.Upsert(this.manualConfig); // ApplicationDomainEx.LiteDbContext.SetManualConfig.Upsert(this.manualConfig);
public bool IsEnbaleTarget public bool IsEnbaleTarget
{ {
...@@ -422,11 +419,6 @@ namespace VIZ.FGOUT.Module ...@@ -422,11 +419,6 @@ namespace VIZ.FGOUT.Module
manualConfig.IsManual = false; manualConfig.IsManual = false;
ApplicationDomainEx.LiteDbContext.SetManualConfig.Upsert(manualConfig); ApplicationDomainEx.LiteDbContext.SetManualConfig.Upsert(manualConfig);
} }
} }
} }
...@@ -692,8 +684,6 @@ namespace VIZ.FGOUT.Module ...@@ -692,8 +684,6 @@ namespace VIZ.FGOUT.Module
#region 按钮可用性 #region 按钮可用性
/// <summary> /// <summary>
/// 开始位置可用性 /// 开始位置可用性
/// </summary> /// </summary>
...@@ -975,7 +965,6 @@ namespace VIZ.FGOUT.Module ...@@ -975,7 +965,6 @@ namespace VIZ.FGOUT.Module
if (e.KeyCode == System.Windows.Forms.Keys.Space) if (e.KeyCode == System.Windows.Forms.Keys.Space)
{ {
this.hotkeyController.ExecuteSpaceUp(); this.hotkeyController.ExecuteSpaceUp();
return; return;
} }
}); });
......
using System; using System.Windows.Controls;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using VIZ.Framework.Core; using VIZ.Framework.Core;
namespace VIZ.FGOUT.Module namespace VIZ.FGOUT.Module
......
using System; using System.Linq;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VIZ.Framework.Common;
using VIZ.Framework.Connection;
using VIZ.Framework.Core;
using VIZ.FGOUT.Connection;
using VIZ.FGOUT.Domain; using VIZ.FGOUT.Domain;
using VIZ.FGOUT.Storage; using VIZ.FGOUT.Storage;
using VIZ.Framework.Common;
namespace VIZ.FGOUT.Module namespace VIZ.FGOUT.Module
{ {
......
using System; using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using VIZ.Framework.Core;
using VIZ.FGOUT.Domain; using VIZ.FGOUT.Domain;
using VIZ.FGOUT.Storage; using VIZ.FGOUT.Storage;
using VIZ.Framework.Core;
namespace VIZ.FGOUT.Module namespace VIZ.FGOUT.Module
{ {
......
using System; using System.Linq;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VIZ.Framework.Core;
using VIZ.FGOUT.Domain; using VIZ.FGOUT.Domain;
using VIZ.FGOUT.Storage; using VIZ.FGOUT.Storage;
......
using System; using System.Linq;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VIZ.Framework.Common;
using VIZ.Framework.Core;
using VIZ.FGOUT.Domain; using VIZ.FGOUT.Domain;
using VIZ.FGOUT.Storage; using VIZ.FGOUT.Storage;
using VIZ.Framework.Common;
namespace VIZ.FGOUT.Module namespace VIZ.FGOUT.Module
{ {
......
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
using VIZ.Framework.Core;
using VIZ.FGOUT.Domain; using VIZ.FGOUT.Domain;
using VIZ.FGOUT.Storage; using VIZ.FGOUT.Storage;
using VIZ.Framework.Core;
namespace VIZ.FGOUT.Module namespace VIZ.FGOUT.Module
{ {
......
using System; namespace VIZ.FGOUT.Module
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Module
{ {
/// <summary> /// <summary>
/// NDI设置 /// NDI设置
......
...@@ -104,6 +104,11 @@ namespace VIZ.FGOUT.Module ...@@ -104,6 +104,11 @@ namespace VIZ.FGOUT.Module
// 配置文件添加config // 配置文件添加config
private SetManualConfig manualConfig; private SetManualConfig manualConfig;
/// <summary>
/// 鼠标左键抬起
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void Border_MouseLeftButtonUp(object sender, MouseButtonEventArgs e) private void Border_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
{ {
// this.manualConfig = ApplicationDomainEx.LiteDbContext.SetManualConfig.FindAll().FirstOrDefault(); // this.manualConfig = ApplicationDomainEx.LiteDbContext.SetManualConfig.FindAll().FirstOrDefault();
...@@ -210,6 +215,11 @@ namespace VIZ.FGOUT.Module ...@@ -210,6 +215,11 @@ namespace VIZ.FGOUT.Module
} }
} }
/// <summary>
/// 鼠标左键按下
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void Border_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) private void Border_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
{ {
startPoint = e.GetPosition(this.canvas1); startPoint = e.GetPosition(this.canvas1);
...@@ -274,6 +284,11 @@ namespace VIZ.FGOUT.Module ...@@ -274,6 +284,11 @@ namespace VIZ.FGOUT.Module
} }
} }
/// <summary>
/// 鼠标移动
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void Border_MouseMove(object sender, MouseEventArgs e) private void Border_MouseMove(object sender, MouseEventArgs e)
{ {
if (isMouseDown) if (isMouseDown)
...@@ -309,6 +324,11 @@ namespace VIZ.FGOUT.Module ...@@ -309,6 +324,11 @@ namespace VIZ.FGOUT.Module
public Polygon polygon; public Polygon polygon;
public PointCollection points; public PointCollection points;
/// <summary>
/// 画多边形
/// </summary>
/// <param name="point"></param>
/// <param name="brush"></param>
private void DrawPolygon(Point point, Brush brush) private void DrawPolygon(Point point, Brush brush)
{ {
if (polygon == null) if (polygon == null)
...@@ -344,6 +364,11 @@ namespace VIZ.FGOUT.Module ...@@ -344,6 +364,11 @@ namespace VIZ.FGOUT.Module
// //polygon.Points = points; // //polygon.Points = points;
//} //}
/// <summary>
/// 鼠标右键一个图形绘制完成
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void Border_OnPreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e) private void Border_OnPreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e)
{ {
if(points == null) if(points == null)
......
...@@ -681,11 +681,11 @@ namespace VIZ.FGOUT.Module ...@@ -681,11 +681,11 @@ namespace VIZ.FGOUT.Module
manualCorrectionColor.A = (float)this.VIDEO_MANUAL_CORRECTION_OPACITY; manualCorrectionColor.A = (float)this.VIDEO_MANUAL_CORRECTION_OPACITY;
this.ManualCorrectionColor = manualCorrectionColor; this.ManualCorrectionColor = manualCorrectionColor;
// 是否显示目标裁切框
this.IsShowAlgorithmTargetBox = config.IsShowAlgorithmTargetBox;
if (this.ViewKey == "CAM_1") if (this.ViewKey == "CAM_1")
{ {
// 是否显示目标裁切框
this.IsShowAlgorithmTargetBox = config.IsShowAlgorithmTargetBox;
//SetPlaceConfig setPlaceConfig = ApplicationDomainEx.LiteDbContext.SetPlaceConfig.FindAll().FirstOrDefault(); //SetPlaceConfig setPlaceConfig = ApplicationDomainEx.LiteDbContext.SetPlaceConfig.FindAll().FirstOrDefault();
SetPlaceNewConfig setPlaceNewConfig = ApplicationDomainEx.LiteDbContext.SetPlaceNewConfig.FindAll().FirstOrDefault(); SetPlaceNewConfig setPlaceNewConfig = ApplicationDomainEx.LiteDbContext.SetPlaceNewConfig.FindAll().FirstOrDefault();
//if (setPlaceConfig == null) return; //if (setPlaceConfig == null) return;
...@@ -962,7 +962,7 @@ namespace VIZ.FGOUT.Module ...@@ -962,7 +962,7 @@ namespace VIZ.FGOUT.Module
/// </summary> /// </summary>
public void WhenAlgorithmStop() public void WhenAlgorithmStop()
{ {
// 新统计目标框丢失帧数 // 新统计目标框丢失帧数
this.algorithmTargetBoxLostFrame_cache = 0; this.algorithmTargetBoxLostFrame_cache = 0;
} }
......
...@@ -42,8 +42,8 @@ namespace VIZ.FGOUT.Module ...@@ -42,8 +42,8 @@ namespace VIZ.FGOUT.Module
//ConnectionManager.UdpConnection.AddEndpointManager(new UdpEndpointManager(_endpointKey, "127.0.0.1", 8888)); //ConnectionManager.UdpConnection.AddEndpointManager(new UdpEndpointManager(_endpointKey, "127.0.0.1", 8888));
string clientIP = ApplicationDomainEx.IniStorage.GetValue<UdpConfig, string>(p => p.UDP_BINDING_IP); 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, clientIP, 8888));
//ConnectionManager.UdpConnection.AddEndpointManager(new UdpEndpointManager(_endpointKey, "192.168.31.70", 8888)); ConnectionManager.UdpConnection.AddEndpointManager(new UdpEndpointManager(_endpointKey, "192.168.31.70", 8888));
javelinThrowConfig = ApplicationDomainEx.LiteDbContext.JavelinThrowConfig.FindAll().FirstOrDefault(); javelinThrowConfig = ApplicationDomainEx.LiteDbContext.JavelinThrowConfig.FindAll().FirstOrDefault();
if (javelinThrowConfig == null) return; 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\NDIMainView\View\NDIMainView.xaml;;
FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIPreviewView\View\NDIPreviewView.xaml;; FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIPreviewView\View\NDIPreviewView.xaml;;
......
using System; namespace VIZ.FGOUT.Storage
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Storage
{ {
/// <summary> /// <summary>
/// 热键配置 /// 热键配置
......
This source diff could not be displayed because it is too large. You can view the blob instead.
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