Skip to content

F
FGOUT
Commit c60535ab by 马宁-艾果
Options

算法添加exit、holdon功能

parent 712af7c5
Showing with 224 additions and 208 deletions
VIZ.FGOUT/VIZ.FGOUT.Common/Themes/Generic.xaml
...@@ -3,6 +3,6 @@ ...@@ -3,6 +3,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:VIZ.FGOUT.Common"> xmlns:local="clr-namespace:VIZ.FGOUT.Common">
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="VIZ.FGOUT.Common;component/Widgets/FootballFieldPanel/FootballFieldPanel.xaml"></ResourceDictionary> <ResourceDictionary Source="VIZ.FGOUT.Common;component/Widgets/FootballFieldPanel/FootballFieldPanel.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
VIZ.FGOUT/VIZ.FGOUT.Common/obj/x64/Debug/VIZ.FGOUT.Common_MarkupCompile.i.cache
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
library library
C# C#
.cs .cs
D:\Projects\VIZ.FGOUT\VIZ.FGOUT.Common\obj\x64\Debug\ C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\obj\x64\Debug\
VIZ.FGOUT.Common VIZ.FGOUT.Common
none none
false false
...@@ -13,7 +13,7 @@ false ...@@ -13,7 +13,7 @@ false
21870986562 21870986562
4-1204812239 4-1204812239
17974055870 17-1683084370
Themes\Generic.xaml;Widgets\FootballFieldPanel\FootballFieldPanel.xaml; Themes\Generic.xaml;Widgets\FootballFieldPanel\FootballFieldPanel.xaml;
True True
......
VIZ.FGOUT/VIZ.FGOUT.Common/obj/x64/Debug/VIZ.FGOUT.Common_MarkupCompile.i.lref
D:\Projects\VIZ.FGOUT\VIZ.FGOUT.Common\obj\x64\Debug\GeneratedInternalTypeHelper.g.i.cs C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\obj\x64\Debug\GeneratedInternalTypeHelper.g.i.cs
FD:\Projects\VIZ.FGOUT\VIZ.FGOUT.Common\Themes\Generic.xaml;; FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\Themes\Generic.xaml;;
FD:\Projects\VIZ.FGOUT\VIZ.FGOUT.Common\Widgets\FootballFieldPanel\FootballFieldPanel.xaml;; FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\Widgets\FootballFieldPanel\FootballFieldPanel.xaml;;
VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Algorithm/Enum/AlgorithmPackageSignal.cs
...@@ -51,7 +51,6 @@ ...@@ -51,7 +51,6 @@
/// </summary> /// </summary>
public const string stop = "stop"; public const string stop = "stop";
/// <summary> /// <summary>
/// 抠图命令 /// 抠图命令
/// </summary> /// </summary>
...@@ -77,6 +76,14 @@ ...@@ -77,6 +76,14 @@
/// </summary> /// </summary>
public const string track = "track"; public const string track = "track";
/// <summary>
/// 退出
/// </summary>
public const string EXIT = "exit";
/// <summary>
/// 稍等，等一下
/// </summary>
public const string HOLD_ON = "hold_on";
} }
} }
VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Algorithm/Signal/Send/AlgorithmPackage_Figout_model.cs
using System; using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Connection namespace VIZ.FGOUT.Connection
{ {
...@@ -61,7 +57,5 @@ namespace VIZ.FGOUT.Connection ...@@ -61,7 +57,5 @@ namespace VIZ.FGOUT.Connection
/// 时间码 /// 时间码
/// </summary> /// </summary>
public long timecode { get; set; } public long timecode { get; set; }
} }
} }
VIZ.FGOUT/VIZ.FGOUT.Domain/Enum/NDIViewKeys.cs
using System; namespace VIZ.FGOUT.Domain
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Domain
{ {
/// <summary> /// <summary>
/// NDI视图键 /// NDI视图键
......
VIZ.FGOUT/VIZ.FGOUT.Domain/Enum/ServiceKeys.cs
using System; namespace VIZ.FGOUT.Domain
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Domain
{ {
/// <summary> /// <summary>
/// 服务键 /// 服务键
......
VIZ.FGOUT/VIZ.FGOUT.Domain/Enum/SystemPermissions.cs
using System; using System.ComponentModel;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Domain namespace VIZ.FGOUT.Domain
{ {
......
VIZ.FGOUT/VIZ.FGOUT.Domain/Message/Setting/CleanPlaceModel.cs
using System; namespace VIZ.FGOUT.Domain
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Domain
{ {
public class CleanPlaceModel public class CleanPlaceModel
{ {
......
VIZ.FGOUT/VIZ.FGOUT.Domain/Message/Setting/EndPlaceModel.cs
using System; namespace VIZ.FGOUT.Domain
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Domain
{ {
public class EndPlaceModel public class EndPlaceModel
{ {
......
VIZ.FGOUT/VIZ.FGOUT.Domain/Message/Setting/InvalidPlaceModel.cs
using System; namespace VIZ.FGOUT.Domain
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Domain
{ {
public class InvalidPlaceModel public class InvalidPlaceModel
{ {
......
VIZ.FGOUT/VIZ.FGOUT.Domain/Message/Setting/SavePlaceModel.cs
using System; namespace VIZ.FGOUT.Domain
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Domain
{ {
public class SavePlaceModel public class SavePlaceModel
{ {
......
VIZ.FGOUT/VIZ.FGOUT.Domain/Message/Setting/StartPlaceModel.cs
using System; namespace VIZ.FGOUT.Domain
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Domain
{ {
public class StartPlaceModel public class StartPlaceModel
{ {
......
VIZ.FGOUT/VIZ.FGOUT.Domain/Message/Setting/UESettingModel.cs
using System; namespace VIZ.FGOUT.Domain.Message.Setting
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Domain.Message.Setting
{ {
public class UESettingModel public class UESettingModel
{ {
......
VIZ.FGOUT/VIZ.FGOUT.Domain/Model/Config/VideoClipModeModel.cs
using System; using VIZ.Framework.Core;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VIZ.Framework.Core;
namespace VIZ.FGOUT.Domain namespace VIZ.FGOUT.Domain
{ {
......
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/Style/Button/Button_NdiView.xaml
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- 功能按钮 --> <!-- 功能按钮 -->
<Style x:Key="Button_Function" TargetType="Button"> <Style x:Key="Button_Function" TargetType="Button">
<Setter Property="FocusVisualStyle" Value="{x:Null}"></Setter> <Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="Button"> <ControlTemplate TargetType="Button">
<Border x:Name="border" Background="Transparent"> <Border x:Name="border" Background="Transparent">
<ContentPresenter VerticalAlignment="Center" HorizontalAlignment="Center"></ContentPresenter> <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
</Border> </Border>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True"> <Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="border" Property="Background" Value="#22ffffff"></Setter> <Setter TargetName="border" Property="Background" Value="#22ffffff" />
</Trigger> </Trigger>
<Trigger Property="IsEnabled" Value="False"> <Trigger Property="IsEnabled" Value="False">
<Setter Property="Opacity" Value="0.35"></Setter> <Setter Property="Opacity" Value="0.35" />
</Trigger> </Trigger>
</ControlTemplate.Triggers> </ControlTemplate.Triggers>
</ControlTemplate> </ControlTemplate>
......
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/Style/CheckBox/CheckBox_Setting.xaml
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Style x:Key="CheckBox_Setting" TargetType="CheckBox"> <Style x:Key="CheckBox_Setting" TargetType="CheckBox">
<Setter Property="FocusVisualStyle" Value="{x:Null}"></Setter> <Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Setter Property="Height" Value="20"></Setter> <Setter Property="Height" Value="20" />
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="CheckBox"> <ControlTemplate TargetType="CheckBox">
<Grid SnapsToDevicePixels="True"> <Grid SnapsToDevicePixels="True">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="20"></ColumnDefinition> <ColumnDefinition Width="20" />
<ColumnDefinition Width="*"></ColumnDefinition> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Border x:Name="border" Height="20" CornerRadius="2" BorderThickness="1" BorderBrush="White" Background="Transparent" <Border
VerticalAlignment="Center"> x:Name="border"
<Image x:Name="img" Width="14" Height="14" VerticalAlignment="Center" HorizontalAlignment="Center" Height="20"
Source="/VIZ.FGOUT.Module.Resource;component/Icons/right_16x16.png" Visibility="Hidden"></Image> VerticalAlignment="Center"
Background="Transparent"
BorderBrush="White"
BorderThickness="1"
CornerRadius="2">
<Image
x:Name="img"
Width="14"
Height="14"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Source="/VIZ.FGOUT.Module.Resource;component/Icons/right_16x16.png"
Visibility="Hidden" />
</Border> </Border>
<ContentPresenter VerticalAlignment="Center" HorizontalAlignment="Left" Grid.Column="1"></ContentPresenter> <ContentPresenter
Grid.Column="1"
HorizontalAlignment="Left"
VerticalAlignment="Center" />
</Grid> </Grid>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
<Trigger Property="IsChecked" Value="True"> <Trigger Property="IsChecked" Value="True">
<Setter TargetName="border" Property="BorderBrush" Value="#ffffc000"></Setter> <Setter TargetName="border" Property="BorderBrush" Value="#ffffc000" />
<Setter TargetName="border" Property="Background" Value="#ffffc000"></Setter> <Setter TargetName="border" Property="Background" Value="#ffffc000" />
<Setter TargetName="img" Property="Visibility" Value="Visible"></Setter> <Setter TargetName="img" Property="Visibility" Value="Visible" />
</Trigger> </Trigger>
</ControlTemplate.Triggers> </ControlTemplate.Triggers>
</ControlTemplate> </ControlTemplate>
......
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/Style/CheckBox/CheckBox_WindowTop.xaml
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Style x:Key="CheckBox_Eye" TargetType="CheckBox"> <Style x:Key="CheckBox_Eye" TargetType="CheckBox">
<Setter Property="FocusVisualStyle" Value="{x:Null}"></Setter> <Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Setter Property="Width" Value="50"></Setter> <Setter Property="Width" Value="50" />
<Setter Property="Height" Value="40"></Setter> <Setter Property="Height" Value="40" />
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="CheckBox"> <ControlTemplate TargetType="CheckBox">
<Grid x:Name="bd" SnapsToDevicePixels="True" Background="Transparent" > <Grid
<Image x:Name="img_hide" Width="24" Height="24" VerticalAlignment="Center" HorizontalAlignment="Center" x:Name="bd"
Source="/VIZ.FGOUT.Module.Resource;component/Icons/eye_hide_24x24.png" Visibility="Visible"></Image> Background="Transparent"
<Image x:Name="img_show" Width="24" Height="24" VerticalAlignment="Center" HorizontalAlignment="Center" SnapsToDevicePixels="True">
Source="/VIZ.FGOUT.Module.Resource;component/Icons/eye_show_24x24.png" Visibility="Hidden"></Image> <Image
x:Name="img_hide"
Width="24"
Height="24"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Source="/VIZ.FGOUT.Module.Resource;component/Icons/eye_hide_24x24.png"
Visibility="Visible" />
<Image
x:Name="img_show"
Width="24"
Height="24"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Source="/VIZ.FGOUT.Module.Resource;component/Icons/eye_show_24x24.png"
Visibility="Hidden" />
</Grid> </Grid>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
<Trigger Property="IsChecked" Value="True"> <Trigger Property="IsChecked" Value="True">
<Setter TargetName="img_hide" Property="Visibility" Value="Hidden"></Setter> <Setter TargetName="img_hide" Property="Visibility" Value="Hidden" />
<Setter TargetName="img_show" Property="Visibility" Value="Visible"></Setter> <Setter TargetName="img_show" Property="Visibility" Value="Visible" />
</Trigger> </Trigger>
<Trigger Property="IsMouseOver" Value="True"> <Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="bd" Property="Background" Value="#22ffffff"></Setter> <Setter TargetName="bd" Property="Background" Value="#22ffffff" />
</Trigger> </Trigger>
</ControlTemplate.Triggers> </ControlTemplate.Triggers>
</ControlTemplate> </ControlTemplate>
...@@ -29,25 +43,40 @@ ...@@ -29,25 +43,40 @@
</Style> </Style>
<Style x:Key="CheckBox_One_Four" TargetType="CheckBox"> <Style x:Key="CheckBox_One_Four" TargetType="CheckBox">
<Setter Property="FocusVisualStyle" Value="{x:Null}"></Setter> <Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Setter Property="Width" Value="50"></Setter> <Setter Property="Width" Value="50" />
<Setter Property="Height" Value="40"></Setter> <Setter Property="Height" Value="40" />
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="CheckBox"> <ControlTemplate TargetType="CheckBox">
<Grid x:Name="bd" SnapsToDevicePixels="True" Background="Transparent" > <Grid
<Image x:Name="img_hide" Width="24" Height="24" VerticalAlignment="Center" HorizontalAlignment="Center" x:Name="bd"
Source="/VIZ.FGOUT.Module.Resource;component/Icons/full_four_24x24.png" Visibility="Visible"></Image> Background="Transparent"
<Image x:Name="img_show" Width="24" Height="24" VerticalAlignment="Center" HorizontalAlignment="Center" SnapsToDevicePixels="True">
Source="/VIZ.FGOUT.Module.Resource;component/Icons/full_one_24x24.png" Visibility="Hidden"></Image> <Image
x:Name="img_hide"
Width="24"
Height="24"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Source="/VIZ.FGOUT.Module.Resource;component/Icons/full_four_24x24.png"
Visibility="Visible" />
<Image
x:Name="img_show"
Width="24"
Height="24"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Source="/VIZ.FGOUT.Module.Resource;component/Icons/full_one_24x24.png"
Visibility="Hidden" />
</Grid> </Grid>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
<Trigger Property="IsChecked" Value="True"> <Trigger Property="IsChecked" Value="True">
<Setter TargetName="img_hide" Property="Visibility" Value="Hidden"></Setter> <Setter TargetName="img_hide" Property="Visibility" Value="Hidden" />
<Setter TargetName="img_show" Property="Visibility" Value="Visible"></Setter> <Setter TargetName="img_show" Property="Visibility" Value="Visible" />
</Trigger> </Trigger>
<Trigger Property="IsMouseOver" Value="True"> <Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="bd" Property="Background" Value="#22ffffff"></Setter> <Setter TargetName="bd" Property="Background" Value="#22ffffff" />
</Trigger> </Trigger>
</ControlTemplate.Triggers> </ControlTemplate.Triggers>
</ControlTemplate> </ControlTemplate>
......
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/obj/x64/Debug/VIZ.FGOUT.Module.Resource_MarkupCompile.i.cache
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
library library
C# C#
.cs .cs
D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\ C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\
VIZ.FGOUT.Module.Resource VIZ.FGOUT.Module.Resource
none none
false false
...@@ -13,8 +13,8 @@ DEBUG;TRACE ...@@ -13,8 +13,8 @@ DEBUG;TRACE
18560433975 18560433975
1470602451 1470602451
121374819015 121374819015
23-1225277564 23977013142
Style\Button\Button_NdiView.xaml;Style\Button\Button_Setting.xaml;Style\Button\Button_WindowTop.xaml;Style\CheckBox\CheckBox_NdiView.xaml;Style\CheckBox\CheckBox_Setting.xaml;Style\CheckBox\CheckBox_WindowTop.xaml;Style\ComboBox\ComboBox_Setting.xaml;Style\HotkeyBox\HotkeyBox_Setting.xaml;Style\MessageBox\MessageBoxEx.xaml;Style\RadioButton\RadioButton_FootballSide.xaml;Style\RadioButton\RadioButton_NdiView.xaml;Style\RadioButton\RadioButton_Setting.xaml;Style\Slider\Slider_Setting.xaml;Style\TextBlock\TextBlock_Setting.xaml;Style\TextBox\TextBox_Setting.xaml;Style\ToogleButton\ToogleButton_Setting.xaml;Themes\Generic.xaml;Toolkit\NumericUpDown\NumericUpDown.xaml; Style\Button\Button_NdiView.xaml;Style\Button\Button_Setting.xaml;Style\Button\Button_WindowTop.xaml;Style\CheckBox\CheckBox_NdiView.xaml;Style\CheckBox\CheckBox_Setting.xaml;Style\CheckBox\CheckBox_WindowTop.xaml;Style\ComboBox\ComboBox_Setting.xaml;Style\HotkeyBox\HotkeyBox_Setting.xaml;Style\MessageBox\MessageBoxEx.xaml;Style\RadioButton\RadioButton_FootballSide.xaml;Style\RadioButton\RadioButton_NdiView.xaml;Style\RadioButton\RadioButton_Setting.xaml;Style\Slider\Slider_Setting.xaml;Style\TextBlock\TextBlock_Setting.xaml;Style\TextBox\TextBox_Setting.xaml;Style\ToogleButton\ToogleButton_Setting.xaml;Themes\Generic.xaml;Toolkit\NumericUpDown\NumericUpDown.xaml;
True False
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/Controller/Hotkey/HotkeyController.cs
using log4net; using log4net;
using System;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VIZ.FGOUT.Connection; using VIZ.FGOUT.Connection;
using VIZ.FGOUT.Domain; using VIZ.FGOUT.Domain;
using VIZ.FGOUT.Storage;
using VIZ.Framework.Connection; using VIZ.Framework.Connection;
namespace VIZ.FGOUT.Module namespace VIZ.FGOUT.Module
...@@ -130,7 +125,7 @@ namespace VIZ.FGOUT.Module ...@@ -130,7 +125,7 @@ namespace VIZ.FGOUT.Module
{ {
//service = ApplicationDomainEx.ServiceManager.GetService<INDIViewService>(NDIViewKeys.CAM_1); //service = ApplicationDomainEx.ServiceManager.GetService<INDIViewService>(NDIViewKeys.CAM_1);
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager("CAM_1"); UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1);
AlgorithmPackage__MatCmd algorithmPackage__MatCmd = new AlgorithmPackage__MatCmd(); AlgorithmPackage__MatCmd algorithmPackage__MatCmd = new AlgorithmPackage__MatCmd();
...@@ -149,7 +144,7 @@ namespace VIZ.FGOUT.Module ...@@ -149,7 +144,7 @@ namespace VIZ.FGOUT.Module
{ {
//service = ApplicationDomainEx.ServiceManager.GetService<INDIViewService>(NDIViewKeys.CAM_2); //service = ApplicationDomainEx.ServiceManager.GetService<INDIViewService>(NDIViewKeys.CAM_2);
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager("CAM_1"); UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1);
AlgorithmPackage__MatCmd algorithmPackage__MatCmd = new AlgorithmPackage__MatCmd(); AlgorithmPackage__MatCmd algorithmPackage__MatCmd = new AlgorithmPackage__MatCmd();
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml
...@@ -221,6 +221,7 @@ ...@@ -221,6 +221,7 @@
<RowDefinition /> <RowDefinition />
<RowDefinition /> <RowDefinition />
<RowDefinition /> <RowDefinition />
<RowDefinition />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition /> <ColumnDefinition />
...@@ -363,6 +364,25 @@ ...@@ -363,6 +364,25 @@
Width="100" Width="100"
Height="40" Height="40"
Margin="10" Margin="10"
Command="{Binding Path=ExitCommand}"
Content="Exit"
Style="{StaticResource ButtonStyle}" />
<Button
Grid.Row="3"
Width="100"
Height="40"
Margin="10"
Command="{Binding Path=HoldonCommand}"
Content="Holdon"
Style="{StaticResource ButtonStyle}" />
<Button
Grid.Row="3"
Grid.Column="1"
Width="100"
Height="40"
Margin="10"
Command="{Binding Path=ReplaySendCommand}" Command="{Binding Path=ReplaySendCommand}"
Content="Replay Send" Content="Replay Send"
Style="{StaticResource ButtonStyle}" Style="{StaticResource ButtonStyle}"
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml.cs
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Input; using System.Windows.Input;
using VIZ.FGOUT.Domain;
using VIZ.Framework.Core; using VIZ.Framework.Core;
namespace VIZ.FGOUT.Module namespace VIZ.FGOUT.Module
...@@ -18,18 +19,12 @@ namespace VIZ.FGOUT.Module ...@@ -18,18 +19,12 @@ namespace VIZ.FGOUT.Module
private void cam2_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) private void cam2_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
{ {
vm.sendPlaceModel.Key = "CAM_2"; vm.invalidPlaceModel.Key = vm.endPlaceModel.Key = vm.startPlaceModel.Key = vm.sendPlaceModel.Key = NDIViewKeys.CAM_2;
vm.startPlaceModel.Key = "CAM_2";
vm.endPlaceModel.Key = "CAM_2";
vm.invalidPlaceModel.Key = "CAM_2";
} }
private void cam1_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) private void cam1_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
{ {
vm.sendPlaceModel.Key = "CAM_1"; vm.invalidPlaceModel.Key = vm.endPlaceModel.Key = vm.startPlaceModel.Key = vm.sendPlaceModel.Key = NDIViewKeys.CAM_1;
vm.startPlaceModel.Key = "CAM_1";
vm.endPlaceModel.Key = "CAM_1";
vm.invalidPlaceModel.Key = "CAM_1";
} }
} }
} }
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
...@@ -62,7 +62,7 @@ namespace VIZ.FGOUT.Module ...@@ -62,7 +62,7 @@ namespace VIZ.FGOUT.Module
this.StartRegionCommand = new VCommand(this.StartRegion); this.StartRegionCommand = new VCommand(this.StartRegion);
this.EndRegionCommand = new VCommand(this.EndRegion); this.EndRegionCommand = new VCommand(this.EndRegion);
this.CleanCommand = new VCommand(this.CleanRect); this.CleanCommand = new VCommand(this.CleanRect);
this.SendPlaceCommand = new VCommand(this.sendPlace); this.SendPlaceCommand = new VCommand(this.SendPlace);
this.SavePalceCommand = new VCommand(this.SavePlace); this.SavePalceCommand = new VCommand(this.SavePlace);
this.SaveMatImageCommand = new VCommand(this.MatImageCommand); this.SaveMatImageCommand = new VCommand(this.MatImageCommand);
// replay // replay
...@@ -82,6 +82,10 @@ namespace VIZ.FGOUT.Module ...@@ -82,6 +82,10 @@ namespace VIZ.FGOUT.Module
this.StopCommand= new VCommand(this.Stop); this.StopCommand= new VCommand(this.Stop);
//视频设置 //视频设置
this.VideoSettingCommand = new VCommand(this.VideoSetting); this.VideoSettingCommand = new VCommand(this.VideoSetting);
//算法Exit
this.ExitCommand = new VCommand(this.Exit);
//算法Holdon
this.HoldonCommand = new VCommand(this.Holdon);
} }
/// <summary> /// <summary>
...@@ -120,7 +124,7 @@ namespace VIZ.FGOUT.Module ...@@ -120,7 +124,7 @@ namespace VIZ.FGOUT.Module
private void SendIsManual(string model) private void SendIsManual(string model)
{ {
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager("CAM_1"); UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1);
//如果manager等于null 返回掉 //如果manager等于null 返回掉
if (manager == null) return; if (manager == null) return;
...@@ -450,6 +454,32 @@ namespace VIZ.FGOUT.Module ...@@ -450,6 +454,32 @@ namespace VIZ.FGOUT.Module
#endregion #endregion
#region 算法Exit And Holdon
public VCommand ExitCommand { get; set; }
/// <summary>
/// exit
/// </summary>
private void Exit()
{
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1);
if (manager == null) return;
manager.SendJson(new AlgorithmPackage_Figout_model(){signal = AlgorithmPackageSignal.EXIT});
}
public VCommand HoldonCommand { get; set; }
/// <summary>
/// hold_on
/// </summary>
private void Holdon()
{
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1);
if (manager == null) return;
manager.SendJson(new AlgorithmPackage_Figout_model() { signal = AlgorithmPackageSignal.HOLD_ON });
}
#endregion
#region Replay功能 #region Replay功能
public VCommand ReplayCommand { get; set; } public VCommand ReplayCommand { get; set; }
...@@ -634,7 +664,7 @@ namespace VIZ.FGOUT.Module ...@@ -634,7 +664,7 @@ namespace VIZ.FGOUT.Module
/// <param name="key">服务键</param> /// <param name="key">服务键</param>
private void VideoSetting() private void VideoSetting()
{ {
NDISettingView view = new NDISettingView("CAM_1", "B0-25-AA-4E-C4-AE__CAM_1"); NDISettingView view = new NDISettingView(NDIViewKeys.CAM_1, "B0-25-AA-4E-C4-AE__CAM_1");
NoneWindow window = new NoneWindow(1200, 1050, view); NoneWindow window = new NoneWindow(1200, 1050, view);
window.Owner = this.GetWindow(); window.Owner = this.GetWindow();
window.ShowDialog(); window.ShowDialog();
...@@ -770,7 +800,7 @@ namespace VIZ.FGOUT.Module ...@@ -770,7 +800,7 @@ namespace VIZ.FGOUT.Module
/// </summary> /// </summary>
public VCommand SendPlaceCommand { get; set; } public VCommand SendPlaceCommand { get; set; }
public SendPlaceModel sendPlaceModel = new SendPlaceModel(); public SendPlaceModel sendPlaceModel = new SendPlaceModel();
private void sendPlace() private void SendPlace()
{ {
ApplicationDomainEx.MessageManager.Send(sendPlaceModel); ApplicationDomainEx.MessageManager.Send(sendPlaceModel);
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIPreviewView/View/NDIPreviewView.xaml
<UserControl x:Class="VIZ.FGOUT.Module.NDIPreviewView" <UserControl
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" x:Class="VIZ.FGOUT.Module.NDIPreviewView"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors"
xmlns:fcommon="clr-namespace:VIZ.Framework.Common;assembly=VIZ.Framework.Common" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors" xmlns:fcommon="clr-namespace:VIZ.Framework.Common;assembly=VIZ.Framework.Common"
xmlns:local="clr-namespace:VIZ.FGOUT.Module" xmlns:local="clr-namespace:VIZ.FGOUT.Module"
mc:Ignorable="d" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DataContext="{d:DesignInstance Type=local:NDIPreviewViewModel}" d:DataContext="{d:DesignInstance Type=local:NDIPreviewViewModel}"
d:DesignHeight="1920" d:DesignWidth="1080"> d:DesignHeight="1920"
d:DesignWidth="1080"
mc:Ignorable="d">
<behaviors:Interaction.Triggers> <behaviors:Interaction.Triggers>
<behaviors:EventTrigger EventName="Loaded"> <behaviors:EventTrigger EventName="Loaded">
...@@ -17,6 +19,6 @@ ...@@ -17,6 +19,6 @@
</behaviors:Interaction.Triggers> </behaviors:Interaction.Triggers>
<Border BorderBrush="#22ffffff" BorderThickness="1"> <Border BorderBrush="#22ffffff" BorderThickness="1">
<fcommon:VideoControl x:Name="video"></fcommon:VideoControl> <fcommon:VideoControl x:Name="video" />
</Border> </Border>
</UserControl> </UserControl>
VIZ.FGOUT/VIZ.FGOUT.Module/NDISettingView/ViewModel/NDISettingPanelViewModel.cs
...@@ -933,7 +933,7 @@ namespace VIZ.FGOUT.Module ...@@ -933,7 +933,7 @@ namespace VIZ.FGOUT.Module
//如果没有选择预设则不发送 //如果没有选择预设则不发送
if (string.IsNullOrEmpty(PresetsItem)) return; if (string.IsNullOrEmpty(PresetsItem)) return;
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager("CAM_1"); UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1);
if (manager == null) if (manager == null)
return; return;
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/Controller/Algorithm/AlgorithmControllerBase.cs
...@@ -497,7 +497,7 @@ namespace VIZ.FGOUT.Module ...@@ -497,7 +497,7 @@ namespace VIZ.FGOUT.Module
//NetHelper.GetAvailableUdpPort(8200, 9200, GlobalUsedPorts); //NetHelper.GetAvailableUdpPort(8200, 9200, GlobalUsedPorts);
GlobalUsedPorts.Add(port); GlobalUsedPorts.Add(port);
ConnectionManager.UdpConnection.AddEndpointManager(new UdpEndpointManager("CAM_1", ip, port)); ConnectionManager.UdpConnection.AddEndpointManager(new UdpEndpointManager(NDIViewKeys.CAM_1, ip, port));
this.Support.ProcessModel.IP = ip; this.Support.ProcessModel.IP = ip;
this.Support.ProcessModel.Port = port; this.Support.ProcessModel.Port = port;
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/Controller/Algorithm/Strategy/AlgoritmController_FiguerOut.cs
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
using VIZ.FGOUT.Connection; using VIZ.FGOUT.Connection;
using VIZ.FGOUT.Domain; using VIZ.FGOUT.Domain;
...@@ -32,7 +30,7 @@ namespace VIZ.FGOUT.Module ...@@ -32,7 +30,7 @@ namespace VIZ.FGOUT.Module
public override void CancelErrorTag(long timeCode) public override void CancelErrorTag(long timeCode)
{ {
// throw new NotImplementedException(); // throw new NotImplementedException();
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager("CAM_1"); UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1);
AlgorithmSenderOption option = new AlgorithmSenderOption(); AlgorithmSenderOption option = new AlgorithmSenderOption();
option.id = this.Support.ID; option.id = this.Support.ID;
option.timecode = timeCode; option.timecode = timeCode;
...@@ -70,7 +68,7 @@ namespace VIZ.FGOUT.Module ...@@ -70,7 +68,7 @@ namespace VIZ.FGOUT.Module
//throw new NotImplementedException(); //throw new NotImplementedException();
this.Support.ViewStatus= NDIViewStatus.Detect; this.Support.ViewStatus= NDIViewStatus.Detect;
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager("CAM_1"); UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1);
AlgorithmSenderOption option = new AlgorithmSenderOption(); AlgorithmSenderOption option = new AlgorithmSenderOption();
option.id = this.Support.ID; option.id = this.Support.ID;
AlgorithmSender.AutoMode(manager,this.bulidPackage(AlgorithmAutoModeCmd.detect,null),option); AlgorithmSender.AutoMode(manager,this.bulidPackage(AlgorithmAutoModeCmd.detect,null),option);
...@@ -86,7 +84,7 @@ namespace VIZ.FGOUT.Module ...@@ -86,7 +84,7 @@ namespace VIZ.FGOUT.Module
if (target_bbox == null || target_bbox.Count != 4 || timeCode <= 0) if (target_bbox == null || target_bbox.Count != 4 || timeCode <= 0)
return; return;
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager("CAM_1"); UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1);
AlgorithmSenderOption option = new AlgorithmSenderOption(); AlgorithmSenderOption option = new AlgorithmSenderOption();
...@@ -108,7 +106,7 @@ namespace VIZ.FGOUT.Module ...@@ -108,7 +106,7 @@ namespace VIZ.FGOUT.Module
/// </summary> /// </summary>
public override void InitAlgorithm() public override void InitAlgorithm()
{ {
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager("CAM_1"); UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1);
AlgorithmSenderOption option = new AlgorithmSenderOption(); AlgorithmSenderOption option = new AlgorithmSenderOption();
...@@ -141,7 +139,7 @@ namespace VIZ.FGOUT.Module ...@@ -141,7 +139,7 @@ namespace VIZ.FGOUT.Module
public override void SetParams() public override void SetParams()
{ {
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager("CAM_1"); UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1);
AlgorithmSenderOption option = new AlgorithmSenderOption(); AlgorithmSenderOption option = new AlgorithmSenderOption();
...@@ -163,7 +161,7 @@ namespace VIZ.FGOUT.Module ...@@ -163,7 +161,7 @@ namespace VIZ.FGOUT.Module
// throw new NotImplementedException(); // throw new NotImplementedException();
//this.Support.ViewStatus = NDIViewStatus.CropRoi; //this.Support.ViewStatus = NDIViewStatus.CropRoi;
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager("CAM_1"); UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1);
AlgorithmSenderOption option = new AlgorithmSenderOption(); AlgorithmSenderOption option = new AlgorithmSenderOption();
...@@ -226,7 +224,7 @@ namespace VIZ.FGOUT.Module ...@@ -226,7 +224,7 @@ namespace VIZ.FGOUT.Module
if (this.manualConfig.IsManual) return; if (this.manualConfig.IsManual) return;
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager("CAM_1"); UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1);
AlgorithmSenderOption option = new AlgorithmSenderOption(); AlgorithmSenderOption option = new AlgorithmSenderOption();
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.Command.cs
...@@ -69,14 +69,12 @@ namespace VIZ.FGOUT.Module ...@@ -69,14 +69,12 @@ namespace VIZ.FGOUT.Module
//} //}
} }
/// <summary> /// <summary>
/// 初始化算法 /// 初始化算法
/// </summary> /// </summary>
private void InitAlgorithm() private void InitAlgorithm()
{ {
if(this.ViewKey!= "CAM_1") if(this.ViewKey!= NDIViewKeys.CAM_1)
{ {
return; return;
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.cs
...@@ -130,7 +130,7 @@ namespace VIZ.FGOUT.Module ...@@ -130,7 +130,7 @@ namespace VIZ.FGOUT.Module
ApplicationDomainEx.MessageManager.Register<EndPlaceModel>(this, this.EndPlace); ApplicationDomainEx.MessageManager.Register<EndPlaceModel>(this, this.EndPlace);
// 无效区域的注册 // 无效区域的注册
ApplicationDomainEx.MessageManager.Register<InvalidPlaceModel>(this, this.InvalidPlaceModel); ApplicationDomainEx.MessageManager.Register<InvalidPlaceModel>(this, this.InvalidPlaceModel);
//清除位置 // 清除位置
ApplicationDomainEx.MessageManager.Register<CleanPlaceModel>(this, this.CleanPlace); ApplicationDomainEx.MessageManager.Register<CleanPlaceModel>(this, this.CleanPlace);
// 算法发送命令 // 算法发送命令
ApplicationDomainEx.MessageManager.Register<SendPlaceModel>(this, this.SendPlace); ApplicationDomainEx.MessageManager.Register<SendPlaceModel>(this, this.SendPlace);
...@@ -149,7 +149,7 @@ namespace VIZ.FGOUT.Module ...@@ -149,7 +149,7 @@ namespace VIZ.FGOUT.Module
private void UESetting(UESettingModel ueSettingModel) private void UESetting(UESettingModel ueSettingModel)
{ {
if (this.ViewKey != "CAM_1") if (this.ViewKey != NDIViewKeys.CAM_1)
return; return;
UESettingPanelView ueSettingPanelView = new UESettingPanelView(); UESettingPanelView ueSettingPanelView = new UESettingPanelView();
ueSettingPanelView.Show(); ueSettingPanelView.Show();
...@@ -157,7 +157,7 @@ namespace VIZ.FGOUT.Module ...@@ -157,7 +157,7 @@ namespace VIZ.FGOUT.Module
private void UEControl(UEControlModel ueControlModel) private void UEControl(UEControlModel ueControlModel)
{ {
if (this.ViewKey != "CAM_1") if (this.ViewKey != NDIViewKeys.CAM_1)
return; return;
UEControlPanelView ueControlPanelView = new UEControlPanelView(); UEControlPanelView ueControlPanelView = new UEControlPanelView();
ueControlPanelView.Show(); ueControlPanelView.Show();
...@@ -174,7 +174,7 @@ namespace VIZ.FGOUT.Module ...@@ -174,7 +174,7 @@ namespace VIZ.FGOUT.Module
/// </summary> /// </summary>
private void Replay(ReplayModel replayModel) private void Replay(ReplayModel replayModel)
{ {
if (this.ViewKey != "CAM_1") if (this.ViewKey != NDIViewKeys.CAM_1)
return; return;
IsReplay = replayModel.IsReplay; IsReplay = replayModel.IsReplay;
IsSliderValueChanged = replayModel.IsSliderValueChanged; IsSliderValueChanged = replayModel.IsSliderValueChanged;
...@@ -192,7 +192,7 @@ namespace VIZ.FGOUT.Module ...@@ -192,7 +192,7 @@ namespace VIZ.FGOUT.Module
/// </summary> /// </summary>
private void StartPlace(StartPlaceModel startPlaceModel) private void StartPlace(StartPlaceModel startPlaceModel)
{ {
if (this.ViewKey != "CAM_1") if (this.ViewKey != NDIViewKeys.CAM_1)
{ {
IsDrawStartPlace = false; IsDrawStartPlace = false;
return; return;
...@@ -209,7 +209,7 @@ namespace VIZ.FGOUT.Module ...@@ -209,7 +209,7 @@ namespace VIZ.FGOUT.Module
/// </summary> /// </summary>
private void EndPlace(EndPlaceModel endPlaceModel) private void EndPlace(EndPlaceModel endPlaceModel)
{ {
if (this.ViewKey != "CAM_1") if (this.ViewKey != NDIViewKeys.CAM_1)
{ {
IsDrawEndPlace = false; IsDrawEndPlace = false;
return; return;
...@@ -227,7 +227,7 @@ namespace VIZ.FGOUT.Module ...@@ -227,7 +227,7 @@ namespace VIZ.FGOUT.Module
/// <param name="invalidPlaceModel"></param> /// <param name="invalidPlaceModel"></param>
private void InvalidPlaceModel(InvalidPlaceModel invalidPlaceModel) private void InvalidPlaceModel(InvalidPlaceModel invalidPlaceModel)
{ {
if (this.ViewKey != "CAM_1") if (this.ViewKey != NDIViewKeys.CAM_1)
{ {
IsDrawInvalidPlace = false; IsDrawInvalidPlace = false;
return; return;
...@@ -274,7 +274,7 @@ namespace VIZ.FGOUT.Module ...@@ -274,7 +274,7 @@ namespace VIZ.FGOUT.Module
// 对结束值进行组装 // 对结束值进行组装
NDIView nDIView = this.GetView<NDIView>(); NDIView nDIView = this.GetView<NDIView>();
if (this.ViewKey != "CAM_1") if (this.ViewKey != NDIViewKeys.CAM_1)
return; return;
//var renderInfo = nDIView.video.GetRenderInfo(); //var renderInfo = nDIView.video.GetRenderInfo();
...@@ -286,9 +286,9 @@ namespace VIZ.FGOUT.Module ...@@ -286,9 +286,9 @@ namespace VIZ.FGOUT.Module
var srcWidth = nDIView.video.ActualWidth; var srcWidth = nDIView.video.ActualWidth;
var srcHeight = nDIView.video.ActualHeight; var srcHeight = nDIView.video.ActualHeight;
// ConnectionManager.UdpConnection.AddEndpointManager(new UdpEndpointManager("CAM_1", "192.168.31.95", 8001)); // ConnectionManager.UdpConnection.AddEndpointManager(new UdpEndpointManager(NDIViewKeys.CAM_1, "192.168.31.95", 8001));
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager("CAM_1"); UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1);
if (manager == null) if (manager == null)
return; return;
...@@ -393,10 +393,8 @@ namespace VIZ.FGOUT.Module ...@@ -393,10 +393,8 @@ namespace VIZ.FGOUT.Module
private SetManualConfig manualConfig; private SetManualConfig manualConfig;
private void SavePlace(SavePlaceModel savePlaceModel) private void SavePlace(SavePlaceModel savePlaceModel)
{ {
if (this.ViewKey != "CAM_1") if (this.ViewKey != NDIViewKeys.CAM_1)
{
return; return;
}
//this.setPlaceConfig = ApplicationDomainEx.LiteDbContext.SetPlaceConfig.FindAll().FirstOrDefault(); //this.setPlaceConfig = ApplicationDomainEx.LiteDbContext.SetPlaceConfig.FindAll().FirstOrDefault();
this.setPlaceNewConfig = ApplicationDomainEx.LiteDbContext.SetPlaceNewConfig.FindAll().FirstOrDefault(); this.setPlaceNewConfig = ApplicationDomainEx.LiteDbContext.SetPlaceNewConfig.FindAll().FirstOrDefault();
...@@ -669,7 +667,7 @@ namespace VIZ.FGOUT.Module ...@@ -669,7 +667,7 @@ 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;
if (this.ViewKey == "CAM_1") if (this.ViewKey == NDIViewKeys.CAM_1)
{ {
// 是否显示目标裁切框 // 是否显示目标裁切框
this.IsShowAlgorithmTargetBox = config.IsShowAlgorithmTargetBox; this.IsShowAlgorithmTargetBox = config.IsShowAlgorithmTargetBox;
......
VIZ.FGOUT/VIZ.FGOUT.Module/Permissions/PermissionsCheck.cs
using System; using VIZ.FGOUT.Domain;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VIZ.Framework.Core;
using VIZ.FGOUT.Domain;
using VIZ.FGOUT.Storage; using VIZ.FGOUT.Storage;
using VIZ.Framework.Core;
namespace VIZ.FGOUT.Module namespace VIZ.FGOUT.Module
{ {
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "58A9C8918EDDD5A194C3881F4D4E1B29ED31209313AAE4C32894090A5E3A7320" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "246CB3D0589E746A77AAE2EA419AE34EE44325F4DDA8F5E0F68ECB7EE3C9DD24"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module { ...@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 373 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 393 "..\..\..\..\..\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 +66,7 @@ namespace VIZ.FGOUT.Module { ...@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 420 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 440 "..\..\..\..\..\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;
......
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}" "58A9C8918EDDD5A194C3881F4D4E1B29ED31209313AAE4C32894090A5E3A7320" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "246CB3D0589E746A77AAE2EA419AE34EE44325F4DDA8F5E0F68ECB7EE3C9DD24"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module { ...@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 373 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 393 "..\..\..\..\..\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 +66,7 @@ namespace VIZ.FGOUT.Module { ...@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 420 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 440 "..\..\..\..\..\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;
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIPreviewView/View/NDIPreviewView.g.cs
#pragma checksum "..\..\..\..\..\NDIPreviewView\View\NDIPreviewView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "5449F11855F801F54515AC3E15799F325720C46AD54FC2D423E8DCD4D2CABF98" #pragma checksum "..\..\..\..\..\NDIPreviewView\View\NDIPreviewView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "FB938830018E36009179009D660FEADC8B5151E97FD6BE9339114B0FDFCFE361"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -47,7 +47,7 @@ namespace VIZ.FGOUT.Module { ...@@ -47,7 +47,7 @@ namespace VIZ.FGOUT.Module {
public partial class NDIPreviewView : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { public partial class NDIPreviewView : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
#line 20 "..\..\..\..\..\NDIPreviewView\View\NDIPreviewView.xaml" #line 22 "..\..\..\..\..\NDIPreviewView\View\NDIPreviewView.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;
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIPreviewView/View/NDIPreviewView.g.i.cs
#pragma checksum "..\..\..\..\..\NDIPreviewView\View\NDIPreviewView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "5449F11855F801F54515AC3E15799F325720C46AD54FC2D423E8DCD4D2CABF98" #pragma checksum "..\..\..\..\..\NDIPreviewView\View\NDIPreviewView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "FB938830018E36009179009D660FEADC8B5151E97FD6BE9339114B0FDFCFE361"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -47,7 +47,7 @@ namespace VIZ.FGOUT.Module { ...@@ -47,7 +47,7 @@ namespace VIZ.FGOUT.Module {
public partial class NDIPreviewView : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { public partial class NDIPreviewView : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
#line 20 "..\..\..\..\..\NDIPreviewView\View\NDIPreviewView.xaml" #line 22 "..\..\..\..\..\NDIPreviewView\View\NDIPreviewView.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;
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/VIZ.FGOUT.Module_MarkupCompile.i.cache
...@@ -11,7 +11,7 @@ false ...@@ -11,7 +11,7 @@ false
DEBUG;TRACE DEBUG;TRACE
22-808211288 22-808211288
4-699044453
91978002453 91978002453
151674092382 151674092382
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;
......
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.
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