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

VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Algorithm/AlgorithmPackageBase.cs

-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VIZ.FGOUT.Connection
+namespace VIZ.FGOUT.Connection
 {
     /// <summary>
     /// 算法数据包基类

VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Algorithm/AlgorithmPackageProvider.cs

-using System;
+using log4net;
+using System;
 using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
-using log4net;
 using VIZ.Framework.Connection;
 
 namespace VIZ.FGOUT.Connection

VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Algorithm/Enum/AlgorithmAutoModeCmd.cs

-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VIZ.FGOUT.Connection
+namespace VIZ.FGOUT.Connection
 {
     /// <summary>
     /// 算法自动模式 命令

VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Algorithm/Enum/AlgorithmPackageSence.cs

-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VIZ.FGOUT.Connection
+namespace VIZ.FGOUT.Connection
 {
     /// <summary>
     /// 算法数据包场景

VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Algorithm/Enum/AlgorithmPackageSignal.cs

-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VIZ.FGOUT.Connection
+namespace VIZ.FGOUT.Connection
 {
     /// <summary>
     /// 算法数据包信号

VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Algorithm/IAlgorithmPackageProvider.cs

-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using VIZ.Framework.Core;
-using VIZ.Framework.Connection;
+using VIZ.Framework.Connection;
 
 namespace VIZ.FGOUT.Connection
 {

VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Algorithm/Provider/AlgorithmProvider__checked_ok.cs

-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using VIZ.Framework.Core;
+using VIZ.FGOUT.Domain;
 using VIZ.Framework.Connection;
-using VIZ.FGOUT.Domain;
 
 namespace VIZ.FGOUT.Connection
 {

VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Algorithm/Provider/AlgorithmProvider__crop_roi..cs

-using System;
-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 log4net;
 using SharpDX.Mathematics.Interop;
-using log4net;
+using VIZ.FGOUT.Domain;
+using VIZ.Framework.Connection;
 
 namespace VIZ.FGOUT.Connection
 {

VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Algorithm/Provider/AlgorithmProvider__detect.cs

-using System;
+using SharpDX.Mathematics.Interop;
 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 VIZ.Framework.Storage;
+using VIZ.Framework.Connection;
 
 namespace VIZ.FGOUT.Connection
 {

VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Algorithm/Sender/AlgorithmSender.cs

-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using VIZ.Framework.Domain;
+using System.Collections.Generic;
 using VIZ.Framework.Connection;
-using log4net;
-using Newtonsoft.Json;
 
 namespace VIZ.FGOUT.Connection
 {

VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Algorithm/Sender/AlgorithmSenderOption.cs

-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using VIZ.FGOUT.Domain;
+using System.Collections.Generic;
 
 namespace VIZ.FGOUT.Connection
 {

VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Algorithm/Signal/Recv/AlgorithmRecvPackage__checked_ok.cs

-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VIZ.FGOUT.Connection
+namespace VIZ.FGOUT.Connection
 {
     /// <summary>
     /// 算法数据包 -- 算法初始化完成

VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Algorithm/Signal/Recv/AlgorithmRecvPackage__crop_roi.cs

-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 using VIZ.FGOUT.Domain;
 
 namespace VIZ.FGOUT.Connection

VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Algorithm/Signal/Recv/AlgorithmRecvPackage__detect.cs

-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace VIZ.FGOUT.Connection
 {

VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Algorithm/Signal/Send/AlgorithmPackage__center_mode.cs

-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace VIZ.FGOUT.Connection
 {

VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Algorithm/Signal/Send/AlgorithmPackage__manual_mode.cs

-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace VIZ.FGOUT.Connection
 {

VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Algorithm/Signal/Send/AlgorithmPackage__no_mode.cs

-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VIZ.FGOUT.Connection
+namespace VIZ.FGOUT.Connection
 {
     /// <summary>
     /// 算法数据包 -- 不裁切

VIZ.FGOUT/VIZ.FGOUT.Domain/Enum/NDIViewStatus.cs

-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>
     /// NDI视图状态

VIZ.FGOUT/VIZ.FGOUT.Domain/Info/AlgorithmInfo_borderline.cs

-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace VIZ.FGOUT.Domain
 {

VIZ.FGOUT/VIZ.FGOUT.Domain/Info/AlgorithmInfo_borderpoint.cs

-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace VIZ.FGOUT.Domain
 {

VIZ.FGOUT/VIZ.FGOUT.Domain/Message/Algorithm/Implementation/AlgorithmMessageBase.cs

-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>
     /// 算法消息基类

VIZ.FGOUT/VIZ.FGOUT.Domain/Message/Algorithm/Implementation/AlgorithmMessage__checked_ok.cs

-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>
     /// 算法消息 -- 初始化完成

VIZ.FGOUT/VIZ.FGOUT.Domain/Message/Algorithm/Implementation/AlgorithmMessage__crop_roi.cs

 using SharpDX.Mathematics.Interop;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 
 namespace VIZ.FGOUT.Domain

VIZ.FGOUT/VIZ.FGOUT.Domain/Message/Algorithm/Implementation/AlgorithmMessage__detect.cs

 using SharpDX.Mathematics.Interop;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace VIZ.FGOUT.Domain
 {

VIZ.FGOUT/VIZ.FGOUT.Domain/Message/Algorithm/Interface/IAlgorithmMessage__roi.cs

 using SharpDX.Mathematics.Interop;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace VIZ.FGOUT.Domain
 {

VIZ.FGOUT/VIZ.FGOUT.Domain/Model/Algorithm/AlgorithmBorderScenceModel.cs

-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using VIZ.Framework.Core;
+using VIZ.Framework.Core;
 
 namespace VIZ.FGOUT.Domain
 {

VIZ.FGOUT/VIZ.FGOUT.Domain/Model/Algorithm/AlgorithmProcessModel.cs

-using System;
-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;
 
 namespace VIZ.FGOUT.Domain

VIZ.FGOUT/VIZ.FGOUT.Domain/Model/Algorithm/AlgorithmStrategyGroupModel.cs

-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 using VIZ.Framework.Core;
 
 

VIZ.FGOUT/VIZ.FGOUT.Domain/Model/Algorithm/AlgorithmStrategyModel.cs

 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using VIZ.FGOUT.Storage;
 using VIZ.Framework.Core;
 

VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/Controller/Loop/LoopController.cs

@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using VIZ.FGOUT.Domain;
 using VIZ.FGOUT.Storage;

VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs

@@ -403,9 +403,6 @@ namespace VIZ.FGOUT.Module
 
         private bool isEnbaleTarget=false;
 
-
-
-
        // ApplicationDomainEx.LiteDbContext.SetManualConfig.Upsert(this.manualConfig);
         public bool IsEnbaleTarget
         {
@@ -422,11 +419,6 @@ namespace VIZ.FGOUT.Module
 
                     manualConfig.IsManual = false;
                     ApplicationDomainEx.LiteDbContext.SetManualConfig.Upsert(manualConfig);
-
-
-
-
-
                 }
             }
         }
@@ -692,8 +684,6 @@ namespace VIZ.FGOUT.Module
 
         #region 按钮可用性
 
-
-
         /// <summary>
         /// 开始位置可用性
         /// </summary>
@@ -975,7 +965,6 @@ namespace VIZ.FGOUT.Module
                 if (e.KeyCode == System.Windows.Forms.Keys.Space)
                 {
                     this.hotkeyController.ExecuteSpaceUp();
-
                     return;
                 }
             });

VIZ.FGOUT/VIZ.FGOUT.Module/NDISettingView/View/NDISettingView.xaml.cs

-using System;
-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 System.Windows.Controls;
 using VIZ.Framework.Core;
 
 namespace VIZ.FGOUT.Module

VIZ.FGOUT/VIZ.FGOUT.Module/NDISettingView/ViewModel/Algorithm/AlgorithmNearPanelViewModel.cs

-using System;
-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 System.Linq;
 using VIZ.FGOUT.Domain;
 using VIZ.FGOUT.Storage;
+using VIZ.Framework.Common;
 
 namespace VIZ.FGOUT.Module
 {

VIZ.FGOUT/VIZ.FGOUT.Module/NDISettingView/ViewModel/Algorithm/AlgorithmPanelViewModelBase.cs

-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using VIZ.Framework.Core;
 using VIZ.FGOUT.Domain;
 using VIZ.FGOUT.Storage;
+using VIZ.Framework.Core;
 
 namespace VIZ.FGOUT.Module
 {

VIZ.FGOUT/VIZ.FGOUT.Module/NDISettingView/ViewModel/Algorithm/AlgorithmSinglePanelViewModel.cs

-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using VIZ.Framework.Core;
+using System.Linq;
 using VIZ.FGOUT.Domain;
 using VIZ.FGOUT.Storage;
 

VIZ.FGOUT/VIZ.FGOUT.Module/NDISettingView/ViewModel/Algorithm/AlgorithmTacticsPanelViewModel.cs

-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using VIZ.Framework.Common;
-using VIZ.Framework.Core;
+using System.Linq;
 using VIZ.FGOUT.Domain;
 using VIZ.FGOUT.Storage;
+using VIZ.Framework.Common;
 
 namespace VIZ.FGOUT.Module
 {

VIZ.FGOUT/VIZ.FGOUT.Module/NDISettingView/ViewModel/AlgorithmSettingPanelViewModel.cs

 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
-using VIZ.Framework.Core;
 using VIZ.FGOUT.Domain;
 using VIZ.FGOUT.Storage;
+using VIZ.Framework.Core;
 
 namespace VIZ.FGOUT.Module
 {

VIZ.FGOUT/VIZ.FGOUT.Module/NDISettingView/ViewModel/INDISetting.cs

-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VIZ.FGOUT.Module
+namespace VIZ.FGOUT.Module
 {
     /// <summary>
     /// NDI设置

VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/View/NDIView.xaml.cs

@@ -104,6 +104,11 @@ namespace VIZ.FGOUT.Module
         // 配置文件添加config 
         private SetManualConfig manualConfig;
 
+        /// <summary>
+        /// 鼠标左键抬起
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void Border_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
         {
            // this.manualConfig = ApplicationDomainEx.LiteDbContext.SetManualConfig.FindAll().FirstOrDefault();
@@ -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)
         {
             startPoint = e.GetPosition(this.canvas1);
@@ -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)
         {
             if (isMouseDown)
@@ -309,6 +324,11 @@ namespace VIZ.FGOUT.Module
         
         public Polygon polygon;
         public PointCollection points;
+        /// <summary>
+        /// 画多边形
+        /// </summary>
+        /// <param name="point"></param>
+        /// <param name="brush"></param>
         private void DrawPolygon(Point point, Brush brush)
         {
             if (polygon == null)
@@ -344,6 +364,11 @@ namespace VIZ.FGOUT.Module
         //    //polygon.Points = points;
         //}
 
+        /// <summary>
+        /// 鼠标右键一个图形绘制完成
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void Border_OnPreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e)
         {
             if(points == null)

VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.cs

@@ -681,11 +681,11 @@ namespace VIZ.FGOUT.Module
             manualCorrectionColor.A = (float)this.VIDEO_MANUAL_CORRECTION_OPACITY;
             this.ManualCorrectionColor = manualCorrectionColor;
 
-            // 是否显示目标裁切框
-            this.IsShowAlgorithmTargetBox = config.IsShowAlgorithmTargetBox;
-
             if (this.ViewKey == "CAM_1")
             {
+                // 是否显示目标裁切框
+                this.IsShowAlgorithmTargetBox = config.IsShowAlgorithmTargetBox;
+
                 //SetPlaceConfig setPlaceConfig = ApplicationDomainEx.LiteDbContext.SetPlaceConfig.FindAll().FirstOrDefault();
                 SetPlaceNewConfig setPlaceNewConfig = ApplicationDomainEx.LiteDbContext.SetPlaceNewConfig.FindAll().FirstOrDefault();
                 //if (setPlaceConfig == null) return;
@@ -962,7 +962,7 @@ namespace VIZ.FGOUT.Module
         /// </summary>
         public void WhenAlgorithmStop()
         {
-            // 从新统计目标框丢失帧数
+            // 重新统计目标框丢失帧数
             this.algorithmTargetBoxLostFrame_cache = 0;
         }
 

VIZ.FGOUT/VIZ.FGOUT.Module/SystemSetting/ViewModel/UEControlPanelViewModel.cs

@@ -42,8 +42,8 @@ namespace VIZ.FGOUT.Module
 
             //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));
+            //ConnectionManager.UdpConnection.AddEndpointManager(new UdpEndpointManager(_endpointKey, clientIP, 8888));
+            ConnectionManager.UdpConnection.AddEndpointManager(new UdpEndpointManager(_endpointKey, "192.168.31.70", 8888));
             
             javelinThrowConfig = ApplicationDomainEx.LiteDbContext.JavelinThrowConfig.FindAll().FirstOrDefault();
             if (javelinThrowConfig == null) return;

VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/VIZ.FGOUT.Module_MarkupCompile.lref

-
+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;;

VIZ.FGOUT/VIZ.FGOUT.Storage/LiteDB/System/HotkeyConfig.cs

-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VIZ.FGOUT.Storage
+namespace VIZ.FGOUT.Storage
 {
     /// <summary>
     /// 热键配置