Skip to content

F
FGOUT
Commit 28532903 by 鲁志-悦动
Options

客户端启动给算法发送2条消息调整

parent 47270184
Showing with 91 additions and 129 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/Provider/AlgorithmProvider__detect.cs
...@@ -44,16 +44,14 @@ namespace VIZ.FGOUT.Connection ...@@ -44,16 +44,14 @@ namespace VIZ.FGOUT.Connection
} }
Signal = AlgorithmPackageSignal.detect; Signal = AlgorithmPackageSignal.detect;
} }
else if(package.signal == "track") else if (package.signal == "track")
{ {
if(package.box!=null) if (package.box != null)
{ {
RawRectangleF target = new RawRectangleF(package.box[0], package.box[1], package.box[2], package.box[3]); RawRectangleF target = new RawRectangleF(package.box[0], package.box[1], package.box[2], package.box[3]);
message.bboxes.Add(target); message.bboxes.Add(target);
} }
Signal = AlgorithmPackageSignal.track; Signal = AlgorithmPackageSignal.track;
} }
//if (package.roi != null && package.roi.Count == 4) //if (package.roi != null && package.roi.Count == 4)
...@@ -63,7 +61,6 @@ namespace VIZ.FGOUT.Connection ...@@ -63,7 +61,6 @@ namespace VIZ.FGOUT.Connection
// message.center_x = package.center_x; // message.center_x = package.center_x;
// message.center_y = package.center_y; // message.center_y = package.center_y;
ApplicationDomainEx.MessageManager.Send(message); ApplicationDomainEx.MessageManager.Send(message);
} }
} }
......
VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Algorithm/Sender/AlgorithmSender.cs
using System.Collections.Generic; using System.Collections.Generic;
using VIZ.FGOUT.Storage;
using VIZ.Framework.Connection; using VIZ.Framework.Connection;
namespace VIZ.FGOUT.Connection namespace VIZ.FGOUT.Connection
...@@ -98,13 +99,17 @@ namespace VIZ.FGOUT.Connection ...@@ -98,13 +99,17 @@ namespace VIZ.FGOUT.Connection
//package.signal = AlgorithmPackageSignal.track; //package.signal = AlgorithmPackageSignal.track;
//手动模式 //手动模式
package.mode = AlgorithmPackageSignal.manual_mode; //package.mode = AlgorithmPackageSignal.manual_mode;
//自动模式
package.mode = AlgorithmPackageSignal.auto_mode;
package.timecode = option.timecode; package.timecode = option.timecode;
manager.SendJson(package); manager.SendJson(package);
} }
public static void AutoMode(UdpEndpointManager manager, string algorithmData)
{
manager.SendJsonString(algorithmData);
}
public static void MatImageCmd(UdpEndpointManager manager, AlgorithmPackage__MatCmd package) public static void MatImageCmd(UdpEndpointManager manager, AlgorithmPackage__MatCmd package)
{ {
......
VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Algorithm/Signal/Send/AlgorithmPackage_Figout_sports_model.cs
...@@ -12,30 +12,37 @@ namespace VIZ.FGOUT.Connection ...@@ -12,30 +12,37 @@ namespace VIZ.FGOUT.Connection
/// 项目代码 /// 项目代码
/// </summary> /// </summary>
public string SportsCode { get; set; } public string SportsCode { get; set; }
/// <summary> /// <summary>
/// 进入结束区域后保留多少张抠像 /// 进入结束区域后保留多少张抠像
/// </summary> /// </summary>
public int Maintain_matting_n { get; set; } public int Maintain_matting_n { get; set; }
/// <summary> /// <summary>
/// 抠图间隔 /// 抠图间隔
/// </summary> /// </summary>
public int Matting_interval { get; set; } public int Matting_interval { get; set; }
/// <summary> /// <summary>
/// 延迟多少帧结束 /// 延迟多少帧结束
/// </summary> /// </summary>
public int Extend_frame { get; set; } public int Extend_frame { get; set; }
/// <summary> /// <summary>
/// 初始区域水平方向外扩像素数 /// 初始区域水平方向外扩像素数
/// </summary> /// </summary>
public int Pad_det_x { get; set; } public int Pad_det_x { get; set; }
/// <summary> /// <summary>
/// 初始区域垂直方向外扩像素数 /// 初始区域垂直方向外扩像素数
/// </summary> /// </summary>
public int Pad_det_y { get; set; } public int Pad_det_y { get; set; }
/// <summary> /// <summary>
/// 跟踪过程中外扩像素数 /// 跟踪过程中外扩像素数
/// </summary> /// </summary>
public int Pad_det_square { get; set; } public int Pad_det_square { get; set; }
/// <summary> /// <summary>
/// 抠像缩放系数 /// 抠像缩放系数
/// </summary> /// </summary>
......
VIZ.FGOUT/VIZ.FGOUT.Connection/VIZ.FGOUT.Connection.csproj
...@@ -128,6 +128,10 @@ ...@@ -128,6 +128,10 @@
<Project>{cbfeeb64-86f4-4ec6-90b2-549462687224}</Project> <Project>{cbfeeb64-86f4-4ec6-90b2-549462687224}</Project>
<Name>VIZ.FGOUT.Domain</Name> <Name>VIZ.FGOUT.Domain</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\VIZ.FGOUT.Storage\VIZ.FGOUT.Storage.csproj">
<Project>{B158AAA2-A738-4017-8554-3A104FBF439D}</Project>
<Name>VIZ.FGOUT.Storage</Name>
</ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="UDP\Algorithm\Info\" /> <Folder Include="UDP\Algorithm\Info\" />
......
VIZ.FGOUT/VIZ.FGOUT.Connection/obj/x64/Debug/VIZ.FGOUT.Connection.csproj.CoreCompileInputs.cache
241c60502b65a9946cf710cfff79d0f890cb784f 879982a20dca0c414aba6411ab84437d1681c4ab
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/Controller/Hotkey/HotkeyController.cs
...@@ -135,8 +135,6 @@ namespace VIZ.FGOUT.Module ...@@ -135,8 +135,6 @@ namespace VIZ.FGOUT.Module
log.Info(hotkey+"发送开始命令：" + algorithmPackage__MatCmd.mode+"" + algorithmPackage__MatCmd.signal); log.Info(hotkey+"发送开始命令：" + algorithmPackage__MatCmd.mode+"" + algorithmPackage__MatCmd.signal);
AlgorithmSender.MatImageCmd(manager, algorithmPackage__MatCmd); AlgorithmSender.MatImageCmd(manager, algorithmPackage__MatCmd);
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
...@@ -656,7 +656,8 @@ namespace VIZ.FGOUT.Module ...@@ -656,7 +656,8 @@ namespace VIZ.FGOUT.Module
/// <param name="key">服务键</param> /// <param name="key">服务键</param>
private void VideoSetting() private void VideoSetting()
{ {
NDISettingView view = new NDISettingView(NDIViewKeys.CAM_1, "B0-25-AA-4E-C4-AE__CAM_1"); //NDISettingView view = new NDISettingView(NDIViewKeys.CAM_1, "B0-25-AA-4E-C4-AE__CAM_1");
NDISettingView view = new NDISettingView(NDIViewKeys.CAM_1, "3E-55-76-D0-9E-B9__CAM_1");
NoneWindow window = new NoneWindow(1200, 1050, view); NoneWindow window = new NoneWindow(1200, 1050, view);
window.Owner = this.GetWindow(); window.Owner = this.GetWindow();
window.ShowDialog(); window.ShowDialog();
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDISettingView/View/AlgorithmSettingPanelView.xaml
...@@ -21,9 +21,7 @@ ...@@ -21,9 +21,7 @@
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/Button/Button_Setting.xaml" /> <ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/Button/Button_Setting.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/TextBox/TextBox_Setting.xaml" /> <ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/TextBox/TextBox_Setting.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
<resource:AlgorithmStrategyTagStringConverter x:Key="AlgorithmStrategyTagStringConverter" /> <resource:AlgorithmStrategyTagStringConverter x:Key="AlgorithmStrategyTagStringConverter" />
<x:Array x:Key="TrueOrFalse" Type="sys:String"> <x:Array x:Key="TrueOrFalse" Type="sys:String">
<sys:String>False</sys:String> <sys:String>False</sys:String>
<sys:String>True</sys:String> <sys:String>True</sys:String>
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDISettingView/ViewModel/AlgorithmSettingPanelViewModel.cs
...@@ -3,7 +3,6 @@ using System; ...@@ -3,7 +3,6 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Windows; using System.Windows;
using System.Windows.Interop;
using VIZ.FGOUT.Connection; using VIZ.FGOUT.Connection;
using VIZ.FGOUT.Connection.UDP.Clip.Signal.Send; using VIZ.FGOUT.Connection.UDP.Clip.Signal.Send;
using VIZ.FGOUT.Domain; using VIZ.FGOUT.Domain;
...@@ -207,7 +206,7 @@ namespace VIZ.FGOUT.Module ...@@ -207,7 +206,7 @@ namespace VIZ.FGOUT.Module
var number = this.ViewConfig.GameName; var number = this.ViewConfig.GameName;
if (!string.IsNullOrEmpty(number)) if (!string.IsNullOrEmpty(number))
{ {
PresetsItem = dics[number]; _initItem = PresetsItem = dics[number];
var config = ApplicationDomainEx.LiteDbContext.JavelinThrowConfig.FindOne(p => p.Number == number); var config = ApplicationDomainEx.LiteDbContext.JavelinThrowConfig.FindOne(p => p.Number == number);
//初始化UE预设数据 //初始化UE预设数据
InitUEDetail(config.Data); InitUEDetail(config.Data);
...@@ -216,6 +215,9 @@ namespace VIZ.FGOUT.Module ...@@ -216,6 +215,9 @@ namespace VIZ.FGOUT.Module
} }
} }
//页面初始化时进来的项目名称
string _initItem = string.Empty;
/// <summary> /// <summary>
/// 获取算法策略视图 /// 获取算法策略视图
/// </summary> /// </summary>
...@@ -261,10 +263,13 @@ namespace VIZ.FGOUT.Module ...@@ -261,10 +263,13 @@ namespace VIZ.FGOUT.Module
/// <returns>是否需要重启算法</returns> /// <returns>是否需要重启算法</returns>
public bool IsNeedRestart() public bool IsNeedRestart()
{ {
if (this.SelectedAlgorithmStrategy != this.oldAlgorithmStrategy) //if (this.SelectedAlgorithmStrategy != this.oldAlgorithmStrategy)
return true; // return true;
if (this.ViewConfig.GPU != this.oldGpu) //if (this.ViewConfig.GPU != this.oldGpu)
// return true;
if (_initItem != (PresetsItem ?? string.Empty))
return true; return true;
return false; return false;
...@@ -505,6 +510,7 @@ namespace VIZ.FGOUT.Module ...@@ -505,6 +510,7 @@ namespace VIZ.FGOUT.Module
} }
} }
//要存库的算法数据
private string _algorithmMessage = ""; private string _algorithmMessage = "";
private void SendAlgorithmParameters() private void SendAlgorithmParameters()
{ {
...@@ -526,7 +532,10 @@ namespace VIZ.FGOUT.Module ...@@ -526,7 +532,10 @@ namespace VIZ.FGOUT.Module
package.Scale = AScale; package.Scale = AScale;
_algorithmMessage = package == null ? string.Empty : JsonConvert.SerializeObject(package, JSON_SERIALIZER_SETTINGS); _algorithmMessage = package == null ? string.Empty : JsonConvert.SerializeObject(package, JSON_SERIALIZER_SETTINGS);
if (_initItem == (PresetsItem ?? string.Empty))
manager.SendJson(package); manager.SendJson(package);
//MessageBoxEx.ShowDialog("发送成功 IP = " + manager.IP + " Port =" + manager.Port); //MessageBoxEx.ShowDialog("发送成功 IP = " + manager.IP + " Port =" + manager.Port);
//MessageBoxEx.ShowDialog("发送成功"); //MessageBoxEx.ShowDialog("发送成功");
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDISettingView/ViewModel/NDISettingPanelViewModel.cs
...@@ -445,9 +445,7 @@ namespace VIZ.FGOUT.Module ...@@ -445,9 +445,7 @@ namespace VIZ.FGOUT.Module
INDIViewService service = ApplicationDomainEx.ServiceManager.GetService<INDIViewService>(this.ViewKey); INDIViewService service = ApplicationDomainEx.ServiceManager.GetService<INDIViewService>(this.ViewKey);
service.DisplayName = this.ViewConfig.DisplayName; service.DisplayName = this.ViewConfig.DisplayName;
if (string.IsNullOrWhiteSpace(this.ViewConfig.StreamName)) if (string.IsNullOrWhiteSpace(this.ViewConfig.StreamName))
{
service.ClearVideoControl(new ClearVideoControlContext(true, true)); service.ClearVideoControl(new ClearVideoControlContext(true, true));
}
return true; return true;
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDISettingView/ViewModel/NDISettingViewModel.cs
...@@ -210,6 +210,7 @@ namespace VIZ.FGOUT.Module ...@@ -210,6 +210,7 @@ namespace VIZ.FGOUT.Module
private void Save() private void Save()
{ {
bool isNeedRestart = false; bool isNeedRestart = false;
// 是否需要重启算法 // 是否需要重启算法
foreach (INDISetting setting in this.Settings) foreach (INDISetting setting in this.Settings)
{ {
...@@ -220,6 +221,10 @@ namespace VIZ.FGOUT.Module ...@@ -220,6 +221,10 @@ namespace VIZ.FGOUT.Module
} }
} }
//如果是CAM_2，不需要重启算法进程
if (this.ViewKey.Equals(NDIViewKeys.CAM_2))
isNeedRestart = false;
if (isNeedRestart) if (isNeedRestart)
{ {
MessageBoxExResult result = MessageBoxEx.ShowDialog("提示", "该配置需要重启算法进程，是否继续保存?", MessageBoxExButtons.YES_CANCEL); MessageBoxExResult result = MessageBoxEx.ShowDialog("提示", "该配置需要重启算法进程，是否继续保存?", MessageBoxExButtons.YES_CANCEL);
...@@ -255,6 +260,9 @@ namespace VIZ.FGOUT.Module ...@@ -255,6 +260,9 @@ namespace VIZ.FGOUT.Module
// 关闭窗口 // 关闭窗口
this.GetWindow().Close(); this.GetWindow().Close();
//如果是CAM_2，不需要重启算法进程
if (this.ViewKey.Equals(NDIViewKeys.CAM_2))
return;
if (service == null) return; if (service == null) return;
ChangeStrategyContext context = new ChangeStrategyContext(); ChangeStrategyContext context = new ChangeStrategyContext();
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/Controller/Algorithm/Strategy/AlgoritmController_FiguerOut.cs
...@@ -7,6 +7,7 @@ using VIZ.FGOUT.Domain; ...@@ -7,6 +7,7 @@ using VIZ.FGOUT.Domain;
using VIZ.FGOUT.Storage; using VIZ.FGOUT.Storage;
using VIZ.Framework.Common; using VIZ.Framework.Common;
using VIZ.Framework.Connection; using VIZ.Framework.Connection;
using VIZ.Framework.Domain;
namespace VIZ.FGOUT.Module namespace VIZ.FGOUT.Module
{ {
...@@ -69,9 +70,14 @@ namespace VIZ.FGOUT.Module ...@@ -69,9 +70,14 @@ namespace VIZ.FGOUT.Module
this.Support.ViewStatus= NDIViewStatus.Detect; this.Support.ViewStatus= NDIViewStatus.Detect;
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1); UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1);
AlgorithmSenderOption option = new AlgorithmSenderOption(); //AlgorithmSenderOption option = new AlgorithmSenderOption();
option.id = this.Support.ID; //option.id = this.Support.ID;
AlgorithmSender.AutoMode(manager,this.bulidPackage(AlgorithmAutoModeCmd.detect,null),option); //AlgorithmSender.AutoMode(manager, this.bulidPackage(AlgorithmAutoModeCmd.detect, null), option);
var ndiViewConfig =
ApplicationDomainEx.LiteDbContext.ViewConfig.FindOne(p => p.ViewKey == NDIViewKeys.CAM_1);
var config = ApplicationDomainEx.LiteDbContext.JavelinThrowConfig.FindOne(p => p.Number == ndiViewConfig.GameName);
AlgorithmSender.AutoMode(manager, config.AlgorithmData);
} }
/// <summary> /// <summary>
...@@ -185,22 +191,16 @@ namespace VIZ.FGOUT.Module ...@@ -185,22 +191,16 @@ namespace VIZ.FGOUT.Module
return package; return package;
} }
public AlgorithmPackage_Figout_model bulidPackage(string cmd, TrackingBoxInfo box) public AlgorithmPackage_Figout_model bulidPackage(string cmd, TrackingBoxInfo box)
{ {
AlgorithmPackage_Figout_model package = new AlgorithmPackage_Figout_model(); AlgorithmPackage_Figout_model package = new AlgorithmPackage_Figout_model();
package.mode = "manual"; package.mode = "manual";
package.signal = AlgorithmPackageSignal.detect; package.signal = AlgorithmPackageSignal.detect;
//package.track_xy = box == null ? null : new List<int> { (int)box.SrcRect.Left, (int)box.SrcRect.Top, (int)box.SrcRect.Right, (int)box.SrcRect.Bottom }; //package.track_xy = box == null ? null : new List<int> { (int)box.SrcRect.Left, (int)box.SrcRect.Top, (int)box.SrcRect.Right, (int)box.SrcRect.Bottom };
//package.track_xy = box == null ? null : new List<int> { (int)box.X, (int)box.Y }; //package.track_xy = box == null ? null : new List<int> { (int)box.X, (int)box.Y };
return package; return package;
} }
public AlgorithmPackage_Figout_model bulidPackage(string cmd, Point box) public AlgorithmPackage_Figout_model bulidPackage(string cmd, Point box)
{ {
AlgorithmPackage_Figout_model package = new AlgorithmPackage_Figout_model(); AlgorithmPackage_Figout_model package = new AlgorithmPackage_Figout_model();
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.Command.cs
...@@ -75,9 +75,8 @@ namespace VIZ.FGOUT.Module ...@@ -75,9 +75,8 @@ namespace VIZ.FGOUT.Module
private void InitAlgorithm() private void InitAlgorithm()
{ {
if(this.ViewKey!= NDIViewKeys.CAM_1) if(this.ViewKey!= NDIViewKeys.CAM_1)
{
return; return;
}
ChangeStrategyContext context = new ChangeStrategyContext(); ChangeStrategyContext context = new ChangeStrategyContext();
context.IsUseClip = this.IsUseClip; context.IsUseClip = this.IsUseClip;
context.Mode = AlgorithmStrategyMode.auto_mode; context.Mode = AlgorithmStrategyMode.auto_mode;
...@@ -166,6 +165,7 @@ namespace VIZ.FGOUT.Module ...@@ -166,6 +165,7 @@ namespace VIZ.FGOUT.Module
//this.UpdateModeProperty(); //this.UpdateModeProperty();
// 重启算法 // 重启算法
if (this.ViewKey == NDIViewKeys.CAM_1)
this.AlgorithmControllerDic[this.StrategyType].RestartAlgorithm(); this.AlgorithmControllerDic[this.StrategyType].RestartAlgorithm();
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.cs
...@@ -100,6 +100,7 @@ namespace VIZ.FGOUT.Module ...@@ -100,6 +100,7 @@ namespace VIZ.FGOUT.Module
//this.AlgorithmControllerDic.Add(AlgorithmStrategyType.Single, new AlgorithmController_Single(this)); //this.AlgorithmControllerDic.Add(AlgorithmStrategyType.Single, new AlgorithmController_Single(this));
// 时间切片算法进行 // 时间切片算法进行
//if (this.ViewKey == NDIViewKeys.CAM_1)
this.AlgorithmControllerDic.Add(AlgorithmStrategyType.FigureOut,new AlgoritmController_FiguerOut(this)); this.AlgorithmControllerDic.Add(AlgorithmStrategyType.FigureOut,new AlgoritmController_FiguerOut(this));
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDISettingView/View/AlgorithmSettingPanelView.g.cs
#pragma checksum "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "01DD8B687722CEA3505A0F5237DB88FC7344409E9D6935DC6D7FAFB0437FEE0B" #pragma checksum "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "D03643DE19E9EB1EC7F52D7E66343089DBF18A77EDA790A6DBB57F26125672EB"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -48,7 +48,7 @@ namespace VIZ.FGOUT.Module { ...@@ -48,7 +48,7 @@ namespace VIZ.FGOUT.Module {
public partial class AlgorithmSettingPanelView : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { public partial class AlgorithmSettingPanelView : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
#line 124 "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml" #line 122 "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ComboBox _Sports_; internal System.Windows.Controls.ComboBox _Sports_;
...@@ -56,7 +56,7 @@ namespace VIZ.FGOUT.Module { ...@@ -56,7 +56,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 279 "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml" #line 277 "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ComboBox _Eases1_; internal System.Windows.Controls.ComboBox _Eases1_;
...@@ -64,7 +64,7 @@ namespace VIZ.FGOUT.Module { ...@@ -64,7 +64,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 290 "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml" #line 288 "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ComboBox _Eases2_; internal System.Windows.Controls.ComboBox _Eases2_;
...@@ -72,7 +72,7 @@ namespace VIZ.FGOUT.Module { ...@@ -72,7 +72,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 313 "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml" #line 311 "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Primitives.ToggleButton EnableSpline; internal System.Windows.Controls.Primitives.ToggleButton EnableSpline;
...@@ -80,7 +80,7 @@ namespace VIZ.FGOUT.Module { ...@@ -80,7 +80,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 433 "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml" #line 431 "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Primitives.ToggleButton MovementOnlyX; internal System.Windows.Controls.Primitives.ToggleButton MovementOnlyX;
...@@ -88,7 +88,7 @@ namespace VIZ.FGOUT.Module { ...@@ -88,7 +88,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 456 "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml" #line 454 "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Primitives.ToggleButton MovementOnlyY; internal System.Windows.Controls.Primitives.ToggleButton MovementOnlyY;
......
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}" "01DD8B687722CEA3505A0F5237DB88FC7344409E9D6935DC6D7FAFB0437FEE0B" #pragma checksum "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "D03643DE19E9EB1EC7F52D7E66343089DBF18A77EDA790A6DBB57F26125672EB"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -48,7 +48,7 @@ namespace VIZ.FGOUT.Module { ...@@ -48,7 +48,7 @@ namespace VIZ.FGOUT.Module {
public partial class AlgorithmSettingPanelView : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { public partial class AlgorithmSettingPanelView : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
#line 124 "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml" #line 122 "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ComboBox _Sports_; internal System.Windows.Controls.ComboBox _Sports_;
...@@ -56,7 +56,7 @@ namespace VIZ.FGOUT.Module { ...@@ -56,7 +56,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 279 "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml" #line 277 "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ComboBox _Eases1_; internal System.Windows.Controls.ComboBox _Eases1_;
...@@ -64,7 +64,7 @@ namespace VIZ.FGOUT.Module { ...@@ -64,7 +64,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 290 "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml" #line 288 "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ComboBox _Eases2_; internal System.Windows.Controls.ComboBox _Eases2_;
...@@ -72,7 +72,7 @@ namespace VIZ.FGOUT.Module { ...@@ -72,7 +72,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 313 "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml" #line 311 "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Primitives.ToggleButton EnableSpline; internal System.Windows.Controls.Primitives.ToggleButton EnableSpline;
...@@ -80,7 +80,7 @@ namespace VIZ.FGOUT.Module { ...@@ -80,7 +80,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 433 "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml" #line 431 "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Primitives.ToggleButton MovementOnlyX; internal System.Windows.Controls.Primitives.ToggleButton MovementOnlyX;
...@@ -88,7 +88,7 @@ namespace VIZ.FGOUT.Module { ...@@ -88,7 +88,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 456 "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml" #line 454 "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Primitives.ToggleButton MovementOnlyY; internal System.Windows.Controls.Primitives.ToggleButton MovementOnlyY;
......
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
22-808211288 22-1559853185
4-699044453 4-1529606353
90-747441034 90-1236168610
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\MattingImagePanelView.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; 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\MattingImagePanelView.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;
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/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/config/algorithm_strategy.csv
...@@ -5,4 +5,4 @@ ID,IsEnabled,Group,Type,Name,DisplayName,MainPath ...@@ -5,4 +5,4 @@ ID,IsEnabled,Group,Type,Name,DisplayName,MainPath
4,TRUE,足球,Tactics,战术机位,战术机位,C:\projects\tactical_v1.0.0.0\main_tactical.exe 4,TRUE,足球,Tactics,战术机位,战术机位,C:\projects\tactical_v1.0.0.0\main_tactical.exe
5,TRUE,羽毛球,Single,测试2,测试2,C:\projects\person_v2.0.0.0\person_v2.0.0.0.exe 5,TRUE,羽毛球,Single,测试2,测试2,C:\projects\person_v2.0.0.0\person_v2.0.0.0.exe
6,TRUE,羽毛球,Single,测试2,测试3,C:\projects\main_person_track\main_person_track.exe 6,TRUE,羽毛球,Single,测试2,测试3,C:\projects\main_person_track\main_person_track.exe
7,TRUE,羽毛球,FigureOut,测试1,测试1,C:\projects\org\person_v1.1.0.0\main_person_new22.py 7,TRUE,羽毛球,FigureOut,测试2,测试2,D:\zhangming\figout_deploy\main_TimePlus_class.py
\ No newline at end of file \ No newline at end of file
VIZ.FGOUT/VIZ.FGOUT/config/algorithm_strategy.csv
...@@ -5,4 +5,4 @@ ID,IsEnabled,Group,Type,Name,DisplayName,MainPath ...@@ -5,4 +5,4 @@ ID,IsEnabled,Group,Type,Name,DisplayName,MainPath
4,TRUE,足球,Tactics,战术机位,战术机位,C:\projects\tactical_v1.0.0.0\main_tactical.exe 4,TRUE,足球,Tactics,战术机位,战术机位,C:\projects\tactical_v1.0.0.0\main_tactical.exe
5,TRUE,羽毛球,Single,测试2,测试2,C:\projects\person_v2.0.0.0\person_v2.0.0.0.exe 5,TRUE,羽毛球,Single,测试2,测试2,C:\projects\person_v2.0.0.0\person_v2.0.0.0.exe
6,TRUE,羽毛球,Single,测试2,测试3,C:\projects\main_person_track\main_person_track.exe 6,TRUE,羽毛球,Single,测试2,测试3,C:\projects\main_person_track\main_person_track.exe
7,TRUE,羽毛球,FigureOut,测试1,测试1,C:\projects\org\person_v1.1.0.0\main_person_new22.py 7,TRUE,羽毛球,FigureOut,测试2,测试2,D:\zhangming\figout_deploy\main_TimePlus_class.py
\ No newline at end of file \ No newline at end of file
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