Skip to content

F
FGOUT
Commit 52535121 by 鲁志-悦动
Options

算法checked_ok后重新加载对应体育项目的开始、结束、无效位置标记(在调试) And 隐藏目标检测按钮

parent b7109d31
Showing with 125 additions and 131 deletions
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/Enum/NDIViewScene.cs
...@@ -9,18 +9,22 @@ ...@@ -9,18 +9,22 @@
/// 视频面板，在视频面板切换自动模式、手动模式、居中模式或不裁切时触发 /// 视频面板，在视频面板切换自动模式、手动模式、居中模式或不裁切时触发
/// </summary> /// </summary>
VideoPanel, VideoPanel,
/// <summary> /// <summary>
/// 设置面板 /// 设置面板
/// </summary> /// </summary>
SettingPanel, SettingPanel,
/// <summary> /// <summary>
/// 热键 /// 热键
/// </summary> /// </summary>
Hotkey, Hotkey,
/// <summary> /// <summary>
/// 空格热键 /// 空格热键
/// </summary> /// </summary>
SpaceHotkey, SpaceHotkey,
/// <summary> /// <summary>
/// 摇杆触发 /// 摇杆触发
/// </summary> /// </summary>
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/Service/INDIViewService.cs
...@@ -153,5 +153,10 @@ namespace VIZ.FGOUT.Module ...@@ -153,5 +153,10 @@ namespace VIZ.FGOUT.Module
/// </summary> /// </summary>
/// <param name="context"></param> /// <param name="context"></param>
void NDIViewHotkeyMode(NDIViewHotkeyContext context); void NDIViewHotkeyMode(NDIViewHotkeyContext context);
/// <summary>
/// 重新加载开始、结束、无效位置标记
/// </summary>
void ReloadPositionMark();
} }
} }
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/View/NDIView.xaml
...@@ -261,7 +261,7 @@ ...@@ -261,7 +261,7 @@
<!-- 机位对应特殊面板区域 --> <!-- 机位对应特殊面板区域 -->
<Grid Grid.Row="1"> <Grid Grid.Row="1">
<!-- 单人机位 ===== 目标检测按钮 --> <!-- 单人机位 ===== 目标检测按钮 -->
<Button <!--<Button
x:Name="_DetectBtn_" x:Name="_DetectBtn_"
Width="32" Width="32"
Height="32" Height="32"
...@@ -270,6 +270,7 @@ ...@@ -270,6 +270,7 @@
VerticalAlignment="Bottom" VerticalAlignment="Bottom"
Command="{Binding Path=DetectCommand}" Command="{Binding Path=DetectCommand}"
Style="{StaticResource ButtonStyle}"> Style="{StaticResource ButtonStyle}">
-->
<!--<Button.IsEnabled> <!--<Button.IsEnabled>
<MultiBinding Converter="{StaticResource NDIViewProperty2BoolConverter_DetectButton}"> <MultiBinding Converter="{StaticResource NDIViewProperty2BoolConverter_DetectButton}">
<Binding Path="ViewStatus"></Binding> <Binding Path="ViewStatus"></Binding>
...@@ -284,6 +285,7 @@ ...@@ -284,6 +285,7 @@
<Binding Path="StrategyType"></Binding> <Binding Path="StrategyType"></Binding>
</MultiBinding> </MultiBinding>
</Button.Visibility>--> </Button.Visibility>-->
<!--
<Button.Content> <Button.Content>
<Image <Image
Width="24" Width="24"
...@@ -292,7 +294,7 @@ ...@@ -292,7 +294,7 @@
VerticalAlignment="Center" VerticalAlignment="Center"
Source="/VIZ.FGOUT.Module.Resource;component/Icons/touch_32x32.png" /> Source="/VIZ.FGOUT.Module.Resource;component/Icons/touch_32x32.png" />
</Button.Content> </Button.Content>
</Button> </Button>-->
</Grid> </Grid>
<!-- 视频区域 --> <!-- 视频区域 -->
<Grid Grid.Row="1" Grid.Column="1"> <Grid Grid.Row="1" Grid.Column="1">
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/View/NDIView.xaml.cs
...@@ -146,7 +146,8 @@ namespace VIZ.FGOUT.Module ...@@ -146,7 +146,8 @@ namespace VIZ.FGOUT.Module
{ {
if ((bool)e.NewValue) if ((bool)e.NewValue)
{ {
_DetectBtn_.Visibility = _RestartBtn_.Visibility = _StopBtn_.Visibility = Visibility.Collapsed; //_DetectBtn_.Visibility =
_RestartBtn_.Visibility = _StopBtn_.Visibility = Visibility.Collapsed;
} }
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.Message.cs
using SharpDX.Mathematics.Interop; using SharpDX.Mathematics.Interop;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization;
using System.Linq; using System.Linq;
using System.Windows.Media;
using VIZ.FGOUT.Domain; using VIZ.FGOUT.Domain;
using VIZ.FGOUT.Storage; using VIZ.FGOUT.Storage;
using VIZ.Framework.Common; using VIZ.Framework.Common;
using VIZ.Framework.Core; using VIZ.Framework.Core;
using VIZ.Framework.Domain;
using VIZ.Framework.Storage; using VIZ.Framework.Storage;
namespace VIZ.FGOUT.Module namespace VIZ.FGOUT.Module
...@@ -72,46 +73,6 @@ namespace VIZ.FGOUT.Module ...@@ -72,46 +73,6 @@ namespace VIZ.FGOUT.Module
} }
} }
////清除开始、结束、无效位置标记
//this.CleanPlace(cpModel);
////目前来看这段代码没起作用
//SystemConfig config = ApplicationDomainEx.LiteDbContext.SystemConfig.FindAll().FirstOrDefault();
//if (this.ViewKey == NDIViewKeys.CAM_1)
//{
// // 是否显示目标裁切框
// this.IsShowAlgorithmTargetBox = config.IsShowAlgorithmTargetBox;
// SetPlaceNewConfig setPlaceNewConfig =
// ApplicationDomainEx.LiteDbContext.SetPlaceNewConfig.FindOne(p =>
// p.SportCode == this.viewConfig.GameName);
// if (setPlaceNewConfig == null) return;
// NDIView view = this.GetView<NDIView>();
// if (view == null)
// return;
// if (setPlaceNewConfig.StartPlace.Count > 0)
// {
// view.polygonsStart = setPlaceNewConfig.StartPlace;
// foreach (var points in setPlaceNewConfig.StartPlace)
// AddPoints(view, points, Brushes.Blue);
// }
// if (setPlaceNewConfig.EndPlace.Count > 0)
// {
// view.polygonsEnd = setPlaceNewConfig.EndPlace;
// foreach (var points in setPlaceNewConfig.EndPlace)
// AddPoints(view, points, Brushes.Green);
// }
// if (setPlaceNewConfig.InvlidPlace.Count > 0)
// {
// view.rectsInvalid = setPlaceNewConfig.InvlidPlace;
// foreach (var points in setPlaceNewConfig.InvlidPlace)
// AddRects(view, points, Brushes.Red);
// }
//}
//==================================================================== //====================================================================
// CODE: SYSTEM_LOG | 记录日志 // CODE: SYSTEM_LOG | 记录日志
//==================================================================== //====================================================================
...@@ -119,6 +80,11 @@ namespace VIZ.FGOUT.Module ...@@ -119,6 +80,11 @@ namespace VIZ.FGOUT.Module
string system_log = string.Format(SystemLogStringFormats.ALGORITHM_CHECKED_OK, this.StrategyType.GetDescription(), this.ViewKey); string system_log = string.Format(SystemLogStringFormats.ALGORITHM_CHECKED_OK, this.StrategyType.GetDescription(), this.ViewKey);
ApplicationDomainEx.CsvContext.AppendSystemLog(this.ViewKey, this.DisplayName, system_log); ApplicationDomainEx.CsvContext.AppendSystemLog(this.ViewKey, this.DisplayName, system_log);
//==================================================================== //====================================================================
// 重新加载开始、结束、无效位置标记
var service = ApplicationDomain.ServiceManager.GetService<INDIViewService>(NDIViewKeys.CAM_1);
if (service == null) return;
service.ReloadPositionMark();
} }
private DateTime cropDt = DateTime.Now; private DateTime cropDt = DateTime.Now;
...@@ -168,7 +134,6 @@ namespace VIZ.FGOUT.Module ...@@ -168,7 +134,6 @@ namespace VIZ.FGOUT.Module
info.DrawingBorderWidth = this.DETECT_BOX_BORDER_WIDTH; info.DrawingBorderWidth = this.DETECT_BOX_BORDER_WIDTH;
// 检测框在显示目标框时显示，否则采用透明色 // 检测框在显示目标框时显示，否则采用透明色
info.DrawingBorderColor = this.IsShowAlgorithmTargetBox ? this.DETECT_BOX_BORDER_COLOR : this.DETECT_BOX_BORDER_COLOR_TRANSPARENT; info.DrawingBorderColor = this.IsShowAlgorithmTargetBox ? this.DETECT_BOX_BORDER_COLOR : this.DETECT_BOX_BORDER_COLOR_TRANSPARENT;
info.TimeCode = msg.timecode; info.TimeCode = msg.timecode;
infos.Add(info); infos.Add(info);
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.cs
...@@ -938,6 +938,7 @@ namespace VIZ.FGOUT.Module ...@@ -938,6 +938,7 @@ namespace VIZ.FGOUT.Module
//SetPlaceConfig setPlaceConfig = ApplicationDomainEx.LiteDbContext.SetPlaceConfig.FindAll().FirstOrDefault(); //SetPlaceConfig setPlaceConfig = ApplicationDomainEx.LiteDbContext.SetPlaceConfig.FindAll().FirstOrDefault();
//SetPlaceNewConfig setPlaceNewConfig = ApplicationDomainEx.LiteDbContext.SetPlaceNewConfig.FindAll().FirstOrDefault(); //SetPlaceNewConfig setPlaceNewConfig = ApplicationDomainEx.LiteDbContext.SetPlaceNewConfig.FindAll().FirstOrDefault();
SetPlaceNewConfig setPlaceNewConfig = ApplicationDomainEx.LiteDbContext.SetPlaceNewConfig.FindOne(p => SetPlaceNewConfig setPlaceNewConfig = ApplicationDomainEx.LiteDbContext.SetPlaceNewConfig.FindOne(p =>
p.SportCode == this.viewConfig.GameName); p.SportCode == this.viewConfig.GameName);
//if (setPlaceConfig == null) return; //if (setPlaceConfig == null) return;
...@@ -949,44 +950,84 @@ namespace VIZ.FGOUT.Module ...@@ -949,44 +950,84 @@ namespace VIZ.FGOUT.Module
//polygon.Points = points; //polygon.Points = points;
//在自动模式下显示位置 //在自动模式下显示位置
//if (this.manualConfig != null && !this.manualConfig.IsManual)
//{
// NDIView view = this.GetView<NDIView>();
// if (setPlaceNewConfig.StartPlace.Count > 0)
// {
// view.polygonsStart = setPlaceNewConfig.StartPlace;
// //view.rectStart = new Rect(setPlaceConfig.StartPlace[0], setPlaceConfig.StartPlace[1], setPlaceConfig.StartPlace[2], setPlaceConfig.StartPlace[3]);
// //view.aa.AddGeometry(new RectangleGeometry(view.rectStart));
// foreach (var points in setPlaceNewConfig.StartPlace)
// AddPoints(view, points, Brushes.Blue);
// }
// if (setPlaceNewConfig.EndPlace.Count > 0)
// {
// view.polygonsEnd = setPlaceNewConfig.EndPlace;
// //view.rectEnd = new Rect(setPlaceConfig.EndPlace[0], setPlaceConfig.EndPlace[1], setPlaceConfig.EndPlace[2], setPlaceConfig.EndPlace[3]);
// //view.aa.AddGeometry(new RectangleGeometry(view.rectEnd));
// foreach (var points in setPlaceNewConfig.EndPlace)
// AddPoints(view, points, Brushes.Green);
// }
// if (setPlaceNewConfig.InvlidPlace.Count > 0)
// {
// //view.polygonsInvalid = setPlaceNewConfig.InvlidPlace;
// ////view.rectInvalid = new Rect(setPlaceConfig.InvlidPlace[0], setPlaceConfig.InvlidPlace[1], setPlaceConfig.InvlidPlace[2], setPlaceConfig.InvlidPlace[3]);
// ////view.aa.AddGeometry(new RectangleGeometry(view.rectInvalid));
// //foreach (var points in setPlaceNewConfig.InvlidPlace)
// // AddPoints(view, points, Brushes.Red);
// view.rectsInvalid = setPlaceNewConfig.InvlidPlace;
// //view.rectInvalid = new Rect(setPlaceConfig.InvlidPlace[0], setPlaceConfig.InvlidPlace[1], setPlaceConfig.InvlidPlace[2], setPlaceConfig.InvlidPlace[3]);
// //view.aa.AddGeometry(new RectangleGeometry(view.rectInvalid));
// foreach (var points in setPlaceNewConfig.InvlidPlace)
// AddRects(view, points, Brushes.Red);
// }
// //view.myPath.Data = view.aa;
//}
LoadPositionMark();
}
}
/// <summary>
/// 加载开始、结束、无效位置标记
/// </summary>
private void LoadPositionMark()
{
var setPlaceNewConfig = ApplicationDomainEx.LiteDbContext.SetPlaceNewConfig.FindOne(p =>
p.SportCode == this.viewConfig.GameName);
if (setPlaceNewConfig == null) return;
//如果结束位置的count为0，则不加载位置标记
if (setPlaceNewConfig.EndPlace.Count == 0) return;
//在自动模式下显示位置
if (this.manualConfig != null && !this.manualConfig.IsManual) if (this.manualConfig != null && !this.manualConfig.IsManual)
{ {
NDIView view = this.GetView<NDIView>(); NDIView view = this.GetView<NDIView>();
if(view == null) return;
if (setPlaceNewConfig.StartPlace.Count > 0) if (setPlaceNewConfig.StartPlace.Count > 0)
{ {
view.polygonsStart = setPlaceNewConfig.StartPlace; view.polygonsStart = setPlaceNewConfig.StartPlace;
//view.rectStart = new Rect(setPlaceConfig.StartPlace[0], setPlaceConfig.StartPlace[1], setPlaceConfig.StartPlace[2], setPlaceConfig.StartPlace[3]);
//view.aa.AddGeometry(new RectangleGeometry(view.rectStart));
foreach (var points in setPlaceNewConfig.StartPlace) foreach (var points in setPlaceNewConfig.StartPlace)
AddPoints(view, points, Brushes.Blue); AddPoints(view, points, Brushes.Blue);
} }
if (setPlaceNewConfig.EndPlace.Count > 0) if (setPlaceNewConfig.EndPlace.Count > 0)
{ {
view.polygonsEnd = setPlaceNewConfig.EndPlace; view.polygonsEnd = setPlaceNewConfig.EndPlace;
//view.rectEnd = new Rect(setPlaceConfig.EndPlace[0], setPlaceConfig.EndPlace[1], setPlaceConfig.EndPlace[2], setPlaceConfig.EndPlace[3]);
//view.aa.AddGeometry(new RectangleGeometry(view.rectEnd));
foreach (var points in setPlaceNewConfig.EndPlace) foreach (var points in setPlaceNewConfig.EndPlace)
AddPoints(view, points, Brushes.Green); AddPoints(view, points, Brushes.Green);
} }
if (setPlaceNewConfig.InvlidPlace.Count > 0) if (setPlaceNewConfig.InvlidPlace.Count > 0)
{ {
//view.polygonsInvalid = setPlaceNewConfig.InvlidPlace;
////view.rectInvalid = new Rect(setPlaceConfig.InvlidPlace[0], setPlaceConfig.InvlidPlace[1], setPlaceConfig.InvlidPlace[2], setPlaceConfig.InvlidPlace[3]);
////view.aa.AddGeometry(new RectangleGeometry(view.rectInvalid));
//foreach (var points in setPlaceNewConfig.InvlidPlace)
// AddPoints(view, points, Brushes.Red);
view.rectsInvalid = setPlaceNewConfig.InvlidPlace; view.rectsInvalid = setPlaceNewConfig.InvlidPlace;
//view.rectInvalid = new Rect(setPlaceConfig.InvlidPlace[0], setPlaceConfig.InvlidPlace[1], setPlaceConfig.InvlidPlace[2], setPlaceConfig.InvlidPlace[3]);
//view.aa.AddGeometry(new RectangleGeometry(view.rectInvalid));
foreach (var points in setPlaceNewConfig.InvlidPlace) foreach (var points in setPlaceNewConfig.InvlidPlace)
AddRects(view, points, Brushes.Red); AddRects(view, points, Brushes.Red);
} }
//view.myPath.Data = view.aa;
}
} }
} }
...@@ -1369,5 +1410,13 @@ namespace VIZ.FGOUT.Module ...@@ -1369,5 +1410,13 @@ namespace VIZ.FGOUT.Module
AddRects(view, points, Brushes.Red); AddRects(view, points, Brushes.Red);
} }
} }
/// <summary>
/// 重新加载位置标记
/// </summary>
public void ReloadPositionMark()
{
LoadPositionMark();
}
} }
} }
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIView/View/NDIView.g.cs
#pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "84C68D3FB0DFBE0619EDC64BD6ED76FDDE4DD0E8E7FFA91EAFC4445A46456537" #pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A9A7AFD382FA9DB1A8D5F8933864890F4E2AB6714C56FF0A9183BC8FDC0F57A6"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -60,15 +60,7 @@ namespace VIZ.FGOUT.Module { ...@@ -60,15 +60,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 265 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 307 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _DetectBtn_;
#line default
#line hidden
#line 305 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Border Border; internal System.Windows.Controls.Border Border;
...@@ -76,7 +68,7 @@ namespace VIZ.FGOUT.Module { ...@@ -76,7 +68,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 325 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 327 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.Framework.Common.VideoControl video; internal VIZ.Framework.Common.VideoControl video;
...@@ -84,7 +76,7 @@ namespace VIZ.FGOUT.Module { ...@@ -84,7 +76,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 331 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 333 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Canvas canvas1; internal System.Windows.Controls.Canvas canvas1;
...@@ -92,7 +84,7 @@ namespace VIZ.FGOUT.Module { ...@@ -92,7 +84,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 436 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 438 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _RestartBtn_; internal System.Windows.Controls.Button _RestartBtn_;
...@@ -100,7 +92,7 @@ namespace VIZ.FGOUT.Module { ...@@ -100,7 +92,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 450 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 452 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _StopBtn_; internal System.Windows.Controls.Button _StopBtn_;
...@@ -141,69 +133,66 @@ namespace VIZ.FGOUT.Module { ...@@ -141,69 +133,66 @@ namespace VIZ.FGOUT.Module {
this.uc = ((VIZ.FGOUT.Module.NDIView)(target)); this.uc = ((VIZ.FGOUT.Module.NDIView)(target));
return; return;
case 2: case 2:
this._DetectBtn_ = ((System.Windows.Controls.Button)(target));
return;
case 3:
this.Border = ((System.Windows.Controls.Border)(target)); this.Border = ((System.Windows.Controls.Border)(target));
#line 307 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 309 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.KeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyDown); this.Border.KeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyDown);
#line default #line default
#line hidden #line hidden
#line 308 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 310 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.KeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyUp); this.Border.KeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyUp);
#line default #line default
#line hidden #line hidden
#line 309 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 311 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewKeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyDown); this.Border.PreviewKeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyDown);
#line default #line default
#line hidden #line hidden
#line 310 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 312 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewKeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyUp); this.Border.PreviewKeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyUp);
#line default #line default
#line hidden #line hidden
#line 311 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 313 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonDown); this.Border.PreviewMouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonDown);
#line default #line default
#line hidden #line hidden
#line 312 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 314 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonUp); this.Border.PreviewMouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonUp);
#line default #line default
#line hidden #line hidden
#line 313 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 315 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseMove += new System.Windows.Input.MouseEventHandler(this.Border_MouseMove); this.Border.PreviewMouseMove += new System.Windows.Input.MouseEventHandler(this.Border_MouseMove);
#line default #line default
#line hidden #line hidden
#line 314 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 316 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseRightButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_OnPreviewMouseRightButtonDown); this.Border.PreviewMouseRightButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_OnPreviewMouseRightButtonDown);
#line default #line default
#line hidden #line hidden
return; return;
case 4: case 3:
this.video = ((VIZ.Framework.Common.VideoControl)(target)); this.video = ((VIZ.Framework.Common.VideoControl)(target));
return; return;
case 5: case 4:
this.canvas1 = ((System.Windows.Controls.Canvas)(target)); this.canvas1 = ((System.Windows.Controls.Canvas)(target));
return; return;
case 6: case 5:
this._RestartBtn_ = ((System.Windows.Controls.Button)(target)); this._RestartBtn_ = ((System.Windows.Controls.Button)(target));
return; return;
case 7: case 6:
this._StopBtn_ = ((System.Windows.Controls.Button)(target)); this._StopBtn_ = ((System.Windows.Controls.Button)(target));
return; return;
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIView/View/NDIView.g.i.cs
#pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "84C68D3FB0DFBE0619EDC64BD6ED76FDDE4DD0E8E7FFA91EAFC4445A46456537" #pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A9A7AFD382FA9DB1A8D5F8933864890F4E2AB6714C56FF0A9183BC8FDC0F57A6"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -60,15 +60,7 @@ namespace VIZ.FGOUT.Module { ...@@ -60,15 +60,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 265 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 307 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _DetectBtn_;
#line default
#line hidden
#line 305 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Border Border; internal System.Windows.Controls.Border Border;
...@@ -76,7 +68,7 @@ namespace VIZ.FGOUT.Module { ...@@ -76,7 +68,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 325 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 327 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.Framework.Common.VideoControl video; internal VIZ.Framework.Common.VideoControl video;
...@@ -84,7 +76,7 @@ namespace VIZ.FGOUT.Module { ...@@ -84,7 +76,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 331 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 333 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Canvas canvas1; internal System.Windows.Controls.Canvas canvas1;
...@@ -92,7 +84,7 @@ namespace VIZ.FGOUT.Module { ...@@ -92,7 +84,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 436 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 438 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _RestartBtn_; internal System.Windows.Controls.Button _RestartBtn_;
...@@ -100,7 +92,7 @@ namespace VIZ.FGOUT.Module { ...@@ -100,7 +92,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 450 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 452 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _StopBtn_; internal System.Windows.Controls.Button _StopBtn_;
...@@ -141,69 +133,66 @@ namespace VIZ.FGOUT.Module { ...@@ -141,69 +133,66 @@ namespace VIZ.FGOUT.Module {
this.uc = ((VIZ.FGOUT.Module.NDIView)(target)); this.uc = ((VIZ.FGOUT.Module.NDIView)(target));
return; return;
case 2: case 2:
this._DetectBtn_ = ((System.Windows.Controls.Button)(target));
return;
case 3:
this.Border = ((System.Windows.Controls.Border)(target)); this.Border = ((System.Windows.Controls.Border)(target));
#line 307 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 309 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.KeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyDown); this.Border.KeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyDown);
#line default #line default
#line hidden #line hidden
#line 308 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 310 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.KeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyUp); this.Border.KeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyUp);
#line default #line default
#line hidden #line hidden
#line 309 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 311 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewKeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyDown); this.Border.PreviewKeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyDown);
#line default #line default
#line hidden #line hidden
#line 310 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 312 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewKeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyUp); this.Border.PreviewKeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyUp);
#line default #line default
#line hidden #line hidden
#line 311 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 313 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonDown); this.Border.PreviewMouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonDown);
#line default #line default
#line hidden #line hidden
#line 312 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 314 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonUp); this.Border.PreviewMouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonUp);
#line default #line default
#line hidden #line hidden
#line 313 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 315 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseMove += new System.Windows.Input.MouseEventHandler(this.Border_MouseMove); this.Border.PreviewMouseMove += new System.Windows.Input.MouseEventHandler(this.Border_MouseMove);
#line default #line default
#line hidden #line hidden
#line 314 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 316 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseRightButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_OnPreviewMouseRightButtonDown); this.Border.PreviewMouseRightButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_OnPreviewMouseRightButtonDown);
#line default #line default
#line hidden #line hidden
return; return;
case 4: case 3:
this.video = ((VIZ.Framework.Common.VideoControl)(target)); this.video = ((VIZ.Framework.Common.VideoControl)(target));
return; return;
case 5: case 4:
this.canvas1 = ((System.Windows.Controls.Canvas)(target)); this.canvas1 = ((System.Windows.Controls.Canvas)(target));
return; return;
case 6: case 5:
this._RestartBtn_ = ((System.Windows.Controls.Button)(target)); this._RestartBtn_ = ((System.Windows.Controls.Button)(target));
return; return;
case 7: case 6:
this._StopBtn_ = ((System.Windows.Controls.Button)(target)); this._StopBtn_ = ((System.Windows.Controls.Button)(target));
return; return;
} }
......
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.Framework/VIZ.Framework.Core/Core/WPF/IService.cs
using System; namespace VIZ.Framework.Core
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.Framework.Core
{ {
/// <summary> /// <summary>
/// 服务 /// 服务
......
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