Skip to content

F
FGOUT
Commit be1fbff7 by 鲁志-悦动
Options

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

parent a3583e62
Showing with 146 additions and 54 deletions
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml
......@@ -47,7 +47,7 @@
<behaviors:InvokeCommandAction Command="{Binding LoadedCommand}" />
</behaviors:EventTrigger>
</behaviors:Interaction.Triggers>
<ScrollViewer VerticalScrollBarVisibility="Disabled">
<!--<ScrollViewer VerticalScrollBarVisibility="Disabled">-->
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="30" />
......@@ -154,14 +154,11 @@
Grid.Column="1"
Margin="45,30,0,0">-->
<!--<ScrollViewer
<ScrollViewer
Grid.Row="2"
Grid.Column="1"
VerticalScrollBarVisibility="Disabled">-->
<Grid
Grid.Row="2"
Grid.Column="1"
Margin="70,0">
VerticalScrollBarVisibility="Disabled">
<Grid Margin="70,0">
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
......@@ -924,29 +921,36 @@
Style="{StaticResource ButtonStyle}"
Visibility="{Binding ReplaySendVisibility, Mode=TwoWay}" />-->
<!-- 三个常用算法参数 -->
<Border
<!--<Border
Grid.Row="3"
Grid.ColumnSpan="5"
BorderBrush="Gray"
BorderThickness="1">
BorderThickness="1">-->
<GroupBox
Grid.Row="3"
Grid.ColumnSpan="5"
BorderBrush="Gray"
BorderThickness="0.25"
Foreground="White"
Header="{DynamicResource AlgorithmParameter}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
<!--<ColumnDefinition />-->
<ColumnDefinition Width="1.8*" />
<ColumnDefinition Width="1.8*" />
<ColumnDefinition Width="1.5*" />
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<TextBlock
<!--<TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="14"
Foreground="White"
Text="{DynamicResource AlgorithmParameter}" />
Text="{DynamicResource AlgorithmParameter}" />-->
<StackPanel
Grid.Column="1"
Grid.Column="0"
HorizontalAlignment="Center"
Orientation="Horizontal">
<!--<TextBlock
......@@ -957,8 +961,9 @@
Foreground="White"
Text="{DynamicResource IntervalFrame}" />-->
<RadioButton
Width="100"
Width="110"
Height="40"
Command="{Binding IntervalFrameCommand}"
Content="{DynamicResource IntervalFrame}"
GroupName="_FrameOrPixel_"
IsChecked="{Binding Path=IsIntervalFrame, Mode=TwoWay}"
......@@ -966,6 +971,7 @@
<TextBox
Width="57"
InputMethod.IsInputMethodEnabled="False"
IsEnabled="{Binding Matting_intervalIsEnabled}"
PreviewTextInput="OnPreviewTextInputCommon"
Style="{StaticResource TextBoxStyle}"
Text="{Binding Matting_interval, Mode=TwoWay}">
......@@ -981,7 +987,7 @@
</StackPanel>
<StackPanel
Grid.Column="2"
Grid.Column="1"
HorizontalAlignment="Center"
Orientation="Horizontal">
<!--<TextBlock
......@@ -992,8 +998,9 @@
Foreground="White"
Text="{DynamicResource IntervalPixel}" />-->
<RadioButton
Width="100"
Width="110"
Height="40"
Command="{Binding IntervalPixelCommand}"
Content="{DynamicResource IntervalPixel}"
GroupName="_FrameOrPixel_"
IsChecked="{Binding Path=IsIntervalPixel, Mode=TwoWay}"
......@@ -1001,6 +1008,7 @@
<TextBox
Width="57"
InputMethod.IsInputMethodEnabled="False"
IsEnabled="{Binding Moving_pixelIsEnabled}"
PreviewTextInput="OnPreviewTextInputCommon"
Style="{StaticResource TextBoxStyle}"
Text="{Binding Moving_pixel, Mode=TwoWay}">
......@@ -1016,7 +1024,7 @@
</StackPanel>
<StackPanel
Grid.Column="3"
Grid.Column="2"
HorizontalAlignment="Center"
Orientation="Horizontal">
<TextBlock
......@@ -1044,7 +1052,7 @@
</StackPanel>
<CheckBox
Grid.Column="4"
Grid.Column="3"
HorizontalAlignment="Center"
Command="{Binding KeepHighestCommand}"
Content="{DynamicResource KeepHighest}"
......@@ -1054,7 +1062,7 @@
Style="{StaticResource CheckBox_Setting}" />
<CheckBox
Grid.Column="5"
Grid.Column="4"
HorizontalAlignment="Center"
Command="{Binding BigModelCommand}"
Content="{DynamicResource LargeModel}"
......@@ -1063,7 +1071,7 @@
Style="{StaticResource CheckBox_Setting}" />
<Button
Grid.Column="6"
Grid.Column="5"
Width="100"
Height="40"
HorizontalAlignment="Center"
......@@ -1071,7 +1079,8 @@
Content="{DynamicResource Save}"
Style="{StaticResource ButtonStyle}" />
</Grid>
</Border>
<!--</Border>-->
</GroupBox>
<!-- Replay -->
<Border
Grid.Row="4"
......@@ -1193,7 +1202,7 @@
</StackPanel>
</Grid>
<!--</ScrollViewer>-->
</ScrollViewer>
<!--</WrapPanel>-->
<!--<WrapPanel
Grid.Row="3"
......@@ -2054,5 +2063,5 @@
</Grid>
</Border>-->
</Grid>
</ScrollViewer>
<!--</ScrollViewer>-->
</UserControl>
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
......@@ -112,7 +112,7 @@ namespace VIZ.FGOUT.Module
{
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;
}
......@@ -224,6 +224,9 @@ namespace VIZ.FGOUT.Module
//裁切区域
this.SelectedCommand = new VCommand(this.Selected);
this.SendSelectedCommand = new VCommand(this.SendSelected);
this.IntervalPixelCommand = new VCommand(this.OnIntervalPixel);
this.IntervalFrameCommand = new VCommand(this.OnIntervalFrame);
}
/// <summary>
......@@ -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;
/// <summary>
/// 是否保留最高点
......@@ -539,6 +564,11 @@ namespace VIZ.FGOUT.Module
});
}
//如果IsIntervalPixel，把_temp_Matting_interval赋值给Matting_interval
if (IsIntervalPixel)
{
alPackage.Matting_interval = _temp_Matting_interval;
}
//再放回去
var algorithmMessage = JsonConvert.SerializeObject(alPackage, JSON_SERIALIZER_SETTINGS);
config.AlgorithmData = algorithmMessage;
......@@ -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; }
private void KeepHighest()
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDISettingView/ViewModel/AlgorithmSettingPanelViewModel.cs
......@@ -874,7 +874,7 @@ namespace VIZ.FGOUT.Module
var number = alPackage.SportsCode;
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;
}
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.cs
......@@ -472,6 +472,9 @@ namespace VIZ.FGOUT.Module
return false;
}
/// <summary>
/// 判断标完出点位置框之后出点是否又移动了
/// </summary>
private bool OutPointIsMoved()
{
if (_RecordEndTime != EndTime)
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.cs
#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>
// 此代码由工具生成。
......@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 264 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 261 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton _AutoMode_;
......@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 327 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 324 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton _ManualMode_;
......@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1452 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1461 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1;
......@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1637 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1646 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2;
......@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1652 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1661 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3;
......@@ -140,7 +140,7 @@ namespace VIZ.FGOUT.Module {
case 2:
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);
#line default
......@@ -149,7 +149,7 @@ namespace VIZ.FGOUT.Module {
case 3:
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);
#line default
......@@ -157,7 +157,7 @@ namespace VIZ.FGOUT.Module {
return;
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);
#line default
......@@ -165,7 +165,7 @@ namespace VIZ.FGOUT.Module {
return;
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);
#line default
......@@ -173,7 +173,7 @@ namespace VIZ.FGOUT.Module {
return;
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);
#line default
......@@ -181,7 +181,7 @@ namespace VIZ.FGOUT.Module {
return;
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);
#line default
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.i.cs
#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>
// 此代码由工具生成。
......@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 264 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 261 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton _AutoMode_;
......@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 327 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 324 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton _ManualMode_;
......@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1452 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1461 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1;
......@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1637 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1646 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2;
......@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1652 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1661 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3;
......@@ -140,7 +140,7 @@ namespace VIZ.FGOUT.Module {
case 2:
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);
#line default
......@@ -149,7 +149,7 @@ namespace VIZ.FGOUT.Module {
case 3:
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);
#line default
......@@ -157,7 +157,7 @@ namespace VIZ.FGOUT.Module {
return;
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);
#line default
......@@ -165,7 +165,7 @@ namespace VIZ.FGOUT.Module {
return;
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);
#line default
......@@ -173,7 +173,7 @@ namespace VIZ.FGOUT.Module {
return;
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);
#line default
......@@ -181,7 +181,7 @@ namespace VIZ.FGOUT.Module {
return;
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);
#line default
......
VIZ.FGOUT/VIZ.FGOUT/Properties/AssemblyInfo.cs
......@@ -55,5 +55,5 @@ using System.Windows;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.16.0")]
[assembly: AssemblyFileVersion("1.0.16.0")]
[assembly: AssemblyVersion("1.0.17.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