单人机位添加 自动校准置信度

VIZ.H2V.Connection/UDP/Algorithm/Signal/Send/AlgorithmPackage__auto_mode_Single.cs

@@ -17,9 +17,14 @@ namespace VIZ.H2V.Connection
         public List<int> bbox { get; set; }
         public List<int> bbox { get; set; }
 
 
         /// <summary>
         /// <summary>
-        /// 面积校准比例
+        /// 最小面积校准比例
         /// </summary>
         /// </summary>
-        public double area_correction_ratio { get; set; }
+        public double min_area_ratio { get; set; }
+
+        /// <summary>
+        /// 最小面积校准比例
+        /// </summary>
+        public double min_conf { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// 是否启用面积校准
         /// 是否启用面积校准

VIZ.H2V.Module/NDISettingView/View/Algorithm/AlgorithmSinglePanelView.xaml

@@ -39,6 +39,7 @@
                 <RowDefinition Height="60"></RowDefinition>
                 <RowDefinition Height="60"></RowDefinition>
                 <RowDefinition Height="60"></RowDefinition>
                 <RowDefinition Height="60"></RowDefinition>
                 <RowDefinition Height="60"></RowDefinition>
                 <RowDefinition Height="60"></RowDefinition>
+                <RowDefinition Height="60"></RowDefinition>
                 <RowDefinition Height="*"></RowDefinition>
                 <RowDefinition Height="*"></RowDefinition>
             </Grid.RowDefinitions>
             </Grid.RowDefinitions>
             <!-- 裁切框移动 -->
             <!-- 裁切框移动 -->
@@ -134,6 +135,7 @@
                     </ComboBox.ItemTemplate>
                     </ComboBox.ItemTemplate>
                 </ComboBox>
                 </ComboBox>
             </Grid>
             </Grid>
+            <Rectangle VerticalAlignment="Bottom" Height="2" Grid.Row="5" Fill="#ff364051"></Rectangle>
 
 
             <!-- 单人机位面积校准 -->
             <!-- 单人机位面积校准 -->
             <Grid Grid.Row="6">
             <Grid Grid.Row="6">
@@ -148,6 +150,17 @@
                 <TextBlock Text="%" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Column="2"
                 <TextBlock Text="%" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Column="2"
                            Margin="10,0,0,0"></TextBlock>
                            Margin="10,0,0,0"></TextBlock>
             </Grid>
             </Grid>
+
+            <!-- 单人机位面积校准置信度 -->
+            <Grid Grid.Row="7">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="380"></ColumnDefinition>
+                    <ColumnDefinition Width="*"></ColumnDefinition>
+                </Grid.ColumnDefinitions>
+                <TextBlock Text="自动校准置信度" Foreground="White" FontSize="18" VerticalAlignment="Center"></TextBlock>
+                <fcommon:NumberBox Grid.Column="1" MinValue="0" MaxValue="100" Interval="0.01" Height="40"
+                                   Value="{Binding Path=AreaCorrectionConfidence,Mode=TwoWay}"></fcommon:NumberBox>
+            </Grid>
         </Grid>
         </Grid>
     </Border>
     </Border>
 </UserControl>
 </UserControl>

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

@@ -41,6 +41,20 @@ namespace VIZ.H2V.Module
 
 
         #endregion
         #endregion
 
 
+        #region AreaCorrectionConfidence -- 单人机位面积校准置信度
+
+        private double areaCorrectionConfidence;
+        /// <summary>
+        /// 单人机位面积校准置信度
+        /// </summary>
+        public double AreaCorrectionConfidence
+        {
+            get { return areaCorrectionConfidence; }
+            set { areaCorrectionConfidence = value; this.RaisePropertyChanged(nameof(AreaCorrectionConfidence)); }
+        }
+
+        #endregion
+
         // ======================================================================================
         // ======================================================================================
         // === Override ===
         // === Override ===
         // ======================================================================================
         // ======================================================================================
@@ -59,6 +73,7 @@ namespace VIZ.H2V.Module
             this.SmoothCoeff = config.SmoothCoeff;
             this.SmoothCoeff = config.SmoothCoeff;
             this.KeepPrevFrame = config.KeepPrevFrame;
             this.KeepPrevFrame = config.KeepPrevFrame;
             this.AreaCorrectionRatio = config.AreaCorrectionRatio;
             this.AreaCorrectionRatio = config.AreaCorrectionRatio;
+            this.AreaCorrectionConfidence = config.AreaCorrectionConfidence;
 
 
             // 场景信息
             // 场景信息
             this.SelectedBorderScence = this.BorderScences?.FirstOrDefault(p => p.Key == this.Config.BorderScene) ?? this.BorderScences?.FirstOrDefault();
             this.SelectedBorderScence = this.BorderScences?.FirstOrDefault(p => p.Key == this.Config.BorderScene) ?? this.BorderScences?.FirstOrDefault();
@@ -76,7 +91,7 @@ namespace VIZ.H2V.Module
             if (this.SmoothCoeff != this.Config.SmoothCoeff)
             if (this.SmoothCoeff != this.Config.SmoothCoeff)
                 return true;
                 return true;
 
 
-            if (this.KeepPrevFrame != this.KeepPrevFrame)
+            if (this.KeepPrevFrame != this.Config.KeepPrevFrame)
                 return true;
                 return true;
 
 
             if (this.SelectedGpuInfo.Physics != this.ViewConfig.GPU)
             if (this.SelectedGpuInfo.Physics != this.ViewConfig.GPU)
@@ -88,6 +103,9 @@ namespace VIZ.H2V.Module
             if (this.AreaCorrectionRatio != this.Config.AreaCorrectionRatio)
             if (this.AreaCorrectionRatio != this.Config.AreaCorrectionRatio)
                 return true;
                 return true;
 
 
+            if (this.AreaCorrectionConfidence != this.Config.AreaCorrectionConfidence)
+                return true;
+
             return false;
             return false;
         }
         }
 
 
@@ -113,6 +131,7 @@ namespace VIZ.H2V.Module
             this.Config.KeepPrevFrame = this.KeepPrevFrame;
             this.Config.KeepPrevFrame = this.KeepPrevFrame;
             this.Config.BorderScene = this.SelectedBorderScence.Key;
             this.Config.BorderScene = this.SelectedBorderScence.Key;
             this.Config.AreaCorrectionRatio = this.AreaCorrectionRatio;
             this.Config.AreaCorrectionRatio = this.AreaCorrectionRatio;
+            this.Config.AreaCorrectionConfidence = this.AreaCorrectionConfidence;
             this.ViewConfig.GPU = this.SelectedGpuInfo?.Physics ?? 0;
             this.ViewConfig.GPU = this.SelectedGpuInfo?.Physics ?? 0;
 
 
             ApplicationDomainEx.LiteDbContext.AlgorithmSingle.Upsert(this.Config);
             ApplicationDomainEx.LiteDbContext.AlgorithmSingle.Upsert(this.Config);

VIZ.H2V.Module/NDIView/Controller/Algorithm/Strategy/AlgorithmController_Single.cs

@@ -179,7 +179,8 @@ namespace VIZ.H2V.Module
             package.bbox = box == null ? null : new List<int> { (int)box.SrcRect.Left, (int)box.SrcRect.Top, (int)box.SrcRect.Right, (int)box.SrcRect.Bottom };
             package.bbox = box == null ? null : new List<int> { (int)box.SrcRect.Left, (int)box.SrcRect.Top, (int)box.SrcRect.Right, (int)box.SrcRect.Bottom };
             package.border_scene = config.BorderScene;
             package.border_scene = config.BorderScene;
             package.border_on = config.IsBorderEnabled ? 1 : 0;
             package.border_on = config.IsBorderEnabled ? 1 : 0;
-            package.area_correction_ratio = config.AreaCorrectionRatio;
+            package.min_area_ratio = config.AreaCorrectionRatio;
+            package.min_conf = config.AreaCorrectionConfidence;
             package.area_correction_on = config.IsAreaCorrectionEnabled ? 1 : 0;
             package.area_correction_on = config.IsAreaCorrectionEnabled ? 1 : 0;
 
 
             return package;
             return package;

VIZ.H2V.Module/Setup/Provider/AppSetup_InitLiteDb.cs

@@ -97,6 +97,8 @@ namespace VIZ.H2V.Module
             {
             {
                 singleConfig = new AlgorithmSingle();
                 singleConfig = new AlgorithmSingle();
                 singleConfig.ViewKey = viewKey;
                 singleConfig.ViewKey = viewKey;
+                // 默认值
+                singleConfig.KeepPrevFrame = 25;
 
 
                 ApplicationDomainEx.LiteDbContext.AlgorithmSingle.Upsert(singleConfig);
                 ApplicationDomainEx.LiteDbContext.AlgorithmSingle.Upsert(singleConfig);
             }
             }

VIZ.H2V.Storage/LiteDB/Algorithm/Algorithm/AlgorithmSingle.cs

@@ -22,6 +22,11 @@ namespace VIZ.H2V.Storage
         public double AreaCorrectionRatio { get; set; } = 0.05d;
         public double AreaCorrectionRatio { get; set; } = 0.05d;
 
 
         /// <summary>
         /// <summary>
+        /// 面积校准比例置信度
+        /// </summary>
+        public double AreaCorrectionConfidence { get; set; } = 85;
+
+        /// <summary>
         /// 是否启用面积校准
         /// 是否启用面积校准
         /// </summary>
         /// </summary>
         public bool IsAreaCorrectionEnabled { get; set; } = true;
         public bool IsAreaCorrectionEnabled { get; set; } = true;

VIZ.H2V/App.xaml.cs

@@ -20,6 +20,8 @@ namespace VIZ.H2V
     {
     {
         public App()
         public App()
         {
         {
+            // 计算机资源
+            AppSetup.AppendSetup(new AppSetup_ComputerResource());
             // 初始化LiteDB
             // 初始化LiteDB
             AppSetup.AppendSetup(new AppSetup_InitLiteDb());
             AppSetup.AppendSetup(new AppSetup_InitLiteDb());
             // 初始化CSV
             // 初始化CSV