Skip to content

F
FGOUT
Commit 6c801caa by 鲁志-悦动
Options

跳水Replay接收算法入点即最高点

parent 8c4605ac
Showing with 311 additions and 44 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
21870986562 2-725104376
31364711570 3947974750
17-1683084370 17-1462717611
Themes\Generic.xaml;Widgets\FootballFieldPanel\FootballFieldPanel.xaml; Themes\Generic.xaml;Widgets\FootballFieldPanel\FootballFieldPanel.xaml;
False True
VIZ.FGOUT/VIZ.FGOUT.Common/obj/x64/Debug/VIZ.FGOUT.Common_MarkupCompile.lref
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\obj\x64\Debug\GeneratedInternalTypeHelper.g.cs 
FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\Themes\Generic.xaml;; FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\Themes\Generic.xaml;;
FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\Widgets\FootballFieldPanel\FootballFieldPanel.xaml;; FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\Widgets\FootballFieldPanel\FootballFieldPanel.xaml;;
......
VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Algorithm/AlgorithmPackageProvider.cs
...@@ -32,10 +32,12 @@ namespace VIZ.FGOUT.Connection ...@@ -32,10 +32,12 @@ namespace VIZ.FGOUT.Connection
this.providers.Add(new AlgorithmProvider__detect()); this.providers.Add(new AlgorithmProvider__detect());
// 算法落盘 // 算法落盘
this.providers.Add(new AlgorithmProvider__start_end()); this.providers.Add(new AlgorithmProvider__start_end());
//通知UI界面贴图状态 // 通知UI界面贴图状态
this.providers.Add(new ClipProvider__MaskMsg()); this.providers.Add(new ClipProvider__MaskMsg());
//回复UI界面Replay结果 // 回复UI界面Replay结果
this.providers.Add(new ClipProvider__ReplayResp()); this.providers.Add(new ClipProvider__ReplayResp());
// 入点时间戳
this.providers.Add(new AlgorithmProvider__in_point_time_code());
} }
/// <summary> /// <summary>
......
VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Algorithm/Enum/AlgorithmPackageSignal.cs
...@@ -9,6 +9,11 @@ ...@@ -9,6 +9,11 @@
// 接收 // 接收
/// <summary> /// <summary>
/// 入点时间戳
/// </summary>
public const string in_point_time_code = "in_point_time_code";
/// <summary>
/// 算法初始化完成 /// 算法初始化完成
/// </summary> /// </summary>
public const string checked_ok = "checked_ok"; public const string checked_ok = "checked_ok";
......
VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Algorithm/Provider/AlgorithmProvider__in_point_time_code.cs 0 → 100644
using VIZ.FGOUT.Domain;
using VIZ.Framework.Connection;
using VIZ.Framework.Domain;
namespace VIZ.FGOUT.Connection
{
public class AlgorithmProvider__in_point_time_code : IAlgorithmPackageProvider
{
/// <summary>
/// 信号
/// <see cref="AlgorithmPackageSignal"/>
/// </summary>
public string Signal { get; } = AlgorithmPackageSignal.in_point_time_code;
/// <summary>
/// 执行
/// </summary>
/// <param name="info">信息</param>
public void Execute(ConnSingleJsonInfo info)
{
var package = Newtonsoft.Json.JsonConvert.DeserializeObject<AlgorithmRecvPackage__in_point_time_code>(info.Json);
var message = new AlgorithmMessage__in_point_time_code();
message.timecode = package.timecode;
ApplicationDomain.MessageManager.Send(message);
}
}
}
VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Algorithm/Signal/Recv/AlgorithmRecvPackage__in_point_time_code.cs 0 → 100644
namespace VIZ.FGOUT.Connection
{
public class AlgorithmRecvPackage__in_point_time_code : AlgorithmPackageBase
{
/// <summary>
/// 信号
/// <see cref="AlgorithmPackageSignal"/>
/// </summary>
public override string signal { get; set; } = AlgorithmPackageSignal.in_point_time_code;
/// <summary>
/// timecode
/// </summary>
public long timecode { get; set; }
}
}
VIZ.FGOUT/VIZ.FGOUT.Connection/VIZ.FGOUT.Connection.csproj
...@@ -82,12 +82,14 @@ ...@@ -82,12 +82,14 @@
<Compile Include="UDP\Algorithm\Provider\AlgorithmProvider__checked_ok.cs" /> <Compile Include="UDP\Algorithm\Provider\AlgorithmProvider__checked_ok.cs" />
<Compile Include="UDP\Algorithm\Provider\AlgorithmProvider__crop_roi..cs" /> <Compile Include="UDP\Algorithm\Provider\AlgorithmProvider__crop_roi..cs" />
<Compile Include="UDP\Algorithm\Provider\AlgorithmProvider__detect.cs" /> <Compile Include="UDP\Algorithm\Provider\AlgorithmProvider__detect.cs" />
<Compile Include="UDP\Algorithm\Provider\AlgorithmProvider__in_point_time_code.cs" />
<Compile Include="UDP\Algorithm\Provider\AlgorithmProvider__start_end.cs" /> <Compile Include="UDP\Algorithm\Provider\AlgorithmProvider__start_end.cs" />
<Compile Include="UDP\Algorithm\Sender\AlgorithmSender.cs" /> <Compile Include="UDP\Algorithm\Sender\AlgorithmSender.cs" />
<Compile Include="UDP\Algorithm\Sender\AlgorithmSenderOption.cs" /> <Compile Include="UDP\Algorithm\Sender\AlgorithmSenderOption.cs" />
<Compile Include="UDP\Algorithm\Signal\Recv\AlgorithmRecvPackage__checked_ok.cs" /> <Compile Include="UDP\Algorithm\Signal\Recv\AlgorithmRecvPackage__checked_ok.cs" />
<Compile Include="UDP\Algorithm\Signal\Recv\AlgorithmRecvPackage__crop_roi.cs" /> <Compile Include="UDP\Algorithm\Signal\Recv\AlgorithmRecvPackage__crop_roi.cs" />
<Compile Include="UDP\Algorithm\Signal\Recv\AlgorithmRecvPackage__detect.cs" /> <Compile Include="UDP\Algorithm\Signal\Recv\AlgorithmRecvPackage__detect.cs" />
<Compile Include="UDP\Algorithm\Signal\Recv\AlgorithmRecvPackage__in_point_time_code.cs" />
<Compile Include="UDP\Algorithm\Signal\Recv\AlgorithmRecvPackage__start_end.cs" /> <Compile Include="UDP\Algorithm\Signal\Recv\AlgorithmRecvPackage__start_end.cs" />
<Compile Include="UDP\Algorithm\Signal\Send\AlgorithmPackage_Figout_sports_model.cs" /> <Compile Include="UDP\Algorithm\Signal\Send\AlgorithmPackage_Figout_sports_model.cs" />
<Compile Include="UDP\Algorithm\Signal\Send\AlgorithmPackage_Figout_new_model.cs" /> <Compile Include="UDP\Algorithm\Signal\Send\AlgorithmPackage_Figout_new_model.cs" />
......
VIZ.FGOUT/VIZ.FGOUT.Connection/obj/x64/Debug/VIZ.FGOUT.Connection.csproj.CoreCompileInputs.cache
595d914fc2bedf510f39f19f90bb79e80b42fb6104e029ff4ab94b194d592105 f74273f956b4e9838a0bc2a1acc019b98e31de587e4f3a947fc5214b993fad6f
VIZ.FGOUT/VIZ.FGOUT.Domain/Message/Algorithm/Implementation/AlgorithmMessage__in_point_time_code.cs 0 → 100644
namespace VIZ.FGOUT.Domain
{
public class AlgorithmMessage__in_point_time_code : AlgorithmMessageBase
{
/// <summary>
/// timecode
/// </summary>
public long timecode { get; set; }
}
}
VIZ.FGOUT/VIZ.FGOUT.Domain/Message/Setting/AlgorithmMessageInPointTimeCodeModel.cs 0 → 100644
namespace VIZ.FGOUT.Domain
{
public class AlgorithmMessageInPointTimeCodeModel
{
}
}
VIZ.FGOUT/VIZ.FGOUT.Domain/VIZ.FGOUT.Domain.csproj
...@@ -79,10 +79,12 @@ ...@@ -79,10 +79,12 @@
<Compile Include="Message\Algorithm\Implementation\AlgorithmMessage__checked_ok.cs" /> <Compile Include="Message\Algorithm\Implementation\AlgorithmMessage__checked_ok.cs" />
<Compile Include="Message\Algorithm\Implementation\AlgorithmMessage__crop_roi.cs" /> <Compile Include="Message\Algorithm\Implementation\AlgorithmMessage__crop_roi.cs" />
<Compile Include="Message\Algorithm\Implementation\AlgorithmMessage__detect.cs" /> <Compile Include="Message\Algorithm\Implementation\AlgorithmMessage__detect.cs" />
<Compile Include="Message\Algorithm\Implementation\AlgorithmMessage__in_point_time_code.cs" />
<Compile Include="Message\Algorithm\Implementation\AlgorithmMessage__start_end.cs" /> <Compile Include="Message\Algorithm\Implementation\AlgorithmMessage__start_end.cs" />
<Compile Include="Message\Algorithm\Interface\IAlgorithmMessage__roi.cs" /> <Compile Include="Message\Algorithm\Interface\IAlgorithmMessage__roi.cs" />
<Compile Include="Message\Clip\Implementation\ClipMessage__ReplayResp.cs" /> <Compile Include="Message\Clip\Implementation\ClipMessage__ReplayResp.cs" />
<Compile Include="Message\Clip\Implementation\ClipMessage__MaskMsg.cs" /> <Compile Include="Message\Clip\Implementation\ClipMessage__MaskMsg.cs" />
<Compile Include="Message\Setting\AlgorithmMessageInPointTimeCodeModel.cs" />
<Compile Include="Message\Setting\AutoSendModel.cs" /> <Compile Include="Message\Setting\AutoSendModel.cs" />
<Compile Include="Message\Setting\CleanInPointsModel.cs" /> <Compile Include="Message\Setting\CleanInPointsModel.cs" />
<Compile Include="Message\Setting\CleanPlaceModel.cs" /> <Compile Include="Message\Setting\CleanPlaceModel.cs" />
......
VIZ.FGOUT/VIZ.FGOUT.Domain/obj/x64/Debug/VIZ.FGOUT.Domain.csproj.CoreCompileInputs.cache
6dbbb496131483f6805b920d58656b9902d6ac9fddf9b32af7a01fa30efc73d7 be411a1d13757dd8127a5e9c5c6b14f3b756312cfe5e66ab937f67a80bcd9d56
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/Resources/StringResource.en.xaml
...@@ -59,6 +59,7 @@ ...@@ -59,6 +59,7 @@
<sys:String x:Key="IntervalPixel">IntPixel</sys:String> <sys:String x:Key="IntervalPixel">IntPixel</sys:String>
<sys:String x:Key="RemoveOutPointPixel">OutPixel</sys:String> <sys:String x:Key="RemoveOutPointPixel">OutPixel</sys:String>
<sys:String x:Key="KeepHighest">Highest</sys:String> <sys:String x:Key="KeepHighest">Highest</sys:String>
<sys:String x:Key="HighestInPoint">HighestAsI</sys:String>
<sys:String x:Key="DetectZoneX">Detect zone X</sys:String> <sys:String x:Key="DetectZoneX">Detect zone X</sys:String>
<sys:String x:Key="DetectZoneY">Detect zone Y</sys:String> <sys:String x:Key="DetectZoneY">Detect zone Y</sys:String>
<sys:String x:Key="TrackingZone">Tracking zone</sys:String> <sys:String x:Key="TrackingZone">Tracking zone</sys:String>
......
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/Resources/StringResource.zh-cn.xaml
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
<sys:String x:Key="IntervalPixel">间隔像素</sys:String> <sys:String x:Key="IntervalPixel">间隔像素</sys:String>
<sys:String x:Key="RemoveOutPointPixel">出点像素</sys:String> <sys:String x:Key="RemoveOutPointPixel">出点像素</sys:String>
<sys:String x:Key="KeepHighest">保留最高点</sys:String> <sys:String x:Key="KeepHighest">保留最高点</sys:String>
<sys:String x:Key="HighestInPoint">最高点为入点</sys:String>
<sys:String x:Key="DetectZoneX">检测区域X值</sys:String> <sys:String x:Key="DetectZoneX">检测区域X值</sys:String>
<sys:String x:Key="DetectZoneY">检测区域Y值</sys:String> <sys:String x:Key="DetectZoneY">检测区域Y值</sys:String>
<sys:String x:Key="TrackingZone">跟踪区域值</sys:String> <sys:String x:Key="TrackingZone">跟踪区域值</sys:String>
......
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
221979955803 22-1578589972
1470602451 1-1441241311
11-350624472 11-1602666439
24-1321085892 23-2035776870
Resources\StringResource.zh-CN.xaml;Resources\StringResource.en.xaml;Style\Button\Button_NdiView.xaml;Style\Button\Button_Setting.xaml;Style\Button\Button_WindowTop.xaml;Style\CheckBox\CheckBox_NdiView.xaml;Style\CheckBox\CheckBox_RaidoButtonStyle.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_NdiMainViewBlue.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; Resources\StringResource.zh-CN.xaml;Resources\StringResource.en.xaml;Style\Button\Button_NdiView.xaml;Style\Button\Button_Setting.xaml;Style\Button\Button_WindowTop.xaml;Style\CheckBox\CheckBox_NdiView.xaml;Style\CheckBox\CheckBox_RaidoButtonStyle.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_NdiMainViewBlue.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
...@@ -939,8 +939,8 @@ ...@@ -939,8 +939,8 @@
<!--<ColumnDefinition />--> <!--<ColumnDefinition />-->
<ColumnDefinition Width="1.8*" /> <ColumnDefinition Width="1.8*" />
<ColumnDefinition Width="1.8*" /> <ColumnDefinition Width="1.8*" />
<ColumnDefinition Width="1.5*" /> <ColumnDefinition Width="1.3*" />
<ColumnDefinition /> <ColumnDefinition Width="1.2*" />
<ColumnDefinition /> <ColumnDefinition />
<ColumnDefinition /> <ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
...@@ -1060,7 +1060,18 @@ ...@@ -1060,7 +1060,18 @@
FontSize="14" FontSize="14"
IsChecked="{Binding Path=IsKeepHighest, Mode=TwoWay}" IsChecked="{Binding Path=IsKeepHighest, Mode=TwoWay}"
IsEnabled="{Binding KeepHighestIsEnabled}" IsEnabled="{Binding KeepHighestIsEnabled}"
Style="{StaticResource CheckBox_Setting}" /> 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}" />
<CheckBox <CheckBox
Grid.Column="4" Grid.Column="4"
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
...@@ -53,7 +53,7 @@ namespace VIZ.FGOUT.Module ...@@ -53,7 +53,7 @@ namespace VIZ.FGOUT.Module
// 注册系统检测循环 // 注册系统检测循环
//ApplicationDomainEx.LoopManager.Register("NDIMainViewModel.UpdateSystemMonitor", 1, this.UpdateSystemMonitor); //ApplicationDomainEx.LoopManager.Register("NDIMainViewModel.UpdateSystemMonitor", 1, this.UpdateSystemMonitor);
// 注册服务 // 注册服务
ApplicationDomainEx.ServiceManager.AddService(NDIMainViewKeys.MainView, this); ApplicationDomain.ServiceManager.AddService(NDIMainViewKeys.MainView, this);
// 初始化二次确认自动发送倒计时器 // 初始化二次确认自动发送倒计时器
InitAutoSendTimer(); InitAutoSendTimer();
...@@ -113,7 +113,20 @@ namespace VIZ.FGOUT.Module ...@@ -113,7 +113,20 @@ namespace VIZ.FGOUT.Module
{ {
Title = "FigureOUT(" + dics[number] + ")"; Title = "FigureOUT(" + dics[number] + ")";
if (number.Equals("DS") || number.Equals("DT") || number.Equals("SS") || number.Equals("ST") || number.Equals("VT")) KeepHighestVisibility = Visibility.Visible;
HighestInPointVisibility = Visibility.Collapsed;
//if (number.Equals("DS") || number.Equals("DT") || number.Equals("SS") || number.Equals("ST") || number.Equals("VT"))
//{
// KeepHighestIsEnabled = true;
//}
if (number.Equals("DS") || number.Equals("DT") || number.Equals("SS") || number.Equals("ST") )
{
KeepHighestIsEnabled = true;
KeepHighestVisibility = Visibility.Collapsed;
HighestInPointVisibility = Visibility.Visible;
}
else if(number.Equals("VT"))
{ {
KeepHighestIsEnabled = true; KeepHighestIsEnabled = true;
} }
...@@ -248,6 +261,27 @@ namespace VIZ.FGOUT.Module ...@@ -248,6 +261,27 @@ namespace VIZ.FGOUT.Module
//回复UI界面Replay结果 //回复UI界面Replay结果
ApplicationDomain.MessageManager.Register<ClipMessage__ReplayResp>(this, this.OnClipMessage__ReplayResp); ApplicationDomain.MessageManager.Register<ClipMessage__ReplayResp>(this, this.OnClipMessage__ReplayResp);
//接收NDIViewModel发来的算法入点时间戳消息
ApplicationDomain.MessageManager.Register<AlgorithmMessageInPointTimeCodeModel>(this, this.OnAlgorithmMessageInPointTimeCode);
}
private void OnAlgorithmMessageInPointTimeCode(AlgorithmMessageInPointTimeCodeModel model)
{
//在Replay的情况下
if (ReplayIsChecked)
{
var number = ApplicationDomainEx.LiteDbContext.ViewConfig.FindOne(p => p.ViewKey == NDIViewKeys.CAM_1)
.GameName;
if (!string.IsNullOrEmpty(number))
{
//并且在跳水的时候
if (number.Equals("DS") || number.Equals("DT") || number.Equals("SS") || number.Equals("ST"))
{
WPFHelper.BeginInvoke(() => { SliderStartValue = NDIViewModel.SliderStartValue; });
}
}
}
} }
private void OnClipMessage__MaskMsg(ClipMessage__MaskMsg msg) private void OnClipMessage__MaskMsg(ClipMessage__MaskMsg msg)
...@@ -486,6 +520,28 @@ namespace VIZ.FGOUT.Module ...@@ -486,6 +520,28 @@ namespace VIZ.FGOUT.Module
} }
} }
private Visibility _keepHighestVisibility = Visibility.Visible;
public Visibility KeepHighestVisibility
{
get => _keepHighestVisibility;
set
{
_keepHighestVisibility = value;
this.RaisePropertyChanged(nameof(KeepHighestVisibility));
}
}
private Visibility _highestInPointVisibility = Visibility.Collapsed;
public Visibility HighestInPointVisibility
{
get => _highestInPointVisibility;
set
{
_highestInPointVisibility = value;
this.RaisePropertyChanged(nameof(HighestInPointVisibility));
}
}
private bool _isBigModel; private bool _isBigModel;
/// <summary> /// <summary>
/// 是否用大模型 /// 是否用大模型
...@@ -1419,6 +1475,8 @@ namespace VIZ.FGOUT.Module ...@@ -1419,6 +1475,8 @@ namespace VIZ.FGOUT.Module
var replayPackage = new ReplayPackage() var replayPackage = new ReplayPackage()
{ {
type = ClipPackageSignal.REPLAY, type = ClipPackageSignal.REPLAY,
start_time = NDIViewModel.StartTime,
end_time = NDIViewModel.EndTime,
status = ReplayStatus.PreStart status = ReplayStatus.PreStart
}; };
managerAlgorithm.SendJson(replayPackage); managerAlgorithm.SendJson(replayPackage);
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDISettingView/View/AlgorithmSettingPanelView.xaml
...@@ -346,7 +346,18 @@ ...@@ -346,7 +346,18 @@
FontSize="16" FontSize="16"
IsChecked="{Binding Path=IsKeepHighest, Mode=TwoWay}" IsChecked="{Binding Path=IsKeepHighest, Mode=TwoWay}"
IsEnabled="{Binding KeepHighestIsEnabled}" IsEnabled="{Binding KeepHighestIsEnabled}"
Style="{StaticResource CheckBox_Setting}" /> Style="{StaticResource CheckBox_Setting}"
Visibility="{Binding KeepHighestVisibility}" />
<CheckBox
Grid.Row="4"
Grid.Column="4"
HorizontalAlignment="Center"
Content="{DynamicResource HighestInPoint}"
FontSize="16"
IsChecked="{Binding Path=IsKeepHighest, Mode=TwoWay}"
IsEnabled="{Binding KeepHighestIsEnabled}"
Style="{StaticResource CheckBox_Setting}"
Visibility="{Binding HighestInPointVisibility}" />
<CheckBox <CheckBox
Grid.Row="4" Grid.Row="4"
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDISettingView/ViewModel/AlgorithmSettingPanelViewModel.cs
...@@ -744,6 +744,28 @@ namespace VIZ.FGOUT.Module ...@@ -744,6 +744,28 @@ namespace VIZ.FGOUT.Module
} }
} }
private Visibility _keepHighestVisibility = Visibility.Visible;
public Visibility KeepHighestVisibility
{
get => _keepHighestVisibility;
set
{
_keepHighestVisibility = value;
this.RaisePropertyChanged(nameof(KeepHighestVisibility));
}
}
private Visibility _highestInPointVisibility = Visibility.Collapsed;
public Visibility HighestInPointVisibility
{
get => _highestInPointVisibility;
set
{
_highestInPointVisibility = value;
this.RaisePropertyChanged(nameof(HighestInPointVisibility));
}
}
//要存库的算法数据 //要存库的算法数据
private string _algorithmMessage = ""; private string _algorithmMessage = "";
private void SendAlgorithmParameters() private void SendAlgorithmParameters()
...@@ -937,7 +959,25 @@ namespace VIZ.FGOUT.Module ...@@ -937,7 +959,25 @@ namespace VIZ.FGOUT.Module
var number = alPackage.SportsCode; var number = alPackage.SportsCode;
if (!string.IsNullOrEmpty(number)) if (!string.IsNullOrEmpty(number))
{ {
if (number.Equals("DS") || number.Equals("DT") || number.Equals("SS") || number.Equals("ST") || number.Equals("VT")) //if (number.Equals("DS") || number.Equals("DT") || number.Equals("SS") || number.Equals("ST") || number.Equals("VT"))
//{
// KeepHighestIsEnabled = true;
//}
//else
//{
// KeepHighestIsEnabled = false;
// IsKeepHighest = false;
//}
KeepHighestVisibility = Visibility.Visible;
HighestInPointVisibility = Visibility.Collapsed;
if (number.Equals("DS") || number.Equals("DT") || number.Equals("SS") || number.Equals("ST"))
{
KeepHighestIsEnabled = true;
KeepHighestVisibility = Visibility.Collapsed;
HighestInPointVisibility = Visibility.Visible;
}
else if(number.Equals("VT"))
{ {
KeepHighestIsEnabled = true; KeepHighestIsEnabled = true;
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.Message.cs
...@@ -16,6 +16,18 @@ namespace VIZ.FGOUT.Module ...@@ -16,6 +16,18 @@ namespace VIZ.FGOUT.Module
public partial class NDIViewModel public partial class NDIViewModel
{ {
/// <summary> /// <summary>
/// 算法入点时间戳消息
/// </summary>
/// <param name="msg"></param>
private void OnAlgorithmMessage__in_point_time_code(AlgorithmMessage__in_point_time_code msg)
{
if (this.ViewKey == NDIViewKeys.CAM_2 || this.ViewKey == NDIViewKeys.CAM_4) return;
StartTime = msg.timecode;
var model = new AlgorithmMessageInPointTimeCodeModel();
ApplicationDomain.MessageManager.Send(model);
}
/// <summary>
/// 算法落盘开始、结束时间戳消息 /// 算法落盘开始、结束时间戳消息
/// </summary> /// </summary>
/// <param name="msg"></param> /// <param name="msg"></param>
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.cs
...@@ -135,6 +135,9 @@ namespace VIZ.FGOUT.Module ...@@ -135,6 +135,9 @@ namespace VIZ.FGOUT.Module
// 算法落盘开始、结束时间戳消息 // 算法落盘开始、结束时间戳消息
ApplicationDomain.MessageManager.Register<AlgorithmMessage__start_end>(this, this.OnAlgorithmMessage__start_end); ApplicationDomain.MessageManager.Register<AlgorithmMessage__start_end>(this, this.OnAlgorithmMessage__start_end);
// 算法入点时间戳消息
ApplicationDomain.MessageManager.Register<AlgorithmMessage__in_point_time_code>(this, this.OnAlgorithmMessage__in_point_time_code);
NDIView nDIView = this.GetView<NDIView>(); NDIView nDIView = this.GetView<NDIView>();
// 算法标记 // 算法标记
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "CA3474987DE5C2378E8DCAFFE7E33F7835A22236B583EF2C23FB90002406FF65" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "1DE0210999FB6D9D425EE012438BC7AEE73E7D25C82080294E120D8AE150EEDA"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module { ...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1558 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1569 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1; internal VIZ.FGOUT.Module.NDIView cam1;
...@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module { ...@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1743 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1754 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2; internal VIZ.FGOUT.Module.NDIView cam2;
...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module { ...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1758 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1769 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3; 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}" "CA3474987DE5C2378E8DCAFFE7E33F7835A22236B583EF2C23FB90002406FF65" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "1DE0210999FB6D9D425EE012438BC7AEE73E7D25C82080294E120D8AE150EEDA"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module { ...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1558 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1569 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1; internal VIZ.FGOUT.Module.NDIView cam1;
...@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module { ...@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1743 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1754 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2; internal VIZ.FGOUT.Module.NDIView cam2;
...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module { ...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1758 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1769 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3; internal VIZ.FGOUT.Module.NDIView cam3;
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDISettingView/View/AlgorithmSettingPanelView.g.cs
#pragma checksum "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "DC58084C355FA5A8F6C7F8C3931D87A676AAC99D63DAAEF5EB4B376142E0DF42" #pragma checksum "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "B38955205D9B8E1ABB2E4A265347C14AA8A8D05770AED7B5011E4B6AFEB0FF44"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <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}" "DC58084C355FA5A8F6C7F8C3931D87A676AAC99D63DAAEF5EB4B376142E0DF42" #pragma checksum "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "B38955205D9B8E1ABB2E4A265347C14AA8A8D05770AED7B5011E4B6AFEB0FF44"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/VIZ.FGOUT.Module_MarkupCompile.cache
...@@ -10,11 +10,11 @@ none ...@@ -10,11 +10,11 @@ none
false false
DEBUG;TRACE DEBUG;TRACE
25-1434354873 25-429057470
4-699044453 4-1529606353
99-439317849 99-1491530721
151674092382 151915249285
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; 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;
False True
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/Properties/AssemblyInfo.cs
...@@ -55,5 +55,5 @@ using System.Windows; ...@@ -55,5 +55,5 @@ using System.Windows;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示: //通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.23.0")] [assembly: AssemblyVersion("1.0.25.0")]
[assembly: AssemblyFileVersion("1.0.23.0")] [assembly: AssemblyFileVersion("1.0.25.0")]
VIZ.FGOUT/VIZ.FGOUT/obj/x64/Debug/VIZ.FGOUT_MarkupCompile.cache
...@@ -10,11 +10,11 @@ none ...@@ -10,11 +10,11 @@ none
false false
DEBUG;TRACE DEBUG;TRACE
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\App.xaml C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\App.xaml
2-1347366880 21265083526
6968741766 6-790135758
43-1958993781 421356718200
CloseAlgorithmWindow.xaml;MainWindow.xaml; CloseAlgorithmWindow.xaml;MainWindow.xaml;
False True
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