Commit be1fbff7 by 鲁志-悦动

间隔帧率、间隔像素切换发送给算法参数逻辑

parent a3583e62
...@@ -112,7 +112,7 @@ namespace VIZ.FGOUT.Module ...@@ -112,7 +112,7 @@ namespace VIZ.FGOUT.Module
{ {
Title = "FigureOUT(" + dics[number] + ")"; Title = "FigureOUT(" + dics[number] + ")";
if (number.Equals("DS") || number.Equals("DT") || number.Equals("SS") || number.Equals("ST")) if (number.Equals("DS") || number.Equals("DT") || number.Equals("SS") || number.Equals("ST") || number.Equals("VT"))
{ {
KeepHighestIsEnabled = true; KeepHighestIsEnabled = true;
} }
...@@ -224,6 +224,9 @@ namespace VIZ.FGOUT.Module ...@@ -224,6 +224,9 @@ namespace VIZ.FGOUT.Module
//裁切区域 //裁切区域
this.SelectedCommand = new VCommand(this.Selected); this.SelectedCommand = new VCommand(this.Selected);
this.SendSelectedCommand = new VCommand(this.SendSelected); this.SendSelectedCommand = new VCommand(this.SendSelected);
this.IntervalPixelCommand = new VCommand(this.OnIntervalPixel);
this.IntervalFrameCommand = new VCommand(this.OnIntervalFrame);
} }
/// <summary> /// <summary>
...@@ -430,6 +433,28 @@ namespace VIZ.FGOUT.Module ...@@ -430,6 +433,28 @@ namespace VIZ.FGOUT.Module
} }
} }
private bool _isIntervalFrame;
public bool IsIntervalFrame
{
get => _isIntervalFrame;
set
{
_isIntervalFrame = value;
this.RaisePropertyChanged(nameof(IsIntervalFrame));
}
}
private bool _isIntervalPixel;
public bool IsIntervalPixel
{
get => _isIntervalPixel;
set
{
_isIntervalPixel = value;
this.RaisePropertyChanged(nameof(IsIntervalPixel));
}
}
private bool _isKeepHighest; private bool _isKeepHighest;
/// <summary> /// <summary>
/// 是否保留最高点 /// 是否保留最高点
...@@ -538,7 +563,12 @@ namespace VIZ.FGOUT.Module ...@@ -538,7 +563,12 @@ namespace VIZ.FGOUT.Module
MessageBoxEx.ShowDialog("算法参数保存成功。"); MessageBoxEx.ShowDialog("算法参数保存成功。");
}); });
} }
//如果IsIntervalPixel,把_temp_Matting_interval赋值给Matting_interval
if (IsIntervalPixel)
{
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,6 +1201,56 @@ namespace VIZ.FGOUT.Module ...@@ -1171,6 +1201,56 @@ namespace VIZ.FGOUT.Module
} }
} }
private int _temp_Matting_interval;
public VCommand IntervalFrameCommand { get; set; }
private void OnIntervalFrame()
{
Matting_intervalIsEnabled = true;
Moving_pixelIsEnabled = false;
if (Matting_interval == 0)
{
Matting_interval = _temp_Matting_interval;
}
AlgorithmSendCommon();
}
public VCommand IntervalPixelCommand { get; set; }
private void OnIntervalPixel()
{
Matting_intervalIsEnabled = false;
Moving_pixelIsEnabled = true;
_temp_Matting_interval = Matting_interval;
Matting_interval = 0;
AlgorithmSendCommon();
}
private bool _matting_intervalIsEnabled = true;
public bool Matting_intervalIsEnabled
{
get => _matting_intervalIsEnabled;
set
{
_matting_intervalIsEnabled = value;
this.RaisePropertyChanged(nameof(Matting_intervalIsEnabled));
}
}
private bool _moving_pixelIsEnabled = true;
public bool Moving_pixelIsEnabled
{
get => _moving_pixelIsEnabled;
set
{
_moving_pixelIsEnabled = value;
this.RaisePropertyChanged(nameof(Moving_pixelIsEnabled));
}
}
public VCommand KeepHighestCommand { get; set; } public VCommand KeepHighestCommand { get; set; }
private void KeepHighest() private void KeepHighest()
......
...@@ -874,7 +874,7 @@ namespace VIZ.FGOUT.Module ...@@ -874,7 +874,7 @@ namespace VIZ.FGOUT.Module
var number = alPackage.SportsCode; var number = alPackage.SportsCode;
if (!string.IsNullOrEmpty(number)) if (!string.IsNullOrEmpty(number))
{ {
if (number.Equals("DS") || number.Equals("DT") || number.Equals("SS") || number.Equals("ST")) if (number.Equals("DS") || number.Equals("DT") || number.Equals("SS") || number.Equals("ST") || number.Equals("VT"))
{ {
KeepHighestIsEnabled = true; KeepHighestIsEnabled = true;
} }
......
...@@ -472,6 +472,9 @@ namespace VIZ.FGOUT.Module ...@@ -472,6 +472,9 @@ namespace VIZ.FGOUT.Module
return false; return false;
} }
/// <summary>
/// 判断标完出点位置框之后出点是否又移动了
/// </summary>
private bool OutPointIsMoved() private bool OutPointIsMoved()
{ {
if (_RecordEndTime != EndTime) if (_RecordEndTime != EndTime)
......
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "15CC284A83D045D69995604731E50F83B95A9914DD5852260594F13D2AC94FF3" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "8E84CF04F9630AF8440F7BF892A0E567159D27CC51997E50F9228CA77CB348C4"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module { ...@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 264 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 261 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton _AutoMode_; internal System.Windows.Controls.RadioButton _AutoMode_;
...@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module { ...@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 327 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 324 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton _ManualMode_; internal System.Windows.Controls.RadioButton _ManualMode_;
...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module { ...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1452 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1461 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1; internal VIZ.FGOUT.Module.NDIView cam1;
...@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module { ...@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1637 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1646 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2; internal VIZ.FGOUT.Module.NDIView cam2;
...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module { ...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1652 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1661 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3; internal VIZ.FGOUT.Module.NDIView cam3;
...@@ -140,7 +140,7 @@ namespace VIZ.FGOUT.Module { ...@@ -140,7 +140,7 @@ namespace VIZ.FGOUT.Module {
case 2: case 2:
this._AutoMode_ = ((System.Windows.Controls.RadioButton)(target)); this._AutoMode_ = ((System.Windows.Controls.RadioButton)(target));
#line 269 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 266 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._AutoMode_.Click += new System.Windows.RoutedEventHandler(this.AutoMode_OnClick); this._AutoMode_.Click += new System.Windows.RoutedEventHandler(this.AutoMode_OnClick);
#line default #line default
...@@ -149,7 +149,7 @@ namespace VIZ.FGOUT.Module { ...@@ -149,7 +149,7 @@ namespace VIZ.FGOUT.Module {
case 3: case 3:
this._ManualMode_ = ((System.Windows.Controls.RadioButton)(target)); this._ManualMode_ = ((System.Windows.Controls.RadioButton)(target));
#line 331 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 328 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._ManualMode_.Click += new System.Windows.RoutedEventHandler(this.ManualMode_OnClick); this._ManualMode_.Click += new System.Windows.RoutedEventHandler(this.ManualMode_OnClick);
#line default #line default
...@@ -157,7 +157,7 @@ namespace VIZ.FGOUT.Module { ...@@ -157,7 +157,7 @@ namespace VIZ.FGOUT.Module {
return; return;
case 4: case 4:
#line 825 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 822 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon); ((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default #line default
...@@ -165,7 +165,7 @@ namespace VIZ.FGOUT.Module { ...@@ -165,7 +165,7 @@ namespace VIZ.FGOUT.Module {
return; return;
case 5: case 5:
#line 969 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 975 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon); ((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default #line default
...@@ -173,7 +173,7 @@ namespace VIZ.FGOUT.Module { ...@@ -173,7 +173,7 @@ namespace VIZ.FGOUT.Module {
return; return;
case 6: case 6:
#line 1004 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1012 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon); ((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default #line default
...@@ -181,7 +181,7 @@ namespace VIZ.FGOUT.Module { ...@@ -181,7 +181,7 @@ namespace VIZ.FGOUT.Module {
return; return;
case 7: case 7:
#line 1032 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1040 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon); ((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default #line default
......
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "15CC284A83D045D69995604731E50F83B95A9914DD5852260594F13D2AC94FF3" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "8E84CF04F9630AF8440F7BF892A0E567159D27CC51997E50F9228CA77CB348C4"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module { ...@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 264 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 261 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton _AutoMode_; internal System.Windows.Controls.RadioButton _AutoMode_;
...@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module { ...@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 327 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 324 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton _ManualMode_; internal System.Windows.Controls.RadioButton _ManualMode_;
...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module { ...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1452 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1461 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1; internal VIZ.FGOUT.Module.NDIView cam1;
...@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module { ...@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1637 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1646 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2; internal VIZ.FGOUT.Module.NDIView cam2;
...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module { ...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1652 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1661 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3; internal VIZ.FGOUT.Module.NDIView cam3;
...@@ -140,7 +140,7 @@ namespace VIZ.FGOUT.Module { ...@@ -140,7 +140,7 @@ namespace VIZ.FGOUT.Module {
case 2: case 2:
this._AutoMode_ = ((System.Windows.Controls.RadioButton)(target)); this._AutoMode_ = ((System.Windows.Controls.RadioButton)(target));
#line 269 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 266 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._AutoMode_.Click += new System.Windows.RoutedEventHandler(this.AutoMode_OnClick); this._AutoMode_.Click += new System.Windows.RoutedEventHandler(this.AutoMode_OnClick);
#line default #line default
...@@ -149,7 +149,7 @@ namespace VIZ.FGOUT.Module { ...@@ -149,7 +149,7 @@ namespace VIZ.FGOUT.Module {
case 3: case 3:
this._ManualMode_ = ((System.Windows.Controls.RadioButton)(target)); this._ManualMode_ = ((System.Windows.Controls.RadioButton)(target));
#line 331 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 328 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._ManualMode_.Click += new System.Windows.RoutedEventHandler(this.ManualMode_OnClick); this._ManualMode_.Click += new System.Windows.RoutedEventHandler(this.ManualMode_OnClick);
#line default #line default
...@@ -157,7 +157,7 @@ namespace VIZ.FGOUT.Module { ...@@ -157,7 +157,7 @@ namespace VIZ.FGOUT.Module {
return; return;
case 4: case 4:
#line 825 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 822 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon); ((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default #line default
...@@ -165,7 +165,7 @@ namespace VIZ.FGOUT.Module { ...@@ -165,7 +165,7 @@ namespace VIZ.FGOUT.Module {
return; return;
case 5: case 5:
#line 969 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 975 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon); ((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default #line default
...@@ -173,7 +173,7 @@ namespace VIZ.FGOUT.Module { ...@@ -173,7 +173,7 @@ namespace VIZ.FGOUT.Module {
return; return;
case 6: case 6:
#line 1004 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1012 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon); ((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default #line default
...@@ -181,7 +181,7 @@ namespace VIZ.FGOUT.Module { ...@@ -181,7 +181,7 @@ namespace VIZ.FGOUT.Module {
return; return;
case 7: case 7:
#line 1032 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1040 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon); ((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default #line default
......
...@@ -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.16.0")] [assembly: AssemblyVersion("1.0.17.0")]
[assembly: AssemblyFileVersion("1.0.16.0")] [assembly: AssemblyFileVersion("1.0.17.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