Skip to content

F
FGOUT
Commit 95a506a0 by 马宁-艾果
Options

CAM_2设置只显示视频流选项 And 启动算法参数添加game_name

parent e6c3339e
Showing with 138 additions and 42 deletions
VIZ.FGOUT/VIZ.FGOUT.Common/obj/x64/Debug/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.FGOUT/VIZ.FGOUT.Common/obj/x64/Debug/VIZ.FGOUT.Common_MarkupCompile.cache
......@@ -10,11 +10,11 @@ none
false
21870986562
2-725104376
31364711570
17-1683084370
3947974750
17-1462717611
Themes\Generic.xaml;Widgets\FootballFieldPanel\FootballFieldPanel.xaml;
False
True
VIZ.FGOUT/VIZ.FGOUT.Module/NDISettingView/View/NDISettingPanelView.xaml
......@@ -131,19 +131,21 @@
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>-->
<!--<StackPanel Grid.Row="2" Grid.RowSpan="4">-->
<TextBlock
Grid.Row="2"
VerticalAlignment="Center"
FontSize="18"
Foreground="White"
Text="赛事" />
Text="赛事"
Visibility="{Binding IsCam1Visibility, Mode=TwoWay}" />
<!--<ComboBox
Grid.Row="5"
Width="510"
Height="40"
ItemsSource="{Binding Path=MatchTypes, Mode=OneWay}"
SelectedValue="{Binding Path=SelectedMatchType, Mode=TwoWay}"
Style="{StaticResource ComboBoxStyle}" />-->
Grid.Row="5"
Width="510"
Height="40"
ItemsSource="{Binding Path=MatchTypes, Mode=OneWay}"
SelectedValue="{Binding Path=SelectedMatchType, Mode=TwoWay}"
Style="{StaticResource ComboBoxStyle}" />-->
<ComboBox
x:Name="_Sports_"
Grid.Row="3"
......@@ -151,7 +153,8 @@
Height="40"
Margin="0,10,0,10"
SelectedValue="{Binding PresetsItem, Mode=TwoWay}"
Style="{StaticResource ComboBoxStyle}">
Style="{StaticResource ComboBoxStyle}"
Visibility="{Binding IsCam1Visibility, Mode=TwoWay}">
<b:Interaction.Triggers>
<b:EventTrigger EventName="SelectionChanged">
<b:InvokeCommandAction Command="{Binding PresetsSelectionChangedCommand}" />
......@@ -161,7 +164,8 @@
<TabControl
Grid.Row="4"
Grid.RowSpan="2"
Background="Transparent">
Background="Transparent"
Visibility="{Binding IsCam1Visibility, Mode=TwoWay}">
<TabItem
Background="{StaticResource ButtonMouseoverBackground}"
FontSize="18"
......@@ -378,13 +382,13 @@
Style="{StaticResource TextBoxStyle}"
Text="{Binding MovementOnlyYPosition, Mode=TwoWay}" />
<!--<Button
Grid.Row="9"
Grid.Column="3"
Width="60"
HorizontalAlignment="Center"
Command="{Binding Path=SaveCommand}"
Content="Save"
Style="{StaticResource ButtonStyle}" />-->
Grid.Row="9"
Grid.Column="3"
Width="60"
HorizontalAlignment="Center"
Command="{Binding Path=SaveCommand}"
Content="Save"
Style="{StaticResource ButtonStyle}" />-->
</Grid>
</TabItem>
<TabItem
......@@ -463,6 +467,7 @@
</Grid>
</TabItem>
</TabControl>
<!--</StackPanel>-->
</Grid>
</Border>
</UserControl>
VIZ.FGOUT/VIZ.FGOUT.Module/NDISettingView/ViewModel/NDISettingPanelViewModel.cs
......@@ -3,6 +3,7 @@ using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Windows;
using System.Windows.Data;
using VIZ.FGOUT.Connection;
using VIZ.FGOUT.Connection.UDP.Clip.Signal.Send;
......@@ -227,6 +228,11 @@ namespace VIZ.FGOUT.Module
NDISettingView settingView = WPFHelper.GetAncestorByType<NDISettingView>(this.GetView<System.Windows.FrameworkElement>());
NDISettingViewModel vm = settingView.DataContext as NDISettingViewModel;
this.ViewKey = vm.ViewKey;
if (this.ViewKey.Equals(NDIViewKeys.CAM_2))
IsCam1Visibility = Visibility.Hidden;
else if(this.ViewKey.Equals(NDIViewKeys.CAM_1))
IsCam1Visibility = Visibility.Visible;
this.ViewConfig = vm.ViewConfig;
if(this.ViewConfig==null)
......@@ -246,6 +252,18 @@ namespace VIZ.FGOUT.Module
this.LoadNdiDelayInfo();
}
private Visibility _isCam1Visibility = Visibility.Visible;
/// <summary>
/// 是Cam1就显示
/// </summary>
public Visibility IsCam1Visibility
{
get { return _isCam1Visibility; }
set { _isCam1Visibility = value; this.RaisePropertyChanged(nameof(IsCam1Visibility)); }
}
/// <summary>
/// 加载NDI流信息
/// </summary>
......@@ -331,9 +349,7 @@ namespace VIZ.FGOUT.Module
/// <returns>是否需要保存</returns>
public bool IsNeedSave()
{
string streamName = this.SelectedNDIStreamInfo == null ? string.Empty : this.SelectedNDIStreamInfo.FullName;
string streamName = this.SelectedNDIStreamInfo == null ? string.Empty : this.SelectedNDIStreamInfo.FullName;
// int delay = this.SelectedNDIDelayInfo == null ? 0 : this.SelectedNDIDelayInfo.Value;
//if (this.NdiDispalyName != this.ViewConfig.DisplayName)
......@@ -374,6 +390,9 @@ namespace VIZ.FGOUT.Module
if (streamName != (this.ViewConfig.StreamName ?? string.Empty))
return true;
//if (PresetsItem != null)
// return true;
return false;
}
......@@ -394,15 +413,18 @@ namespace VIZ.FGOUT.Module
this.ViewConfig.StreamName = streamName;
// this.ViewConfig.DelayFrame = delay;
// this.ViewConfig.IsSendToCrop = this.IsSendToCrop;
var gameCode = "";
if (PresetsItem != null)
{
gameCode = GetDicKey(PresetsItem);
//发送UE预设数据
PresetSave();
//发送算法参数
SendAlgorithmParameters();
}
this.ViewConfig.GameName = gameCode;
ApplicationDomainEx.LiteDbContext.ViewConfig.Upsert(this.ViewConfig);
//发送UE预设数据
PresetSave();
//发送算法参数
SendAlgorithmParameters();
return true;
}
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/Controller/Algorithm/AlgorithmControllerBase.cs
......@@ -396,12 +396,15 @@ namespace VIZ.FGOUT.Module
// GPU设备号
int device = this.Support.ViewConfig.GPU;
string game_name = this.Support.ViewConfig.GameName;
Dictionary<string, string> args = new Dictionary<string, string>();
args["--port"] = $"{port}"; // 端口
args["--ndi_name"] = $"{ndi_name}"; // NDI流名称
args["--id"] = $"{id}"; // 窗口ID
args["--device"] = $"{device}"; // GPU设备ID
args["--vis_port"] = $"{CLIENT_PORT}"; // 软件端口
args["--game_name"] = $"{game_name}"; // 项目Code
/* ============================================================================= */
/* === 目前暂时只有"单人机位"拥有裁切窗口过滤参数 === */
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDISettingView/View/NDISettingPanelView.g.cs
#pragma checksum "..\..\..\..\..\NDISettingView\View\NDISettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "5E5710EFD7426F21C0A7995A42A757F5EC04A0951D00D9CA20FF24AB1491EE4F"
#pragma checksum "..\..\..\..\..\NDISettingView\View\NDISettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "4D595C38494AFCEB4D804C8DF75A6C84207955539EEA59714C8DDB9AB01A8C1E"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -63,7 +63,7 @@ namespace VIZ.FGOUT.Module {
public partial class NDISettingPanelView : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
#line 148 "..\..\..\..\..\NDISettingView\View\NDISettingPanelView.xaml"
#line 150 "..\..\..\..\..\NDISettingView\View\NDISettingPanelView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ComboBox _Sports_;
......@@ -71,7 +71,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 226 "..\..\..\..\..\NDISettingView\View\NDISettingPanelView.xaml"
#line 230 "..\..\..\..\..\NDISettingView\View\NDISettingPanelView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Primitives.ToggleButton EnableSpline;
......@@ -79,7 +79,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 346 "..\..\..\..\..\NDISettingView\View\NDISettingPanelView.xaml"
#line 350 "..\..\..\..\..\NDISettingView\View\NDISettingPanelView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Primitives.ToggleButton MovementOnlyX;
......@@ -87,7 +87,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 369 "..\..\..\..\..\NDISettingView\View\NDISettingPanelView.xaml"
#line 373 "..\..\..\..\..\NDISettingView\View\NDISettingPanelView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Primitives.ToggleButton MovementOnlyY;
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDISettingView/View/NDISettingPanelView.g.i.cs
#pragma checksum "..\..\..\..\..\NDISettingView\View\NDISettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "5E5710EFD7426F21C0A7995A42A757F5EC04A0951D00D9CA20FF24AB1491EE4F"
#pragma checksum "..\..\..\..\..\NDISettingView\View\NDISettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "4D595C38494AFCEB4D804C8DF75A6C84207955539EEA59714C8DDB9AB01A8C1E"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -63,7 +63,7 @@ namespace VIZ.FGOUT.Module {
public partial class NDISettingPanelView : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
#line 148 "..\..\..\..\..\NDISettingView\View\NDISettingPanelView.xaml"
#line 150 "..\..\..\..\..\NDISettingView\View\NDISettingPanelView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ComboBox _Sports_;
......@@ -71,7 +71,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 226 "..\..\..\..\..\NDISettingView\View\NDISettingPanelView.xaml"
#line 230 "..\..\..\..\..\NDISettingView\View\NDISettingPanelView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Primitives.ToggleButton EnableSpline;
......@@ -79,7 +79,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 346 "..\..\..\..\..\NDISettingView\View\NDISettingPanelView.xaml"
#line 350 "..\..\..\..\..\NDISettingView\View\NDISettingPanelView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Primitives.ToggleButton MovementOnlyX;
......@@ -87,7 +87,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 369 "..\..\..\..\..\NDISettingView\View\NDISettingPanelView.xaml"
#line 373 "..\..\..\..\..\NDISettingView\View\NDISettingPanelView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Primitives.ToggleButton MovementOnlyY;
......
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/NdiView/NdiViewConfig.cs
......@@ -61,5 +61,11 @@
/// 裁切模式
/// </summary>
public AlgorithmStrategyMode StrategyMode { get; set; } = AlgorithmStrategyMode.auto_mode;
/// <summary>
/// 体育项目的缩写代码（用于赛事编号）
/// </summary>
public string GameName { get; set; }
}
}
VIZ.FGOUT/VIZ.FGOUT/bin/x64/Debug/Logs/err.log
This source diff could not be displayed because it is too large. You can view the blob instead.
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