Skip to content

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

音视频参数

parent 7b6c36b6
Showing with 365 additions and 38 deletions
VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Clip/Enum/ClipPackageSignal.cs
......@@ -31,5 +31,10 @@
/// 裁切
/// </summary>
public const string CUT = "CUT";
/// <summary>
/// 音视频参数
/// </summary>
public const string ClipParam = "ClipParam";
}
}
VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Clip/Signal/Send/ClipParameterPacakge.cs 0 → 100644
namespace VIZ.FGOUT.Connection
{
public class ClipParameterPacakge
{
/// <summary>
/// 类型
/// </summary>
public string type { get; set; }
/// <summary>
/// 动进
/// </summary>
public int dynamicin { get; set; }
/// <summary>
/// 动出
/// </summary>
public int dynamicout { get; set; }
/// <summary>
/// 静帧
/// </summary>
public int staticframe { get; set; }
}
}
VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Clip/Signal/Send/CutPackage.cs
using System.Windows;
namespace VIZ.FGOUT.Connection
namespace VIZ.FGOUT.Connection
{
public class CutPackage
{
......
VIZ.FGOUT/VIZ.FGOUT.Connection/VIZ.FGOUT.Connection.csproj
......@@ -110,6 +110,7 @@
<Compile Include="UDP\Clip\Signal\Recv\ClipRecvPackage__MaskMsg.cs" />
<Compile Include="UDP\Clip\Signal\Recv\ClipRecvPackage__ReplayResp.cs" />
<Compile Include="UDP\Clip\Signal\Send\ClipPackage__crop_roi.cs" />
<Compile Include="UDP\Clip\Signal\Send\ClipParameterPacakge.cs" />
<Compile Include="UDP\Clip\Signal\Send\CutPackage.cs" />
<Compile Include="UDP\Clip\Signal\Send\ReconfirmPackage.cs" />
<Compile Include="UDP\Clip\Signal\Send\ReplayPackage.cs" />
......
VIZ.FGOUT/VIZ.FGOUT.Connection/obj/x64/Debug/VIZ.FGOUT.Connection.csproj.CoreCompileInputs.cache
fdb17c9cbb423f79e69f8ee66f5a678e13d013d039a83615c37adfa96664664b
595d914fc2bedf510f39f19f90bb79e80b42fb6104e029ff4ab94b194d592105
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/Resources/StringResource.en.xaml
......@@ -76,4 +76,8 @@
<sys:String x:Key="PullBox">PullBox</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>
</ResourceDictionary>
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/Resources/StringResource.zh-cn.xaml
......@@ -75,4 +75,8 @@
<sys:String x:Key="PullBox">拖框</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>
</ResourceDictionary>
\ No newline at end of file
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml
......@@ -176,6 +176,7 @@
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>
<!--<GroupBox Foreground="White" Header="自动检测">
<CheckBox
......@@ -1083,7 +1084,7 @@
</GroupBox>
<!-- Replay -->
<Border
Grid.Row="4"
Grid.Row="5"
Grid.ColumnSpan="5"
BorderBrush="Gray"
BorderThickness="1">
......@@ -1141,9 +1142,96 @@
</Grid>
</Border>
<!-- 音视频参数 -->
<Border
Grid.Row="4"
Grid.Column="0"
Grid.ColumnSpan="5"
BorderBrush="Gray"
BorderThickness="1">
<Border.Resources>
<Style TargetType="TextBlock">
<Setter Property="HorizontalAlignment" Value="Right" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Foreground" Value="White" />
<Setter Property="FontSize" Value="14" />
<Setter Property="Margin" Value="0,0,6,0" />
</Style>
</Border.Resources>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="14"
Foreground="White"
Text="{DynamicResource ClipParameter}" />
<StackPanel
Grid.Column="1"
HorizontalAlignment="Center"
Orientation="Horizontal">
<TextBlock Text="{DynamicResource DynamicIn}" />
<TextBox
Width="57"
InputMethod.IsInputMethodEnabled="False"
Style="{StaticResource TextBoxStyle}"
Text="{Binding DynamicIn, Mode=TwoWay}">
<b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdateBehavior />
</b:Interaction.Behaviors>
</TextBox>
</StackPanel>
<StackPanel
Grid.Column="2"
HorizontalAlignment="Center"
Orientation="Horizontal">
<TextBlock Text="{DynamicResource DynamicOut}" />
<TextBox
Width="57"
InputMethod.IsInputMethodEnabled="False"
Style="{StaticResource TextBoxStyle}"
Text="{Binding DynamicOut, Mode=TwoWay}">
<b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdateBehavior />
</b:Interaction.Behaviors>
</TextBox>
</StackPanel>
<StackPanel
Grid.Column="3"
HorizontalAlignment="Center"
Orientation="Horizontal">
<TextBlock Text="{DynamicResource StaticFrame}" />
<TextBox
Width="57"
InputMethod.IsInputMethodEnabled="False"
Style="{StaticResource TextBoxStyle}"
Text="{Binding StaticFrame, Mode=TwoWay}">
<b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdateBehavior />
</b:Interaction.Behaviors>
</TextBox>
</StackPanel>
<Button
Grid.Column="4"
Width="100"
Height="40"
HorizontalAlignment="Center"
Command="{Binding Path=ClipParamCommand}"
Content="{DynamicResource Send}"
IsEnabled="{Binding SendEnable}"
Style="{StaticResource ButtonStyle}" />
</Grid>
</Border>
<!-- 裁切区域 -->
<Border
Grid.Row="5"
Grid.Row="6"
Grid.Column="0"
Grid.ColumnSpan="5"
BorderBrush="Gray"
......@@ -1193,7 +1281,7 @@
<!-- 系统版本 -->
<StackPanel
Grid.Row="5"
Grid.Row="6"
Grid.Column="4"
HorizontalAlignment="Right"
Orientation="Horizontal">
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
......@@ -227,8 +227,12 @@ namespace VIZ.FGOUT.Module
this.SendSelectedCommand = new VCommand(this.SendSelected);
this.NotCutCommand = new VCommand(this.NotCut);
//间隔帧率和间隔像素
this.IntervalPixelCommand = new VCommand(this.OnIntervalPixel);
this.IntervalFrameCommand = new VCommand(this.OnIntervalFrame);
//音视频参数
this.ClipParamCommand = new VCommand(this.SendClipParameters);
}
/// <summary>
......@@ -1400,7 +1404,8 @@ namespace VIZ.FGOUT.Module
replayModel.IsReplayStarted = true;
//自动模式下
if (isAutoEnable)
//if (isAutoEnable)
if (IsAutoEnable)
{
//发送抛弃命令
AutoAbandon();
......@@ -1762,6 +1767,67 @@ namespace VIZ.FGOUT.Module
#endregion
#region 音视频参数
public VCommand ClipParamCommand { get; set; }
private int _dynamicIn = 50;
/// <summary>
/// 动进
/// </summary>
public int DynamicIn
{
get => _dynamicIn;
set
{
_dynamicIn = value;
this.RaisePropertyChanged(nameof(DynamicIn));
}
}
private int _dynamicOut = 50;
/// <summary>
/// 动出
/// </summary>
public int DynamicOut
{
get => _dynamicOut;
set
{
_dynamicOut = value;
this.RaisePropertyChanged(nameof(DynamicOut));
}
}
private int _staticFrame = 50;
/// <summary>
/// 静帧
/// </summary>
public int StaticFrame
{
get => _staticFrame;
set
{
_staticFrame = value;
this.RaisePropertyChanged(nameof(StaticFrame));
}
}
/// <summary>
/// 发送音视频参数
/// </summary>
private void SendClipParameters()
{
// 发送UDP命令给音视频
var manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1__CLIP);
if (manager == null) return;
var package = new ClipParameterPacakge() { dynamicin = DynamicIn, dynamicout = DynamicOut, staticframe = StaticFrame, type = ClipPackageSignal.ClipParam };
manager.SendJson(package);
}
#endregion
#region Live
public VCommand LiveCommand { get; set; }
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDISettingView/View/AlgorithmSettingPanelView.xaml
......@@ -69,7 +69,7 @@
<RowDefinition Height="3" />
<RowDefinition Height="300" />
<RowDefinition Height="3" />
<RowDefinition Height="60" />
<RowDefinition Height="120" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<!-- 模块 -->
......@@ -364,6 +364,77 @@
Margin="0,0,10,0"
VerticalAlignment="Bottom"
Fill="White" />
<!-- 音视频参数 -->
<!--<Grid Grid.Row="5">
<Grid.RowDefinitions>
<RowDefinition Height="60" />
<RowDefinition Height="60" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1.5*" />
<ColumnDefinition />
<ColumnDefinition Width="1.8*" />
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Grid.Resources>
<Style TargetType="TextBlock">
<Setter Property="HorizontalAlignment" Value="Right" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Foreground" Value="White" />
<Setter Property="FontSize" Value="16" />
<Setter Property="Margin" Value="0,0,6,0" />
</Style>
</Grid.Resources>
<TextBlock
Grid.ColumnSpan="2"
HorizontalAlignment="Left"
VerticalAlignment="Center"
FontSize="18"
Text="{DynamicResource ClipParameter}" />
<TextBlock Grid.Row="1" Text="{DynamicResource DynamicIn}" />
<TextBox
Grid.Row="1"
Grid.Column="1"
InputMethod.IsInputMethodEnabled="False"
Style="{StaticResource TextBoxStyle}"
Text="{Binding DynamicIn, Mode=TwoWay}">
<b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdateBehavior />
</b:Interaction.Behaviors>
</TextBox>
<TextBlock
Grid.Row="1"
Grid.Column="2"
Text="{DynamicResource DynamicOut}" />
<TextBox
Grid.Row="1"
Grid.Column="3"
InputMethod.IsInputMethodEnabled="False"
Style="{StaticResource TextBoxStyle}"
Text="{Binding DynamicOut, Mode=TwoWay}">
<b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdateBehavior />
</b:Interaction.Behaviors>
</TextBox>
<TextBlock
Grid.Row="1"
Grid.Column="4"
Text="{DynamicResource StaticFrame}" />
<TextBox
Grid.Row="1"
Grid.Column="5"
InputMethod.IsInputMethodEnabled="False"
Style="{StaticResource TextBoxStyle}"
Text="{Binding StaticFrame, Mode=TwoWay}">
<b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdateBehavior />
</b:Interaction.Behaviors>
</TextBox>
</Grid>-->
<!-- UE预设 -->
<!--<TextBlock
Grid.Row="5"
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDISettingView/ViewModel/AlgorithmSettingPanelViewModel.cs
......@@ -430,6 +430,7 @@ namespace VIZ.FGOUT.Module
{
//发送UE预设数据
//PresetSave();
//发送算法参数
SendAlgorithmParameters();
......@@ -457,6 +458,9 @@ namespace VIZ.FGOUT.Module
//更新主页面Title体育项目名和位置标记
var updateTitleAndPositionMarkModel = new UpdateTitleAndPositionMarkModel();
ApplicationDomain.MessageManager.Send(updateTitleAndPositionMarkModel);
//发送音视频参数
//SendClipParameters();
}
return true;
}
......@@ -472,6 +476,65 @@ namespace VIZ.FGOUT.Module
}
}
#region 音视频参数
private int _dynamicIn = 50;
/// <summary>
/// 动进
/// </summary>
public int DynamicIn
{
get => _dynamicIn;
set
{
_dynamicIn = value;
this.RaisePropertyChanged(nameof(DynamicIn));
}
}
private int _dynamicOut = 50;
/// <summary>
/// 动出
/// </summary>
public int DynamicOut
{
get => _dynamicOut;
set
{
_dynamicOut = value;
this.RaisePropertyChanged(nameof(DynamicOut));
}
}
private int _staticFrame = 50;
/// <summary>
/// 静帧
/// </summary>
public int StaticFrame
{
get => _staticFrame;
set
{
_staticFrame = value;
this.RaisePropertyChanged(nameof(StaticFrame));
}
}
/// <summary>
/// 发送音视频参数
/// </summary>
private void SendClipParameters()
{
// 发送UDP命令给音视频
var manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1__CLIP);
if (manager == null) return;
var package = new ClipParameterPacakge() { dynamicin = DynamicIn, dynamicout = DynamicOut, staticframe = StaticFrame, type = ClipPackageSignal.ClipParam };
manager.SendJson(package);
}
#endregion
#region 算法参数
private int _maintain_matting_n = 2;
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "D45B66326BF707625E61F9AD8F8E4C04A17E261BE8152B30375E608CF2D4CC98"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "CA3474987DE5C2378E8DCAFFE7E33F7835A22236B583EF2C23FB90002406FF65"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 261 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 262 "..\..\..\..\..\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 324 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 325 "..\..\..\..\..\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 1470 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1558 "..\..\..\..\..\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 1655 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1743 "..\..\..\..\..\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 1670 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1758 "..\..\..\..\..\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 266 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 267 "..\..\..\..\..\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 328 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 329 "..\..\..\..\..\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 822 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 823 "..\..\..\..\..\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 975 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 976 "..\..\..\..\..\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 1012 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1013 "..\..\..\..\..\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 1040 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1041 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.i.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "D45B66326BF707625E61F9AD8F8E4C04A17E261BE8152B30375E608CF2D4CC98"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "CA3474987DE5C2378E8DCAFFE7E33F7835A22236B583EF2C23FB90002406FF65"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 261 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 262 "..\..\..\..\..\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 324 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 325 "..\..\..\..\..\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 1470 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1558 "..\..\..\..\..\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 1655 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1743 "..\..\..\..\..\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 1670 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1758 "..\..\..\..\..\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 266 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 267 "..\..\..\..\..\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 328 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 329 "..\..\..\..\..\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 822 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 823 "..\..\..\..\..\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 975 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 976 "..\..\..\..\..\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 1012 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1013 "..\..\..\..\..\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 1040 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1041 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDISettingView/View/AlgorithmSettingPanelView.g.cs
#pragma checksum "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "E437BA1CCDB3E2A2153A625D47BDDAC8500D8B9D681257C8706D91101487CE9B"
#pragma checksum "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "DC58084C355FA5A8F6C7F8C3931D87A676AAC99D63DAAEF5EB4B376142E0DF42"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDISettingView/View/AlgorithmSettingPanelView.g.i.cs
#pragma checksum "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "E437BA1CCDB3E2A2153A625D47BDDAC8500D8B9D681257C8706D91101487CE9B"
#pragma checksum "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "DC58084C355FA5A8F6C7F8C3931D87A676AAC99D63DAAEF5EB4B376142E0DF42"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......
VIZ.FGOUT/VIZ.FGOUT/Properties/AssemblyInfo.cs
......@@ -55,5 +55,5 @@ using System.Windows;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.22.0")]
[assembly: AssemblyFileVersion("1.0.22.0")]
[assembly: AssemblyVersion("1.0.23.0")]
[assembly: AssemblyFileVersion("1.0.23.0")]
VIZ.FGOUT/VIZ.FGOUT/bin/x64/Debug/config/config.ini
......@@ -86,7 +86,7 @@ UDP_UESETTING_PORT=8888
;UDP算法端口
UDP_Algorithm_PORT=8001
;UDP音视频流IP, 如果该值不配置，那么会从流中获取
UDP_Stream_IP=192.168.31.83
;UDP_Stream_IP=192.168.31.83
; ============================================================
; === Algorithm ===
; ============================================================
......
VIZ.Framework/VIZ.Framework.Core/Core/WPF/VCommand.cs
......@@ -106,6 +106,7 @@ namespace VIZ.Framework.Core
catch (Exception ex)
{
log.Error(ex);
//return;
}
}
......
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