Commit 6c801caa by 鲁志-悦动

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

parent 8c4605ac

//------------------------------------------------------------------------------
// <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);
}
}
}
......@@ -10,11 +10,11 @@ none
false
21870986562
2-725104376
31364711570
17-1683084370
3947974750
17-1462717611
Themes\Generic.xaml;Widgets\FootballFieldPanel\FootballFieldPanel.xaml;
False
True
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\Widgets\FootballFieldPanel\FootballFieldPanel.xaml;;
......
......@@ -32,10 +32,12 @@ namespace VIZ.FGOUT.Connection
this.providers.Add(new AlgorithmProvider__detect());
// 算法落盘
this.providers.Add(new AlgorithmProvider__start_end());
//通知UI界面贴图状态
// 通知UI界面贴图状态
this.providers.Add(new ClipProvider__MaskMsg());
//回复UI界面Replay结果
// 回复UI界面Replay结果
this.providers.Add(new ClipProvider__ReplayResp());
// 入点时间戳
this.providers.Add(new AlgorithmProvider__in_point_time_code());
}
/// <summary>
......
......@@ -9,6 +9,11 @@
// 接收
/// <summary>
/// 入点时间戳
/// </summary>
public const string in_point_time_code = "in_point_time_code";
/// <summary>
/// 算法初始化完成
/// </summary>
public const string checked_ok = "checked_ok";
......
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);
}
}
}
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; }
}
}
......@@ -82,12 +82,14 @@
<Compile Include="UDP\Algorithm\Provider\AlgorithmProvider__checked_ok.cs" />
<Compile Include="UDP\Algorithm\Provider\AlgorithmProvider__crop_roi..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\Sender\AlgorithmSender.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__crop_roi.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\Send\AlgorithmPackage_Figout_sports_model.cs" />
<Compile Include="UDP\Algorithm\Signal\Send\AlgorithmPackage_Figout_new_model.cs" />
......
595d914fc2bedf510f39f19f90bb79e80b42fb6104e029ff4ab94b194d592105
f74273f956b4e9838a0bc2a1acc019b98e31de587e4f3a947fc5214b993fad6f
namespace VIZ.FGOUT.Domain
{
public class AlgorithmMessage__in_point_time_code : AlgorithmMessageBase
{
/// <summary>
/// timecode
/// </summary>
public long timecode { get; set; }
}
}
namespace VIZ.FGOUT.Domain
{
public class AlgorithmMessageInPointTimeCodeModel
{
}
}
......@@ -79,10 +79,12 @@
<Compile Include="Message\Algorithm\Implementation\AlgorithmMessage__checked_ok.cs" />
<Compile Include="Message\Algorithm\Implementation\AlgorithmMessage__crop_roi.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\Interface\IAlgorithmMessage__roi.cs" />
<Compile Include="Message\Clip\Implementation\ClipMessage__ReplayResp.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\CleanInPointsModel.cs" />
<Compile Include="Message\Setting\CleanPlaceModel.cs" />
......
6dbbb496131483f6805b920d58656b9902d6ac9fddf9b32af7a01fa30efc73d7
be411a1d13757dd8127a5e9c5c6b14f3b756312cfe5e66ab937f67a80bcd9d56
......@@ -59,6 +59,7 @@
<sys:String x:Key="IntervalPixel">IntPixel</sys:String>
<sys:String x:Key="RemoveOutPointPixel">OutPixel</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="DetectZoneY">Detect zone Y</sys:String>
<sys:String x:Key="TrackingZone">Tracking zone</sys:String>
......
......@@ -58,6 +58,7 @@
<sys:String x:Key="IntervalPixel">间隔像素</sys:String>
<sys:String x:Key="RemoveOutPointPixel">出点像素</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="DetectZoneY">检测区域Y值</sys:String>
<sys:String x:Key="TrackingZone">跟踪区域值</sys:String>
......
......@@ -10,11 +10,11 @@ none
false
DEBUG;TRACE
221979955803
1470602451
11-350624472
24-1321085892
22-1578589972
1-1441241311
11-1602666439
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;
False
True
......@@ -939,8 +939,8 @@
<!--<ColumnDefinition />-->
<ColumnDefinition Width="1.8*" />
<ColumnDefinition Width="1.8*" />
<ColumnDefinition Width="1.5*" />
<ColumnDefinition />
<ColumnDefinition Width="1.3*" />
<ColumnDefinition Width="1.2*" />
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
......@@ -1060,7 +1060,18 @@
FontSize="14"
IsChecked="{Binding Path=IsKeepHighest, Mode=TwoWay}"
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
Grid.Column="4"
......
......@@ -53,7 +53,7 @@ namespace VIZ.FGOUT.Module
// 注册系统检测循环
//ApplicationDomainEx.LoopManager.Register("NDIMainViewModel.UpdateSystemMonitor", 1, this.UpdateSystemMonitor);
// 注册服务
ApplicationDomainEx.ServiceManager.AddService(NDIMainViewKeys.MainView, this);
ApplicationDomain.ServiceManager.AddService(NDIMainViewKeys.MainView, this);
// 初始化二次确认自动发送倒计时器
InitAutoSendTimer();
......@@ -113,7 +113,20 @@ namespace VIZ.FGOUT.Module
{
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;
}
......@@ -248,6 +261,27 @@ namespace VIZ.FGOUT.Module
//回复UI界面Replay结果
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)
......@@ -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;
/// <summary>
/// 是否用大模型
......@@ -1419,6 +1475,8 @@ namespace VIZ.FGOUT.Module
var replayPackage = new ReplayPackage()
{
type = ClipPackageSignal.REPLAY,
start_time = NDIViewModel.StartTime,
end_time = NDIViewModel.EndTime,
status = ReplayStatus.PreStart
};
managerAlgorithm.SendJson(replayPackage);
......
......@@ -346,7 +346,18 @@
FontSize="16"
IsChecked="{Binding Path=IsKeepHighest, Mode=TwoWay}"
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
Grid.Row="4"
......
......@@ -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 void SendAlgorithmParameters()
......@@ -937,7 +959,25 @@ namespace VIZ.FGOUT.Module
var number = alPackage.SportsCode;
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;
}
......
......@@ -16,6 +16,18 @@ namespace VIZ.FGOUT.Module
public partial class NDIViewModel
{
/// <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>
/// <param name="msg"></param>
......
......@@ -135,6 +135,9 @@ namespace VIZ.FGOUT.Module
// 算法落盘开始、结束时间戳消息
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>();
// 算法标记
......
#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>
// 此代码由工具生成。
......@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1558 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1569 "..\..\..\..\..\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 1743 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1754 "..\..\..\..\..\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 1758 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1769 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3;
......
#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>
// 此代码由工具生成。
......@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1558 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1569 "..\..\..\..\..\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 1743 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1754 "..\..\..\..\..\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 1758 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1769 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3;
......
#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>
// 此代码由工具生成。
......
#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>
// 此代码由工具生成。
......
......@@ -10,11 +10,11 @@ none
false
DEBUG;TRACE
25-1434354873
4-699044453
99-439317849
151674092382
25-429057470
4-1529606353
99-1491530721
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;
False
True
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;;
......
......@@ -55,5 +55,5 @@ using System.Windows;
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
//通过使用 "*",如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.23.0")]
[assembly: AssemblyFileVersion("1.0.23.0")]
[assembly: AssemblyVersion("1.0.25.0")]
[assembly: AssemblyFileVersion("1.0.25.0")]
......@@ -10,11 +10,11 @@ none
false
DEBUG;TRACE
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\App.xaml
2-1347366880
21265083526
6968741766
43-1958993781
6-790135758
421356718200
CloseAlgorithmWindow.xaml;MainWindow.xaml;
False
True
......@@ -10,10 +10,10 @@ none
false
DEBUG;TRACE
91711917753
9-721875057
3-1719726047
201914760168
3-630027162
19-1136530284
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
......

//------------------------------------------------------------------------------
// <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);
}
}
}
......@@ -10,11 +10,11 @@ none
false
DEBUG;TRACE
15488264905
15-721109437
1212046750213
150843184444
121-1133520871
150238613261
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;
False
True
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\obj\x64\Debug\GeneratedInternalTypeHelper.g.cs

FC:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\MessageBox\MessageBoxEx.xaml;;
FC:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\MessageBox\MessageBoxExWindow.xaml;;
......
......@@ -10,11 +10,11 @@ none
false
DEBUG;TRACE
11882902973
1-731644535
212023628146
26-1598261527
212002329545
25439653939
Themes\Generic.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