Skip to content

F
FGOUT
Commit 8dc4eaf7 by 鲁志-悦动
Options

音视频参数敲回车发送

parent 08c0d247
Showing with 117 additions and 44 deletions
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml
......@@ -1014,7 +1014,7 @@
Style="{StaticResource TextBoxStyle}"
Text="{Binding Moving_pixel, Mode=TwoWay}">
<b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdateDownBehavior />
<local:TextBoxEnterKeyUpdateUpBehavior />
</b:Interaction.Behaviors>
<b:Interaction.Triggers>
<b:EventTrigger EventName="KeyDown">
......@@ -1042,7 +1042,7 @@
Style="{StaticResource TextBoxStyle}"
Text="{Binding Remove_out_point_pixel, Mode=TwoWay}">
<b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdateBehavior />
<local:TextBoxEnterKeyUpdateNextBehavior />
</b:Interaction.Behaviors>
<b:Interaction.Triggers>
<b:EventTrigger EventName="KeyDown">
......@@ -1190,13 +1190,18 @@
<TextBlock Text="{DynamicResource DynamicIn}" />
<TextBox
Width="57"
PreviewTextInput="OnPreviewTextInputCommon"
InputMethod.IsInputMethodEnabled="False"
PreviewTextInput="OnPreviewTextInputCommon"
Style="{StaticResource TextBoxStyle}"
Text="{Binding DynamicIn, Mode=TwoWay}">
<b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdateBehavior />
<local:TextBoxEnterKeyUpdatePreBehavior />
</b:Interaction.Behaviors>
<b:Interaction.Triggers>
<b:EventTrigger EventName="KeyDown">
<b:InvokeCommandAction Command="{Binding Clip_TextBoxKeyDownCommand}" PassEventArgsToCommand="True" />
</b:EventTrigger>
</b:Interaction.Triggers>
</TextBox>
</StackPanel>
<StackPanel
......@@ -1206,13 +1211,18 @@
<TextBlock Text="{DynamicResource DynamicOut}" />
<TextBox
Width="57"
PreviewTextInput="OnPreviewTextInputCommon"
InputMethod.IsInputMethodEnabled="False"
PreviewTextInput="OnPreviewTextInputCommon"
Style="{StaticResource TextBoxStyle}"
Text="{Binding DynamicOut, Mode=TwoWay}">
<b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdateBehavior />
<local:TextBoxEnterKeyUpdateDownBehavior />
</b:Interaction.Behaviors>
<b:Interaction.Triggers>
<b:EventTrigger EventName="KeyDown">
<b:InvokeCommandAction Command="{Binding Clip_TextBoxKeyDownCommand}" PassEventArgsToCommand="True" />
</b:EventTrigger>
</b:Interaction.Triggers>
</TextBox>
</StackPanel>
<StackPanel
......@@ -1222,13 +1232,18 @@
<TextBlock Text="{DynamicResource StaticFrame}" />
<TextBox
Width="57"
PreviewTextInput="OnPreviewTextInputCommon"
InputMethod.IsInputMethodEnabled="False"
PreviewTextInput="OnPreviewTextInputCommon"
Style="{StaticResource TextBoxStyle}"
Text="{Binding StaticFrame, Mode=TwoWay}">
<b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdateBehavior />
<local:TextBoxEnterKeyUpdateNextBehavior />
</b:Interaction.Behaviors>
<b:Interaction.Triggers>
<b:EventTrigger EventName="KeyDown">
<b:InvokeCommandAction Command="{Binding Clip_TextBoxKeyDownCommand}" PassEventArgsToCommand="True" />
</b:EventTrigger>
</b:Interaction.Triggers>
</TextBox>
</StackPanel>
<Button
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
......@@ -248,6 +248,7 @@ namespace VIZ.FGOUT.Module
//音视频参数
this.ClipParamCommand = new VCommand(this.SendClipParameters);
this.Clip_TextBoxKeyDownCommand = new VCommand<KeyEventArgs>(this.OnClip_TextBoxKeyDown);
}
/// <summary>
......@@ -1852,6 +1853,23 @@ namespace VIZ.FGOUT.Module
#region 音视频参数
public VCommand<KeyEventArgs> Clip_TextBoxKeyDownCommand { get; set; }
private void OnClip_TextBoxKeyDown(KeyEventArgs e)
{
if (e.Key == Key.Enter)
{
if (e.OriginalSource is System.Windows.Controls.TextBox tb)
{
var text = tb.Text;
if (int.TryParse(text, out var value) && value >= 0)
{
SendClipParameters();
}
}
}
}
public VCommand ClipParamCommand { get; set; }
private int _dynamicIn = 50;
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDISettingView/View/AlgorithmSettingPanelView.xaml
......@@ -180,7 +180,7 @@
Style="{StaticResource TextBoxStyle}"
Text="{Binding Maintain_matting_n, Mode=TwoWay}">
<b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdateBehavior />
<local:TextBoxEnterKeyUpdateNextBehavior />
</b:Interaction.Behaviors>
</TextBox>
<TextBlock
......@@ -194,7 +194,7 @@
Style="{StaticResource TextBoxStyle}"
Text="{Binding Matting_interval, Mode=TwoWay}">
<b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdateBehavior />
<local:TextBoxEnterKeyUpdateNextBehavior />
</b:Interaction.Behaviors>
</TextBox>
<TextBlock
......@@ -208,7 +208,7 @@
Style="{StaticResource TextBoxStyle}"
Text="{Binding Moving_pixel, Mode=TwoWay}">
<b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdateBehavior />
<local:TextBoxEnterKeyUpdateNextBehavior />
</b:Interaction.Behaviors>
</TextBox>
<TextBlock Grid.Row="2" Text="{DynamicResource DetectZoneX}" />
......@@ -219,7 +219,7 @@
Style="{StaticResource TextBoxStyle}"
Text="{Binding Pad_det_x, Mode=TwoWay}">
<b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdateBehavior />
<local:TextBoxEnterKeyUpdateNextBehavior />
</b:Interaction.Behaviors>
</TextBox>
<TextBlock
......@@ -233,7 +233,7 @@
Style="{StaticResource TextBoxStyle}"
Text="{Binding Pad_det_y, Mode=TwoWay}">
<b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdateBehavior />
<local:TextBoxEnterKeyUpdateNextBehavior />
</b:Interaction.Behaviors>
</TextBox>
<TextBlock
......@@ -247,7 +247,7 @@
Style="{StaticResource TextBoxStyle}"
Text="{Binding Pad_det_square, Mode=TwoWay}">
<b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdateBehavior />
<local:TextBoxEnterKeyUpdateNextBehavior />
</b:Interaction.Behaviors>
</TextBox>
<TextBlock
......@@ -261,7 +261,7 @@
Style="{StaticResource TextBoxStyle}"
Text="{Binding AScale, Mode=TwoWay}">
<b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdateBehavior />
<local:TextBoxEnterKeyUpdateNextBehavior />
</b:Interaction.Behaviors>
</TextBox>
<!--<TextBlock
......@@ -289,7 +289,7 @@
Style="{StaticResource TextBoxStyle}"
Text="{Binding Landing_frame_interval, Mode=TwoWay}">
<b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdateBehavior />
<local:TextBoxEnterKeyUpdateNextBehavior />
</b:Interaction.Behaviors>
</TextBox>
......@@ -304,7 +304,7 @@
Style="{StaticResource TextBoxStyle}"
Text="{Binding Bbox_min_h, Mode=TwoWay}">
<b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdateBehavior />
<local:TextBoxEnterKeyUpdateNextBehavior />
</b:Interaction.Behaviors>
</TextBox>
......@@ -319,7 +319,7 @@
Style="{StaticResource TextBoxStyle}"
Text="{Binding Bbox_min_w, Mode=TwoWay}">
<b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdateBehavior />
<local:TextBoxEnterKeyUpdateNextBehavior />
</b:Interaction.Behaviors>
</TextBox>
......@@ -334,7 +334,7 @@
Style="{StaticResource TextBoxStyle}"
Text="{Binding Remove_out_point_pixel, Mode=TwoWay}">
<b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdateBehavior />
<local:TextBoxEnterKeyUpdateNextBehavior />
</b:Interaction.Behaviors>
</TextBox>
......
VIZ.FGOUT/VIZ.FGOUT.Module/Themes/TextBoxEnterKeyUpdateDownBehavior.cs
......@@ -4,7 +4,6 @@ using System.Windows.Input;
namespace VIZ.FGOUT.Module
{
public class TextBoxEnterKeyUpdateDownBehavior : Behavior<TextBox>
{
protected override void OnAttached()
......
VIZ.FGOUT/VIZ.FGOUT.Module/Themes/TextBoxEnterKeyUpdateBehavior.cs → VIZ.FGOUT/VIZ.FGOUT.Module/Themes/TextBoxEnterKeyUpdateNextBehavior.cs
......@@ -4,8 +4,7 @@ using System.Windows.Input;
namespace VIZ.FGOUT.Module
{
public class TextBoxEnterKeyUpdateBehavior : Behavior<TextBox>
public class TextBoxEnterKeyUpdateNextBehavior : Behavior<TextBox>
{
protected override void OnAttached()
{
......
VIZ.FGOUT/VIZ.FGOUT.Module/Themes/TextBoxEnterKeyUpdatePreBehavior.cs
......@@ -4,7 +4,6 @@ using System.Windows.Input;
namespace VIZ.FGOUT.Module
{
public class TextBoxEnterKeyUpdatePreBehavior : Behavior<TextBox>
{
protected override void OnAttached()
......
VIZ.FGOUT/VIZ.FGOUT.Module/Themes/TextBoxEnterKeyUpdateUpBehavior.cs 0 → 100644
using Microsoft.Xaml.Behaviors;
using System.Windows.Controls;
using System.Windows.Input;
namespace VIZ.FGOUT.Module
{
public class TextBoxEnterKeyUpdateUpBehavior : Behavior<TextBox>
{
protected override void OnAttached()
{
if (AssociatedObject != null)
{
base.OnAttached();
AssociatedObject.KeyDown += AssociatedObject_KeyDown;
}
}
protected override void OnDetaching()
{
if (AssociatedObject != null)
{
AssociatedObject.KeyDown -= AssociatedObject_KeyDown;
base.OnDetaching();
}
}
private void AssociatedObject_KeyDown(object sender, KeyEventArgs e)
{
if (sender is TextBox textBox)
{
if (e.Key == Key.Return)
{
if (e.Key == Key.Enter)
{
textBox.MoveFocus(new TraversalRequest(FocusNavigationDirection.Up));
}
}
}
}
}
}
VIZ.FGOUT/VIZ.FGOUT.Module/VIZ.FGOUT.Module.csproj
......@@ -273,9 +273,10 @@
<Compile Include="Themes\SliderArrange.xaml.cs">
<DependentUpon>SliderArrange.xaml</DependentUpon>
</Compile>
<Compile Include="Themes\TextBoxEnterKeyUpdateUpBehavior.cs" />
<Compile Include="Themes\TextBoxEnterKeyUpdateDownBehavior.cs" />
<Compile Include="Themes\TextBoxEnterKeyUpdatePreBehavior.cs" />
<Compile Include="Themes\TextBoxEnterKeyUpdateBehavior.cs" />
<Compile Include="Themes\TextBoxEnterKeyUpdateNextBehavior.cs" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "94047D76C780C3BFEB6802FFEAB954C420A2E627512B2F25391F2D7BBADBE7A0"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C6B73F41F42B841B0ADA3567D0417B42DCA6214070E5A8637741E4AD789E5067"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1572 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1587 "..\..\..\..\..\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 1757 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1772 "..\..\..\..\..\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 1772 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1787 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3;
......@@ -189,7 +189,7 @@ namespace VIZ.FGOUT.Module {
return;
case 8:
#line 1193 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1194 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
......@@ -197,7 +197,7 @@ namespace VIZ.FGOUT.Module {
return;
case 9:
#line 1209 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1215 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
......@@ -205,7 +205,7 @@ namespace VIZ.FGOUT.Module {
return;
case 10:
#line 1225 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1236 "..\..\..\..\..\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}" "94047D76C780C3BFEB6802FFEAB954C420A2E627512B2F25391F2D7BBADBE7A0"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C6B73F41F42B841B0ADA3567D0417B42DCA6214070E5A8637741E4AD789E5067"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1572 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1587 "..\..\..\..\..\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 1757 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1772 "..\..\..\..\..\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 1772 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1787 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3;
......@@ -189,7 +189,7 @@ namespace VIZ.FGOUT.Module {
return;
case 8:
#line 1193 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1194 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
......@@ -197,7 +197,7 @@ namespace VIZ.FGOUT.Module {
return;
case 9:
#line 1209 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1215 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
......@@ -205,7 +205,7 @@ namespace VIZ.FGOUT.Module {
return;
case 10:
#line 1225 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1236 "..\..\..\..\..\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/NDISettingView/View/AlgorithmSettingPanelView.g.cs
#pragma checksum "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "B38955205D9B8E1ABB2E4A265347C14AA8A8D05770AED7B5011E4B6AFEB0FF44"
#pragma checksum "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C6A38D41A060F742B0647AE901F568E54B74FD9B2AF75870F4F25D083DE23A4E"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDISettingView/View/AlgorithmSettingPanelView.g.i.cs
#pragma checksum "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "B38955205D9B8E1ABB2E4A265347C14AA8A8D05770AED7B5011E4B6AFEB0FF44"
#pragma checksum "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C6A38D41A060F742B0647AE901F568E54B74FD9B2AF75870F4F25D083DE23A4E"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/VIZ.FGOUT.Module.csproj.CoreCompileInputs.cache
fec8ecabf1a44bcef30953a1475567246ed246dc8b2a5be20e17856e3781c4d0
7028a22ce086f820cb5c8f70c19072a1b5b3b695c4adcb24a14c5206a54d086f
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/VIZ.FGOUT.Module_MarkupCompile.cache
......@@ -12,7 +12,7 @@ DEBUG;TRACE
25-1434354873
4-699044453
99-439317849
100279871941
151674092382
NDIMainView\View\NDIMainView.xaml;NDIPreviewView\View\NDIPreviewView.xaml;NDISettingView\View\AlgorithmSettingPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmCablewayPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmNearPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmSinglePanelView.xaml;NDISettingView\View\Algorithm\AlgorithmSixteenPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmTacticsPanelView.xaml;NDISettingView\View\NDISettingPanelView.xaml;NDISettingView\View\NDISettingView.xaml;NDIView\View\NDIView.xaml;SystemSetting\View\AboutPanelView.xaml;SystemSetting\View\CheckDataPanelView.xaml;SystemSetting\View\HotkeySettingPanelView.xaml;SystemSetting\View\LanguagePanelView.xaml;SystemSetting\View\MattingImagePanelView.xaml;SystemSetting\View\NewWindowView.xaml;SystemSetting\View\PackageSettingPanelView.xaml;SystemSetting\View\PreviewSettingPanelView.xaml;SystemSetting\View\ReplayPanelView.xaml;SystemSetting\View\StyleSettingPanelView.xaml;SystemSetting\View\SystemSettingView.xaml;SystemSetting\View\UEControlPanelView.xaml;SystemSetting\View\UESettingPanelView.xaml;Themes\SliderArrange.xaml;
......
VIZ.FGOUT/VIZ.FGOUT/Properties/AssemblyInfo.cs
......@@ -55,5 +55,5 @@ using System.Windows;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.26.0")]
[assembly: AssemblyFileVersion("1.0.26.0")]
[assembly: AssemblyVersion("1.0.27.0")]
[assembly: AssemblyFileVersion("1.0.27.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