Skip to content

F
FGOUT
Commit 50d89196 by 鲁志-悦动
Options

接口改动去掉'signal'字段 And 按钮名字修改 And 手动模式下：开始、结束区域不展现和开始位置、结束位置、无效位置、清空位置、发送位置、保存位置不可用

parent 30db6f45
Showing with 304 additions and 66 deletions
VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Algorithm/Signal/Send/AlgorithmPackage_Figout_model.cs
...@@ -17,9 +17,11 @@ namespace VIZ.FGOUT.Connection ...@@ -17,9 +17,11 @@ namespace VIZ.FGOUT.Connection
/// <summary> /// <summary>
/// signal 信号 /// signal 信号
/// </summary> /// </summary>
//public override string signal { get; set; } = "auto_Place"; //public override string signal { get; set; } = "auto_Place";
public override string signal { get; set; } = AlgorithmPackageSignal.auto_Place; //public override string signal { get; set; } = AlgorithmPackageSignal.auto_Place;
// 去掉'signal'字段,不给他赋初值
public override string signal { get; set; }
/// <summary> /// <summary>
/// startPlace /// startPlace
......
VIZ.FGOUT/VIZ.FGOUT.Domain/Message/Setting/CleanPlaceModel.cs
namespace VIZ.FGOUT.Domain namespace VIZ.FGOUT.Domain
{ {
/// <summary>
/// 清除位置模型
/// </summary>
public class CleanPlaceModel public class CleanPlaceModel
{ {
public bool CleanPlace { get; set; } public bool CleanPlace { get; set; }
......
VIZ.FGOUT/VIZ.FGOUT.Domain/Message/Setting/DisplayPlaceModel.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Domain
{
/// <summary>
/// 显示位置模型
/// </summary>
public class DisplayPlaceModel
{
}
}
VIZ.FGOUT/VIZ.FGOUT.Domain/VIZ.FGOUT.Domain.csproj
...@@ -76,6 +76,7 @@ ...@@ -76,6 +76,7 @@
<Compile Include="Message\Algorithm\Implementation\AlgorithmMessage__start_end.cs" /> <Compile Include="Message\Algorithm\Implementation\AlgorithmMessage__start_end.cs" />
<Compile Include="Message\Algorithm\Interface\IAlgorithmMessage__roi.cs" /> <Compile Include="Message\Algorithm\Interface\IAlgorithmMessage__roi.cs" />
<Compile Include="Message\Setting\CleanPlaceModel.cs" /> <Compile Include="Message\Setting\CleanPlaceModel.cs" />
<Compile Include="Message\Setting\DisplayPlaceModel.cs" />
<Compile Include="Message\Setting\EndPlaceModel.cs" /> <Compile Include="Message\Setting\EndPlaceModel.cs" />
<Compile Include="Message\Setting\InvalidPlaceModel.cs" /> <Compile Include="Message\Setting\InvalidPlaceModel.cs" />
<Compile Include="Message\Setting\ReplayModel.cs" /> <Compile Include="Message\Setting\ReplayModel.cs" />
......
VIZ.FGOUT/VIZ.FGOUT.Domain/obj/x64/Debug/VIZ.FGOUT.Domain.csproj.CoreCompileInputs.cache
f7bf41927ace3a05c36b8a463696a418ba43880e 35ff8143cc4c1f911f49bb7be9e50906549de29c
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/Style/Button/Button_Setting.xaml
...@@ -188,12 +188,12 @@ ...@@ -188,12 +188,12 @@
<Trigger Property="IsPressed" Value="True"> <Trigger Property="IsPressed" Value="True">
<Setter Property="Background" Value="#378CFF" /> <Setter Property="Background" Value="#378CFF" />
</Trigger> </Trigger>
<!--<Trigger Property="IsEnabled" Value="False">
<Setter Property="Foreground" Value="Gray" />
</Trigger>-->
<Trigger Property="IsEnabled" Value="False"> <Trigger Property="IsEnabled" Value="False">
<Setter Property="Background" Value="#378CFF" /> <Setter Property="Foreground" Value="Gray" />
</Trigger> </Trigger>
<!--<Trigger Property="IsEnabled" Value="False">
<Setter Property="Background" Value="#378CFF" />
</Trigger>-->
</ControlTemplate.Triggers> </ControlTemplate.Triggers>
</ControlTemplate> </ControlTemplate>
</Setter.Value> </Setter.Value>
......
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/Style/ToogleButton/ToogleButton_Setting.xaml
...@@ -167,6 +167,10 @@ ...@@ -167,6 +167,10 @@
<Trigger Property="IsMouseOver" Value="True"> <Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" Value="#22ffffff" /> <Setter Property="Background" Value="#22ffffff" />
</Trigger> </Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="Background" Value="Gray" />
<Setter Property="Foreground" Value="LightGray" />
</Trigger>
</ControlTemplate.Triggers> </ControlTemplate.Triggers>
</ControlTemplate> </ControlTemplate>
</Setter.Value> </Setter.Value>
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml
...@@ -219,8 +219,10 @@ ...@@ -219,8 +219,10 @@
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<GroupBox Foreground="White" Header="自动检测"> <GroupBox Foreground="White" Header="自动检测">
<CheckBox <CheckBox
x:Name="_AutoMode_"
Margin="15" Margin="15"
Content="启用自动检测" Click="AutoMode_OnClick"
Content="自动模式"
Foreground="White" Foreground="White"
IsChecked="{Binding Path=IsAutoEnable, Mode=TwoWay}" IsChecked="{Binding Path=IsAutoEnable, Mode=TwoWay}"
Style="{StaticResource CheckBox_Setting}" /> Style="{StaticResource CheckBox_Setting}" />
...@@ -235,8 +237,10 @@ ...@@ -235,8 +237,10 @@
<ColumnDefinition /> <ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<CheckBox <CheckBox
x:Name="_ManualMode_"
Margin="14" Margin="14"
Content="选择目标" Click="ManualMode_OnClick"
Content="手动模式"
Foreground="White" Foreground="White"
IsChecked="{Binding Path=IsEnableTarget, Mode=TwoWay}" IsChecked="{Binding Path=IsEnableTarget, Mode=TwoWay}"
Style="{StaticResource CheckBox_Setting}" /> Style="{StaticResource CheckBox_Setting}" />
...@@ -336,6 +340,21 @@ ...@@ -336,6 +340,21 @@
Content="开始位置" Content="开始位置"
IsEnabled="{Binding StartEnable}" IsEnabled="{Binding StartEnable}"
Style="{StaticResource ButtonStyle}" /> Style="{StaticResource ButtonStyle}" />
<!--<ToggleButton
Grid.Row="1"
Grid.Column="0"
Width="100"
Height="40"
Margin="10"
Content="开始位置"
IsEnabled="{Binding StartEnable}"
Style="{StaticResource ToggleButtonStyle}">
<b:Interaction.Triggers>
<b:EventTrigger EventName="Checked">
<b:InvokeCommandAction Command="{Binding StartRegionCommand}" />
</b:EventTrigger>
</b:Interaction.Triggers>
</ToggleButton>-->
<Button <Button
Grid.Row="1" Grid.Row="1"
...@@ -367,6 +386,7 @@ ...@@ -367,6 +386,7 @@
Margin="10" Margin="10"
Command="{Binding Path=CleanCommand}" Command="{Binding Path=CleanCommand}"
Content="清空位置" Content="清空位置"
IsEnabled="{Binding CleanEnable}"
Style="{StaticResource ButtonStyle}" /> Style="{StaticResource ButtonStyle}" />
<Button <Button
...@@ -376,7 +396,8 @@ ...@@ -376,7 +396,8 @@
Height="40" Height="40"
Margin="10" Margin="10"
Command="{Binding Path=SendPlaceCommand}" Command="{Binding Path=SendPlaceCommand}"
Content="发送命令" Content="发送位置"
IsEnabled="{Binding SendEnable}"
Style="{StaticResource ButtonStyle}" /> Style="{StaticResource ButtonStyle}" />
<Button <Button
...@@ -386,7 +407,8 @@ ...@@ -386,7 +407,8 @@
Height="40" Height="40"
Margin="10" Margin="10"
Command="{Binding Path=SavePalceCommand}" Command="{Binding Path=SavePalceCommand}"
Content="保存" Content="保存位置"
IsEnabled="{Binding SaveEnable}"
Style="{StaticResource ButtonStyle}" /> Style="{StaticResource ButtonStyle}" />
<!--<Button Content="UE设置" Grid.Row="2" Grid.Column="2" Margin="10" Style="{StaticResource ButtonStyle}" Command="{Binding Path=UESettingCommand}" Height="40"/>--> <!--<Button Content="UE设置" Grid.Row="2" Grid.Column="2" Margin="10" Style="{StaticResource ButtonStyle}" Command="{Binding Path=UESettingCommand}" Height="40"/>-->
...@@ -473,7 +495,6 @@ ...@@ -473,7 +495,6 @@
Content="Replay Stop" Content="Replay Stop"
Style="{StaticResource ButtonStyle}" Style="{StaticResource ButtonStyle}"
Visibility="{Binding ReplaySendVisibility, Mode=TwoWay}" /> Visibility="{Binding ReplaySendVisibility, Mode=TwoWay}" />
</Grid> </Grid>
</WrapPanel> </WrapPanel>
<local:NDIView <local:NDIView
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml.cs
using System.Windows.Controls; using System.Windows;
using System.Windows.Controls;
using System.Windows.Input; using System.Windows.Input;
using VIZ.FGOUT.Domain; using VIZ.FGOUT.Domain;
using VIZ.Framework.Core; using VIZ.Framework.Core;
...@@ -26,5 +27,27 @@ namespace VIZ.FGOUT.Module ...@@ -26,5 +27,27 @@ namespace VIZ.FGOUT.Module
{ {
vm.invalidPlaceModel.Key = vm.endPlaceModel.Key = vm.startPlaceModel.Key = vm.sendPlaceModel.Key = NDIViewKeys.CAM_1; vm.invalidPlaceModel.Key = vm.endPlaceModel.Key = vm.startPlaceModel.Key = vm.sendPlaceModel.Key = NDIViewKeys.CAM_1;
} }
/// <summary>
/// 保证一直选中
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void ManualMode_OnClick(object sender, RoutedEventArgs e)
{
//_AutoMode_.IsChecked = false;
_ManualMode_.IsChecked = true;
}
/// <summary>
/// 保证一直选中
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void AutoMode_OnClick(object sender, RoutedEventArgs e)
{
_AutoMode_.IsChecked = true;
//_ManualMode_.IsChecked =false;
}
} }
} }
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
...@@ -393,6 +393,8 @@ namespace VIZ.FGOUT.Module ...@@ -393,6 +393,8 @@ namespace VIZ.FGOUT.Module
private bool isAutoEnable = true; private bool isAutoEnable = true;
private bool _flagAutoValue = false;
public bool IsAutoEnable public bool IsAutoEnable
{ {
get { return isAutoEnable; } get { return isAutoEnable; }
...@@ -400,15 +402,18 @@ namespace VIZ.FGOUT.Module ...@@ -400,15 +402,18 @@ namespace VIZ.FGOUT.Module
{ {
isAutoEnable = value; isAutoEnable = value;
RaisePropertyChanged(nameof(IsAutoEnable)); RaisePropertyChanged(nameof(IsAutoEnable));
if(value) if(value && !_flagAutoValue)
{ {
_flagAutoValue = true;
_flagManualValue = false;
IsEnableTarget = false; IsEnableTarget = false;
IsStartImaget = false; IsStartImaget = false;
SendIsManual(AlgorithmPackageSignal.auto_mode); SendIsManual(AlgorithmPackageSignal.auto_mode);
//manualConfig.IsManual = true; //manualConfig.IsManual = true;
manualConfig.IsManual = false; manualConfig.IsManual = false;
ApplicationDomainEx.LiteDbContext.SetManualConfig.Upsert(manualConfig); ApplicationDomainEx.LiteDbContext.SetManualConfig.Upsert(manualConfig);
CleanRect(); //CleanRect();
DisplayPlace();
} }
} }
} }
...@@ -418,6 +423,7 @@ namespace VIZ.FGOUT.Module ...@@ -418,6 +423,7 @@ namespace VIZ.FGOUT.Module
#region 选择目标 #region 选择目标
private bool isEnableTarget; private bool isEnableTarget;
private bool _flagManualValue = false;
// ApplicationDomainEx.LiteDbContext.SetManualConfig.Upsert(this.manualConfig); // ApplicationDomainEx.LiteDbContext.SetManualConfig.Upsert(this.manualConfig);
public bool IsEnableTarget public bool IsEnableTarget
...@@ -427,18 +433,37 @@ namespace VIZ.FGOUT.Module ...@@ -427,18 +433,37 @@ namespace VIZ.FGOUT.Module
{ {
isEnableTarget = value; isEnableTarget = value;
this.RaisePropertyChanged(nameof(IsEnableTarget)); this.RaisePropertyChanged(nameof(IsEnableTarget));
if(value) if(value && !_flagManualValue)
{ {
_flagAutoValue = false;
_flagManualValue = true;
IsAutoEnable = false; IsAutoEnable = false;
SendIsManual(AlgorithmPackageSignal.manual_mode); SendIsManual(AlgorithmPackageSignal.manual_mode);
//manualConfig.IsManual = false; //manualConfig.IsManual = false;
manualConfig.IsManual = true; manualConfig.IsManual = true;
ApplicationDomainEx.LiteDbContext.SetManualConfig.Upsert(manualConfig); ApplicationDomainEx.LiteDbContext.SetManualConfig.Upsert(manualConfig);
CleanRect(); //CleanRect();
HidePlace();
} }
} }
} }
/// <summary>
/// 隐藏位置
/// </summary>
private void HidePlace()
{
cleanPlaceModel.CleanPlace = true;
ApplicationDomainEx.MessageManager.Send(cleanPlaceModel);
//6个位置相关按钮都不可用
StartEnable = false;
EndEnable = false;
InvalidEnable = false;
CleanEnable = false;
SendEnable = false;
SaveEnable = false;
}
#endregion #endregion
#region 开始抠像 #region 开始抠像
...@@ -953,6 +978,22 @@ namespace VIZ.FGOUT.Module ...@@ -953,6 +978,22 @@ namespace VIZ.FGOUT.Module
InvalidEnable = true; InvalidEnable = true;
} }
public DisplayPlaceModel displayPlaceModel = new DisplayPlaceModel();
/// <summary>
/// 显示位置
/// </summary>
private void DisplayPlace()
{
ApplicationDomainEx.MessageManager.Send(displayPlaceModel);
//6个位置相关按钮都可用
StartEnable = true;
EndEnable = true;
InvalidEnable = true;
CleanEnable = true;
SendEnable = true;
SaveEnable = true;
}
/// <summary> /// <summary>
/// 发送位置命令 /// 发送位置命令
/// </summary> /// </summary>
...@@ -1063,6 +1104,28 @@ namespace VIZ.FGOUT.Module ...@@ -1063,6 +1104,28 @@ namespace VIZ.FGOUT.Module
set { cleanEnable = value; this.RaisePropertyChanged(nameof(CleanEnable)); } set { cleanEnable = value; this.RaisePropertyChanged(nameof(CleanEnable)); }
} }
/// <summary>
/// 发送位置按钮可用性
/// </summary>
private bool sendEnable = false;
public bool SendEnable
{
get { return sendEnable; }
set { sendEnable = value; this.RaisePropertyChanged(nameof(SendEnable)); }
}
/// <summary>
/// 保存位置按钮可用性
/// </summary>
private bool saveEnable = false;
public bool SaveEnable
{
get { return saveEnable; }
set { saveEnable = value; this.RaisePropertyChanged(nameof(SaveEnable)); }
}
#endregion #endregion
#region CloseCommand -- 关闭命令 #region CloseCommand -- 关闭命令
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/Controller/Algorithm/IAlgorithmController.cs
...@@ -47,7 +47,6 @@ namespace VIZ.FGOUT.Module ...@@ -47,7 +47,6 @@ namespace VIZ.FGOUT.Module
/// <param name="box">跟踪框</param> /// <param name="box">跟踪框</param>
void Tracking(TrackingBoxInfo box); void Tracking(TrackingBoxInfo box);
/// <summary> /// <summary>
/// 跟踪模式 /// 跟踪模式
/// </summary> /// </summary>
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/Controller/Algorithm/Strategy/AlgoritmController_FiguerOut.cs
...@@ -212,9 +212,10 @@ namespace VIZ.FGOUT.Module ...@@ -212,9 +212,10 @@ namespace VIZ.FGOUT.Module
{ {
AlgorithmPackage_Figout_model package = new AlgorithmPackage_Figout_model(); AlgorithmPackage_Figout_model package = new AlgorithmPackage_Figout_model();
package.mode = cmd; package.mode = cmd;
package.signal = AlgorithmPackageSignal.track; // 去掉'signal'字段
//package.signal = AlgorithmPackageSignal.track;
// 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;
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.cs
...@@ -142,6 +142,9 @@ namespace VIZ.FGOUT.Module ...@@ -142,6 +142,9 @@ namespace VIZ.FGOUT.Module
// 清除位置 // 清除位置
ApplicationDomainEx.MessageManager.Register<CleanPlaceModel>(this, this.CleanPlace); ApplicationDomainEx.MessageManager.Register<CleanPlaceModel>(this, this.CleanPlace);
//显示位置
ApplicationDomainEx.MessageManager.Register<DisplayPlaceModel>(this, this.DisplayPlace);
// 算法发送命令 // 算法发送命令
ApplicationDomainEx.MessageManager.Register<SendPlaceModel>(this, this.SendPlace); ApplicationDomainEx.MessageManager.Register<SendPlaceModel>(this, this.SendPlace);
...@@ -346,8 +349,41 @@ namespace VIZ.FGOUT.Module ...@@ -346,8 +349,41 @@ namespace VIZ.FGOUT.Module
IsDrawEndPlace = false; IsDrawEndPlace = false;
IsCleanPlace = false; IsCleanPlace = false;
} }
/// <summary>
/// 显示位置
/// </summary>
/// <param name="displayPlaceModel"></param>
private void DisplayPlace(DisplayPlaceModel displayPlaceModel)
{
SetPlaceNewConfig setPlaceNewConfig = ApplicationDomainEx.LiteDbContext.SetPlaceNewConfig.FindOne(p =>
p.SportCode == this.viewConfig.GameName);
if (setPlaceNewConfig == null) return;
if (setPlaceNewConfig.EndPlace.Count == 0) return;
NDIView view = this.GetView<NDIView>();
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);
}
}
public bool IsCleanPlace = false; public bool IsCleanPlace;
private void CleanPlace(CleanPlaceModel cleanPlaceModel) private void CleanPlace(CleanPlaceModel cleanPlaceModel)
{ {
IsCleanPlace = cleanPlaceModel.CleanPlace; IsCleanPlace = cleanPlaceModel.CleanPlace;
...@@ -501,7 +537,7 @@ namespace VIZ.FGOUT.Module ...@@ -501,7 +537,7 @@ namespace VIZ.FGOUT.Module
/// </summary> /// </summary>
//private SetPlaceConfig setPlaceConfig; //private SetPlaceConfig setPlaceConfig;
private SetPlaceNewConfig setPlaceNewConfig; private SetPlaceNewConfig setPlaceNewConfig;
//private SetManualConfig manualConfig; private SetManualConfig manualConfig;
private void SavePlace(SavePlaceModel savePlaceModel) private void SavePlace(SavePlaceModel savePlaceModel)
{ {
if (this.ViewKey != NDIViewKeys.CAM_1) if (this.ViewKey != NDIViewKeys.CAM_1)
...@@ -780,6 +816,8 @@ namespace VIZ.FGOUT.Module ...@@ -780,6 +816,8 @@ namespace VIZ.FGOUT.Module
manualCorrectionColor.A = (float)this.VIDEO_MANUAL_CORRECTION_OPACITY; manualCorrectionColor.A = (float)this.VIDEO_MANUAL_CORRECTION_OPACITY;
this.ManualCorrectionColor = manualCorrectionColor; this.ManualCorrectionColor = manualCorrectionColor;
this.manualConfig = ApplicationDomainEx.LiteDbContext.SetManualConfig.FindAll().FirstOrDefault();
if (this.ViewKey == NDIViewKeys.CAM_1) if (this.ViewKey == NDIViewKeys.CAM_1)
{ {
// 是否显示目标裁切框 // 是否显示目标裁切框
...@@ -796,41 +834,45 @@ namespace VIZ.FGOUT.Module ...@@ -796,41 +834,45 @@ namespace VIZ.FGOUT.Module
//points.Add(point); //points.Add(point);
//polygon.Points = points; //polygon.Points = points;
NDIView view = this.GetView<NDIView>(); //在自动模式下显示位置
if (this.manualConfig != null && !this.manualConfig.IsManual)
if (setPlaceNewConfig.StartPlace.Count > 0)
{ {
view.polygonsStart = setPlaceNewConfig.StartPlace; NDIView view = this.GetView<NDIView>();
//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) if (setPlaceNewConfig.StartPlace.Count > 0)
{ {
view.polygonsEnd = setPlaceNewConfig.EndPlace; view.polygonsStart = setPlaceNewConfig.StartPlace;
//view.rectEnd = new Rect(setPlaceConfig.EndPlace[0], setPlaceConfig.EndPlace[1], setPlaceConfig.EndPlace[2], setPlaceConfig.EndPlace[3]); //view.rectStart = new Rect(setPlaceConfig.StartPlace[0], setPlaceConfig.StartPlace[1], setPlaceConfig.StartPlace[2], setPlaceConfig.StartPlace[3]);
//view.aa.AddGeometry(new RectangleGeometry(view.rectEnd)); //view.aa.AddGeometry(new RectangleGeometry(view.rectStart));
foreach (var points in setPlaceNewConfig.EndPlace) foreach (var points in setPlaceNewConfig.StartPlace)
AddPoints(view, points, Brushes.Green); AddPoints(view, points, Brushes.Blue);
} }
if (setPlaceNewConfig.InvlidPlace.Count > 0) if (setPlaceNewConfig.EndPlace.Count > 0)
{ {
//view.polygonsInvalid = setPlaceNewConfig.InvlidPlace; view.polygonsEnd = setPlaceNewConfig.EndPlace;
////view.rectInvalid = new Rect(setPlaceConfig.InvlidPlace[0], setPlaceConfig.InvlidPlace[1], setPlaceConfig.InvlidPlace[2], setPlaceConfig.InvlidPlace[3]); //view.rectEnd = new Rect(setPlaceConfig.EndPlace[0], setPlaceConfig.EndPlace[1], setPlaceConfig.EndPlace[2], setPlaceConfig.EndPlace[3]);
////view.aa.AddGeometry(new RectangleGeometry(view.rectInvalid)); //view.aa.AddGeometry(new RectangleGeometry(view.rectEnd));
//foreach (var points in setPlaceNewConfig.InvlidPlace) foreach (var points in setPlaceNewConfig.EndPlace)
// AddPoints(view, points, Brushes.Red); AddPoints(view, points, Brushes.Green);
}
view.rectsInvalid = setPlaceNewConfig.InvlidPlace;
//view.rectInvalid = new Rect(setPlaceConfig.InvlidPlace[0], setPlaceConfig.InvlidPlace[1], setPlaceConfig.InvlidPlace[2], setPlaceConfig.InvlidPlace[3]); if (setPlaceNewConfig.InvlidPlace.Count > 0)
//view.aa.AddGeometry(new RectangleGeometry(view.rectInvalid)); {
foreach (var points in setPlaceNewConfig.InvlidPlace) //view.polygonsInvalid = setPlaceNewConfig.InvlidPlace;
AddRects(view, points, Brushes.Red); ////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;
} }
//view.myPath.Data = view.aa;
} }
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "088F7A4814CCB3C687D13BFF70E8228CC099DEF6DCF28EBAFEC111EC0A56CB00" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "9F86C31B17231EAAD42D6D3D0CFC5F468A8C9078E3F06C5CB7B1A7A803A95E65"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -58,7 +58,23 @@ namespace VIZ.FGOUT.Module { ...@@ -58,7 +58,23 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 480 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 222 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox _AutoMode_;
#line default
#line hidden
#line 240 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox _ManualMode_;
#line default
#line hidden
#line 501 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1; internal VIZ.FGOUT.Module.NDIView cam1;
...@@ -66,7 +82,7 @@ namespace VIZ.FGOUT.Module { ...@@ -66,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 527 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 548 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2; internal VIZ.FGOUT.Module.NDIView cam2;
...@@ -114,9 +130,27 @@ namespace VIZ.FGOUT.Module { ...@@ -114,9 +130,27 @@ namespace VIZ.FGOUT.Module {
this.tbFocus = ((System.Windows.Controls.TextBox)(target)); this.tbFocus = ((System.Windows.Controls.TextBox)(target));
return; return;
case 2: case 2:
this.cam1 = ((VIZ.FGOUT.Module.NDIView)(target)); this._AutoMode_ = ((System.Windows.Controls.CheckBox)(target));
#line 224 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._AutoMode_.Click += new System.Windows.RoutedEventHandler(this.AutoMode_OnClick);
#line default
#line hidden
return; return;
case 3: case 3:
this._ManualMode_ = ((System.Windows.Controls.CheckBox)(target));
#line 242 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._ManualMode_.Click += new System.Windows.RoutedEventHandler(this.ManualMode_OnClick);
#line default
#line hidden
return;
case 4:
this.cam1 = ((VIZ.FGOUT.Module.NDIView)(target));
return;
case 5:
this.cam2 = ((VIZ.FGOUT.Module.NDIView)(target)); this.cam2 = ((VIZ.FGOUT.Module.NDIView)(target));
return; return;
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.i.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "088F7A4814CCB3C687D13BFF70E8228CC099DEF6DCF28EBAFEC111EC0A56CB00" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "9F86C31B17231EAAD42D6D3D0CFC5F468A8C9078E3F06C5CB7B1A7A803A95E65"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -58,7 +58,23 @@ namespace VIZ.FGOUT.Module { ...@@ -58,7 +58,23 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 480 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 222 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox _AutoMode_;
#line default
#line hidden
#line 240 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox _ManualMode_;
#line default
#line hidden
#line 501 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1; internal VIZ.FGOUT.Module.NDIView cam1;
...@@ -66,7 +82,7 @@ namespace VIZ.FGOUT.Module { ...@@ -66,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 527 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 548 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2; internal VIZ.FGOUT.Module.NDIView cam2;
...@@ -114,9 +130,27 @@ namespace VIZ.FGOUT.Module { ...@@ -114,9 +130,27 @@ namespace VIZ.FGOUT.Module {
this.tbFocus = ((System.Windows.Controls.TextBox)(target)); this.tbFocus = ((System.Windows.Controls.TextBox)(target));
return; return;
case 2: case 2:
this.cam1 = ((VIZ.FGOUT.Module.NDIView)(target)); this._AutoMode_ = ((System.Windows.Controls.CheckBox)(target));
#line 224 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._AutoMode_.Click += new System.Windows.RoutedEventHandler(this.AutoMode_OnClick);
#line default
#line hidden
return; return;
case 3: case 3:
this._ManualMode_ = ((System.Windows.Controls.CheckBox)(target));
#line 242 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._ManualMode_.Click += new System.Windows.RoutedEventHandler(this.ManualMode_OnClick);
#line default
#line hidden
return;
case 4:
this.cam1 = ((VIZ.FGOUT.Module.NDIView)(target));
return;
case 5:
this.cam2 = ((VIZ.FGOUT.Module.NDIView)(target)); this.cam2 = ((VIZ.FGOUT.Module.NDIView)(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.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.
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