Skip to content

F
FGOUT
Commit a77ec563 by 鲁志-悦动
Options

三行参数设置快捷键，默认v,b,n

parent 90bc17e8
Showing with 1634 additions and 349 deletions
VIZ.FGOUT/VIZ.FGOUT.Domain/Enum/NDIMainViewHotkeys.cs
......@@ -90,6 +90,21 @@
/// <summary>
/// 快速右移
/// </summary>
FastRight
FastRight,
/// <summary>
/// 算法参数第一行
/// </summary>
FirstLine,
/// <summary>
/// 算法参数第二行
/// </summary>
SecondLine,
/// <summary>
/// 算法参数第三行
/// </summary>
ThridLine
}
}
VIZ.FGOUT/VIZ.FGOUT.Domain/Message/Setting/SelectedFourModel.cs 0 → 100644
namespace VIZ.FGOUT.Domain
{
public class SelectedFourModel
{
public bool IsSelected { get; set; }
}
}
VIZ.FGOUT/VIZ.FGOUT.Domain/Message/Setting/SelectedThreeModel.cs 0 → 100644
namespace VIZ.FGOUT.Domain
{
public class SelectedThreeModel
{
public bool IsSelected { get; set; }
}
}
VIZ.FGOUT/VIZ.FGOUT.Domain/Message/Setting/SelectedTwoModel.cs 0 → 100644
namespace VIZ.FGOUT.Domain
{
public class SelectedTwoModel
{
public bool IsSelected { get; set; }
}
}
VIZ.FGOUT/VIZ.FGOUT.Domain/VIZ.FGOUT.Domain.csproj
......@@ -108,6 +108,9 @@
<Compile Include="Message\Setting\SaveMarkModel.cs" />
<Compile Include="Message\Setting\SavePlaceModel.cs" />
<Compile Include="Message\Setting\SelectedModel.cs" />
<Compile Include="Message\Setting\SelectedThreeModel.cs" />
<Compile Include="Message\Setting\SelectedFourModel.cs" />
<Compile Include="Message\Setting\SelectedTwoModel.cs" />
<Compile Include="Message\Setting\SendPlaceModel.cs" />
<Compile Include="Message\Setting\SendSelectedModel.cs" />
<Compile Include="Message\Setting\ShowInvalidPlaceModel.cs" />
......
VIZ.FGOUT/VIZ.FGOUT.Domain/obj/x64/Debug/VIZ.FGOUT.Domain.csproj.CoreCompileInputs.cache
be411a1d13757dd8127a5e9c5c6b14f3b756312cfe5e66ab937f67a80bcd9d56
9765853d4e2fdd5df9f659f13472c13b3d718658d40c058f62bf0a3c94834ab2
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/Resources/StringResource.en.xaml
......@@ -75,10 +75,17 @@
<sys:String x:Key="DefaultHotkey">RestoreDefault</sys:String>
<sys:String x:Key="CutZone">CutZone</sys:String>
<sys:String x:Key="PullBox">PullBox</sys:String>
<sys:String x:Key="PullBoxOne">PullBox1</sys:String>
<sys:String x:Key="PullBoxTwo">PullBox2</sys:String>
<sys:String x:Key="PullBoxThree">PullBox3</sys:String>
<sys:String x:Key="PullBoxFour">PullBox4</sys:String>
<sys:String x:Key="Cut">Cut</sys:String>
<sys:String x:Key="NotCut">NotCut</sys:String>
<sys:String x:Key="ClipParameter">ClipParameter</sys:String>
<sys:String x:Key="DynamicIn">DynamicIn</sys:String>
<sys:String x:Key="DynamicOut">DynamicOut</sys:String>
<sys:String x:Key="StaticFrame">StaticFrame</sys:String>
<sys:String x:Key="FirstLine">FirstLine</sys:String>
<sys:String x:Key="SecondLine">SecondLine</sys:String>
<sys:String x:Key="ThirdLine">ThirdLine</sys:String>
</ResourceDictionary>
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/Resources/StringResource.zh-cn.xaml
......@@ -74,10 +74,17 @@
<sys:String x:Key="DefaultHotkey">恢复默认</sys:String>
<sys:String x:Key="CutZone">裁切区域</sys:String>
<sys:String x:Key="PullBox">拖框</sys:String>
<sys:String x:Key="PullBoxOne">拖框1</sys:String>
<sys:String x:Key="PullBoxTwo">拖框2</sys:String>
<sys:String x:Key="PullBoxThree">拖框3</sys:String>
<sys:String x:Key="PullBoxFour">拖框4</sys:String>
<sys:String x:Key="Cut">裁切</sys:String>
<sys:String x:Key="NotCut">不裁切</sys:String>
<sys:String x:Key="ClipParameter">音视频参数</sys:String>
<sys:String x:Key="DynamicIn">动进</sys:String>
<sys:String x:Key="DynamicOut">动出</sys:String>
<sys:String x:Key="StaticFrame">静帧</sys:String>
<sys:String x:Key="FirstLine">第一行算法参</sys:String>
<sys:String x:Key="SecondLine">第二行算法参</sys:String>
<sys:String x:Key="ThirdLine">第三行算法参</sys:String>
</ResourceDictionary>
\ No newline at end of file
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/obj/x64/Debug/VIZ.FGOUT.Module.Resource.csproj.FileListAbsolute.txt
......@@ -588,10 +588,15 @@ C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\VIZ.FGOUT.Mo
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\VIZ.FGOUT.Module.Resource.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\VIZ.FGOUT.Module.Resource.pdb
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\CheckBox\CheckBox_WindowTop.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\CheckBox\CheckBox_RaidoButtonStyle.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\VIZ.FGOU.942AC757.Up2Date
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Resources\StringResource.zh-CN.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Resources\StringResource.en.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\ComboBox\ComboBox_Setting.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\HotkeyBox\HotkeyBox_Setting.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\MessageBox\MessageBoxEx.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\RadioButton\RadioButton_FootballSide.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\RadioButton\RadioButton_NdiMainViewBlue.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\RadioButton\RadioButton_NdiView.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\RadioButton\RadioButton_Setting.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\Slider\Slider_Setting.baml
......@@ -600,8 +605,3 @@ C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\TextBo
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\ToogleButton\ToogleButton_Setting.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Toolkit\NumericUpDown\NumericUpDown.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Themes\Generic.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\RadioButton\RadioButton_NdiMainViewBlue.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\CheckBox\CheckBox_RaidoButtonStyle.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\VIZ.FGOU.942AC757.Up2Date
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Resources\StringResource.zh-CN.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Resources\StringResource.en.baml
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/Controller/Hotkey/HotkeyController.cs
......@@ -279,6 +279,24 @@ namespace VIZ.FGOUT.Module
return AssembleNDIMainViewHotkeyMode(NDIMainViewHotkeys.FastRight);
}
//第一行算法参数
if (string.Equals(this.Support.HotkeyConfig.FirstLine, hotkey))
{
return AssembleNDIMainViewHotkeyMode(NDIMainViewHotkeys.FirstLine);
}
//第二行算法参数
if (string.Equals(this.Support.HotkeyConfig.SecondLine, hotkey))
{
return AssembleNDIMainViewHotkeyMode(NDIMainViewHotkeys.SecondLine);
}
//第三行算法参数
if (string.Equals(this.Support.HotkeyConfig.ThirdLine, hotkey))
{
return AssembleNDIMainViewHotkeyMode(NDIMainViewHotkeys.ThridLine);
}
//INDIViewService service = null;
//如果不是手动，返回false
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml
......@@ -177,6 +177,8 @@
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>
<!--<GroupBox Foreground="White" Header="自动检测">
<CheckBox
......@@ -831,271 +833,410 @@
</b:Interaction.Triggers>
</TextBox>
</StackPanel>
<!--<TextBox
Width="30"
Background="Yellow"
BorderBrush="Red"
BorderThickness="2"
FontSize="14"
Foreground="Black"
IsEnabled="False"
Style="{StaticResource TextBoxStyle}"
Text="{Binding AutoSendCount, Mode=TwoWay}" />-->
<!--<ListBox
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
ItemsSource="{Binding MessageCollection}" />-->
<!--<TextBlock
Width="30"
Height="30"
Padding="0,6,0,0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Background="Yellow"
FontSize="14"
Foreground="Black"
IsEnabled="False"
Text="{Binding AutoSendIntervalTime}"
TextAlignment="Center"
Visibility="{Binding TimeCountDefaultVisibility}" />
<fcommon:CountdownDisplayControl
Width="30"
Height="30"
Padding="0,6,0,0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Background="Yellow"
FontSize="14"
Foreground="Black"
IsEnabled="False"
NumText="{Binding AutoSendIntervalTime}"
TempNumText="{Binding AutoSendIntervalTime}"
TextAlignment="Center"
Visibility="{Binding TimeCountActVisibility}" />-->
</Grid>
</Border>
<!--<Button
Grid.Row="2"
Grid.Column="4"
Width="100"
Height="40"
Margin="10"
Command="{Binding Path=Command}"
Content="抛弃"
Style="{StaticResource ButtonStyle}" />
<Button
Grid.Row="2"
Grid.Column="5"
Width="100"
Height="40"
Margin="10"
Command="{Binding Path=Command}"
Content="发送"
Style="{StaticResource ButtonStyle}" />-->
<!--<Button
Grid.Row="3"
Grid.Column="1"
Width="100"
Height="40"
Margin="10"
Command="{Binding Path=InPointCommand}"
Content="In Point"
Style="{StaticResource ButtonStyle}"
Visibility="{Binding ReplaySendVisibility, Mode=TwoWay}" />
<Button
Grid.Row="3"
Grid.Column="2"
Width="100"
Height="40"
Margin="10"
Command="{Binding Path=OutPointCommand}"
Content="Out Point"
Style="{StaticResource ButtonStyle}"
Visibility="{Binding ReplaySendVisibility, Mode=TwoWay}" />-->
<!-- 三个常用算法参数 -->
<!--<Border
Grid.Row="3"
Grid.ColumnSpan="5"
BorderBrush="Gray"
BorderThickness="1">-->
<!-- 常用算法参数 -->
<GroupBox
Grid.Row="3"
Grid.RowSpan="3"
Grid.ColumnSpan="5"
BorderBrush="Gray"
BorderThickness="0.25"
Foreground="White"
Header="{DynamicResource AlgorithmParameter}">
<Grid>
<Grid.ColumnDefinitions>
<!--<ColumnDefinition />-->
<ColumnDefinition Width="1.8*" />
<ColumnDefinition Width="1.8*" />
<ColumnDefinition Width="1.3*" />
<ColumnDefinition Width="1.2*" />
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<!--<TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="14"
Foreground="White"
Text="{DynamicResource AlgorithmParameter}" />-->
<StackPanel
Grid.Column="0"
HorizontalAlignment="Center"
Orientation="Horizontal">
<!--<TextBlock
Margin="0,0,3,0"
HorizontalAlignment="Right"
VerticalAlignment="Center"
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1.8*" />
<ColumnDefinition Width="1.8*" />
<ColumnDefinition Width="1.3*" />
<ColumnDefinition Width="1.2*" />
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<StackPanel
Grid.Column="0"
HorizontalAlignment="Center"
Orientation="Horizontal">
<!--<TextBlock
Margin="0,0,3,0"
HorizontalAlignment="Right"
VerticalAlignment="Center"
FontSize="14"
Foreground="White"
Text="{DynamicResource IntervalFrame}" />-->
<RadioButton
Width="110"
Height="40"
Command="{Binding IntervalFrameCommand}"
Content="{DynamicResource IntervalFrame}"
GroupName="_FrameOrPixel_"
IsChecked="{Binding Path=IsIntervalFrame, Mode=TwoWay}"
Style="{StaticResource RadioButton_NdiMainViewBlue}" />
<TextBox
Width="57"
InputMethod.IsInputMethodEnabled="False"
IsEnabled="{Binding Matting_intervalIsEnabled}"
PreviewTextInput="OnPreviewTextInputCommon"
Style="{StaticResource TextBoxStyle}"
Text="{Binding Matting_interval, Mode=TwoWay}">
<b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdatePreBehavior />
</b:Interaction.Behaviors>
<b:Interaction.Triggers>
<b:EventTrigger EventName="KeyDown">
<b:InvokeCommandAction Command="{Binding Matting_intervalKeyDownCommand}" PassEventArgsToCommand="True" />
</b:EventTrigger>
</b:Interaction.Triggers>
</TextBox>
</StackPanel>
<StackPanel
Grid.Column="1"
HorizontalAlignment="Center"
Orientation="Horizontal">
<TextBlock
Margin="0,0,3,0"
HorizontalAlignment="Right"
VerticalAlignment="Center"
FontSize="14"
Foreground="White"
Text="{DynamicResource IntervalPixel}" />
<!--<RadioButton
Width="110"
Height="40"
Command="{Binding IntervalPixelCommand}"
Content="{DynamicResource IntervalPixel}"
GroupName="_FrameOrPixel_"
IsChecked="{Binding Path=IsIntervalPixel, Mode=TwoWay}"
Style="{StaticResource RadioButton_NdiMainViewBlue}" />-->
<TextBox
Width="57"
InputMethod.IsInputMethodEnabled="False"
IsEnabled="{Binding Moving_pixelIsEnabled}"
PreviewTextInput="OnPreviewTextInputCommon"
Style="{StaticResource TextBoxStyle}"
Text="{Binding Moving_pixel, Mode=TwoWay}">
<b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdateUpBehavior />
</b:Interaction.Behaviors>
<b:Interaction.Triggers>
<b:EventTrigger EventName="KeyDown">
<b:InvokeCommandAction Command="{Binding Moving_pixelKeyDownCommand}" PassEventArgsToCommand="True" />
</b:EventTrigger>
</b:Interaction.Triggers>
</TextBox>
</StackPanel>
<StackPanel
Grid.Column="2"
HorizontalAlignment="Center"
Orientation="Horizontal">
<TextBlock
Margin="0,0,3,0"
HorizontalAlignment="Right"
VerticalAlignment="Center"
FontSize="14"
Foreground="White"
Text="{DynamicResource RemoveOutPointPixel}" />
<TextBox
Width="57"
InputMethod.IsInputMethodEnabled="False"
PreviewTextInput="OnPreviewTextInputCommon"
Style="{StaticResource TextBoxStyle}"
Text="{Binding Remove_out_point_pixel, Mode=TwoWay}">
<b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdateNextBehavior />
</b:Interaction.Behaviors>
<b:Interaction.Triggers>
<b:EventTrigger EventName="KeyDown">
<b:InvokeCommandAction Command="{Binding Remove_out_point_pixelKeyDownCommand}" PassEventArgsToCommand="True" />
</b:EventTrigger>
</b:Interaction.Triggers>
</TextBox>
</StackPanel>
<CheckBox
Grid.Column="3"
HorizontalAlignment="Center"
Command="{Binding KeepHighestCommand}"
Content="{DynamicResource KeepHighest}"
FontSize="14"
Foreground="White"
Text="{DynamicResource IntervalFrame}" />-->
<RadioButton
Width="110"
Height="40"
Command="{Binding IntervalFrameCommand}"
Content="{DynamicResource IntervalFrame}"
GroupName="_FrameOrPixel_"
IsChecked="{Binding Path=IsIntervalFrame, Mode=TwoWay}"
Style="{StaticResource RadioButton_NdiMainViewBlue}" />
<TextBox
Width="57"
InputMethod.IsInputMethodEnabled="False"
IsEnabled="{Binding Matting_intervalIsEnabled}"
PreviewTextInput="OnPreviewTextInputCommon"
Style="{StaticResource TextBoxStyle}"
Text="{Binding Matting_interval, Mode=TwoWay}">
<b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdatePreBehavior />
</b:Interaction.Behaviors>
<b:Interaction.Triggers>
<b:EventTrigger EventName="KeyDown">
<b:InvokeCommandAction Command="{Binding Matting_intervalKeyDownCommand}" PassEventArgsToCommand="True" />
</b:EventTrigger>
</b:Interaction.Triggers>
</TextBox>
</StackPanel>
IsChecked="{Binding Path=IsKeepHighest, Mode=TwoWay}"
IsEnabled="{Binding KeepHighestIsEnabled}"
Style="{StaticResource CheckBox_Setting}"
Visibility="{Binding KeepHighestVisibility}" />
<CheckBox
Grid.Column="3"
HorizontalAlignment="Center"
Command="{Binding KeepHighestCommand}"
Content="{DynamicResource HighestInPoint}"
FontSize="14"
IsChecked="{Binding Path=IsKeepHighest, Mode=TwoWay}"
IsEnabled="{Binding KeepHighestIsEnabled}"
Style="{StaticResource CheckBox_Setting}"
Visibility="{Binding HighestInPointVisibility}" />
<StackPanel
Grid.Column="1"
HorizontalAlignment="Center"
Orientation="Horizontal">
<!--<TextBlock
Margin="0,0,3,0"
HorizontalAlignment="Right"
VerticalAlignment="Center"
<CheckBox
Grid.Column="4"
HorizontalAlignment="Center"
Command="{Binding BigModelCommand}"
Content="{DynamicResource LargeModel}"
FontSize="14"
Foreground="White"
Text="{DynamicResource IntervalPixel}" />-->
<RadioButton
Width="110"
IsChecked="{Binding Path=IsBigModel, Mode=TwoWay}"
Style="{StaticResource CheckBox_Setting}" />
<Button
Grid.Column="5"
Width="100"
Height="40"
Command="{Binding IntervalPixelCommand}"
Content="{DynamicResource IntervalPixel}"
GroupName="_FrameOrPixel_"
IsChecked="{Binding Path=IsIntervalPixel, Mode=TwoWay}"
Style="{StaticResource RadioButton_NdiMainViewBlue}" />
<TextBox
Width="57"
InputMethod.IsInputMethodEnabled="False"
IsEnabled="{Binding Moving_pixelIsEnabled}"
PreviewTextInput="OnPreviewTextInputCommon"
Style="{StaticResource TextBoxStyle}"
Text="{Binding Moving_pixel, Mode=TwoWay}">
<b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdateUpBehavior />
</b:Interaction.Behaviors>
<b:Interaction.Triggers>
<b:EventTrigger EventName="KeyDown">
<b:InvokeCommandAction Command="{Binding Moving_pixelKeyDownCommand}" PassEventArgsToCommand="True" />
</b:EventTrigger>
</b:Interaction.Triggers>
</TextBox>
</StackPanel>
HorizontalAlignment="Center"
Command="{Binding Path=AlgorithmSendCommand}"
Content="{DynamicResource Save}"
Style="{StaticResource ButtonStyle}" />
</Grid>
<Grid Grid.Row="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1.8*" />
<ColumnDefinition Width="1.8*" />
<ColumnDefinition Width="1.3*" />
<ColumnDefinition Width="1.2*" />
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<StackPanel
Grid.Column="0"
HorizontalAlignment="Center"
Orientation="Horizontal">
<RadioButton
Width="110"
Height="40"
Command="{Binding IntervalFrameCommand2}"
Content="{DynamicResource IntervalFrame}"
GroupName="_FrameOrPixel_"
IsChecked="{Binding Path=IsIntervalFrame2, Mode=TwoWay}"
Style="{StaticResource RadioButton_NdiMainViewBlue}" />
<TextBox
Width="57"
InputMethod.IsInputMethodEnabled="False"
IsEnabled="{Binding Matting_intervalIsEnabled}"
PreviewTextInput="OnPreviewTextInputCommon"
Style="{StaticResource TextBoxStyle}"
Text="{Binding Matting_interval2, Mode=TwoWay}">
<b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdatePreBehavior />
</b:Interaction.Behaviors>
<b:Interaction.Triggers>
<b:EventTrigger EventName="KeyDown">
<b:InvokeCommandAction Command="{Binding Matting_intervalKeyDownCommand2}" PassEventArgsToCommand="True" />
</b:EventTrigger>
</b:Interaction.Triggers>
</TextBox>
</StackPanel>
<StackPanel
Grid.Column="2"
HorizontalAlignment="Center"
Orientation="Horizontal">
<TextBlock
Margin="0,0,3,0"
HorizontalAlignment="Right"
VerticalAlignment="Center"
FontSize="14"
Foreground="White"
Text="{DynamicResource RemoveOutPointPixel}" />
<TextBox
Width="57"
InputMethod.IsInputMethodEnabled="False"
PreviewTextInput="OnPreviewTextInputCommon"
Style="{StaticResource TextBoxStyle}"
Text="{Binding Remove_out_point_pixel, Mode=TwoWay}">
<b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdateNextBehavior />
</b:Interaction.Behaviors>
<b:Interaction.Triggers>
<b:EventTrigger EventName="KeyDown">
<b:InvokeCommandAction Command="{Binding Remove_out_point_pixelKeyDownCommand}" PassEventArgsToCommand="True" />
</b:EventTrigger>
</b:Interaction.Triggers>
</TextBox>
</StackPanel>
<StackPanel
Grid.Column="1"
HorizontalAlignment="Center"
Orientation="Horizontal">
<TextBlock
Margin="0,0,3,0"
HorizontalAlignment="Right"
VerticalAlignment="Center"
FontSize="14"
Foreground="White"
Text="{DynamicResource IntervalPixel}" />
<!--<RadioButton
Width="110"
Height="40"
Command="{Binding IntervalPixelCommand2}"
Content="{DynamicResource IntervalPixel}"
GroupName="_FrameOrPixel_"
IsChecked="{Binding Path=IsIntervalPixel2, Mode=TwoWay}"
Style="{StaticResource RadioButton_NdiMainViewBlue}" />-->
<TextBox
Width="57"
InputMethod.IsInputMethodEnabled="False"
IsEnabled="{Binding Moving_pixelIsEnabled}"
PreviewTextInput="OnPreviewTextInputCommon"
Style="{StaticResource TextBoxStyle}"
Text="{Binding Moving_pixel2, Mode=TwoWay}">
<b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdateRightBehavior />
</b:Interaction.Behaviors>
<b:Interaction.Triggers>
<b:EventTrigger EventName="KeyDown">
<b:InvokeCommandAction Command="{Binding Moving_pixelKeyDownCommand2}" PassEventArgsToCommand="True" />
</b:EventTrigger>
</b:Interaction.Triggers>
</TextBox>
</StackPanel>
<CheckBox
Grid.Column="3"
HorizontalAlignment="Center"
Command="{Binding KeepHighestCommand}"
Content="{DynamicResource KeepHighest}"
FontSize="14"
IsChecked="{Binding Path=IsKeepHighest, Mode=TwoWay}"
IsEnabled="{Binding KeepHighestIsEnabled}"
Style="{StaticResource CheckBox_Setting}"
Visibility="{Binding KeepHighestVisibility}" />
<CheckBox
Grid.Column="3"
HorizontalAlignment="Center"
Command="{Binding KeepHighestCommand}"
Content="{DynamicResource HighestInPoint}"
FontSize="14"
IsChecked="{Binding Path=IsKeepHighest, Mode=TwoWay}"
IsEnabled="{Binding KeepHighestIsEnabled}"
Style="{StaticResource CheckBox_Setting}"
Visibility="{Binding HighestInPointVisibility}" />
<StackPanel
Grid.Column="2"
HorizontalAlignment="Center"
Orientation="Horizontal">
<TextBlock
Margin="0,0,3,0"
HorizontalAlignment="Right"
VerticalAlignment="Center"
FontSize="14"
Foreground="White"
Text="{DynamicResource RemoveOutPointPixel}" />
<TextBox
Width="57"
InputMethod.IsInputMethodEnabled="False"
PreviewTextInput="OnPreviewTextInputCommon"
Style="{StaticResource TextBoxStyle}"
Text="{Binding Remove_out_point_pixel2, Mode=TwoWay}">
<b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdateNextBehavior />
</b:Interaction.Behaviors>
<b:Interaction.Triggers>
<b:EventTrigger EventName="KeyDown">
<b:InvokeCommandAction Command="{Binding Remove_out_point_pixelKeyDownCommand2}" PassEventArgsToCommand="True" />
</b:EventTrigger>
</b:Interaction.Triggers>
</TextBox>
</StackPanel>
</Grid>
<Grid Grid.Row="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1.8*" />
<ColumnDefinition Width="1.8*" />
<ColumnDefinition Width="1.3*" />
<ColumnDefinition Width="1.2*" />
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<StackPanel
Grid.Column="0"
HorizontalAlignment="Center"
Orientation="Horizontal">
<RadioButton
Width="110"
Height="40"
Command="{Binding IntervalFrameCommand2}"
Content="{DynamicResource IntervalFrame}"
GroupName="_FrameOrPixel_"
IsChecked="{Binding Path=IsIntervalFrame3, Mode=TwoWay}"
Style="{StaticResource RadioButton_NdiMainViewBlue}" />
<TextBox
Width="57"
InputMethod.IsInputMethodEnabled="False"
IsEnabled="{Binding Matting_intervalIsEnabled}"
PreviewTextInput="OnPreviewTextInputCommon"
Style="{StaticResource TextBoxStyle}"
Text="{Binding Matting_interval3, Mode=TwoWay}">
<b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdatePreBehavior />
</b:Interaction.Behaviors>
<b:Interaction.Triggers>
<b:EventTrigger EventName="KeyDown">
<b:InvokeCommandAction Command="{Binding Matting_intervalKeyDownCommand3}" PassEventArgsToCommand="True" />
</b:EventTrigger>
</b:Interaction.Triggers>
</TextBox>
</StackPanel>
<CheckBox
Grid.Column="4"
HorizontalAlignment="Center"
Command="{Binding BigModelCommand}"
Content="{DynamicResource LargeModel}"
FontSize="14"
IsChecked="{Binding Path=IsBigModel, Mode=TwoWay}"
Style="{StaticResource CheckBox_Setting}" />
<StackPanel
Grid.Column="1"
HorizontalAlignment="Center"
Orientation="Horizontal">
<TextBlock
Margin="0,0,3,0"
HorizontalAlignment="Right"
VerticalAlignment="Center"
FontSize="14"
Foreground="White"
Text="{DynamicResource IntervalPixel}" />
<!--<RadioButton
Width="110"
Height="40"
Command="{Binding IntervalPixelCommand2}"
Content="{DynamicResource IntervalPixel}"
GroupName="_FrameOrPixel_"
IsChecked="{Binding Path=IsIntervalPixel3, Mode=TwoWay}"
Style="{StaticResource RadioButton_NdiMainViewBlue}" />-->
<TextBox
Width="57"
InputMethod.IsInputMethodEnabled="False"
IsEnabled="{Binding Moving_pixelIsEnabled}"
PreviewTextInput="OnPreviewTextInputCommon"
Style="{StaticResource TextBoxStyle}"
Text="{Binding Moving_pixel3, Mode=TwoWay}">
<b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdateNextBehavior />
</b:Interaction.Behaviors>
<b:Interaction.Triggers>
<b:EventTrigger EventName="KeyDown">
<b:InvokeCommandAction Command="{Binding Moving_pixelKeyDownCommand3}" PassEventArgsToCommand="True" />
</b:EventTrigger>
</b:Interaction.Triggers>
</TextBox>
</StackPanel>
<Button
Grid.Column="5"
Width="100"
Height="40"
HorizontalAlignment="Center"
Command="{Binding Path=AlgorithmSendCommand}"
Content="{DynamicResource Save}"
Style="{StaticResource ButtonStyle}" />
<StackPanel
Grid.Column="2"
HorizontalAlignment="Center"
Orientation="Horizontal">
<TextBlock
Margin="0,0,3,0"
HorizontalAlignment="Right"
VerticalAlignment="Center"
FontSize="14"
Foreground="White"
Text="{DynamicResource RemoveOutPointPixel}" />
<TextBox
Width="57"
InputMethod.IsInputMethodEnabled="False"
PreviewTextInput="OnPreviewTextInputCommon"
Style="{StaticResource TextBoxStyle}"
Text="{Binding Remove_out_point_pixel3, Mode=TwoWay}">
<b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdateNextBehavior />
</b:Interaction.Behaviors>
<b:Interaction.Triggers>
<b:EventTrigger EventName="KeyDown">
<b:InvokeCommandAction Command="{Binding Remove_out_point_pixelKeyDownCommand3}" PassEventArgsToCommand="True" />
</b:EventTrigger>
</b:Interaction.Triggers>
</TextBox>
</StackPanel>
</Grid>
</Grid>
<!--</Border>-->
</GroupBox>
<!--<GroupBox
Grid.Row="4"
Grid.ColumnSpan="5"
BorderBrush="Gray"
BorderThickness="0.25"
Foreground="White"
Header="{DynamicResource AlgorithmParameter}" />
<GroupBox
Grid.Row="5"
Grid.ColumnSpan="5"
BorderBrush="Gray"
BorderThickness="0.25"
Foreground="White"
Header="{DynamicResource AlgorithmParameter}">
</GroupBox>-->
<!-- Replay -->
<Border
Grid.Row="5"
Grid.Row="7"
Grid.ColumnSpan="5"
BorderBrush="Gray"
BorderThickness="1">
......@@ -1155,7 +1296,7 @@
<!-- 音视频参数 -->
<Border
Grid.Row="4"
Grid.Row="6"
Grid.Column="0"
Grid.ColumnSpan="5"
BorderBrush="Gray"
......@@ -1260,7 +1401,7 @@
<!-- 裁切区域 -->
<Border
Grid.Row="6"
Grid.Row="8"
Grid.Column="0"
Grid.ColumnSpan="5"
BorderBrush="Gray"
......@@ -1272,6 +1413,8 @@
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<TextBlock
HorizontalAlignment="Center"
......@@ -1279,7 +1422,7 @@
FontSize="14"
Foreground="White"
Text="{DynamicResource CutZone}" />
<ToggleButton
<!--<ToggleButton
Grid.Column="1"
Width="100"
Height="40"
......@@ -1287,18 +1430,54 @@
Command="{Binding Path=SelectedCommand}"
Content="{DynamicResource PullBox}"
IsChecked="{Binding SelectedIsChecked, Mode=TwoWay}"
Style="{StaticResource ToggleButtonStyle}" />-->
<ToggleButton
Grid.Column="1"
Width="100"
Height="40"
HorizontalAlignment="Center"
Command="{Binding Path=SelectedCommand}"
Content="{DynamicResource PullBoxOne}"
IsChecked="{Binding SelectedIsChecked, Mode=TwoWay}"
Style="{StaticResource ToggleButtonStyle}" />
<Button
<ToggleButton
Grid.Column="2"
Width="100"
Height="40"
HorizontalAlignment="Center"
Command="{Binding Path=SelectedTwoCommand}"
Content="{DynamicResource PullBoxTwo}"
IsChecked="{Binding SelectedTwoIsChecked, Mode=TwoWay}"
Style="{StaticResource ToggleButtonStyle}" />
<ToggleButton
Grid.Column="3"
Width="100"
Height="40"
HorizontalAlignment="Center"
Command="{Binding Path=SelectedThreeCommand}"
Content="{DynamicResource PullBoxThree}"
IsChecked="{Binding SelectedThreeIsChecked, Mode=TwoWay}"
Style="{StaticResource ToggleButtonStyle}" />
<ToggleButton
Grid.Column="4"
Width="100"
Height="40"
HorizontalAlignment="Center"
Command="{Binding Path=SelectedFourCommand}"
Content="{DynamicResource PullBoxFour}"
IsChecked="{Binding SelectedFourIsChecked, Mode=TwoWay}"
Style="{StaticResource ToggleButtonStyle}" />
<Button
Grid.Column="5"
Width="100"
Height="40"
HorizontalAlignment="Center"
Command="{Binding Path=SendSelectedCommand}"
Content="{DynamicResource Cut}"
Style="{StaticResource ButtonStyle}" />
<Button
Grid.Column="3"
Grid.Column="6"
Width="100"
Height="40"
HorizontalAlignment="Center"
......@@ -1310,7 +1489,7 @@
<!-- 系统版本 -->
<StackPanel
Grid.Row="6"
Grid.Row="7"
Grid.Column="4"
HorizontalAlignment="Right"
Orientation="Horizontal">
......@@ -1326,7 +1505,6 @@
Foreground="White"
Text="{Binding Path=SystemVersion}" />
</StackPanel>
</Grid>
</ScrollViewer>
<!--</WrapPanel>-->
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
......@@ -108,6 +108,8 @@ namespace VIZ.FGOUT.Module
try
{
IsIntervalFrame = IsIntervalPixel = false;
IsIntervalFrame2 = IsIntervalPixel2 = false;
IsIntervalFrame3 = IsIntervalPixel3 = false;
var number = ApplicationDomainEx.LiteDbContext.ViewConfig.FindOne(p => p.ViewKey == NDIViewKeys.CAM_1)
.GameName;
......@@ -230,14 +232,23 @@ namespace VIZ.FGOUT.Module
//三个算法参数回车命令
this.Matting_intervalKeyDownCommand = new VCommand<KeyEventArgs>(this.Matting_intervalKeyDown);
this.Matting_intervalKeyDownCommand2 = new VCommand<KeyEventArgs>(this.Matting_intervalKeyDown2);
this.Matting_intervalKeyDownCommand3 = new VCommand<KeyEventArgs>(this.Matting_intervalKeyDown3);
this.Moving_pixelKeyDownCommand = new VCommand<KeyEventArgs>(this.Moving_pixelKeyDown);
this.Moving_pixelKeyDownCommand2 = new VCommand<KeyEventArgs>(this.Moving_pixelKeyDown2);
this.Moving_pixelKeyDownCommand3 = new VCommand<KeyEventArgs>(this.Moving_pixelKeyDown3);
this.Remove_out_point_pixelKeyDownCommand = new VCommand<KeyEventArgs>(Remove_out_point_pixelKeyDown);
this.Remove_out_point_pixelKeyDownCommand2 = new VCommand<KeyEventArgs>(Remove_out_point_pixelKeyDown2);
this.Remove_out_point_pixelKeyDownCommand3 = new VCommand<KeyEventArgs>(Remove_out_point_pixelKeyDown3);
//保留最高点和大模型
this.KeepHighestCommand = new VCommand(this.KeepHighest);
this.BigModelCommand = new VCommand(this.BigModel);
//裁切区域
this.SelectedFourCommand = new VCommand(this.SelectedFour);
this.SelectedThreeCommand = new VCommand(this.SelectedThree);
this.SelectedTwoCommand = new VCommand(this.SelectedTwo);
this.SelectedCommand = new VCommand(this.Selected);
this.SendSelectedCommand = new VCommand(this.SendSelected);
this.NotCutCommand = new VCommand(this.NotCut);
......@@ -245,6 +256,8 @@ namespace VIZ.FGOUT.Module
//间隔帧率和间隔像素
this.IntervalPixelCommand = new VCommand(this.OnIntervalPixel);
this.IntervalFrameCommand = new VCommand(this.OnIntervalFrame);
this.IntervalPixelCommand2 = new VCommand(this.OnIntervalPixel2);
this.IntervalFrameCommand2 = new VCommand(this.OnIntervalFrame2);
//音视频参数
this.ClipParamCommand = new VCommand(this.SendClipParameters);
......@@ -471,6 +484,34 @@ namespace VIZ.FGOUT.Module
}
}
private int _matting_interval2 = 7;
/// <summary>
/// 抠图间隔2
/// </summary>
public int Matting_interval2
{
get => _matting_interval2;
set
{
_matting_interval2 = value;
this.RaisePropertyChanged(nameof(Matting_interval2));
}
}
private int _matting_interval3 = 7;
/// <summary>
/// 抠图间隔2
/// </summary>
public int Matting_interval3
{
get => _matting_interval3;
set
{
_matting_interval3 = value;
this.RaisePropertyChanged(nameof(Matting_interval3));
}
}
private int _moving_pixel;
/// <summary>
/// 移动像素
......@@ -485,6 +526,34 @@ namespace VIZ.FGOUT.Module
}
}
private int _moving_pixel2;
/// <summary>
/// 移动像素2
/// </summary>
public int Moving_pixel2
{
get => _moving_pixel2;
set
{
_moving_pixel2 = value;
this.RaisePropertyChanged(nameof(Moving_pixel2));
}
}
private int _moving_pixel3;
/// <summary>
/// 移动像素3
/// </summary>
public int Moving_pixel3
{
get => _moving_pixel3;
set
{
_moving_pixel3 = value;
this.RaisePropertyChanged(nameof(Moving_pixel3));
}
}
private int _remove_out_point_pixel = 100;
/// <summary>
/// 出点像素
......@@ -499,6 +568,34 @@ namespace VIZ.FGOUT.Module
}
}
private int _remove_out_point_pixel2 = 100;
/// <summary>
/// 出点像素2
/// </summary>
public int Remove_out_point_pixel2
{
get => _remove_out_point_pixel2;
set
{
_remove_out_point_pixel2 = value;
this.RaisePropertyChanged(nameof(Remove_out_point_pixel2));
}
}
private int _remove_out_point_pixel3 = 100;
/// <summary>
/// 出点像素3
/// </summary>
public int Remove_out_point_pixel3
{
get => _remove_out_point_pixel3;
set
{
_remove_out_point_pixel3 = value;
this.RaisePropertyChanged(nameof(Remove_out_point_pixel3));
}
}
private bool _isIntervalFrame;
public bool IsIntervalFrame
{
......@@ -510,6 +607,28 @@ namespace VIZ.FGOUT.Module
}
}
private bool _isIntervalFrame2;
public bool IsIntervalFrame2
{
get => _isIntervalFrame2;
set
{
_isIntervalFrame2 = value;
this.RaisePropertyChanged(nameof(IsIntervalFrame2));
}
}
private bool _isIntervalFrame3;
public bool IsIntervalFrame3
{
get => _isIntervalFrame3;
set
{
_isIntervalFrame3 = value;
this.RaisePropertyChanged(nameof(IsIntervalFrame3));
}
}
private bool _isIntervalPixel;
public bool IsIntervalPixel
{
......@@ -521,6 +640,28 @@ namespace VIZ.FGOUT.Module
}
}
private bool _isIntervalPixel2;
public bool IsIntervalPixel2
{
get => _isIntervalPixel2;
set
{
_isIntervalPixel2 = value;
this.RaisePropertyChanged(nameof(IsIntervalPixel2));
}
}
private bool _isIntervalPixel3;
public bool IsIntervalPixel3
{
get => _isIntervalPixel3;
set
{
_isIntervalPixel3 = value;
this.RaisePropertyChanged(nameof(IsIntervalPixel3));
}
}
private bool _isKeepHighest;
/// <summary>
/// 是否保留最高点
......@@ -595,9 +736,9 @@ namespace VIZ.FGOUT.Module
var alPackage =
(AlgorithmPackage_Figout_sports_model)JsonConvert.DeserializeObject(config.AlgorithmData,
typeof(AlgorithmPackage_Figout_sports_model));
Matting_interval = alPackage.Matting_interval;
Moving_pixel = alPackage.Moving_pixel;
Remove_out_point_pixel = alPackage.Remove_out_point_pixel;
Matting_interval3 = Matting_interval2 = Matting_interval = alPackage.Matting_interval;
Moving_pixel3 = Moving_pixel2 = Moving_pixel = alPackage.Moving_pixel;
Remove_out_point_pixel3 = Remove_out_point_pixel2 = Remove_out_point_pixel = alPackage.Remove_out_point_pixel;
IsKeepHighest = alPackage.Is_Keep_highest;
IsBigModel = alPackage.Is_Big_Model;
}
......@@ -638,9 +779,39 @@ namespace VIZ.FGOUT.Module
var alPackage = (AlgorithmPackage_Figout_sports_model)JsonConvert.DeserializeObject(config.AlgorithmData, typeof(AlgorithmPackage_Figout_sports_model));
if (alPackage == null) return;
alPackage.Matting_interval = Matting_interval;
alPackage.Moving_pixel = Moving_pixel;
alPackage.Remove_out_point_pixel = Remove_out_point_pixel;
if (IsIntervalFrame2)
{
alPackage.Matting_interval = Matting_interval2;
alPackage.Moving_pixel = Moving_pixel2;
alPackage.Remove_out_point_pixel = Remove_out_point_pixel2;
}
else if (IsIntervalFrame3)
{
alPackage.Matting_interval = Matting_interval3;
alPackage.Moving_pixel = Moving_pixel3;
alPackage.Remove_out_point_pixel = Remove_out_point_pixel3;
}
else
{
alPackage.Matting_interval = Matting_interval;
alPackage.Moving_pixel = Moving_pixel;
alPackage.Remove_out_point_pixel = Remove_out_point_pixel;
}
//if (IsIntervalPixel2)
//{
// alPackage.Moving_pixel = Moving_pixel2;
//}
//else if (IsIntervalPixel3)
//{
// alPackage.Moving_pixel = Moving_pixel3;
//}
//else
//{
// alPackage.Moving_pixel = Moving_pixel;
//}
//alPackage.Remove_out_point_pixel = Remove_out_point_pixel;
alPackage.Is_Keep_highest = IsKeepHighest;
alPackage.Is_Big_Model = IsBigModel;
//再放回数据库
......@@ -648,10 +819,10 @@ namespace VIZ.FGOUT.Module
config.AlgorithmData = algorithmMessage;
ApplicationDomainEx.LiteDbContext.JavelinThrowConfig.Upsert(config);
if (IsIntervalPixel)
{
alPackage.Matting_interval = 0;
}
//if (IsIntervalPixel || IsIntervalPixel2 || IsIntervalPixel3)
//{
// alPackage.Matting_interval = 0;
//}
//发送给算法
manager.SendJson(alPackage);
......@@ -1266,12 +1437,55 @@ namespace VIZ.FGOUT.Module
}
}
public VCommand<KeyEventArgs> Matting_intervalKeyDownCommand2 { get; set; }
private void Matting_intervalKeyDown2(KeyEventArgs e)
{
if (e.Key == Key.Enter)
{
IsIntervalFrame2 = true;
TextBoxTextCommon(e);
}
}
public VCommand<KeyEventArgs> Matting_intervalKeyDownCommand3 { get; set; }
private void Matting_intervalKeyDown3(KeyEventArgs e)
{
if (e.Key == Key.Enter)
{
IsIntervalFrame3 = true;
TextBoxTextCommon(e);
}
}
public VCommand<KeyEventArgs> Moving_pixelKeyDownCommand { get; set; }
private void Moving_pixelKeyDown(KeyEventArgs e)
{
if (e.Key == Key.Enter)
{
IsIntervalPixel = true;
IsIntervalFrame = true;
//IsIntervalPixel = true;
TextBoxTextCommon(e);
}
}
public VCommand<KeyEventArgs> Moving_pixelKeyDownCommand2 { get; set; }
private void Moving_pixelKeyDown2(KeyEventArgs e)
{
if (e.Key == Key.Enter)
{
//IsIntervalPixel2 = true;
IsIntervalFrame2 = true;
TextBoxTextCommon(e);
}
}
public VCommand<KeyEventArgs> Moving_pixelKeyDownCommand3 { get; set; }
private void Moving_pixelKeyDown3(KeyEventArgs e)
{
if (e.Key == Key.Enter)
{
//IsIntervalPixel3 = true;
IsIntervalFrame3 = true;
TextBoxTextCommon(e);
}
}
......@@ -1282,6 +1496,29 @@ namespace VIZ.FGOUT.Module
{
if (e.Key == Key.Enter)
{
IsIntervalFrame = true;
TextBoxTextCommon(e);
}
}
public VCommand<KeyEventArgs> Remove_out_point_pixelKeyDownCommand2 { get; set; }
private void Remove_out_point_pixelKeyDown2(KeyEventArgs e)
{
if (e.Key == Key.Enter)
{
IsIntervalFrame2 = true;
TextBoxTextCommon(e);
}
}
public VCommand<KeyEventArgs> Remove_out_point_pixelKeyDownCommand3 { get; set; }
private void Remove_out_point_pixelKeyDown3(KeyEventArgs e)
{
if (e.Key == Key.Enter)
{
IsIntervalFrame3 = true;
TextBoxTextCommon(e);
}
}
......@@ -1314,6 +1551,13 @@ namespace VIZ.FGOUT.Module
AlgorithmSendCommon();
}
public VCommand IntervalFrameCommand2 { get; set; }
private void OnIntervalFrame2()
{
AlgorithmSendCommon();
}
public VCommand IntervalPixelCommand { get; set; }
private void OnIntervalPixel()
......@@ -1326,6 +1570,13 @@ namespace VIZ.FGOUT.Module
AlgorithmSendCommon();
}
public VCommand IntervalPixelCommand2 { get; set; }
private void OnIntervalPixel2()
{
AlgorithmSendCommon();
}
private bool _matting_intervalIsEnabled = true;
public bool Matting_intervalIsEnabled
{
......@@ -1802,7 +2053,45 @@ namespace VIZ.FGOUT.Module
}
}
private bool _selectedTwoIsChecked;
public bool SelectedTwoIsChecked
{
get => _selectedTwoIsChecked;
set
{
_selectedTwoIsChecked = value;
this.RaisePropertyChanged(nameof(SelectedTwoIsChecked));
}
}
private bool _selectedThreeIsChecked;
public bool SelectedThreeIsChecked
{
get => _selectedThreeIsChecked;
set
{
_selectedThreeIsChecked = value;
this.RaisePropertyChanged(nameof(SelectedThreeIsChecked));
}
}
private bool _selectedFourIsChecked;
public bool SelectedFourIsChecked
{
get => _selectedFourIsChecked;
set
{
_selectedFourIsChecked = value;
this.RaisePropertyChanged(nameof(SelectedFourIsChecked));
}
}
SendSelectedModel _sendSelectedModel = new SendSelectedModel();
SelectedModel _selectedModel = new SelectedModel();
SelectedTwoModel _selectedTwoModel = new SelectedTwoModel();
SelectedThreeModel _selectedThreeModel = new SelectedThreeModel();
SelectedFourModel _selectedFourModel = new SelectedFourModel();
/// <summary>
/// 拖框开关
/// </summary>
......@@ -1813,6 +2102,25 @@ namespace VIZ.FGOUT.Module
if (SelectedIsChecked)
{
_selectedModel.IsSelected = true;
if (SelectedTwoIsChecked)
{
SelectedTwoIsChecked = false;
_selectedTwoModel.IsSelected = false;
ApplicationDomain.MessageManager.Send(_selectedTwoModel);
}
else if (SelectedThreeIsChecked)
{
SelectedThreeIsChecked = false;
_selectedThreeModel.IsSelected = false;
ApplicationDomain.MessageManager.Send(_selectedThreeModel);
}
else if (SelectedFourIsChecked)
{
SelectedFourIsChecked = false;
_selectedFourModel.IsSelected = false;
ApplicationDomain.MessageManager.Send(_selectedFourModel);
}
}
else
{
......@@ -1821,7 +2129,108 @@ namespace VIZ.FGOUT.Module
ApplicationDomain.MessageManager.Send(_selectedModel);
}
SendSelectedModel _sendSelectedModel = new SendSelectedModel();
/// <summary>
/// 拖框2开关
/// </summary>
public VCommand SelectedTwoCommand { get; set; }
private void SelectedTwo()
{
if (SelectedTwoIsChecked)
{
_selectedTwoModel.IsSelected = true;
if (SelectedIsChecked)
{
SelectedIsChecked = false;
_selectedModel.IsSelected = false;
ApplicationDomain.MessageManager.Send(_selectedModel);
}
else if (SelectedThreeIsChecked)
{
SelectedThreeIsChecked = false;
_selectedThreeModel.IsSelected = false;
ApplicationDomain.MessageManager.Send(_selectedThreeModel);
}
else if (SelectedFourIsChecked)
{
SelectedFourIsChecked = false;
_selectedFourModel.IsSelected = false;
ApplicationDomain.MessageManager.Send(_selectedFourModel);
}
}
else
{
_selectedTwoModel.IsSelected = false;
}
ApplicationDomain.MessageManager.Send(_selectedTwoModel);
}
public VCommand SelectedThreeCommand { get; set; }
private void SelectedThree()
{
if (SelectedThreeIsChecked)
{
_selectedThreeModel.IsSelected = true;
if (SelectedTwoIsChecked)
{
SelectedTwoIsChecked = false;
_selectedTwoModel.IsSelected = false;
ApplicationDomain.MessageManager.Send(_selectedTwoModel);
}
else if (SelectedIsChecked)
{
SelectedIsChecked = false;
_selectedModel.IsSelected = false;
ApplicationDomain.MessageManager.Send(_selectedModel);
}
else if (SelectedFourIsChecked)
{
SelectedFourIsChecked = false;
_selectedFourModel.IsSelected = false;
ApplicationDomain.MessageManager.Send(_selectedFourModel);
}
}
else
{
_selectedThreeModel.IsSelected = false;
}
ApplicationDomain.MessageManager.Send(_selectedThreeModel);
}
public VCommand SelectedFourCommand { get; set; }
private void SelectedFour()
{
if (SelectedFourIsChecked)
{
_selectedFourModel.IsSelected = true;
if (SelectedTwoIsChecked)
{
SelectedTwoIsChecked = false;
_selectedTwoModel.IsSelected = false;
ApplicationDomain.MessageManager.Send(_selectedTwoModel);
}
else if (SelectedThreeIsChecked)
{
SelectedThreeIsChecked = false;
_selectedThreeModel.IsSelected = false;
ApplicationDomain.MessageManager.Send(_selectedThreeModel);
}
else if (SelectedIsChecked)
{
SelectedIsChecked = false;
_selectedModel.IsSelected = false;
ApplicationDomain.MessageManager.Send(_selectedModel);
}
}
else
{
_selectedFourModel.IsSelected = false;
}
ApplicationDomain.MessageManager.Send(_selectedFourModel);
}
/// <summary>
/// 发送拖框数据
/// </summary>
......@@ -2727,6 +3136,24 @@ namespace VIZ.FGOUT.Module
{
GoOn();
}
//FirstLine
else if (context.hotkey.Equals(NDIMainViewHotkeys.FirstLine))
{
IsIntervalFrame = true;
AlgorithmSendCommon();
}
//SecondLine
else if (context.hotkey.Equals(NDIMainViewHotkeys.SecondLine))
{
IsIntervalFrame2 = true;
AlgorithmSendCommon();
}
//ThirdLine
else if (context.hotkey.Equals(NDIMainViewHotkeys.ThridLine))
{
IsIntervalFrame3 = true;
AlgorithmSendCommon();
}
}
}
}
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/View/NDIView.xaml.cs
......@@ -6,6 +6,7 @@ using System.Windows.Controls;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Shapes;
using System.Windows.Shell;
using VIZ.FGOUT.Domain;
using VIZ.Framework.Common;
using VIZ.Framework.Core;
......@@ -48,6 +49,9 @@ namespace VIZ.FGOUT.Module
//裁切
public Rect rectSelected;
public Rect rectSelectedTwo;
public Rect rectSelectedThree;
public Rect rectSelectedFour;
public List<Rect> rectsSelected = new List<Rect>();
//Rectangle rectSelected = new Rectangle();
......@@ -628,6 +632,7 @@ namespace VIZ.FGOUT.Module
}
}
private Brush _brush;
public Path _currMarkPath;
bool _isMove;
/// <summary>
......@@ -680,41 +685,152 @@ namespace VIZ.FGOUT.Module
}
//裁切
if (vm.IsSelected && this.NDIKey == NDIViewKeys.CAM_1)
//if (vm.IsSelected)
//{
// this.canvas1.Children.Remove(vm.path1);
// //var rect = rectSelected;
// //if (rect.Width > 0)
// //{
// // Path tempPath = new Path();
// // foreach (UIElement uec in this.canvas1.Children)
// // {
// // var path = uec as Path;
// // if (path?.Stroke == Brushes.Yellow)
// // {
// // tempPath = path;
// // }
// // }
// // this.canvas1.Children.Remove(tempPath);
// //}
// 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;
// var width = Math.Abs(currentPoint.X - startX);
// var height = width * 9 / 16;
// var rg = new RectangleGeometry
// {
// Rect = new Rect(startX, startY, width, height)
// };
// //rectSelected = new Rect(startPoint, currentPoint);
// rectSelected = new Rect(startX, startY, width, height);
// if (_currMarkPath == null)
// {
// _currMarkPath = new Path
// {
// Stroke = Brushes.Yellow,
// StrokeThickness = 1,
// Data = rg
// };
// //this.canvas1.Children.Clear();
// this.canvas1.Children.Add(_currMarkPath);
// }
// else
// {
// _currMarkPath.Data = rg;
// }
//}
//else if (vm.IsSelectedTwo)
//{
// this.canvas1.Children.Remove(vm.path1);
// var currentPoint = e.GetPosition(this.canvas1);
// var startX = startPoint.X;
// var startY = startPoint.Y;
// var width = Math.Abs(currentPoint.X - startX);
// var height = width * 9 / 16;
// var rg = new RectangleGeometry
// {
// Rect = new Rect(startX, startY, width, height)
// };
// //rectSelectedTwo = new Rect(startPoint, currentPoint);
// rectSelectedTwo = new Rect(startX, startY, width, height);
// if (_currMarkPath == null)
// {
// _currMarkPath = new Path
// {
// Stroke = Brushes.Orange,
// StrokeThickness = 1,
// Data = rg
// };
// //this.canvas1.Children.Clear();
// this.canvas1.Children.Add(_currMarkPath);
// }
// else
// {
// _currMarkPath.Data = rg;
// }
//}
if (this.NDIKey == NDIViewKeys.CAM_1)
{
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;
var width = Math.Abs(currentPoint.X - startX);
var height = width * 9 / 16;
var rg = new RectangleGeometry
if (vm.IsSelected || vm.IsSelectedTwo || vm.IsSelectedThree || vm.IsSelectedFour)
{
Rect = new Rect(startX, startY, width, height)
};
this.canvas1.Children.Remove(vm.path1);
rectSelected = new Rect(startPoint, currentPoint);
var currentPoint = e.GetPosition(this.canvas1);
if (_currMarkPath == null)
{
_currMarkPath = new Path
var startX = startPoint.X;
var startY = startPoint.Y;
var width = Math.Abs(currentPoint.X - startX);
var height = width * 9 / 16;
var rg = new RectangleGeometry
{
Stroke = Brushes.Yellow,
StrokeThickness = 1,
Data = rg
Rect = new Rect(startX, startY, width, height)
};
this.canvas1.Children.Add(_currMarkPath);
}
else
{
_currMarkPath.Data = rg;
if (vm.IsSelected)
{
_brush = Brushes.Yellow;
rectSelected = new Rect(startX, startY, width, height);
}
else if (vm.IsSelectedTwo)
{
_brush = Brushes.Orange;
rectSelectedTwo = new Rect(startX, startY, width, height);
}
else if (vm.IsSelectedThree)
{
_brush = Brushes.Cyan;
rectSelectedThree = new Rect(startX, startY, width, height);
}
else if (vm.IsSelectedFour)
{
rectSelectedFour = new Rect(startX, startY, width, height);
_brush = Brushes.Pink;
}
if (_currMarkPath == null)
{
_currMarkPath = new Path
{
Stroke = _brush,
StrokeThickness = 1,
Data = rg
};
this.canvas1.Children.Add(_currMarkPath);
}
else
{
_currMarkPath.Data = rg;
}
}
}
}
}
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.cs
......@@ -215,10 +215,18 @@ namespace VIZ.FGOUT.Module
//ApplicationDomain.MessageManager.Register<ReconfirmAutoSendIntervalTimeModel>(this, this.ReconfirmAutoSendIntervalTime);
//裁切区域发送命令
ApplicationDomain.MessageManager.Register<SelectedFourModel>(this, this.SelectedFour);
ApplicationDomain.MessageManager.Register<SelectedThreeModel>(this, this.SelectedThree);
ApplicationDomain.MessageManager.Register<SelectedTwoModel>(this, this.SelectedTwo);
ApplicationDomain.MessageManager.Register<SelectedModel>(this, this.Selected);
ApplicationDomain.MessageManager.Register<SendSelectedModel>(this, this.SendSelected);
}
public Rect RectSelectedSaved;
public Rect RectSelectedSavedTwo;
public Rect RectSelectedSavedThree;
public Rect RectSelectedSavedFour;
private CutPackage _package;
/// <summary>
/// 发送裁切框数据
......@@ -229,7 +237,24 @@ namespace VIZ.FGOUT.Module
if (this.ViewKey != NDIViewKeys.CAM_1) return;
NDIView nDIView = this.GetView<NDIView>();
var rect = nDIView.rectSelected;
Rect rect = new Rect();
if (IsSelected)
{
rect = RectSelectedSaved = nDIView.rectSelected;
}
else if (IsSelectedTwo)
{
rect = RectSelectedSavedTwo = nDIView.rectSelectedTwo;
}
else if (IsSelectedThree)
{
rect = RectSelectedSavedThree = nDIView.rectSelectedThree;
}
else if (IsSelectedFour)
{
rect = RectSelectedSavedFour = nDIView.rectSelectedFour;
}
if (rect.Width > 0)
{
// 发送UDP命令给音视频
......@@ -254,6 +279,111 @@ namespace VIZ.FGOUT.Module
}
private void SelectedFour(SelectedFourModel selectedFourModel)
{
if (this.ViewKey != NDIViewKeys.CAM_1) return;
IsSelectedFour = selectedFourModel.IsSelected;
//没有选中的时候，清除框
NDIView nDIView = this.GetView<NDIView>();
if (IsSelectedFour)
{
nDIView.rectSelectedFour = RectSelectedSavedFour;
AddRects(nDIView, RectSelectedSavedFour, Brushes.Pink);
}
else
{
var rect = nDIView.rectSelectedFour;
if (rect.Width > 0)
{
Path tempPath = new Path();
foreach (UIElement uec in nDIView.canvas1.Children)
{
var path = uec as Path;
if (path?.Stroke == Brushes.Pink)
{
tempPath = path;
}
}
nDIView.canvas1.Children.Remove(tempPath);
nDIView.rectSelectedFour = new Rect();
nDIView._currMarkPath = null;
}
_package = null;
}
}
private void SelectedThree(SelectedThreeModel selectedThreeModel)
{
if (this.ViewKey != NDIViewKeys.CAM_1) return;
IsSelectedThree = selectedThreeModel.IsSelected;
//没有选中的时候，清除框
NDIView nDIView = this.GetView<NDIView>();
if (IsSelectedThree)
{
nDIView.rectSelectedThree = RectSelectedSavedThree;
AddRects(nDIView, RectSelectedSavedThree, Brushes.Cyan);
}
else
{
var rect = nDIView.rectSelectedThree;
if (rect.Width > 0)
{
Path tempPath = new Path();
foreach (UIElement uec in nDIView.canvas1.Children)
{
var path = uec as Path;
if (path?.Stroke == Brushes.Cyan)
{
tempPath = path;
}
}
nDIView.canvas1.Children.Remove(tempPath);
nDIView.rectSelectedThree = new Rect();
nDIView._currMarkPath = null;
}
_package = null;
}
}
public bool IsSelectedFour;
public bool IsSelectedThree;
public bool IsSelectedTwo;
private void SelectedTwo(SelectedTwoModel selectedTwoModel)
{
if (this.ViewKey != NDIViewKeys.CAM_1) return;
IsSelectedTwo = selectedTwoModel.IsSelected;
//没有选中的时候，清除框
NDIView nDIView = this.GetView<NDIView>();
if (IsSelectedTwo)
{
nDIView.rectSelectedTwo = RectSelectedSavedTwo;
AddRects(nDIView, RectSelectedSavedTwo, Brushes.Orange);
}
else
{
var rect = nDIView.rectSelectedTwo;
if (rect.Width > 0)
{
Path tempPath = new Path();
foreach (UIElement uec in nDIView.canvas1.Children)
{
var path = uec as Path;
if (path?.Stroke == Brushes.Orange)
{
tempPath = path;
}
}
nDIView.canvas1.Children.Remove(tempPath);
nDIView.rectSelectedTwo = new Rect();
nDIView._currMarkPath = null;
}
_package = null;
}
}
public bool IsSelected;
private void Selected(SelectedModel selectedModel)
{
......@@ -261,10 +391,15 @@ namespace VIZ.FGOUT.Module
if (this.ViewKey != NDIViewKeys.CAM_1) return;
IsSelected = selectedModel.IsSelected;
//没有选中的时候，清除框
if (!IsSelected)
{
NDIView nDIView = this.GetView<NDIView>();
NDIView nDIView = this.GetView<NDIView>();
if (IsSelected)
{
nDIView.rectSelected = RectSelectedSaved;
AddRects(nDIView, nDIView.rectSelected, Brushes.Yellow);
}
else
{
var rect = nDIView.rectSelected;
if (rect.Width > 0)
{
......@@ -1628,18 +1763,41 @@ namespace VIZ.FGOUT.Module
polygon.Points = points;
}
private void AddRects(NDIView view, System.Windows.Rect points, Brush brush)
//private void AddRects(NDIView view, Rect points, Brush brush)
//{
// PathGeometry aa = new PathGeometry();
// aa.AddGeometry(new RectangleGeometry(points));
// var myPath = new Path
// {
// Fill = Brushes.Transparent,
// Stroke = Brushes.Red,
// StrokeThickness = 1,
// Data = aa
// };
// view.canvas1.Children.Add(myPath);
//}
public Path path1;
private void AddRects(NDIView view, Rect points, Brush brush)
{
PathGeometry aa = new PathGeometry();
aa.AddGeometry(new RectangleGeometry(points));
var myPath = new Path
//var myPath = new Path
//{
// Fill = Brushes.Transparent,
// Stroke = brush,
// StrokeThickness = 1,
// Data = aa
//};
//view.canvas1.Children.Add(myPath);
path1 = new Path
{
Fill = Brushes.Transparent,
Stroke = Brushes.Red,
Stroke = brush,
StrokeThickness = 1,
Data = aa
};
view.canvas1.Children.Add(myPath);
view.canvas1.Children.Add(path1);
}
/// <summary>
......@@ -2011,6 +2169,23 @@ namespace VIZ.FGOUT.Module
// foreach (var points in view.rectsReplay)
// AddRects(view, points, Brushes.Red);
//}
if (IsSelected)
{
AddRects(view, view.rectSelected, Brushes.Yellow);
}
else if (IsSelectedTwo)
{
AddRects(view, view.rectSelectedTwo, Brushes.Orange);
}
else if (IsSelectedThree)
{
AddRects(view, view.rectSelectedThree, Brushes.Cyan);
}
else if (IsSelectedFour)
{
AddRects(view, view.rectSelectedFour, Brushes.Pink);
}
}
/// <summary>
......
VIZ.FGOUT/VIZ.FGOUT.Module/SystemSetting/View/HotkeySettingPanelView.xaml
......@@ -35,7 +35,7 @@
<Grid Margin="45,60,40,0">
<Grid.RowDefinitions>
<RowDefinition Height="60" />
<RowDefinition Height="550" />
<RowDefinition Height="650" />
</Grid.RowDefinitions>
<!-- 算法裁切快捷键 -->
<!--<TextBlock
......@@ -65,6 +65,8 @@
<RowDefinition Height="50" />
<RowDefinition Height="50" />
<RowDefinition Height="50" />
<RowDefinition Height="50" />
<RowDefinition Height="50" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="120" />
......@@ -348,8 +350,56 @@
InputMethod.IsInputMethodEnabled="False"
Style="{StaticResource HotkeyBox_Setting}" />
<Button
<!-- 第一行算法参数 -->
<TextBlock
Grid.Row="9"
Grid.Column="0"
VerticalAlignment="Center"
FontSize="18"
Foreground="White"
Text="{DynamicResource FirstLine}" />
<fcommon:HotkeyBox
Grid.Row="9"
Grid.Column="1"
Height="30"
Margin="0,0,20,0"
Hotkey="{Binding Path=FirstLineCmd, Mode=TwoWay}"
Style="{StaticResource HotkeyBox_Setting}" />
<!-- 第二行算法参数 -->
<TextBlock
Grid.Row="9"
Grid.Column="2"
VerticalAlignment="Center"
FontSize="18"
Foreground="White"
Text="{DynamicResource SecondLine}" />
<fcommon:HotkeyBox
Grid.Row="9"
Grid.Column="3"
Height="30"
Margin="0,0,20,0"
Hotkey="{Binding Path=SecondLineCmd, Mode=TwoWay}"
Style="{StaticResource HotkeyBox_Setting}" />
<!-- 第三行算法参数 -->
<TextBlock
Grid.Row="10"
Grid.Column="0"
VerticalAlignment="Center"
FontSize="18"
Foreground="White"
Text="{DynamicResource ThirdLine}" />
<fcommon:HotkeyBox
Grid.Row="10"
Grid.Column="1"
Height="30"
Margin="0,0,20,0"
Hotkey="{Binding Path=ThirdLineCmd, Mode=TwoWay}"
Style="{StaticResource HotkeyBox_Setting}" />
<Button
Grid.Row="11"
Grid.Column="2"
Grid.ColumnSpan="2"
Width="105"
......@@ -362,7 +412,7 @@
<!-- 快左 -->
<TextBlock
Grid.Row="10"
Grid.Row="11"
Grid.Column="0"
VerticalAlignment="Center"
FontSize="18"
......@@ -370,7 +420,7 @@
Text="快左"
Visibility="Hidden" />
<fcommon:HotkeyBox
Grid.Row="10"
Grid.Row="11"
Grid.Column="1"
Height="30"
Margin="0,0,20,0"
......
VIZ.FGOUT/VIZ.FGOUT.Module/SystemSetting/ViewModel/HotkeySettingPanelViewModel.cs
......@@ -396,6 +396,66 @@ namespace VIZ.FGOUT.Module
#endregion
#region 第一行算法参数快捷键
private string _firstLineCmd;
/// <summary>
/// 第一行算法参数快捷键
/// </summary>
[HotkeyProperty]
public string FirstLineCmd
{
get { return _firstLineCmd; }
set
{
_firstLineCmd = value;
this.RaisePropertyChanged(nameof(FirstLineCmd));
this.CheckHotkey(nameof(FirstLineCmd), value);
}
}
#endregion
#region 第二行算法参数快捷键
private string _secondLineCmd;
/// <summary>
/// 第二行算法参数快捷键
/// </summary>
[HotkeyProperty]
public string SecondLineCmd
{
get { return _secondLineCmd; }
set
{
_secondLineCmd = value;
this.RaisePropertyChanged(nameof(SecondLineCmd));
this.CheckHotkey(nameof(SecondLineCmd), value);
}
}
#endregion
#region 第三行算法参数快捷键
private string _thridLineCmd;
/// <summary>
/// 第三行算法参数快捷键
/// </summary>
[HotkeyProperty]
public string ThirdLineCmd
{
get { return _thridLineCmd; }
set
{
_thridLineCmd = value;
this.RaisePropertyChanged(nameof(ThirdLineCmd));
this.CheckHotkey(nameof(ThirdLineCmd), value);
}
}
#endregion
#region 快左
private string _fastLeft;
......@@ -478,6 +538,9 @@ namespace VIZ.FGOUT.Module
this.DeleteCmd = this.HotkeyConfig.Delete;
this.FastLeftCmd = this.HotkeyConfig.FastLeft;
this.FastRightCmd = this.HotkeyConfig.FastRight;
this.FirstLineCmd = this.HotkeyConfig.FirstLine;
this.SecondLineCmd = this.HotkeyConfig.SecondLine;
this.ThirdLineCmd = this.HotkeyConfig.ThirdLine;
}
#endregion
......@@ -508,6 +571,9 @@ namespace VIZ.FGOUT.Module
this.DeleteCmd = "Delete";
this.FastLeftCmd = "Shift + Left";
this.FastRightCmd = "Shift + Right";
this.FirstLineCmd = "V";
this.SecondLineCmd = "B";
this.ThirdLineCmd = "N";
Save();
}
......@@ -580,6 +646,15 @@ namespace VIZ.FGOUT.Module
if(this.FastRightCmd != this.HotkeyConfig.FastRight)
return true;
if (this.FirstLineCmd != this.HotkeyConfig.FirstLine)
return true;
if (this.SecondLineCmd != this.HotkeyConfig.SecondLine)
return true;
if (this.ThirdLineCmd != this.HotkeyConfig.ThirdLine)
return true;
//// 算法裁切
//if (this.AutoCAM1 != this.HotkeyConfig.AutoCAM1)
// return true;
......@@ -656,6 +731,9 @@ namespace VIZ.FGOUT.Module
this.HotkeyConfig.Delete = DeleteCmd;
this.HotkeyConfig.FastLeft = FastLeftCmd;
this.HotkeyConfig.FastRight = FastRightCmd;
this.HotkeyConfig.FirstLine = FirstLineCmd;
this.HotkeyConfig.SecondLine = SecondLineCmd;
this.HotkeyConfig.ThirdLine = ThirdLineCmd;
// 更新配置
ApplicationDomainEx.LiteDbContext.HotkeyConfig.Upsert(this.HotkeyConfig);
......
VIZ.FGOUT/VIZ.FGOUT.Module/Themes/TextBoxEnterKeyUpdateLeftBehavior.cs 0 → 100644
using Microsoft.Xaml.Behaviors;
using System.Windows.Controls;
using System.Windows.Input;
namespace VIZ.FGOUT.Module
{
public class TextBoxEnterKeyUpdateLeftBehavior : 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.Left));
}
}
}
}
}
}
VIZ.FGOUT/VIZ.FGOUT.Module/Themes/TextBoxEnterKeyUpdateRightBehavior.cs 0 → 100644
using Microsoft.Xaml.Behaviors;
using System.Windows.Controls;
using System.Windows.Input;
namespace VIZ.FGOUT.Module
{
public class TextBoxEnterKeyUpdateRightBehavior : 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.Right));
}
}
}
}
}
}
VIZ.FGOUT/VIZ.FGOUT.Module/VIZ.FGOUT.Module.csproj
......@@ -273,6 +273,8 @@
<Compile Include="Themes\SliderArrange.xaml.cs">
<DependentUpon>SliderArrange.xaml</DependentUpon>
</Compile>
<Compile Include="Themes\TextBoxEnterKeyUpdateRightBehavior.cs" />
<Compile Include="Themes\TextBoxEnterKeyUpdateLeftBehavior.cs" />
<Compile Include="Themes\TextBoxEnterKeyUpdateUpBehavior.cs" />
<Compile Include="Themes\TextBoxEnterKeyUpdateDownBehavior.cs" />
<Compile Include="Themes\TextBoxEnterKeyUpdatePreBehavior.cs" />
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C6B73F41F42B841B0ADA3567D0417B42DCA6214070E5A8637741E4AD789E5067"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "483570659CA859114E4D1C106B3AFE246FBC36A99FDBE61864022E7AC88DA897"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 262 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 264 "..\..\..\..\..\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 325 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 327 "..\..\..\..\..\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 1587 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1765 "..\..\..\..\..\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 1772 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1950 "..\..\..\..\..\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 1787 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1965 "..\..\..\..\..\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 267 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 269 "..\..\..\..\..\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 329 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 331 "..\..\..\..\..\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 823 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 825 "..\..\..\..\..\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 976 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 887 "..\..\..\..\..\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 1013 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 924 "..\..\..\..\..\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 1041 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 952 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
......@@ -189,7 +189,7 @@ namespace VIZ.FGOUT.Module {
return;
case 8:
#line 1194 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1031 "..\..\..\..\..\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 1215 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1068 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
......@@ -205,19 +205,67 @@ namespace VIZ.FGOUT.Module {
return;
case 10:
#line 1236 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1096 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
#line hidden
return;
case 11:
this.cam1 = ((VIZ.FGOUT.Module.NDIView)(target));
#line 1136 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
#line hidden
return;
case 12:
this.cam2 = ((VIZ.FGOUT.Module.NDIView)(target));
#line 1173 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
#line hidden
return;
case 13:
#line 1201 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
#line hidden
return;
case 14:
#line 1335 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
#line hidden
return;
case 15:
#line 1356 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
#line hidden
return;
case 16:
#line 1377 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
#line hidden
return;
case 17:
this.cam1 = ((VIZ.FGOUT.Module.NDIView)(target));
return;
case 18:
this.cam2 = ((VIZ.FGOUT.Module.NDIView)(target));
return;
case 19:
this.cam3 = ((VIZ.FGOUT.Module.NDIView)(target));
return;
}
......
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}" "C6B73F41F42B841B0ADA3567D0417B42DCA6214070E5A8637741E4AD789E5067"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "483570659CA859114E4D1C106B3AFE246FBC36A99FDBE61864022E7AC88DA897"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 262 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 264 "..\..\..\..\..\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 325 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 327 "..\..\..\..\..\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 1587 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1765 "..\..\..\..\..\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 1772 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1950 "..\..\..\..\..\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 1787 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1965 "..\..\..\..\..\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 267 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 269 "..\..\..\..\..\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 329 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 331 "..\..\..\..\..\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 823 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 825 "..\..\..\..\..\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 976 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 887 "..\..\..\..\..\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 1013 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 924 "..\..\..\..\..\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 1041 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 952 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
......@@ -189,7 +189,7 @@ namespace VIZ.FGOUT.Module {
return;
case 8:
#line 1194 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1031 "..\..\..\..\..\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 1215 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1068 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
......@@ -205,19 +205,67 @@ namespace VIZ.FGOUT.Module {
return;
case 10:
#line 1236 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1096 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
#line hidden
return;
case 11:
this.cam1 = ((VIZ.FGOUT.Module.NDIView)(target));
#line 1136 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
#line hidden
return;
case 12:
this.cam2 = ((VIZ.FGOUT.Module.NDIView)(target));
#line 1173 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
#line hidden
return;
case 13:
#line 1201 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
#line hidden
return;
case 14:
#line 1335 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
#line hidden
return;
case 15:
#line 1356 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
#line hidden
return;
case 16:
#line 1377 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
#line hidden
return;
case 17:
this.cam1 = ((VIZ.FGOUT.Module.NDIView)(target));
return;
case 18:
this.cam2 = ((VIZ.FGOUT.Module.NDIView)(target));
return;
case 19:
this.cam3 = ((VIZ.FGOUT.Module.NDIView)(target));
return;
}
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/SystemSetting/View/HotkeySettingPanelView.g.cs
#pragma checksum "..\..\..\..\..\SystemSetting\View\HotkeySettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "725F92D6D061C34E0D64FEB5BF1DE93BA7C9ECCCB30D43D95378E39B4D0B13A5"
#pragma checksum "..\..\..\..\..\SystemSetting\View\HotkeySettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "199A2F0FC3CB3D88F6CDB5B79CD223269AE6BDDDE32BD9B383D11C4D9E09B1FB"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/SystemSetting/View/HotkeySettingPanelView.g.i.cs
#pragma checksum "..\..\..\..\..\SystemSetting\View\HotkeySettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "725F92D6D061C34E0D64FEB5BF1DE93BA7C9ECCCB30D43D95378E39B4D0B13A5"
#pragma checksum "..\..\..\..\..\SystemSetting\View\HotkeySettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "199A2F0FC3CB3D88F6CDB5B79CD223269AE6BDDDE32BD9B383D11C4D9E09B1FB"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/VIZ.FGOUT.Module.csproj.CoreCompileInputs.cache
7028a22ce086f820cb5c8f70c19072a1b5b3b695c4adcb24a14c5206a54d086f
ff2619e730532a9c0a906123f3d3f02c373d4cbaca4907418a8f4a9cc385105c
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/VIZ.FGOUT.Module_MarkupCompile.cache
......@@ -12,7 +12,7 @@ DEBUG;TRACE
25-1434354873
4-699044453
100279871941
102565772642
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.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\NDIPreviewView\View\NDIPreviewView.xaml;;
......
VIZ.FGOUT/VIZ.FGOUT.Storage/LiteDB/System/HotkeyConfig.cs
......@@ -72,5 +72,12 @@
public string FastLeft { get; set;} = "Shift + Left";
public string FastRight { get; set; } = "Shift + Right";
public string FirstLine { get; set; } = "V";
public string SecondLine { get; set; } = "B";
public string ThirdLine { get; set; } = "N";
}
}
VIZ.FGOUT/VIZ.FGOUT/Properties/AssemblyInfo.cs
......@@ -55,5 +55,5 @@ using System.Windows;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.28.0")]
[assembly: AssemblyFileVersion("1.0.28.0")]
[assembly: AssemblyVersion("1.0.37.0")]
[assembly: AssemblyFileVersion("1.0.37.0")]
VIZ.Framework/VIZ.Framework.Common/obj/x64/Release/VIZ.Framework.Common_MarkupCompile.lref
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\obj\x64\Release\GeneratedInternalTypeHelper.g.cs

FC:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\MessageBox\MessageBoxEx.xaml;;
FC:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\MessageBox\MessageBoxExWindow.xaml;;
......
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