Skip to content

F
FGOUT
Commit 43a791ad by 鲁志-悦动
Options

无效标记改由矩形框实现

parent bf12278e
Showing with 151 additions and 51 deletions
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
...@@ -384,20 +384,15 @@ namespace VIZ.FGOUT.Module ...@@ -384,20 +384,15 @@ namespace VIZ.FGOUT.Module
set set
{ {
isAutoEnbale = value; isAutoEnbale = value;
this.RaisePropertyChanged(nameof(IsAutoEnbale)); RaisePropertyChanged(nameof(IsAutoEnbale));
if(value) if(value)
{ {
IsEnbaleTarget = false; IsEnbaleTarget = false;
IsStartImaget = false; IsStartImaget = false;
SendIsManual("auto"); SendIsManual("auto");
manualConfig.IsManual = true; manualConfig.IsManual = true;
ApplicationDomainEx.LiteDbContext.SetManualConfig.Upsert(manualConfig); ApplicationDomainEx.LiteDbContext.SetManualConfig.Upsert(manualConfig);
CleanRect(); CleanRect();
} }
} }
} }
...@@ -685,17 +680,12 @@ namespace VIZ.FGOUT.Module ...@@ -685,17 +680,12 @@ namespace VIZ.FGOUT.Module
private void SavePlace() private void SavePlace()
{ {
if(IsAutoEnbale) if(IsAutoEnbale)
{
savePlaceModel.IsManual = true; savePlaceModel.IsManual = true;
}
else else
{
savePlaceModel.IsManual = false; savePlaceModel.IsManual = false;
}
savePlaceModel.IsStartMat = IsStartImaget; savePlaceModel.IsStartMat = IsStartImaget;
ApplicationDomain.MessageManager.Send(savePlaceModel);
ApplicationDomainEx.MessageManager.Send(savePlaceModel);
} }
#endregion #endregion
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/View/NDIView.xaml
...@@ -304,7 +304,11 @@ ...@@ -304,7 +304,11 @@
<Border <Border
x:Name="Border" x:Name="Border"
Background="Transparent" Background="White"
KeyDown="Border_OnKeyDown"
KeyUp="Border_OnKeyUp"
PreviewKeyDown="Border_OnPreviewKeyDown"
PreviewKeyUp="Border_OnPreviewKeyUp"
PreviewMouseLeftButtonDown="Border_MouseLeftButtonDown" PreviewMouseLeftButtonDown="Border_MouseLeftButtonDown"
PreviewMouseLeftButtonUp="Border_MouseLeftButtonUp" PreviewMouseLeftButtonUp="Border_MouseLeftButtonUp"
PreviewMouseMove="Border_MouseMove" PreviewMouseMove="Border_MouseMove"
...@@ -324,7 +328,8 @@ ...@@ -324,7 +328,8 @@
Height="{Binding ElementName=canvas1, Path=ActualHeight}" Height="{Binding ElementName=canvas1, Path=ActualHeight}"
BorderBrush="White" BorderBrush="White"
BorderThickness="6" /> BorderThickness="6" />
<Canvas x:Name="canvas1" Focusable="False" /> <!--<Canvas x:Name="canvas1" Focusable="False" />-->
<Canvas x:Name="canvas1" Focusable="True" />
</Grid> </Grid>
</Border> </Border>
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.cs
using log4net; using log4net;
using OpenCvSharp;
using SharpDX.Mathematics.Interop; using SharpDX.Mathematics.Interop;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Windows;
using System.Windows.Media; using System.Windows.Media;
using System.Windows.Shapes; using System.Windows.Shapes;
using VIZ.FGOUT.Connection; using VIZ.FGOUT.Connection;
...@@ -248,9 +250,8 @@ namespace VIZ.FGOUT.Module ...@@ -248,9 +250,8 @@ namespace VIZ.FGOUT.Module
NDIView nDIView = this.GetView<NDIView>(); NDIView nDIView = this.GetView<NDIView>();
nDIView.aa = null; //nDIView.aa = null;
//nDIView.myPath.Data = null;
nDIView.myPath.Data = null;
IsDrawStartPlace = false; IsDrawStartPlace = false;
IsDrawEndPlace = false; IsDrawEndPlace = false;
...@@ -262,7 +263,8 @@ namespace VIZ.FGOUT.Module ...@@ -262,7 +263,8 @@ namespace VIZ.FGOUT.Module
nDIView.polygonsStart.Clear(); nDIView.polygonsStart.Clear();
nDIView.polygonsEnd.Clear(); nDIView.polygonsEnd.Clear();
nDIView.polygonsInvalid.Clear(); //nDIView.polygonsInvalid.Clear();
nDIView.rectsInvalid.Clear();
nDIView.canvas1.Children.Clear(); nDIView.canvas1.Children.Clear();
nDIView.polygon = null; nDIView.polygon = null;
...@@ -300,6 +302,8 @@ namespace VIZ.FGOUT.Module ...@@ -300,6 +302,8 @@ namespace VIZ.FGOUT.Module
package.start = Coordinate(nDIView.polygonsStart, srcWidth, srcHeight); package.start = Coordinate(nDIView.polygonsStart, srcWidth, srcHeight);
package.end = Coordinate(nDIView.polygonsEnd, srcWidth, srcHeight); package.end = Coordinate(nDIView.polygonsEnd, srcWidth, srcHeight);
package.ignore = Coordinate(nDIView.polygonsInvalid, srcWidth, srcHeight); package.ignore = Coordinate(nDIView.polygonsInvalid, srcWidth, srcHeight);
package.ignore = Coordinate(nDIView.rectsInvalid, srcWidth, srcHeight);
//if (rectStart.Width == 0 && rectStart.Height == 0) //if (rectStart.Width == 0 && rectStart.Height == 0)
//{ //{
// package.startPlace = null; // package.startPlace = null;
...@@ -330,7 +334,8 @@ namespace VIZ.FGOUT.Module ...@@ -330,7 +334,8 @@ namespace VIZ.FGOUT.Module
if (manager == null) if (manager == null)
return; return;
manager.SendJson(package); manager.SendJson(package);
MessageBoxEx.ShowDialog("发送成功 IP = " + manager.IP + " Port =" + manager.Port); //MessageBoxEx.ShowDialog("发送成功 IP = " + manager.IP + " Port =" + manager.Port);
MessageBoxEx.ShowDialog("发送成功");
} }
private List<List<List<int>>> Coordinate(List<PointCollection> points, double srcWidth, double srcHeight) private List<List<List<int>>> Coordinate(List<PointCollection> points, double srcWidth, double srcHeight)
...@@ -354,6 +359,39 @@ namespace VIZ.FGOUT.Module ...@@ -354,6 +359,39 @@ namespace VIZ.FGOUT.Module
return listOuterMost; return listOuterMost;
} }
private List<List<List<int>>> Coordinate(List<System.Windows.Rect> rects, double srcWidth, double srcHeight)
{
// 视频的宽度
int resWith = ApplicationDomainEx.IniStorage.GetValue<VideoConfig, int>(p => p.VIDEO_WITH);
// 视频的高度
int resHeight = ApplicationDomainEx.IniStorage.GetValue<VideoConfig, int>(p => p.VIDEO_HEIGHT);
double xp = srcWidth / resWith;
double xy = srcHeight / resHeight;
var listOuterMost = new List<List<List<int>>>();
foreach (var rect in rects)
{
int dx = Convert.ToInt32(rect.X / xp);
int dy = Convert.ToInt32(rect.Y / xy);
int width = Convert.ToInt32(rect.Width / xp);
int height = Convert.ToInt32(rect.Height / 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);
}
return listOuterMost;
}
/// <summary> /// <summary>
/// 保存配置命令 /// 保存配置命令
/// </summary> /// </summary>
...@@ -389,7 +427,8 @@ namespace VIZ.FGOUT.Module ...@@ -389,7 +427,8 @@ namespace VIZ.FGOUT.Module
setPlaceNewConfig.StartPlace = nDIView.polygonsStart; setPlaceNewConfig.StartPlace = nDIView.polygonsStart;
setPlaceNewConfig.EndPlace = nDIView.polygonsEnd; setPlaceNewConfig.EndPlace = nDIView.polygonsEnd;
setPlaceNewConfig.InvlidPlace = nDIView.polygonsInvalid; //setPlaceNewConfig.InvlidPlace = nDIView.polygonsInvalid;
setPlaceNewConfig.InvlidPlace = nDIView.rectsInvalid;
//ApplicationDomainEx.LiteDbContext.SetPlaceConfig.Upsert(setPlaceConfig); //ApplicationDomainEx.LiteDbContext.SetPlaceConfig.Upsert(setPlaceConfig);
ApplicationDomainEx.LiteDbContext.SetPlaceNewConfig.Upsert(setPlaceNewConfig); ApplicationDomainEx.LiteDbContext.SetPlaceNewConfig.Upsert(setPlaceNewConfig);
...@@ -677,11 +716,17 @@ namespace VIZ.FGOUT.Module ...@@ -677,11 +716,17 @@ namespace VIZ.FGOUT.Module
if (setPlaceNewConfig.InvlidPlace.Count > 0) if (setPlaceNewConfig.InvlidPlace.Count > 0)
{ {
view.polygonsInvalid = setPlaceNewConfig.InvlidPlace; //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.rectInvalid = new Rect(setPlaceConfig.InvlidPlace[0], setPlaceConfig.InvlidPlace[1], setPlaceConfig.InvlidPlace[2], setPlaceConfig.InvlidPlace[3]);
//view.aa.AddGeometry(new RectangleGeometry(view.rectInvalid)); //view.aa.AddGeometry(new RectangleGeometry(view.rectInvalid));
foreach (var points in setPlaceNewConfig.InvlidPlace) foreach (var points in setPlaceNewConfig.InvlidPlace)
AddPoints(view, points, Brushes.Red); AddRects(view, points, Brushes.Red);
} }
//view.myPath.Data = view.aa; //view.myPath.Data = view.aa;
} }
...@@ -699,6 +744,20 @@ namespace VIZ.FGOUT.Module ...@@ -699,6 +744,20 @@ namespace VIZ.FGOUT.Module
polygon.Points = points; polygon.Points = points;
} }
private void AddRects(NDIView view, System.Windows.Rect points, Brush brush)
{
PathGeometry aa = new PathGeometry();
aa.AddGeometry(new RectangleGeometry(points));
var myPath = new Path
{
Fill = Brushes.Transparent,
Stroke = Brushes.Red,
StrokeThickness = 1,
Data = aa
};
view.canvas1.Children.Add(myPath);
}
/// <summary> /// <summary>
/// 更新裁切框平滑系数 /// 更新裁切框平滑系数
/// </summary> /// </summary>
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIView/View/NDIView.g.cs
#pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "4C53870627456E69FD41DB4A8FBCB21CFC262A56D9C54343A3B4412BE754F5A5" #pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "50A3F2F42F19F0BA024180A4E588F55EAD42EB852476710A326DD09B9C860D0B"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -68,7 +68,7 @@ namespace VIZ.FGOUT.Module { ...@@ -68,7 +68,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 322 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 326 "..\..\..\..\..\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;
...@@ -76,7 +76,7 @@ namespace VIZ.FGOUT.Module { ...@@ -76,7 +76,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 327 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 332 "..\..\..\..\..\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;
...@@ -120,24 +120,48 @@ namespace VIZ.FGOUT.Module { ...@@ -120,24 +120,48 @@ namespace VIZ.FGOUT.Module {
this.Border = ((System.Windows.Controls.Border)(target)); this.Border = ((System.Windows.Controls.Border)(target));
#line 308 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 308 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonDown); this.Border.KeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyDown);
#line default #line default
#line hidden #line hidden
#line 309 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 309 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonUp); this.Border.KeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyUp);
#line default #line default
#line hidden #line hidden
#line 310 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 310 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseMove += new System.Windows.Input.MouseEventHandler(this.Border_MouseMove); this.Border.PreviewKeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyDown);
#line default #line default
#line hidden #line hidden
#line 311 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 311 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewKeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyUp);
#line default
#line hidden
#line 312 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonDown);
#line default
#line hidden
#line 313 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonUp);
#line default
#line hidden
#line 314 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseMove += new System.Windows.Input.MouseEventHandler(this.Border_MouseMove);
#line default
#line hidden
#line 315 "..\..\..\..\..\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
......
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}" "4C53870627456E69FD41DB4A8FBCB21CFC262A56D9C54343A3B4412BE754F5A5" #pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "50A3F2F42F19F0BA024180A4E588F55EAD42EB852476710A326DD09B9C860D0B"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -68,7 +68,7 @@ namespace VIZ.FGOUT.Module { ...@@ -68,7 +68,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 322 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 326 "..\..\..\..\..\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;
...@@ -76,7 +76,7 @@ namespace VIZ.FGOUT.Module { ...@@ -76,7 +76,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 327 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 332 "..\..\..\..\..\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;
...@@ -120,24 +120,48 @@ namespace VIZ.FGOUT.Module { ...@@ -120,24 +120,48 @@ namespace VIZ.FGOUT.Module {
this.Border = ((System.Windows.Controls.Border)(target)); this.Border = ((System.Windows.Controls.Border)(target));
#line 308 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 308 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonDown); this.Border.KeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyDown);
#line default #line default
#line hidden #line hidden
#line 309 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 309 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonUp); this.Border.KeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyUp);
#line default #line default
#line hidden #line hidden
#line 310 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 310 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseMove += new System.Windows.Input.MouseEventHandler(this.Border_MouseMove); this.Border.PreviewKeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyDown);
#line default #line default
#line hidden #line hidden
#line 311 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 311 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewKeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyUp);
#line default
#line hidden
#line 312 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonDown);
#line default
#line hidden
#line 313 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonUp);
#line default
#line hidden
#line 314 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseMove += new System.Windows.Input.MouseEventHandler(this.Border_MouseMove);
#line default
#line hidden
#line 315 "..\..\..\..\..\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
......
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-1559853185 22-808211288
4-137960189 4414250355
90-1236168610 90-747441034
151-737430311 151697787199
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;
True False
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/VIZ.FGOUT.Module_MarkupCompile.lref
D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\obj\x64\Debug\GeneratedInternalTypeHelper.g.cs 
FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIMainView\View\NDIMainView.xaml;; FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIMainView\View\NDIMainView.xaml;;
FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIPreviewView\View\NDIPreviewView.xaml;; FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIPreviewView\View\NDIPreviewView.xaml;;
......
VIZ.FGOUT/VIZ.FGOUT.Storage/LiteDB/System/SetPlaceNewConfig.cs
using System.Collections.Generic; using System.Collections.Generic;
using System.Windows;
using System.Windows.Media; using System.Windows.Media;
namespace VIZ.FGOUT.Storage namespace VIZ.FGOUT.Storage
...@@ -24,6 +25,7 @@ namespace VIZ.FGOUT.Storage ...@@ -24,6 +25,7 @@ namespace VIZ.FGOUT.Storage
/// <summary> /// <summary>
/// 无效位置 /// 无效位置
/// </summary> /// </summary>
public List<PointCollection> InvlidPlace { get; set; } = new List<PointCollection>(); //public List<PointCollection> InvlidPlace { get; set; } = new List<PointCollection>();
public List<Rect> InvlidPlace { get; set; } = new List<Rect>();
} }
} }
VIZ.FGOUT/VIZ.FGOUT.Storage/VIZ.FGOUT.Storage.csproj
...@@ -110,6 +110,7 @@ ...@@ -110,6 +110,7 @@
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Net.Http" /> <Reference Include="System.Net.Http" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="WindowsBase" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="CSV\Algorithm\AlgorithmBorderScene.cs" /> <Compile Include="CSV\Algorithm\AlgorithmBorderScene.cs" />
......
VIZ.FGOUT/VIZ.FGOUT.Storage/obj/x64/Debug/VIZ.FGOUT.Storage.csproj.CoreCompileInputs.cache
4eb86bfe6ccc5d8d0d4c02849c1cddbfdee97841 38478df6363104abbce807186aeaa82dc35c2c4b
VIZ.FGOUT/VIZ.FGOUT/bin/x64/Debug/Logs/info.log
This source diff could not be displayed because it is too large. You can view the blob instead.
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
D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\App.xaml D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\App.xaml
21265083526 2-1347366880
6-790135758 6968741766
42-431505870 431460283494
CloseAlgorithmWindow.xaml;MainWindow.xaml; CloseAlgorithmWindow.xaml;MainWindow.xaml;
True False
VIZ.Framework/VIZ.Framework.Connection/Protocol/UDP/UdpEndpointManagerExpand.cs
...@@ -67,14 +67,12 @@ namespace VIZ.Framework.Connection ...@@ -67,14 +67,12 @@ namespace VIZ.Framework.Connection
{ {
string msg = obj == null ? string.Empty : JsonConvert.SerializeObject(obj, JSON_SERIALIZER_SETTINGS); string msg = obj == null ? string.Empty : JsonConvert.SerializeObject(obj, JSON_SERIALIZER_SETTINGS);
SendString(manager, msg, Encoding.UTF8); SendString(manager, msg, Encoding.UTF8);
log.Info("发送UDPJosn串："+msg); log.Info("发送UDPJosn串："+msg);
} }
public static void SendJsonString(this UdpEndpointManager manager, string msg) public static void SendJsonString(this UdpEndpointManager manager, string msg)
{ {
SendString(manager, msg, Encoding.UTF8); SendString(manager, msg, Encoding.UTF8);
log.Info("发送UDPJosn串：" + msg); log.Info("发送UDPJosn串：" + msg);
} }
} }
......
VIZ.Framework/VIZ.Framework.Domain/ApplicationDomain.cs
using System; using System;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VIZ.Framework.Core; using VIZ.Framework.Core;
using VIZ.Framework.Storage; using VIZ.Framework.Storage;
......
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