Skip to content

F
FGOUT
Commit b6de3863 by 鲁志-悦动
Options

NDISetting算法参数加一个big_model的CheckBox And CAM_2边框设置为Red红色

parent 86b4132a
Showing with 47 additions and 79 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 ...@@ -10,11 +10,11 @@ none
false false
2-725104376 21870986562
3947974750 31364711570
17-1462717611 17-1683084370
Themes\Generic.xaml;Widgets\FootballFieldPanel\FootballFieldPanel.xaml; Themes\Generic.xaml;Widgets\FootballFieldPanel\FootballFieldPanel.xaml;
True False
VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Algorithm/Signal/Send/AlgorithmPackage_Figout_sports_model.cs
...@@ -57,5 +57,7 @@ namespace VIZ.FGOUT.Connection ...@@ -57,5 +57,7 @@ namespace VIZ.FGOUT.Connection
/// 落地后帧间隔 /// 落地后帧间隔
/// </summary> /// </summary>
public int Landing_frame_interval { get; set; } = 7; public int Landing_frame_interval { get; set; } = 7;
public bool Is_Big_Model { get; set; } = false;
} }
} }
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/obj/x64/Debug/VIZ.FGOUT.Module.Resource_MarkupCompile.cache
...@@ -10,11 +10,11 @@ none ...@@ -10,11 +10,11 @@ none
false false
DEBUG;TRACE DEBUG;TRACE
18560433975 181380438361
1470602451 1-1441241311
11-350624472 11-1602666439
24-1321085892 23-2035776870
Style\Button\Button_NdiView.xaml;Style\Button\Button_Setting.xaml;Style\Button\Button_WindowTop.xaml;Style\CheckBox\CheckBox_NdiView.xaml;Style\CheckBox\CheckBox_Setting.xaml;Style\CheckBox\CheckBox_WindowTop.xaml;Style\ComboBox\ComboBox_Setting.xaml;Style\HotkeyBox\HotkeyBox_Setting.xaml;Style\MessageBox\MessageBoxEx.xaml;Style\RadioButton\RadioButton_FootballSide.xaml;Style\RadioButton\RadioButton_NdiView.xaml;Style\RadioButton\RadioButton_Setting.xaml;Style\Slider\Slider_Setting.xaml;Style\TextBlock\TextBlock_Setting.xaml;Style\TextBox\TextBox_Setting.xaml;Style\ToogleButton\ToogleButton_Setting.xaml;Themes\Generic.xaml;Toolkit\NumericUpDown\NumericUpDown.xaml; Style\Button\Button_NdiView.xaml;Style\Button\Button_Setting.xaml;Style\Button\Button_WindowTop.xaml;Style\CheckBox\CheckBox_NdiView.xaml;Style\CheckBox\CheckBox_Setting.xaml;Style\CheckBox\CheckBox_WindowTop.xaml;Style\ComboBox\ComboBox_Setting.xaml;Style\HotkeyBox\HotkeyBox_Setting.xaml;Style\MessageBox\MessageBoxEx.xaml;Style\RadioButton\RadioButton_FootballSide.xaml;Style\RadioButton\RadioButton_NdiView.xaml;Style\RadioButton\RadioButton_Setting.xaml;Style\Slider\Slider_Setting.xaml;Style\TextBlock\TextBlock_Setting.xaml;Style\TextBox\TextBox_Setting.xaml;Style\ToogleButton\ToogleButton_Setting.xaml;Themes\Generic.xaml;Toolkit\NumericUpDown\NumericUpDown.xaml;
False True
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml
...@@ -1016,7 +1016,7 @@ ...@@ -1016,7 +1016,7 @@
IsCam2="True" IsCam2="True"
MouseLeftButtonDown="cam2_MouseLeftButtonDown" MouseLeftButtonDown="cam2_MouseLeftButtonDown"
NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_2}" NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_2}"
VideoBorderBrush="#B85069" /> VideoBorderBrush="Red" />
</Grid> </Grid>
<!-- 底部 --> <!-- 底部 -->
<Border Grid.Row="2" Background="{StaticResource TitleBarBackground}"> <Border Grid.Row="2" Background="{StaticResource TitleBarBackground}">
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDISettingView/View/AlgorithmSettingPanelView.xaml
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<RowDefinition Height="60" /> <RowDefinition Height="60" />
<RowDefinition Height="60" /> <RowDefinition Height="60" />
<RowDefinition Height="3" /> <RowDefinition Height="3" />
<RowDefinition Height="240" /> <RowDefinition Height="300" />
<RowDefinition Height="3" /> <RowDefinition Height="3" />
<RowDefinition Height="60" /> <RowDefinition Height="60" />
<RowDefinition Height="*" /> <RowDefinition Height="*" />
...@@ -146,6 +146,7 @@ ...@@ -146,6 +146,7 @@
<RowDefinition Height="60" /> <RowDefinition Height="60" />
<RowDefinition Height="60" /> <RowDefinition Height="60" />
<RowDefinition Height="60" /> <RowDefinition Height="60" />
<RowDefinition Height="60" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition /> <ColumnDefinition />
...@@ -299,6 +300,16 @@ ...@@ -299,6 +300,16 @@
<local:TextBoxEnterKeyUpdateBehavior /> <local:TextBoxEnterKeyUpdateBehavior />
</b:Interaction.Behaviors> </b:Interaction.Behaviors>
</TextBox> </TextBox>
<CheckBox
Grid.Row="4"
Grid.Column="5"
Margin="14"
Content="big_model"
FontSize="16"
Foreground="White"
IsChecked="{Binding Path=IsBigModel, Mode=TwoWay}"
Style="{StaticResource CheckBox_Setting}" />
</Grid> </Grid>
<!-- 白线 --> <!-- 白线 -->
<Rectangle <Rectangle
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDISettingView/ViewModel/AlgorithmSettingPanelViewModel.cs
...@@ -561,6 +561,20 @@ namespace VIZ.FGOUT.Module ...@@ -561,6 +561,20 @@ namespace VIZ.FGOUT.Module
} }
} }
private bool _isBigModel;
/// <summary>
/// 是否是大模型
/// </summary>
public bool IsBigModel
{
get => _isBigModel;
set
{
_isBigModel = value;
this.RaisePropertyChanged(nameof(IsBigModel));
}
}
//要存库的算法数据 //要存库的算法数据
private string _algorithmMessage = ""; private string _algorithmMessage = "";
private void SendAlgorithmParameters() private void SendAlgorithmParameters()
...@@ -583,7 +597,8 @@ namespace VIZ.FGOUT.Module ...@@ -583,7 +597,8 @@ namespace VIZ.FGOUT.Module
Pad_det_x = Pad_det_x, Pad_det_x = Pad_det_x,
Pad_det_y = Pad_det_y, Pad_det_y = Pad_det_y,
Pad_det_square = Pad_det_square, Pad_det_square = Pad_det_square,
Scale = AScale Scale = AScale,
Is_Big_Model = IsBigModel
}; };
_algorithmMessage = package == null ? string.Empty : JsonConvert.SerializeObject(package, JSON_SERIALIZER_SETTINGS); _algorithmMessage = package == null ? string.Empty : JsonConvert.SerializeObject(package, JSON_SERIALIZER_SETTINGS);
...@@ -720,6 +735,7 @@ namespace VIZ.FGOUT.Module ...@@ -720,6 +735,7 @@ namespace VIZ.FGOUT.Module
Pad_det_y = alPackage.Pad_det_y; Pad_det_y = alPackage.Pad_det_y;
Pad_det_square = alPackage.Pad_det_square; Pad_det_square = alPackage.Pad_det_square;
AScale = alPackage.Scale; AScale = alPackage.Scale;
IsBigModel = alPackage.Is_Big_Model;
} }
#region 预设属性 #region 预设属性
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDISettingView/View/AlgorithmSettingPanelView.g.cs
#pragma checksum "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F3D77DCC999A7CE3BA30909979FF28ADB008D784B65262B99895B228859F459C" #pragma checksum "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F19EA6F5F1FB80AFB0D5E5F094B32D142B11D3339C6D2987D25E6FAB7F9F9026"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <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}" "F3D77DCC999A7CE3BA30909979FF28ADB008D784B65262B99895B228859F459C" #pragma checksum "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F19EA6F5F1FB80AFB0D5E5F094B32D142B11D3339C6D2987D25E6FAB7F9F9026"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
......
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\NDIMainView\View\NDIMainView.xaml;;
FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIPreviewView\View\NDIPreviewView.xaml;; FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIPreviewView\View\NDIPreviewView.xaml;;
......
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.
VIZ.FGOUT/VIZ.FGOUT/bin/x64/Debug/Logs/info.log
2024-01-26 14:51:05,234 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"SportsCode":"HB","Maintain_matting_n":20,"Matting_interval":7,"Moving_pixel":0,"Extend_frame":0,"Pad_det_x":400,"Pad_det_y":400,"Pad_det_square":500,"Scale":1.6,"Landing_frame_interval":7} 2024-01-29 18:49:34,130 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"SportsCode":"HB","Maintain_matting_n":20,"Matting_interval":7,"Moving_pixel":0,"Extend_frame":0,"Pad_det_x":400,"Pad_det_y":400,"Pad_det_square":500,"Scale":1.6,"Landing_frame_interval":7,"Is_Big_Model":true}
2024-01-26 15:04:28,726 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"SportsCode":"HB","Maintain_matting_n":20,"Matting_interval":7,"Moving_pixel":0,"Extend_frame":0,"Pad_det_x":400,"Pad_det_y":400,"Pad_det_square":500,"Scale":1.6,"Landing_frame_interval":7} 2024-01-29 18:50:06,923 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"SportsCode":"HB","Maintain_matting_n":20,"Matting_interval":7,"Moving_pixel":0,"Extend_frame":0,"Pad_det_x":400,"Pad_det_y":400,"Pad_det_square":500,"Scale":1.6,"Landing_frame_interval":7,"Is_Big_Model":false}
2024-01-26 15:08:58,088 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"SportsCode":"HB","Maintain_matting_n":20,"Matting_interval":7,"Moving_pixel":0,"Extend_frame":0,"Pad_det_x":400,"Pad_det_y":400,"Pad_det_square":500,"Scale":1.6,"Landing_frame_interval":7}
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