Skip to content

F
FGOUT
Commit 6fc45532 by 鲁志-悦动
Options

间隔像素选中间隔帧率不置为0 And 间隔帧率、间隔像素输入框一直可用 And 间隔帧率、间隔像素输入框回车选中按钮也切换

parent 118513ff
Showing with 43 additions and 26 deletions
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/obj/x64/Debug/VIZ.FGOUT.Module.Resource_MarkupCompile.cache
...@@ -10,11 +10,11 @@ none ...@@ -10,11 +10,11 @@ none
false false
DEBUG;TRACE DEBUG;TRACE
221979955803 22-1578589972
1470602451 1-1441241311
11-350624472 11-1602666439
24-1321085892 23-2035776870
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;
False True
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
...@@ -549,7 +549,15 @@ namespace VIZ.FGOUT.Module ...@@ -549,7 +549,15 @@ namespace VIZ.FGOUT.Module
//拿出来，更新修改数据 //拿出来，更新修改数据
var alPackage = (AlgorithmPackage_Figout_sports_model)JsonConvert.DeserializeObject(config.AlgorithmData, typeof(AlgorithmPackage_Figout_sports_model)); var alPackage = (AlgorithmPackage_Figout_sports_model)JsonConvert.DeserializeObject(config.AlgorithmData, typeof(AlgorithmPackage_Figout_sports_model));
if (alPackage == null) return; if (alPackage == null) return;
if (IsIntervalPixel)
{
alPackage.Matting_interval = 0;
}
else
{
alPackage.Matting_interval = Matting_interval; alPackage.Matting_interval = Matting_interval;
}
alPackage.Moving_pixel = Moving_pixel; alPackage.Moving_pixel = Moving_pixel;
alPackage.Remove_out_point_pixel = Remove_out_point_pixel; alPackage.Remove_out_point_pixel = Remove_out_point_pixel;
alPackage.Is_Keep_highest = IsKeepHighest; alPackage.Is_Keep_highest = IsKeepHighest;
...@@ -565,11 +573,12 @@ namespace VIZ.FGOUT.Module ...@@ -565,11 +573,12 @@ namespace VIZ.FGOUT.Module
}); });
} }
//如果IsIntervalPixel，把_temp_Matting_interval赋值给Matting_interval ////如果IsIntervalPixel，把_temp_Matting_interval赋值给Matting_interval
if (IsIntervalPixel) //if (IsIntervalPixel)
{ //{
alPackage.Matting_interval = _temp_Matting_interval; // alPackage.Matting_interval = _temp_Matting_interval;
} //}
//再放回去 //再放回去
var algorithmMessage = JsonConvert.SerializeObject(alPackage, JSON_SERIALIZER_SETTINGS); var algorithmMessage = JsonConvert.SerializeObject(alPackage, JSON_SERIALIZER_SETTINGS);
config.AlgorithmData = algorithmMessage; config.AlgorithmData = algorithmMessage;
...@@ -1171,26 +1180,35 @@ namespace VIZ.FGOUT.Module ...@@ -1171,26 +1180,35 @@ namespace VIZ.FGOUT.Module
public VCommand<KeyEventArgs> Matting_intervalKeyDownCommand { get; set; } public VCommand<KeyEventArgs> Matting_intervalKeyDownCommand { get; set; }
private void Matting_intervalKeyDown(KeyEventArgs e) private void Matting_intervalKeyDown(KeyEventArgs e)
{ {
if (e.Key == Key.Enter)
{
IsIntervalFrame = true;
TextBoxTextCommon(e); TextBoxTextCommon(e);
} }
}
public VCommand<KeyEventArgs> Moving_pixelKeyDownCommand { get; set; } public VCommand<KeyEventArgs> Moving_pixelKeyDownCommand { get; set; }
private void Moving_pixelKeyDown(KeyEventArgs e) private void Moving_pixelKeyDown(KeyEventArgs e)
{ {
if (e.Key == Key.Enter)
{
IsIntervalPixel = true;
TextBoxTextCommon(e); TextBoxTextCommon(e);
} }
}
public VCommand<KeyEventArgs> Remove_out_point_pixelKeyDownCommand { get; set; } public VCommand<KeyEventArgs> Remove_out_point_pixelKeyDownCommand { get; set; }
private void Remove_out_point_pixelKeyDown(KeyEventArgs e) private void Remove_out_point_pixelKeyDown(KeyEventArgs e)
{ {
if (e.Key == Key.Enter)
{
TextBoxTextCommon(e); TextBoxTextCommon(e);
} }
}
private void TextBoxTextCommon(KeyEventArgs e) private void TextBoxTextCommon(KeyEventArgs e)
{ {
if (e.Key == Key.Enter)
{
if (e.OriginalSource is System.Windows.Controls.TextBox tb) if (e.OriginalSource is System.Windows.Controls.TextBox tb)
{ {
var text = tb.Text; var text = tb.Text;
...@@ -1200,7 +1218,6 @@ namespace VIZ.FGOUT.Module ...@@ -1200,7 +1218,6 @@ namespace VIZ.FGOUT.Module
} }
} }
} }
}
private int _temp_Matting_interval; private int _temp_Matting_interval;
...@@ -1208,12 +1225,12 @@ namespace VIZ.FGOUT.Module ...@@ -1208,12 +1225,12 @@ namespace VIZ.FGOUT.Module
private void OnIntervalFrame() private void OnIntervalFrame()
{ {
Matting_intervalIsEnabled = true; //Matting_intervalIsEnabled = true;
Moving_pixelIsEnabled = false; //Moving_pixelIsEnabled = false;
if (Matting_interval == 0) //if (Matting_interval == 0)
{ //{
Matting_interval = _temp_Matting_interval; // Matting_interval = _temp_Matting_interval;
} //}
AlgorithmSendCommon(); AlgorithmSendCommon();
} }
...@@ -1222,10 +1239,10 @@ namespace VIZ.FGOUT.Module ...@@ -1222,10 +1239,10 @@ namespace VIZ.FGOUT.Module
private void OnIntervalPixel() private void OnIntervalPixel()
{ {
Matting_intervalIsEnabled = false; //Matting_intervalIsEnabled = false;
Moving_pixelIsEnabled = true; //Moving_pixelIsEnabled = true;
_temp_Matting_interval = Matting_interval; //_temp_Matting_interval = Matting_interval;
Matting_interval = 0; //Matting_interval = 0;
AlgorithmSendCommon(); AlgorithmSendCommon();
} }
......
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\NDIMainView\View\NDIMainView.xaml;;
FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIPreviewView\View\NDIPreviewView.xaml;; FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIPreviewView\View\NDIPreviewView.xaml;;
......
VIZ.FGOUT/VIZ.FGOUT/Properties/AssemblyInfo.cs
...@@ -55,5 +55,5 @@ using System.Windows; ...@@ -55,5 +55,5 @@ using System.Windows;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示: //通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.18.0")] [assembly: AssemblyVersion("1.0.19.0")]
[assembly: AssemblyFileVersion("1.0.18.0")] [assembly: AssemblyFileVersion("1.0.19.0")]
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