Commit 7d1befff by 鲁志-悦动

处理算法发过来的ROI消息,计算点到中心点的最短距离框,点击框由粉红色变为红色

parent 32af1cbb

//------------------------------------------------------------------------------
// <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
......@@ -8,5 +8,7 @@
public bool CleanPlace { get; set; }
public string Key { get; set; }
public bool IsRefreshPosition { get; set; }
}
}
......@@ -18,17 +18,6 @@
mc:Ignorable="d">
<UserControl.Resources>
<ResourceDictionary>
<!--<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/Button/Button_WindowTop.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/CheckBox/CheckBox_WindowTop.xaml" />
<ResourceDictionary Source="/VIZ.Framework.Common.Resource;component/Style/Button/Button_WindowTop.xaml" />
<ResourceDictionary Source="/VIZ.Framework.Common.Resource;component/Style/ListBox/ListBox_None.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/CheckBox/CheckBox_Setting.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/Button/Button_Setting.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/ToogleButton/ToogleButton_Setting.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/TextBlock/TextBlock_Setting.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Themes/Generic.xaml" />
</ResourceDictionary.MergedDictionaries>-->
<fcore:ByteSizeConverter
x:Key="ByteSizeConverter"
InType="B"
......
......@@ -137,21 +137,21 @@ namespace VIZ.FGOUT.Module
//ApplicationDomain.MessageManager.Register<ReplayEndValueModel>(this, this.ReplayEndValueFromNDIViewModel);
}
int _sliderStartInitValue;
int _sliderEndInitValue;
private void ReplayStartValueFromNDIViewModel(ReplayStartValueModel vm)
{
_isReplayChecked = true;
SliderStartValue = _sliderStartInitValue = vm.ReplayStartValue;
_isReplayChecked = false;
}
//int _sliderStartInitValue;
//int _sliderEndInitValue;
//private void ReplayStartValueFromNDIViewModel(ReplayStartValueModel vm)
//{
// _isReplayChecked = true;
// SliderStartValue = _sliderStartInitValue = vm.ReplayStartValue;
// _isReplayChecked = false;
//}
private void ReplayEndValueFromNDIViewModel(ReplayEndValueModel vm)
{
_isReplayChecked = true;
SliderEndValue = _sliderEndInitValue = vm.ReplayEndValue;
_isReplayChecked = false;
}
//private void ReplayEndValueFromNDIViewModel(ReplayEndValueModel vm)
//{
// _isReplayChecked = true;
// SliderEndValue = _sliderEndInitValue = vm.ReplayEndValue;
// _isReplayChecked = false;
//}
private SetManualConfig manualConfig;
/// <summary>
......@@ -515,6 +515,7 @@ namespace VIZ.FGOUT.Module
private void HidePlace()
{
cleanPlaceModel.CleanPlace = true;
cleanPlaceModel.IsRefreshPosition = true;
ApplicationDomain.MessageManager.Send(cleanPlaceModel);
}
......@@ -1318,6 +1319,7 @@ namespace VIZ.FGOUT.Module
//三个按钮取消选中
ThreePositionButtonsUnChecked();
cleanPlaceModel.CleanPlace = true;
cleanPlaceModel.IsRefreshPosition = false;
ApplicationDomain.MessageManager.Send(cleanPlaceModel);
}
......
......@@ -149,8 +149,8 @@ namespace VIZ.FGOUT.Module
/// </summary>
public virtual void ChangeManualMode()
{
// 重置3D鼠标
this.Support.Reset3DMouse();
// 重置3D鼠标(20240305注释)
//this.Support.Reset3DMouse();
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(this.Support.ViewKey);
if (manager == null)
......
......@@ -340,16 +340,19 @@ namespace VIZ.FGOUT.Module
{
foreach (var info in NDIViewModel._cam3StaticInfos)
{
//if (info.SrcRect.Left > 0 && info.SrcRect.Right > 0 && info.SrcRect.Top > 0 && info.SrcRect.Bottom > 0)
//{
var difference = Math.Abs(startPoint.X - info.SrcRect.Left) + Math.Abs(info.SrcRect.Right - startPoint.X)
+ Math.Abs(startPoint.Y - info.SrcRect.Top) + Math.Abs(info.SrcRect.Bottom - startPoint.Y);
if (info.SrcRect.Left >= 0 && info.SrcRect.Right >= 0 && info.SrcRect.Top >= 0 && info.SrcRect.Bottom >= 0)
{
//计算四个方向到点的距离取绝对值
//var difference = Math.Abs(startPoint.X - info.SrcRect.Left) + Math.Abs(info.SrcRect.Right - startPoint.X)
// + Math.Abs(startPoint.Y - info.SrcRect.Top) + Math.Abs(info.SrcRect.Bottom - startPoint.Y);
//计算点到矩形中心点的距离的绝对值
var difference = Math.Abs(startPoint.X - (info.SrcRect.Right - info.SrcRect.Left) / 2) + Math.Abs(startPoint.Y - (info.SrcRect.Bottom - info.SrcRect.Top) / 2);
if (difference < minDistance)
{
saveInfo = info;
minDistance = difference;
}
//}
}
}
}
}
......
......@@ -261,14 +261,12 @@ namespace VIZ.FGOUT.Module
foreach (var info in infoBuffers)
{
if (info.TimeCode == dse.TimeStamp)
{
_cam3Infos.Add(info);
}
}
}
//如果是Start滑块在动
if (view.vm.IsStartValue)
if (view.vm.IsStartValue)
StartTime = dse.TimeStamp;
else if (view.vm.IsEndValue)
EndTime = dse.TimeStamp;
......@@ -287,6 +285,12 @@ namespace VIZ.FGOUT.Module
if (_cam3Infos.Count > 0)
{
_cam3StaticInfos = _cam3Infos;
//更新红色点中框
if (view3.saveInfo.SrcRect.Left > 0)
{
view3.saveInfo.DrawingBorderColor = this.TRACKING_BOX_BORDER_COLOR;
_cam3Infos.Add(view3.saveInfo);
}
view3.video.UpdateTrackingBox(_cam3Infos);
}
}
......@@ -296,7 +300,6 @@ namespace VIZ.FGOUT.Module
log.Error(ex);
}
});
//view.video.UpdateVideoFrame(dse, true);
}
view.vm.IsStartValue = false;
......@@ -402,8 +405,9 @@ namespace VIZ.FGOUT.Module
// ClipSender.CropRoi(manager_clip, 0, this.GetManulRoi((int)sendValue.Value), ApplicationDomainEx.VIDEO_CLIP_BOX_WIDTH, e.Frame.Height, sendValue.TimeCode);
// }
//}
// 统计裁切FPS
this.ClipFPS.CalcFps();
// 统计裁切FPS(20240305注释)
//this.ClipFPS.CalcFps();
}
}
}
......
......@@ -135,11 +135,6 @@ namespace VIZ.FGOUT.Module
{
foreach (RawRectangleF item in msg.bboxes)
{
//// 视频的宽度
//int resWith = ApplicationDomainEx.IniStorage.GetValue<VideoConfig, int>(p => p.VIDEO_WIDTH);
//// 视频的高度
//int resHeight = ApplicationDomainEx.IniStorage.GetValue<VideoConfig, int>(p => p.VIDEO_HEIGHT);
//RawRectangleF rect = RawRectangleFExpand.ClipInVideoFrame(item, 0, 0, renderInfo.Frame.Width, renderInfo.Frame.Height);
RawRectangleF rect = RawRectangleFExpand.ClipInVideoFrame(item, 0, 0, resWith, resHeight);
if (!RawRectangleFExpand.IsEffective(rect))
......@@ -163,10 +158,6 @@ namespace VIZ.FGOUT.Module
{
foreach (RawRectangleF item in msg.ignore_bboxes)
{
//// 视频的宽度
//int resWith = ApplicationDomainEx.IniStorage.GetValue<VideoConfig, int>(p => p.VIDEO_WIDTH);
//// 视频的高度
//int resHeight = ApplicationDomainEx.IniStorage.GetValue<VideoConfig, int>(p => p.VIDEO_HEIGHT);
RawRectangleF rect = RawRectangleFExpand.ClipInVideoFrame(item, 0, 0, resWith, resHeight);
if (!RawRectangleFExpand.IsEffective(rect))
......@@ -180,6 +171,31 @@ namespace VIZ.FGOUT.Module
info.DrawingBorderColor = this.IsShowAlgorithmTargetBox ? this.IGNORE_BOX_BORDER_COLOR : this.DETECT_BOX_BORDER_COLOR_TRANSPARENT;
info.TimeCode = msg.timecode;
infos.Add(info);
if (!view.vm.IsReplay)
_trackingBoxInfoBuffer.AddInfo(info);
}
}
//刷新ROI
if (msg.ignore_bboxes != null)
{
foreach (RawRectangleF item in msg.roi_bbox)
{
RawRectangleF rect = RawRectangleFExpand.ClipInVideoFrame(item, 0, 0, resWith, resHeight);
if (!RawRectangleFExpand.IsEffective(rect))
continue;
TrackingBoxInfo info = new TrackingBoxInfo();
info.Type = TrackingBoxStyle.Rectangle;
info.SrcRect = rect;
info.DrawingBorderWidth = this.DETECT_BOX_BORDER_WIDTH;
// 检测框在显示目标框时显示,否则采用透明色
info.DrawingBorderColor = this.IsShowAlgorithmTargetBox ? this.DETECT_BOX_BORDER_COLOR : this.DETECT_BOX_BORDER_COLOR_TRANSPARENT;
info.TimeCode = msg.timecode;
infos.Add(info);
if (!view.vm.IsReplay)
_trackingBoxInfoBuffer.AddInfo(info);
}
}
......@@ -189,27 +205,8 @@ namespace VIZ.FGOUT.Module
// 更新视频控件跟踪框信息
view.video.UpdateTrackingBox(infos);
//if (view.vm.IsReplay)
//{
// // Replay更新画面
// WPFHelper.Invoke(() =>
// {
// try
// {
// var view3 = this.FindChild<NDIView>(Application.Current.MainWindow, NDIViewKeys.cam3);
// // 更新视频控件跟踪框信息
// if (infos.Count > 0)
// view3.video.UpdateTrackingBox(_cam3Infos);
// }
// catch (Exception ex)
// {
// log.Error(ex);
// }
// });
//}
// 更新算法帧率统计
this.AlgorithmFPS.CalcFps();
// 更新算法帧率统计(20240305注释)
//this.AlgorithmFPS.CalcFps();
}
#region 定时器
......
......@@ -271,12 +271,8 @@ namespace VIZ.FGOUT.Module
{
inPoints = CoordinateTrackingBoxInfo(nDIView.saveInfo.SrcRect, srcWidth, srcHeight);
isInPoint = true;
nDIView.saveInfo = new TrackingBoxInfo();
//nDIView.saveInfo = new TrackingBoxInfo();
}
//if (_cam3StaticInfos.Count > 0)
// inPoints = CoordinateTrackingBoxInfo(nDIView.saveInfo.SrcRect, srcWidth, srcHeight);
//else
// inPoints = Coordinate(nDIView.rectsReplay, srcWidth, srcHeight);
if (!isInPoint)
{
......@@ -429,6 +425,11 @@ namespace VIZ.FGOUT.Module
IsReplay = replayModel.IsReplay;
if (IsReplay)
_autoSend_Timer.Stop();//自动发送计时器取消
else
{
NDIView nDIView = this.GetView<NDIView>();
nDIView.saveInfo = new TrackingBoxInfo();
}
IsSliderValueChanged = replayModel.IsSliderValueChanged;
SliderValue = replayModel.SliderValue;
}
......@@ -586,9 +587,12 @@ namespace VIZ.FGOUT.Module
if (this.ViewKey != NDIViewKeys.CAM_1)
return;
MessageBoxExResult result = MessageBoxEx.ShowDialog("提示", "确定清空位置?", MessageBoxExButtons.YES_CANCEL, this.GetWindow());
if (result != MessageBoxExResult.YES)
return;
if (!cleanPlaceModel.IsRefreshPosition)
{
MessageBoxExResult result = MessageBoxEx.ShowDialog("提示", "确定清空位置?", MessageBoxExButtons.YES_CANCEL, this.GetWindow());
if (result != MessageBoxExResult.YES)
return;
}
var ndiView = this.GetView<NDIView>();
if (ndiView == null)
......@@ -814,33 +818,8 @@ namespace VIZ.FGOUT.Module
private List<List<List<int>>> CoordinateTrackingBoxInfo(RawRectangleF rect, double srcWidth, double srcHeight)
{
//// 视频的宽度
//int resWith = ApplicationDomain.IniStorage.GetValue<VideoConfig, int>(p => p.VIDEO_WIDTH);
//// 视频的高度
//int resHeight = ApplicationDomain.IniStorage.GetValue<VideoConfig, int>(p => p.VIDEO_HEIGHT);
//double xp = srcWidth / resWith;
//double xy = srcHeight / resHeight;
var listOuterMost = new List<List<List<int>>>();
// int dx = Convert.ToInt32(rect.Left / xp);
// int dy = Convert.ToInt32(rect.Top / xy);
// int width = Convert.ToInt32((rect.Right - rect.Left) / xp);
// int height = Convert.ToInt32((rect.Bottom - rect.Top) / xy);
// int x2 = dx + width;
// int y2 = dy;
// int x3 = dx + width;
// int y3 = dy + height;
// int x4 = dx;
// int y4 = dy + height;
// List<List<int>> coordinates = new List<List<int>>() { new List<int>() { dx, dy }, new List<int>() { x2, y2 }, new List<int>() { x3, y3 }, new List<int>() { x4, y4 } };
// listOuterMost.Add(coordinates);
List<List<int>> coordinates = new List<List<int>>() { new List<int>() { (int)rect.Left, (int)rect.Top }, new List<int>() { (int)rect.Right, (int)rect.Top },
new List<int>() { (int)rect.Right, (int)rect.Bottom }, new List<int>() { (int)rect.Left, (int)rect.Bottom } };
listOuterMost.Add(coordinates);
......@@ -897,6 +876,8 @@ namespace VIZ.FGOUT.Module
MessageBoxEx.ShowDialog("保存成功");
}
#region 注释的代码
//private List<List<int>> Coordinate(Rect rect, VideoRenderInfo renderInfo, double srcWidth, double srcHeight)
//{
// // 视频的宽度
......@@ -926,6 +907,8 @@ namespace VIZ.FGOUT.Module
// return coordinates;
//}
#endregion
/// <summary>
/// 初始化属性
/// </summary>
......
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "92032BE26A79275C32F9A1DAAF9EDD381648C4FAF81BFCBC15AB4A4AD1709510"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "1BC6005DEC97683699E8BC1C488098071D060F2AB82985E25ABCD6F8877D0638"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -50,7 +50,7 @@ namespace VIZ.FGOUT.Module {
public partial class NDIMainView : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
#line 66 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 55 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox tbFocus;
......@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 214 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 203 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox _AutoMode_;
......@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 225 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 214 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox _ManualMode_;
......@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1029 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1018 "..\..\..\..\..\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 1078 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1067 "..\..\..\..\..\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 1093 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1082 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3;
......@@ -140,7 +140,7 @@ namespace VIZ.FGOUT.Module {
case 2:
this._AutoMode_ = ((System.Windows.Controls.CheckBox)(target));
#line 218 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 207 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._AutoMode_.Click += new System.Windows.RoutedEventHandler(this.AutoMode_OnClick);
#line default
......@@ -149,7 +149,7 @@ namespace VIZ.FGOUT.Module {
case 3:
this._ManualMode_ = ((System.Windows.Controls.CheckBox)(target));
#line 229 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 218 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._ManualMode_.Click += new System.Windows.RoutedEventHandler(this.ManualMode_OnClick);
#line default
......
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "92032BE26A79275C32F9A1DAAF9EDD381648C4FAF81BFCBC15AB4A4AD1709510"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "1BC6005DEC97683699E8BC1C488098071D060F2AB82985E25ABCD6F8877D0638"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -50,7 +50,7 @@ namespace VIZ.FGOUT.Module {
public partial class NDIMainView : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
#line 66 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 55 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox tbFocus;
......@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 214 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 203 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox _AutoMode_;
......@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 225 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 214 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox _ManualMode_;
......@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1029 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1018 "..\..\..\..\..\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 1078 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1067 "..\..\..\..\..\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 1093 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1082 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3;
......@@ -140,7 +140,7 @@ namespace VIZ.FGOUT.Module {
case 2:
this._AutoMode_ = ((System.Windows.Controls.CheckBox)(target));
#line 218 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 207 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._AutoMode_.Click += new System.Windows.RoutedEventHandler(this.AutoMode_OnClick);
#line default
......@@ -149,7 +149,7 @@ namespace VIZ.FGOUT.Module {
case 3:
this._ManualMode_ = ((System.Windows.Controls.CheckBox)(target));
#line 229 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 218 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._ManualMode_.Click += new System.Windows.RoutedEventHandler(this.ManualMode_OnClick);
#line default
......
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;;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -77,9 +77,8 @@ namespace VIZ.Framework.Common
var c = context.VideoRenderInfo.Frame.TimeStamp;
Console.WriteLine("111:"+b.ToString());
Console.WriteLine(string.Format("本地时间: {0} 时间错: {1}" ,DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss fffffff"),c.ToString()));
//Console.WriteLine("111:"+b.ToString());
//Console.WriteLine(string.Format("本地时间: {0} 时间错: {1}" ,DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss fffffff"),c.ToString()));
// 跟踪框绘制区域转化为UI绘制区域
RawRectangleF rect;
......

//------------------------------------------------------------------------------
// <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);
}
}
}
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;;
......
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