修复选中间隔像素重启客户端间隔帧率变为0的缺陷

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

@@ -10,11 +10,11 @@ none
 false
 false
 DEBUG;TRACE
 DEBUG;TRACE
 
 
-22-1578589972
-1-1441241311
-11-1602666439
-23-2035776870
+221979955803
+1470602451
+11-350624472
+24-1321085892
 Resources\StringResource.zh-CN.xaml;Resources\StringResource.en.xaml;Style\Button\Button_NdiView.xaml;Style\Button\Button_Setting.xaml;Style\Button\Button_WindowTop.xaml;Style\CheckBox\CheckBox_NdiView.xaml;Style\CheckBox\CheckBox_RaidoButtonStyle.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_NdiMainViewBlue.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;
 Resources\StringResource.zh-CN.xaml;Resources\StringResource.en.xaml;Style\Button\Button_NdiView.xaml;Style\Button\Button_Setting.xaml;Style\Button\Button_WindowTop.xaml;Style\CheckBox\CheckBox_NdiView.xaml;Style\CheckBox\CheckBox_RaidoButtonStyle.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_NdiMainViewBlue.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;
 
 
-True
+False
 
 

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

@@ -579,6 +579,7 @@ namespace VIZ.FGOUT.Module
                 //    alPackage.Matting_interval = _temp_Matting_interval;
                 //    alPackage.Matting_interval = _temp_Matting_interval;
                 //}
                 //}
 
 
+                alPackage.Matting_interval = Matting_interval;
                 //再放回去
                 //再放回去
                 var algorithmMessage = JsonConvert.SerializeObject(alPackage, JSON_SERIALIZER_SETTINGS);
                 var algorithmMessage = JsonConvert.SerializeObject(alPackage, JSON_SERIALIZER_SETTINGS);
                 config.AlgorithmData = algorithmMessage;
                 config.AlgorithmData = algorithmMessage;

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

@@ -369,9 +369,10 @@ namespace VIZ.FGOUT.Module
                         rectSelected.Height = this.video.Height - rectSelected.TopLeft.Y - 6;
                         rectSelected.Height = this.video.Height - rectSelected.TopLeft.Y - 6;
                         rectSelected.Width = rectSelected.Height * 16 / 9;
                         rectSelected.Width = rectSelected.Height * 16 / 9;
                     }
                     }
-                    //rectSelected.Width = rectSelected.Height * 16 / 9;
+
                     aa = new PathGeometry();
                     aa = new PathGeometry();
                     aa.AddGeometry(new RectangleGeometry(rectSelected));
                     aa.AddGeometry(new RectangleGeometry(rectSelected));
+
                     var myPath = new Path()
                     var myPath = new Path()
                     {
                     {
                         Fill = Brushes.Transparent,
                         Fill = Brushes.Transparent,
@@ -381,10 +382,7 @@ namespace VIZ.FGOUT.Module
                     };
                     };
                     this.canvas1.Children.Add(myPath);
                     this.canvas1.Children.Add(myPath);
                 }
                 }
-                //aa = new PathGeometry();
-                //aa.AddGeometry(new RectangleGeometry(rectSelected));
             }
             }
-            //myPath.Data = aa;
 
 
             if (vm.IsReplay)
             if (vm.IsReplay)
             {
             {
@@ -442,11 +440,11 @@ namespace VIZ.FGOUT.Module
                     //double xp = this.video.ActualWidth / resWith;
                     //double xp = this.video.ActualWidth / resWith;
                     //var x = startPoint.X / xp;
                     //var x = startPoint.X / xp;
 
 
+                    // 视频实际宽度和高度
                     var srcWidth = this.video.ActualWidth;
                     var srcWidth = this.video.ActualWidth;
                     var srcHeight = this.video.ActualHeight;
                     var srcHeight = this.video.ActualHeight;
-                    // 视频的宽度
+                    // 视频的宽度和高度
                     int resWith = ApplicationDomain.IniStorage.GetValue<VideoConfig, int>(p => p.VIDEO_WIDTH);
                     int resWith = ApplicationDomain.IniStorage.GetValue<VideoConfig, int>(p => p.VIDEO_WIDTH);
-                    // 视频的高度
                     int resHeight = ApplicationDomain.IniStorage.GetValue<VideoConfig, int>(p => p.VIDEO_HEIGHT);
                     int resHeight = ApplicationDomain.IniStorage.GetValue<VideoConfig, int>(p => p.VIDEO_HEIGHT);
                     double xp = srcWidth / resWith;
                     double xp = srcWidth / resWith;
                     double xy = srcHeight / resHeight;
                     double xy = srcHeight / resHeight;
@@ -628,6 +626,7 @@ namespace VIZ.FGOUT.Module
             }
             }
         }
         }
 
 
+        public Path _currMarkPath;
         bool _isMove;
         bool _isMove;
         /// <summary>
         /// <summary>
         /// 鼠标移动
         /// 鼠标移动
@@ -681,7 +680,38 @@ namespace VIZ.FGOUT.Module
                 //裁切
                 //裁切
                 if (vm.IsSelected && this.NDIKey == NDIViewKeys.CAM_1)
                 if (vm.IsSelected && this.NDIKey == NDIViewKeys.CAM_1)
                 {
                 {
-                    rectSelected = new Rect(startPoint, e.GetPosition(this.canvas1));
+                    var currentPoint = e.GetPosition(this.canvas1);
+
+                    //1
+                    //rectSelected = new Rect(startPoint, e.GetPosition(this.canvas1));
+                    rectSelected = new Rect(startPoint, currentPoint);
+
+                    ////2
+                    //var startX = startPoint.X;
+                    //var startY = startPoint.Y;
+                    //double width = Math.Abs(currentPoint.X - startX);
+                    //double height = width * 9 / 16;
+                    //var rg = new RectangleGeometry
+                    //{
+                    //    Rect = new Rect(startX, startY, width, height)
+                    //};
+
+                    //rectSelected = new Rect(startPoint, currentPoint);
+
+                    //if (_currMarkPath == null)
+                    //{
+                    //    _currMarkPath = new Path
+                    //    {
+                    //        Stroke = Brushes.Yellow,
+                    //        StrokeThickness = 1,
+                    //        Data = rg
+                    //    };
+                    //    this.canvas1.Children.Add(_currMarkPath);
+                    //}
+                    //else
+                    //{
+                    //    _currMarkPath.Data = rg;
+                    //}
                 }
                 }
             }
             }
         }
         }

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

@@ -269,6 +269,7 @@ namespace VIZ.FGOUT.Module
                     }
                     }
                     nDIView.canvas1.Children.Remove(tempPath);
                     nDIView.canvas1.Children.Remove(tempPath);
                     nDIView.rectSelected = new Rect();
                     nDIView.rectSelected = new Rect();
+                    nDIView._currMarkPath = null;
                 }
                 }
             }
             }
         }
         }

VIZ.FGOUT/VIZ.FGOUT/Properties/AssemblyInfo.cs

@@ -55,5 +55,5 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.19.0")]
-[assembly: AssemblyFileVersion("1.0.19.0")]
+[assembly: AssemblyVersion("1.0.20.0")]
+[assembly: AssemblyFileVersion("1.0.20.0")]