Replay双人项目鼠标点击跟踪框和发送跟踪框数据优化

VIZ.FGOUT/VIZ.FGOUT.Module.Resource/obj/x64/Debug/VIZ.FGOUT.Module.Resource_MarkupCompile.cache

@@ -10,11 +10,11 @@ none
 false
 DEBUG;TRACE
 
-18560433975
-1470602451
-11-350624472
-24-1321085892
+181380438361
+1-1441241311
+11-1602666439
+23-2035776870
 Style\Button\Button_NdiView.xaml;Style\Button\Button_Setting.xaml;Style\Button\Button_WindowTop.xaml;Style\CheckBox\CheckBox_NdiView.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_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;
 
-False
+True
 

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

@@ -5,6 +5,7 @@ using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Shapes;
+using VIZ.FGOUT.Domain;
 using VIZ.Framework.Common;
 using VIZ.Framework.Core;
 using VIZ.Framework.Domain;
@@ -400,13 +401,12 @@ namespace VIZ.FGOUT.Module
                             }
                         }
                     }
-                    var gameName = this.vm.ViewConfig.GameName;
+                    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"))
                     {
                         if (saveInfos.Count == 2)
                         {
-                            saveInfos.RemoveAt(0);
                             saveInfos[0] = saveInfos[1];
                             saveInfos[1] = saveInfo;
                         }

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

@@ -266,6 +266,7 @@ namespace VIZ.FGOUT.Module
                     {
                         foreach (var info in infoBuffers)
                         {
+                            if(info == null) continue;
                             if (info.TimeCode == dse.TimeStamp)
                                 _cam3Infos.Add(info);
                         }
@@ -287,14 +288,14 @@ namespace VIZ.FGOUT.Module
                             {
                                 //WPFHelper.Invoke(() =>
                                 //{
-                                    // 更新视频流
-                                    view3.video.UpdateVideoFrame(dsExtend, true);
+                                // 更新视频流
+                                view3.video.UpdateVideoFrame(dsExtend, true);
                                 //});
                                 // 更新视频控件跟踪框信息
                                 if (_cam3Infos.Count > 0)
                                 {
                                     _cam3StaticInfos = _cam3Infos;
-                                    var gameName = this.ViewConfig.GameName;
+                                    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"))
                                     {
@@ -319,7 +320,7 @@ namespace VIZ.FGOUT.Module
                                     }
                                     //WPFHelper.Invoke(() =>
                                     //{
-                                        view3.video.UpdateTrackingBox(_cam3Infos);
+                                    view3.video.UpdateTrackingBox(_cam3Infos);
                                     //});
                                 }
                             }

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

@@ -268,11 +268,18 @@ namespace VIZ.FGOUT.Module
                 inPoints = Coordinate(nDIView.rectsReplay, srcWidth, srcHeight);
                 isInPoint = true;
             }
-            else if(nDIView.saveInfo.SrcRect.Left > 0)
+            else if(nDIView.saveInfos.Count > 0)
             {
-                inPoints = CoordinateTrackingBoxInfo(nDIView.saveInfo.SrcRect, srcWidth, srcHeight);
+                inPoints = CoordinateTrackingBoxInfos(nDIView.saveInfos, srcWidth, srcHeight);
                 isInPoint = true;
-                //nDIView.saveInfo = new TrackingBoxInfo();
+            }
+            else
+            {
+                if(nDIView.saveInfo.SrcRect.Left > 0)
+                {
+                    inPoints = CoordinateTrackingBoxInfo(nDIView.saveInfo.SrcRect, srcWidth, srcHeight);
+                    isInPoint = true;
+                }
             }
 
             if (!isInPoint)
@@ -432,6 +439,7 @@ namespace VIZ.FGOUT.Module
             {
                 NDIView nDIView = this.GetView<NDIView>();
                 nDIView.saveInfo = new TrackingBoxInfo();
+                nDIView.saveInfos = new List<TrackingBoxInfo>();
             }
             IsSliderValueChanged = replayModel.IsSliderValueChanged;
             SliderValue = replayModel.SliderValue;
@@ -830,6 +838,23 @@ namespace VIZ.FGOUT.Module
             return listOuterMost;
         }
 
+        private List<List<List<int>>> CoordinateTrackingBoxInfos(List<TrackingBoxInfo> infos, double srcWidth, double srcHeight)
+        {
+            var listOuterMost = new List<List<List<int>>>();
+
+            foreach(TrackingBoxInfo info in infos)
+            {
+                if ((info.SrcRect.Left > 0))
+                {
+                    var rect = info.SrcRect;
+                    List<List<int>> coordinates = new List<List<int>>() { new List<int>() { (int)rect.Left, (int)rect.Top }, new List<int>() { (int)rect.Right, (int)rect.Top },
+                new List<int>() { (int)rect.Right, (int)rect.Bottom }, new List<int>() { (int)rect.Left, (int)rect.Bottom } };
+                    listOuterMost.Add(coordinates);
+                }
+            }
+            return listOuterMost;
+        }
+
         /// <summary>
         /// 保存位置命令
         /// </summary>

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

@@ -10,11 +10,11 @@ none
 false
 DEBUG;TRACE
 
-241325682082
-4-699044453
-951167816992
-151674092382
+24-1226537834
+4-1529606353
+95-2032219709
+151915249285
 NDIMainView\View\NDIMainView.xaml;NDIPreviewView\View\NDIPreviewView.xaml;NDISettingView\View\AlgorithmSettingPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmCablewayPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmNearPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmSinglePanelView.xaml;NDISettingView\View\Algorithm\AlgorithmSixteenPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmTacticsPanelView.xaml;NDISettingView\View\NDISettingPanelView.xaml;NDISettingView\View\NDISettingView.xaml;NDIView\View\NDIView.xaml;SystemSetting\View\AboutPanelView.xaml;SystemSetting\View\CheckDataPanelView.xaml;SystemSetting\View\HotkeySettingPanelView.xaml;SystemSetting\View\MattingImagePanelView.xaml;SystemSetting\View\NewWindowView.xaml;SystemSetting\View\PackageSettingPanelView.xaml;SystemSetting\View\PreviewSettingPanelView.xaml;SystemSetting\View\ReplayPanelView.xaml;SystemSetting\View\StyleSettingPanelView.xaml;SystemSetting\View\SystemSettingView.xaml;SystemSetting\View\UEControlPanelView.xaml;SystemSetting\View\UESettingPanelView.xaml;Themes\SliderArrange.xaml;
 
-False
+True
 

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

-
+C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\obj\x64\Debug\GeneratedInternalTypeHelper.g.cs
 
 FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIMainView\View\NDIMainView.xaml;;
 FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIPreviewView\View\NDIPreviewView.xaml;;

VIZ.FGOUT/VIZ.FGOUT/obj/x64/Debug/VIZ.FGOUT_MarkupCompile.cache

@@ -10,11 +10,11 @@ none
 false
 DEBUG;TRACE
 C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\App.xaml
-2-1347366880
+21265083526
 
-6968741766
-43-1958993781
+6-790135758
+421356718200
 CloseAlgorithmWindow.xaml;MainWindow.xaml;
 
-False
+True
 

VIZ.Framework/VIZ.Framework.Common.Resource/obj/x64/Debug/VIZ.Framework.Common.Resource_MarkupCompile.cache

@@ -10,10 +10,10 @@ none
 false
 DEBUG;TRACE
 
-91711917753
+9-721875057
 
-3-1719726047
-19-82108094
+3-630027162
+19-1136530284
 Path\ArrowPathResource.xaml;Style\Button\Button_MessageBox.xaml;Style\Button\Button_Normal.xaml;Style\Button\Button_WindowTop.xaml;Style\GridSplitter\GridSplitter_None.xaml;Style\ListBox\ListBox_None.xaml;Style\ScrollView\ScrollView_Default.xaml;Style\TextBox\TextBox_None.xaml;Themes\Generic.xaml;
 
 False

VIZ.Framework/VIZ.Framework.Common/obj/x64/Debug/GeneratedInternalTypeHelper.g.cs

-
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//     运行时版本:4.0.30319.42000
+//
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace XamlGeneratedNamespace {
+    
+    
+    /// <summary>
+    /// GeneratedInternalTypeHelper
+    /// </summary>
+    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
+    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+    public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
+        
+        /// <summary>
+        /// CreateInstance
+        /// </summary>
+        protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
+            return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) 
+                            | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
+        }
+        
+        /// <summary>
+        /// GetPropertyValue
+        /// </summary>
+        protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
+            return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
+        }
+        
+        /// <summary>
+        /// SetPropertyValue
+        /// </summary>
+        protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
+            propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
+        }
+        
+        /// <summary>
+        /// CreateDelegate
+        /// </summary>
+        protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
+            return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod 
+                            | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
+                        delegateType,
+                        handler}, null)));
+        }
+        
+        /// <summary>
+        /// AddEventHandler
+        /// </summary>
+        protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
+            eventInfo.AddEventHandler(target, handler);
+        }
+    }
+}
 

VIZ.Framework/VIZ.Framework.Common/obj/x64/Debug/VIZ.Framework.Common_MarkupCompile.cache

@@ -10,11 +10,11 @@ none
 false
 DEBUG;TRACE
 
-15488264905
+15-721109437
 
-120494897808
-44-1238315823
+120150095399
+44-785521425
 MessageBox\MessageBoxEx.xaml;MessageBox\MessageBoxExWindow.xaml;Themes\Generic.xaml;VideoControl\Control\VideoControl.xaml;Widgets\ColorPickButton\ColorPickButton.xaml;Widgets\ColorPickButton\ColorPickWindow.xaml;Widgets\GPIOPinTestControl\GPIOPinTestControl.xaml;Widgets\HotkeyBox\HotkeyBox.xaml;Widgets\IconButton\IconButton.xaml;Widgets\LabelValue\LabelValue.xaml;Widgets\NavigationControl\NavigationControl.xaml;Widgets\ResizeImageControl\ResizeImageControl.xaml;Widgets\ShowMessageControl\ShowMessageControl.xaml;Widgets\VideoTimeBar\VideoTimeBar.xaml;Widgets\ViewLoader\ViewLoader.xaml;
 
-False
+True
 

VIZ.Framework/VIZ.Framework.Module/obj/x64/Debug/VIZ.Framework.Module_MarkupCompile.cache

@@ -10,11 +10,11 @@ none
 false
 DEBUG;TRACE
 
-11882902973
+1-731644535
 
-212023628146
-25699837507
+212002329545
+25439653939
 Themes\Generic.xaml;
 
-False
+True