Skip to content

F
FGOUT
Commit 7f486ba9 by 鲁志-悦动
Options

参数：帧间隔、移动距离间隔、大模型，放置到一级页面 And 增加快捷键：二次确认“抛弃”“确认” And 在NDISetting页面把算法参数设置放到视频输入上面

parent 19a4e6bb
Showing with 275 additions and 125 deletions
VIZ.FGOUT/VIZ.FGOUT.Domain/Enum/NDIMainViewHotkeys.cs
......@@ -55,6 +55,16 @@
/// <summary>
/// Replay Stop
/// </summary>
ReplayStop
ReplayStop,
/// <summary>
/// 抛弃
/// </summary>
Abandon,
/// <summary>
/// 发送
/// </summary>
Send
}
}
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/Resources/StringResource.en.xaml
......@@ -66,4 +66,6 @@
<sys:String x:Key="IgnoreZoneW">Ignore zone W</sys:String>
<sys:String x:Key="LargeModel">Large model</sys:String>
<sys:String x:Key="ExtendFrame">Extend frame</sys:String>
<sys:String x:Key="SendHotkey">Send</sys:String>
<sys:String x:Key="AbandonHotkey">Abandon</sys:String>
</ResourceDictionary>
\ No newline at end of file
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/Resources/StringResource.zh-cn.xaml
......@@ -65,4 +65,6 @@
<sys:String x:Key="IgnoreZoneW">忽略框宽</sys:String>
<sys:String x:Key="LargeModel">大模型</sys:String>
<sys:String x:Key="ExtendFrame">扩展帧</sys:String>
<sys:String x:Key="SendHotkey">二次确认(发送)</sys:String>
<sys:String x:Key="AbandonHotkey">二次确认(抛弃)</sys:String>
</ResourceDictionary>
\ No newline at end of file
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/Style/CheckBox/CheckBox_RaidoButtonStyle.xaml
......@@ -3,7 +3,7 @@
<Style x:Key="CheckBox_RaidoButtonStyle" TargetType="CheckBox">
<Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Setter Property="Height" Value="20" />
<Setter Property="FontSize" Value="16" />
<Setter Property="FontSize" Value="14" />
<Setter Property="Padding" Value="10,0,0,0" />
<Setter Property="Template">
<Setter.Value>
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/Controller/Hotkey/HotkeyController.cs
......@@ -230,6 +230,18 @@ namespace VIZ.FGOUT.Module
return AssembleNDIMainViewHotkeyMode(NDIMainViewHotkeys.CleanInPoints);
}
//二次确认(抛弃)
if (string.Equals(this.Support.HotkeyConfig.Abandon, hotkey))
{
return AssembleNDIMainViewHotkeyMode(NDIMainViewHotkeys.Abandon);
}
//二次确认(发送)
if (string.Equals(this.Support.HotkeyConfig.Send, hotkey))
{
return AssembleNDIMainViewHotkeyMode(NDIMainViewHotkeys.Send);
}
//位置标记删除命令
//if (string.Equals("Ctrl + Z", hotkey) || string.Equals(this.Support.HotkeyConfig.Delete, hotkey))
if (string.Equals(this.Support.HotkeyConfig.Delete, hotkey))
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml
......@@ -786,7 +786,7 @@
Content="{DynamicResource Send}"
Style="{StaticResource ButtonStyle}" />
<TextBlock
Margin="30,0,0,0"
Margin="50,0,0,0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="14"
......@@ -794,7 +794,7 @@
Text="{DynamicResource AutoSend}" />
<TextBox
Width="30"
Margin="10,0"
Margin="5,0"
Background="#378CFF"
FontSize="14"
Style="{StaticResource TextBoxStyle}"
......@@ -805,6 +805,7 @@
</b:EventTrigger>
</b:Interaction.Triggers>
</TextBox>
<TextBox
Width="30"
Background="Yellow"
......@@ -815,6 +816,7 @@
IsEnabled="False"
Style="{StaticResource TextBoxStyle}"
Text="{Binding AutoSendCount}" />
<!--<TextBlock
Width="30"
Height="30"
......@@ -888,7 +890,7 @@
Visibility="{Binding ReplaySendVisibility, Mode=TwoWay}" />-->
<!-- Replay -->
<Border
Grid.Row="3"
Grid.Row="4"
Grid.ColumnSpan="5"
Margin="0,10,0,0"
BorderBrush="Gray"
......@@ -947,33 +949,37 @@
Visibility="{Binding ReplaySendVisibility, Mode=TwoWay}" />
</Grid>
</Border>
<!-- 两个算法常用参数 -->
<!--<Border
Grid.Row="4"
<!-- 三个常用算法参数 -->
<Border
Grid.Row="3"
Grid.ColumnSpan="5"
Margin="0,10,0,0"
BorderBrush="White"
BorderThickness="3">
BorderBrush="Gray"
BorderThickness="1">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1.5*" />
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition Width="1.1*" />
<ColumnDefinition Width="1.1*" />
</Grid.ColumnDefinitions>
<TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="14"
Foreground="White"
Text="算法参数" />
Text="{DynamicResource AlgorithmParameter}" />
<TextBlock
Grid.Column="1"
Margin="0,0,3,0"
HorizontalAlignment="Right"
VerticalAlignment="Center"
FontSize="14"
Foreground="White"
Text="matting_interval" />
Text="{DynamicResource IntervalFrame}" />
<TextBox
Grid.Column="2"
Width="60"
......@@ -985,9 +991,12 @@
</TextBox>
<TextBlock
Grid.Column="3"
Margin="0,0,3,0"
HorizontalAlignment="Right"
VerticalAlignment="Center"
FontSize="14"
Foreground="White"
Text="moving_pixel" />
Text="{DynamicResource IntervalPixel}" />
<TextBox
Grid.Column="4"
Width="60"
......@@ -997,15 +1006,24 @@
<local:TextBoxEnterKeyUpdateBehavior />
</b:Interaction.Behaviors>
</TextBox>
<Button
<CheckBox
Grid.Column="5"
Margin="0,12"
Content="{DynamicResource LargeModel}"
FontSize="14"
Foreground="White"
IsChecked="{Binding Path=IsBigModel, Mode=TwoWay}"
Style="{StaticResource CheckBox_Setting}" />
<Button
Grid.Column="6"
Width="100"
Height="40"
Margin="0,0,3,0"
Command="{Binding Path=AlgorithmSendCommand}"
Content="发送"
Content="{DynamicResource Save}"
Style="{StaticResource ButtonStyle}" />
</Grid>
</Border>-->
</Border>
</Grid>
</ScrollViewer>
<!--</WrapPanel>-->
......@@ -1386,11 +1404,27 @@
VerticalAlignment="Center"
Orientation="Horizontal">
<fcommon:TimeDisplayControl
Margin="0,0,0,0"
FontSize="30"
FontWeight="Bold"
Foreground="#AAFF0000" />
</StackPanel>
<!--<TextBox
Grid.Row="1"
Grid.Column="1"
Width="30"
Margin="0,0,0,0"
HorizontalAlignment="Center"
Background="Yellow"
BorderBrush="Red"
BorderThickness="2"
FontSize="14"
Foreground="Black"
IsEnabled="False"
Style="{StaticResource TextBoxStyle}"
Text="{Binding AutoSendCount}" />-->
<!--<StackPanel Grid.Row="1" Grid.Column="1">
<Button
Width="130"
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
......@@ -59,8 +59,8 @@ namespace VIZ.FGOUT.Module
//TimeCountActVisibility = Visibility.Visible;
//TimeCountDefaultVisibility = Visibility.Collapsed;
//初始化算法数据
//InitAlgorithmData();
//初始化算法参数数据
InitAlgorithmData();
//初始化音视频流缓存时间
InitStreamCachedTime();
......@@ -208,7 +208,7 @@ namespace VIZ.FGOUT.Module
//接收自动发送消息，触发倒计时
ApplicationDomain.MessageManager.Register<AutoSendModel>(this, this.AutoSendIntervalTimeChanged);
//接收更新主页面Title体育项目名和位置标记消息
//接收更新主页面Title体育项目名和位置标记消息和三个常用算法参数信息
ApplicationDomain.MessageManager.Register<UpdateTitleAndPositionMarkModel>(this, this.UpdateTitleAndPositionMarkMethod);
// 算法落盘开始、结束时间戳消息(在NDIViewModel已注册了接收方法)
......@@ -237,6 +237,8 @@ namespace VIZ.FGOUT.Module
InitSportName();
//刷新位置标记
RefreshPosition();
//三个常用算法参数信息
InitAlgorithmData();
}
private void AutoSendIntervalTimeChanged(AutoSendModel model)
......@@ -432,6 +434,20 @@ namespace VIZ.FGOUT.Module
}
}
private bool _isBigModel;
/// <summary>
/// 是否是大模型
/// </summary>
public bool IsBigModel
{
get => _isBigModel;
set
{
_isBigModel = value;
this.RaisePropertyChanged(nameof(IsBigModel));
}
}
private void InitAlgorithmData()
{
try
......@@ -448,6 +464,7 @@ namespace VIZ.FGOUT.Module
typeof(AlgorithmPackage_Figout_sports_model));
Matting_interval = alPackage.Matting_interval;
Moving_pixel = alPackage.Moving_pixel;
IsBigModel = alPackage.Is_Big_Model;
}
}
catch (Exception ex)
......@@ -456,6 +473,14 @@ namespace VIZ.FGOUT.Module
}
}
/// <summary>
/// 序列化设置
/// </summary>
private readonly static JsonSerializerSettings JSON_SERIALIZER_SETTINGS = new JsonSerializerSettings
{
NullValueHandling = NullValueHandling.Ignore
};
public VCommand AlgorithmSendCommand { get; set; }
private void AlgorithmSend()
......@@ -467,9 +492,30 @@ namespace VIZ.FGOUT.Module
AlgorithmPackage_Figout_sports_model package = new AlgorithmPackage_Figout_sports_model
{
Matting_interval = Matting_interval,
Moving_pixel = Moving_pixel
Moving_pixel = Moving_pixel,
Is_Big_Model = IsBigModel
};
manager.SendJson(package);
MessageBoxEx.ShowDialog("算法参数保存成功。");
//存算法数据
var number = ApplicationDomainEx.LiteDbContext.ViewConfig.FindOne(p => p.ViewKey == NDIViewKeys.CAM_1)
.GameName;
if (!string.IsNullOrEmpty(number))
{
var config = ApplicationDomainEx.LiteDbContext.JavelinThrowConfig.FindOne(p => p.Number == number);
if (config == null) return;
//拿出来，更新修改数据，再放回去
var alPackage =
(AlgorithmPackage_Figout_sports_model)JsonConvert.DeserializeObject(config.AlgorithmData,
typeof(AlgorithmPackage_Figout_sports_model));
alPackage.Matting_interval = Matting_interval;
alPackage.Moving_pixel = Moving_pixel;
alPackage.Is_Big_Model = IsBigModel;
var _algorithmMessage = alPackage == null ? string.Empty : JsonConvert.SerializeObject(alPackage, JSON_SERIALIZER_SETTINGS);
config.AlgorithmData = _algorithmMessage;
ApplicationDomainEx.LiteDbContext.JavelinThrowConfig.Upsert(config);
}
}
#endregion
......@@ -1000,6 +1046,8 @@ namespace VIZ.FGOUT.Module
//_autoSend_Timer.Stop();
TimeCountActVisibility = Visibility.Collapsed;
TimeCountDefaultVisibility = Visibility.Visible;
MessageBoxEx.ShowDialog("二次确认抛弃完成。");
}
public VCommand SendCommand { get; set; }
......@@ -1011,6 +1059,7 @@ namespace VIZ.FGOUT.Module
{
//ReconfirmSendParamsCommon(ReconfirmStatus.Send);
ApplicationDomain.MessageManager.Send(_reconfirmSendModel);
MessageBoxEx.ShowDialog("二次确认发送成功。");
}
private Visibility _timeCountDefaultVisibility = Visibility.Visible;
......@@ -2345,6 +2394,17 @@ namespace VIZ.FGOUT.Module
ReplayIsChecked = true;
}
}
//二次确认(抛弃)
if (context.hotkey.Equals(NDIMainViewHotkeys.Abandon))
{
Abandon();
}
//二次确认(发送)
else if (context.hotkey.Equals(NDIMainViewHotkeys.Send))
{
Send();
}
}
}
}
VIZ.FGOUT/VIZ.FGOUT.Module/NDISettingView/View/NDISettingView.xaml
......@@ -59,23 +59,23 @@
</StackPanel>
<StackPanel Grid.Row="1" Grid.RowSpan="2">
<RadioButton
x:Name="rbNDI"
x:Name="rbAlgorithm"
Height="50"
VerticalContentAlignment="Center"
Content="{DynamicResource VideoInput}"
Content="{DynamicResource ParameterSettings}"
FontSize="20"
Foreground="White"
IsChecked="True"
Style="{StaticResource RadioButton_Setting}" />
Style="{StaticResource RadioButton_Setting}"
Visibility="{Binding IsCam1Visibility}" />
<RadioButton
x:Name="rbAlgorithm"
x:Name="rbNDI"
Height="50"
VerticalContentAlignment="Center"
Content="{DynamicResource ParameterSettings}"
Content="{DynamicResource VideoInput}"
FontSize="20"
Foreground="White"
Style="{StaticResource RadioButton_Setting}"
Visibility="{Binding IsCam1Visibility}" />
Style="{StaticResource RadioButton_Setting}" />
</StackPanel>
<Button
Grid.Column="1"
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.cs
......@@ -735,7 +735,7 @@ namespace VIZ.FGOUT.Module
package.ignore = Coordinate(nDIView.polygonsInvalid, srcWidth, srcHeight);
manager.SendJson(package);
MessageBoxEx.ShowDialog("发送成功");
MessageBoxEx.ShowDialog("发送成功。");
#endregion
......
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="300" />
<RowDefinition Height="350" />
</Grid.RowDefinitions>
<!-- 算法裁切快捷键 -->
<!--<TextBlock
......@@ -60,6 +60,7 @@
<RowDefinition Height="50" />
<RowDefinition Height="50" />
<RowDefinition Height="50" />
<RowDefinition Height="50" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="120" />
......@@ -246,6 +247,38 @@
Hotkey="{Binding Path=ReplayStopCmd, Mode=TwoWay}"
Style="{StaticResource HotkeyBox_Setting}" />
<!-- 二次确认 抛弃 -->
<TextBlock
Grid.Row="6"
Grid.Column="0"
VerticalAlignment="Center"
FontSize="18"
Foreground="White"
Text="{DynamicResource AbandonHotkey}" />
<fcommon:HotkeyBox
Grid.Row="6"
Grid.Column="1"
Height="30"
Margin="0,0,20,0"
Hotkey="{Binding Path=AbandonCmd, Mode=TwoWay}"
Style="{StaticResource HotkeyBox_Setting}" />
<!-- 二次确认 发送 -->
<TextBlock
Grid.Row="6"
Grid.Column="2"
VerticalAlignment="Center"
FontSize="18"
Foreground="White"
Text="{DynamicResource SendHotkey}" />
<fcommon:HotkeyBox
Grid.Row="6"
Grid.Column="3"
Height="30"
Margin="0,0,20,0"
Hotkey="{Binding Path=SendCmd, Mode=TwoWay}"
Style="{StaticResource HotkeyBox_Setting}" />
<!-- CAM 3 -->
<!--<TextBlock Text="CAM 3" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="1"></TextBlock>
......
VIZ.FGOUT/VIZ.FGOUT.Module/SystemSetting/ViewModel/HotkeySettingPanelViewModel.cs
......@@ -255,6 +255,47 @@ namespace VIZ.FGOUT.Module
#endregion
#region Abandon快捷键
private string _abandonCmd;
/// <summary>
/// Abandon快捷键
/// </summary>
[HotkeyProperty]
public string AbandonCmd
{
get { return _abandonCmd; }
set
{
_abandonCmd = value;
this.RaisePropertyChanged(nameof(AbandonCmd));
this.CheckHotkey(nameof(AbandonCmd), value);
}
}
#endregion
#region Abandon快捷键
private string _sendCmd;
/// <summary>
/// Send快捷键
/// </summary>
[HotkeyProperty]
public string SendCmd
{
get { return _sendCmd; }
set
{
_sendCmd = value;
this.RaisePropertyChanged(nameof(SendCmd));
this.CheckHotkey(nameof(SendCmd), value);
}
}
#endregion
#region 清除选区快捷键
private string _cleanInPointCmd;
......@@ -309,6 +350,8 @@ namespace VIZ.FGOUT.Module
this.ReplayStopCmd = this.HotkeyConfig.ReplayStop;
this.ReplayStartCmd = this.HotkeyConfig.ReplayStart;
this.CleanInPointCmd = this.HotkeyConfig.CleanInPoint;
this.AbandonCmd = this.HotkeyConfig.Abandon;
this.SendCmd = this.HotkeyConfig.Send;
}
#endregion
......@@ -355,6 +398,12 @@ namespace VIZ.FGOUT.Module
if (this.CleanInPointCmd != this.HotkeyConfig.CleanInPoint)
return true;
if(this.AbandonCmd != this.HotkeyConfig.Abandon)
return true;
if(this.SendCmd != this.HotkeyConfig.Send)
return true;
//// 算法裁切
//if (this.AutoCAM1 != this.HotkeyConfig.AutoCAM1)
// return true;
......@@ -423,6 +472,8 @@ namespace VIZ.FGOUT.Module
this.HotkeyConfig.ReplayStart = ReplayStartCmd;
this.HotkeyConfig.ReplayStop = ReplayStopCmd;
this.HotkeyConfig.CleanInPoint = CleanInPointCmd;
this.HotkeyConfig.Abandon = AbandonCmd;
this.HotkeyConfig.Send = SendCmd;
// 更新配置
ApplicationDomainEx.LiteDbContext.HotkeyConfig.Upsert(this.HotkeyConfig);
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "AFE42B99853E26767984F713CB7D706EAB707EF8F96350441DAC6E57FB1787D7"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "126F1AF2ECAD94E5253CE99CBFDC9A46E91FBE7FAF4EFD597C8C99033B333D71"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1266 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1284 "..\..\..\..\..\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 1435 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1469 "..\..\..\..\..\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 1450 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1484 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3;
......
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}" "AFE42B99853E26767984F713CB7D706EAB707EF8F96350441DAC6E57FB1787D7"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "126F1AF2ECAD94E5253CE99CBFDC9A46E91FBE7FAF4EFD597C8C99033B333D71"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1266 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1284 "..\..\..\..\..\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 1435 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1469 "..\..\..\..\..\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 1450 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1484 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3;
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDISettingView/View/NDISettingView.g.cs
#pragma checksum "..\..\..\..\..\NDISettingView\View\NDISettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "2E818EF314B3BF02DAF996686C3EC039C5C3EB1611913293C92C6A2B43FE0425"
#pragma checksum "..\..\..\..\..\NDISettingView\View\NDISettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "73469FFA974139AFC12C541768EF8867F11126E859B99308408A3C3E99E96EA9"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -50,15 +50,15 @@ namespace VIZ.FGOUT.Module {
#line 62 "..\..\..\..\..\NDISettingView\View\NDISettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbNDI;
internal System.Windows.Controls.RadioButton rbAlgorithm;
#line default
#line hidden
#line 71 "..\..\..\..\..\NDISettingView\View\NDISettingView.xaml"
#line 72 "..\..\..\..\..\NDISettingView\View\NDISettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbAlgorithm;
internal System.Windows.Controls.RadioButton rbNDI;
#line default
#line hidden
......@@ -94,10 +94,10 @@ namespace VIZ.FGOUT.Module {
switch (connectionId)
{
case 1:
this.rbNDI = ((System.Windows.Controls.RadioButton)(target));
this.rbAlgorithm = ((System.Windows.Controls.RadioButton)(target));
return;
case 2:
this.rbAlgorithm = ((System.Windows.Controls.RadioButton)(target));
this.rbNDI = ((System.Windows.Controls.RadioButton)(target));
return;
}
this._contentLoaded = true;
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDISettingView/View/NDISettingView.g.i.cs
#pragma checksum "..\..\..\..\..\NDISettingView\View\NDISettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "2E818EF314B3BF02DAF996686C3EC039C5C3EB1611913293C92C6A2B43FE0425"
#pragma checksum "..\..\..\..\..\NDISettingView\View\NDISettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "73469FFA974139AFC12C541768EF8867F11126E859B99308408A3C3E99E96EA9"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -50,15 +50,15 @@ namespace VIZ.FGOUT.Module {
#line 62 "..\..\..\..\..\NDISettingView\View\NDISettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbNDI;
internal System.Windows.Controls.RadioButton rbAlgorithm;
#line default
#line hidden
#line 71 "..\..\..\..\..\NDISettingView\View\NDISettingView.xaml"
#line 72 "..\..\..\..\..\NDISettingView\View\NDISettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbAlgorithm;
internal System.Windows.Controls.RadioButton rbNDI;
#line default
#line hidden
......@@ -94,10 +94,10 @@ namespace VIZ.FGOUT.Module {
switch (connectionId)
{
case 1:
this.rbNDI = ((System.Windows.Controls.RadioButton)(target));
this.rbAlgorithm = ((System.Windows.Controls.RadioButton)(target));
return;
case 2:
this.rbAlgorithm = ((System.Windows.Controls.RadioButton)(target));
this.rbNDI = ((System.Windows.Controls.RadioButton)(target));
return;
}
this._contentLoaded = true;
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/SystemSetting/View/HotkeySettingPanelView.g.cs
#pragma checksum "..\..\..\..\..\SystemSetting\View\HotkeySettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0CFCB23CA897688F867B8297EEAE171B14537344F2603CC59CF2940578B4D461"
#pragma checksum "..\..\..\..\..\SystemSetting\View\HotkeySettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F9D23A9A540816FB3B4B874A6BBC7272C616AF5F4E1823CCBC43886AD8725573"
//------------------------------------------------------------------------------
// <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}" "0CFCB23CA897688F867B8297EEAE171B14537344F2603CC59CF2940578B4D461"
#pragma checksum "..\..\..\..\..\SystemSetting\View\HotkeySettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F9D23A9A540816FB3B4B874A6BBC7272C616AF5F4E1823CCBC43886AD8725573"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......
VIZ.FGOUT/VIZ.FGOUT.Storage/LiteDB/System/HotkeyConfig.cs
......@@ -58,5 +58,9 @@
public string ReplayStop { get; set; } = "L";
public string CleanInPoint { get; set; } = "J";
public string Abandon { get; set; } = "P";
public string Send { get; set; } = "M";
}
}
VIZ.Framework/VIZ.Framework.Common.Resource/obj/x64/Release/VIZ.Framework.Common.Resource_MarkupCompile.cache
......@@ -10,10 +10,10 @@ none
false
TRACE
9-721875057
91711917753
3-630027162
19468308608
3-1719726047
20-2028247964
Path\ArrowPathResource.xaml;Style\Button\Button_MessageBox.xaml;Style\Button\Button_Normal.xaml;Style\Button\Button_WindowTop.xaml;Style\GridSplitter\GridSplitter_None.xaml;Style\ListBox\ListBox_None.xaml;Style\ScrollView\ScrollView_Default.xaml;Style\TextBox\TextBox_None.xaml;Themes\Generic.xaml;
False
......
VIZ.Framework/VIZ.Framework.Common/obj/x64/Release/GeneratedInternalTypeHelper.g.cs
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
// 运行时版本:4.0.30319.42000
//
// 对此文件的更改可能会导致不正确的行为，并且如果
// 重新生成代码，这些更改将会丢失。
// </auto-generated>
//------------------------------------------------------------------------------
namespace XamlGeneratedNamespace {
/// <summary>
/// GeneratedInternalTypeHelper
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
/// <summary>
/// CreateInstance
/// </summary>
protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic)
| (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
}
/// <summary>
/// GetPropertyValue
/// </summary>
protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
}
/// <summary>
/// SetPropertyValue
/// </summary>
protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
}
/// <summary>
/// CreateDelegate
/// </summary>
protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod
| (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
delegateType,
handler}, null)));
}
/// <summary>
/// AddEventHandler
/// </summary>
protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
eventInfo.AddEventHandler(target, handler);
}
}
}

VIZ.Framework/VIZ.Framework.Common/obj/x64/Release/VIZ.Framework.Common_MarkupCompile.cache
......@@ -10,11 +10,11 @@ none
false
TRACE
15-721109437
15488264905
121-1133520871
150-762123096
1212046750213
150-875198046
MessageBox\MessageBoxEx.xaml;MessageBox\MessageBoxExWindow.xaml;Themes\Generic.xaml;VideoControl\Control\VideoControl.xaml;Widgets\ColorPickButton\ColorPickButton.xaml;Widgets\ColorPickButton\ColorPickWindow.xaml;Widgets\GPIOPinTestControl\GPIOPinTestControl.xaml;Widgets\HotkeyBox\HotkeyBox.xaml;Widgets\IconButton\IconButton.xaml;Widgets\LabelValue\LabelValue.xaml;Widgets\NavigationControl\NavigationControl.xaml;Widgets\ResizeImageControl\ResizeImageControl.xaml;Widgets\ShowMessageControl\ShowMessageControl.xaml;Widgets\VideoTimeBar\VideoTimeBar.xaml;Widgets\ViewLoader\ViewLoader.xaml;
True
False
VIZ.Framework/VIZ.Framework.Module/obj/x64/Release/VIZ.Framework.Module_MarkupCompile.cache
......@@ -10,11 +10,11 @@ none
false
TRACE
1-731644535
11882902973
212002329545
25-1969161261
212023628146
26917618797
Themes\Generic.xaml;
True
False
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