Skip to content

F
FGOUT
Commit 26603392 by 鲁志-悦动
Options

Replay滑动条加tip And 两个Cam Border颜色区分

parent 0dbd2eb5
Showing with 216 additions and 278 deletions
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml
...@@ -129,6 +129,8 @@ ...@@ -129,6 +129,8 @@
Width="740" Width="740"
Height="90" Height="90"
Margin="80,0,0,0" Margin="80,0,0,0"
AutoToolTipPlacement="BottomRight"
AutoToolTipPrecision="0"
IsMoveToPointEnabled="True" IsMoveToPointEnabled="True"
IsSnapToTickEnabled="True" IsSnapToTickEnabled="True"
Maximum="{Binding SliderMaxValue, Mode=TwoWay}" Maximum="{Binding SliderMaxValue, Mode=TwoWay}"
...@@ -337,7 +339,8 @@ ...@@ -337,7 +339,8 @@
Grid.Column="0" Grid.Column="0"
Margin="15,10,10,10" Margin="15,10,10,10"
MouseLeftButtonDown="cam1_MouseLeftButtonDown" MouseLeftButtonDown="cam1_MouseLeftButtonDown"
NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_1}" /> NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_1}"
VideoBorderBrush="#46AFA0" />
<!-- ***************************************************************************************** --> <!-- ***************************************************************************************** -->
<!--<local:NDIView x:Name="cam3" NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_3}" Grid.Row="1" Grid.Column="0" Margin="10,10,15,10"></local:NDIView> <!--<local:NDIView x:Name="cam3" NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_3}" Grid.Row="1" Grid.Column="0" Margin="10,10,15,10"></local:NDIView>
...@@ -355,7 +358,8 @@ ...@@ -355,7 +358,8 @@
Grid.Column="1" Grid.Column="1"
Margin="15,10,10,10" Margin="15,10,10,10"
MouseLeftButtonDown="cam2_MouseLeftButtonDown" MouseLeftButtonDown="cam2_MouseLeftButtonDown"
NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_2}" /> NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_2}"
VideoBorderBrush="#B85069" />
</Grid> </Grid>
<!-- 底部 --> <!-- 底部 -->
<Border Grid.Row="2" Background="#ff12202d"> <Border Grid.Row="2" Background="#ff12202d">
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml.cs
...@@ -13,7 +13,6 @@ namespace VIZ.FGOUT.Module ...@@ -13,7 +13,6 @@ namespace VIZ.FGOUT.Module
public NDIMainView() public NDIMainView()
{ {
InitializeComponent(); InitializeComponent();
WPFHelper.BindingViewModel(this, vm); WPFHelper.BindingViewModel(this, vm);
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
...@@ -35,22 +35,16 @@ namespace VIZ.FGOUT.Module ...@@ -35,22 +35,16 @@ namespace VIZ.FGOUT.Module
{ {
// 初始化命令 // 初始化命令
this.InitCommand(); this.InitCommand();
// 初始化消息 // 初始化消息
this.InitMessage(); this.InitMessage();
// 初始化属性 // 初始化属性
this.InitProperty(); this.InitProperty();
// 初始化控制器 // 初始化控制器
this.InitController(); this.InitController();
// 初始化鼠标键盘钩子 // 初始化鼠标键盘钩子
this.InitKeyboardMouseEvents(); this.InitKeyboardMouseEvents();
// 注册系统检测循环 // 注册系统检测循环
ApplicationDomainEx.LoopManager.Register("NDIMainViewModel.UpdateSystemMonitor", 1, this.UpdateSystemMonitor); ApplicationDomainEx.LoopManager.Register("NDIMainViewModel.UpdateSystemMonitor", 1, this.UpdateSystemMonitor);
// 注册服务 // 注册服务
ApplicationDomainEx.ServiceManager.AddService(NDIViewKeys.MainView, this); ApplicationDomainEx.ServiceManager.AddService(NDIViewKeys.MainView, this);
} }
...@@ -64,21 +58,13 @@ namespace VIZ.FGOUT.Module ...@@ -64,21 +58,13 @@ namespace VIZ.FGOUT.Module
this.MinCommand = new VCommand(this.Min); this.MinCommand = new VCommand(this.Min);
this.CloseCommand = new VCommand(this.Close); this.CloseCommand = new VCommand(this.Close);
this.SettingCommand = new VCommand(this.Setting); this.SettingCommand = new VCommand(this.Setting);
this.InvalidRegionCommand = new VCommand(this.Invalid); this.InvalidRegionCommand = new VCommand(this.Invalid);
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
this.ReplayCommand = new VCommand(this.Replay); this.ReplayCommand = new VCommand(this.Replay);
this.ReplayCheckedCommand = new VCommand(this.ReplayChecked); this.ReplayCheckedCommand = new VCommand(this.ReplayChecked);
...@@ -98,7 +84,6 @@ namespace VIZ.FGOUT.Module ...@@ -98,7 +84,6 @@ namespace VIZ.FGOUT.Module
} }
private SetManualConfig manualConfig; private SetManualConfig manualConfig;
/// <summary> /// <summary>
/// 初始化属性 /// 初始化属性
...@@ -125,7 +110,6 @@ namespace VIZ.FGOUT.Module ...@@ -125,7 +110,6 @@ 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("CAM_1");
...@@ -154,10 +138,8 @@ namespace VIZ.FGOUT.Module ...@@ -154,10 +138,8 @@ namespace VIZ.FGOUT.Module
{ {
// 注册键盘钩子 // 注册键盘钩子
this.globalHook = Hook.GlobalEvents(); this.globalHook = Hook.GlobalEvents();
this.globalHook.KeyDown -= GlobalHook_KeyDown; this.globalHook.KeyDown -= GlobalHook_KeyDown;
this.globalHook.KeyDown += GlobalHook_KeyDown; this.globalHook.KeyDown += GlobalHook_KeyDown;
//this.globalHook.KeyUp -= GlobalHook_KeyUp; //this.globalHook.KeyUp -= GlobalHook_KeyUp;
//this.globalHook.KeyUp += GlobalHook_KeyUp; //this.globalHook.KeyUp += GlobalHook_KeyUp;
} }
...@@ -356,10 +338,8 @@ namespace VIZ.FGOUT.Module ...@@ -356,10 +338,8 @@ namespace VIZ.FGOUT.Module
{ {
// 获取热键配置 // 获取热键配置
this.HotkeyConfig = ApplicationDomainEx.LiteDbContext.HotkeyConfig.FindAll().FirstOrDefault(); this.HotkeyConfig = ApplicationDomainEx.LiteDbContext.HotkeyConfig.FindAll().FirstOrDefault();
// 开始初始化服务状态 // 开始初始化服务状态
this.BeginInitServiceStatus(); this.BeginInitServiceStatus();
// 初始化系统配置 // 初始化系统配置
this.InitSystemConfig(); this.InitSystemConfig();
} }
...@@ -411,12 +391,10 @@ namespace VIZ.FGOUT.Module ...@@ -411,12 +391,10 @@ namespace VIZ.FGOUT.Module
{ {
isEnbaleTarget = value; isEnbaleTarget = value;
this.RaisePropertyChanged(nameof(IsEnbaleTarget)); this.RaisePropertyChanged(nameof(IsEnbaleTarget));
if(value) if(value)
{ {
IsAutoEnbale = false; IsAutoEnbale = false;
SendIsManual("manual"); SendIsManual("manual");
manualConfig.IsManual = false; manualConfig.IsManual = false;
ApplicationDomainEx.LiteDbContext.SetManualConfig.Upsert(manualConfig); ApplicationDomainEx.LiteDbContext.SetManualConfig.Upsert(manualConfig);
} }
...@@ -445,7 +423,6 @@ namespace VIZ.FGOUT.Module ...@@ -445,7 +423,6 @@ namespace VIZ.FGOUT.Module
#region UESetting #region UESetting
public VCommand UESettingCommand { get; set; } public VCommand UESettingCommand { get; set; }
private void UESetting() private void UESetting()
{ {
UESettingModel ueSettingModel = new UESettingModel(); UESettingModel ueSettingModel = new UESettingModel();
...@@ -457,7 +434,6 @@ namespace VIZ.FGOUT.Module ...@@ -457,7 +434,6 @@ namespace VIZ.FGOUT.Module
#region UEControl #region UEControl
public VCommand UEControlCommand { get; set; } public VCommand UEControlCommand { get; set; }
private void UEControl() private void UEControl()
{ {
UEControlModel ueControlModel = new UEControlModel(); UEControlModel ueControlModel = new UEControlModel();
...@@ -469,7 +445,6 @@ namespace VIZ.FGOUT.Module ...@@ -469,7 +445,6 @@ namespace VIZ.FGOUT.Module
#region 落盘开关 #region 落盘开关
public VCommand SaveMatImageCommand { get; set; } public VCommand SaveMatImageCommand { get; set; }
/// <summary> /// <summary>
/// 是否落盘开始 /// 是否落盘开始
/// </summary> /// </summary>
...@@ -517,24 +492,18 @@ namespace VIZ.FGOUT.Module ...@@ -517,24 +492,18 @@ namespace VIZ.FGOUT.Module
/// 无效区域Command命令 /// 无效区域Command命令
/// </summary> /// </summary>
public VCommand InvalidRegionCommand { get; set; } public VCommand InvalidRegionCommand { get; set; }
public InvalidPlaceModel invalidPlaceModel = new InvalidPlaceModel(); public InvalidPlaceModel invalidPlaceModel = new InvalidPlaceModel();
private void Invalid() private void Invalid()
{ {
invalidPlaceModel.IsInvalid = true; invalidPlaceModel.IsInvalid = true;
ApplicationDomainEx.MessageManager.Send(invalidPlaceModel); ApplicationDomain.MessageManager.Send(invalidPlaceModel);
EndEnable = true; EndEnable = true;
InvalidEnable = false; InvalidEnable = false;
StartEnable = true; StartEnable = true;
} }
#region Replay功能 #region Replay功能
public VCommand ReplayCommand { get; set; } public VCommand ReplayCommand { get; set; }
//private bool _replayButtonIsEnable = true; //private bool _replayButtonIsEnable = true;
/// <summary> /// <summary>
/// replay 播控功能 /// replay 播控功能
...@@ -550,7 +519,6 @@ namespace VIZ.FGOUT.Module ...@@ -550,7 +519,6 @@ namespace VIZ.FGOUT.Module
} }
public VCommand SliderValueChangedCommand { get; set; } public VCommand SliderValueChangedCommand { get; set; }
private int _initialValue = 150; private int _initialValue = 150;
private void SliderValueChanged() private void SliderValueChanged()
{ {
...@@ -564,7 +532,6 @@ namespace VIZ.FGOUT.Module ...@@ -564,7 +532,6 @@ namespace VIZ.FGOUT.Module
public VCommand ReplayCheckedCommand { get; set; } public VCommand ReplayCheckedCommand { get; set; }
public VCommand ReplayUncheckedCommand { get; set; } public VCommand ReplayUncheckedCommand { get; set; }
private void ReplayChecked() private void ReplayChecked()
{ {
SliderVisibility = Visibility.Visible; SliderVisibility = Visibility.Visible;
...@@ -587,9 +554,7 @@ namespace VIZ.FGOUT.Module ...@@ -587,9 +554,7 @@ namespace VIZ.FGOUT.Module
/// 开始位置Command命令 /// 开始位置Command命令
/// </summary> /// </summary>
public VCommand StartRegionCommand { get; set; } public VCommand StartRegionCommand { get; set; }
public StartPlaceModel startPlaceModel = new StartPlaceModel(); public StartPlaceModel startPlaceModel = new StartPlaceModel();
public EndPlaceModel endPlaceModel = new EndPlaceModel(); public EndPlaceModel endPlaceModel = new EndPlaceModel();
/// <summary> /// <summary>
...@@ -602,7 +567,6 @@ namespace VIZ.FGOUT.Module ...@@ -602,7 +567,6 @@ namespace VIZ.FGOUT.Module
//endPlaceModel.EndPlace = false; //endPlaceModel.EndPlace = false;
invalidPlaceModel.IsInvalid = false; invalidPlaceModel.IsInvalid = false;
ApplicationDomainEx.MessageManager.Send(startPlaceModel); ApplicationDomainEx.MessageManager.Send(startPlaceModel);
EndEnable = true; EndEnable = true;
InvalidEnable = true; InvalidEnable = true;
StartEnable = false; StartEnable = false;
...@@ -633,13 +597,10 @@ namespace VIZ.FGOUT.Module ...@@ -633,13 +597,10 @@ namespace VIZ.FGOUT.Module
} }
/// <summary> /// <summary>
/// 清除矩形框 /// 清除矩形框
/// </summary> /// </summary>
public VCommand CleanCommand { get; set; } public VCommand CleanCommand { get; set; }
public CleanPlaceModel cleanPlaceModel = new CleanPlaceModel(); public CleanPlaceModel cleanPlaceModel = new CleanPlaceModel();
private void CleanRect() private void CleanRect()
...@@ -655,8 +616,7 @@ namespace VIZ.FGOUT.Module ...@@ -655,8 +616,7 @@ namespace VIZ.FGOUT.Module
/// <summary> /// <summary>
/// 发送位置命令 /// 发送位置命令
/// </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()
{ {
...@@ -672,7 +632,6 @@ namespace VIZ.FGOUT.Module ...@@ -672,7 +632,6 @@ namespace VIZ.FGOUT.Module
savePlaceModel.IsManual = true; savePlaceModel.IsManual = true;
else else
savePlaceModel.IsManual = false; savePlaceModel.IsManual = false;
savePlaceModel.IsStartMat = IsStartImaget; savePlaceModel.IsStartMat = IsStartImaget;
ApplicationDomain.MessageManager.Send(savePlaceModel); ApplicationDomain.MessageManager.Send(savePlaceModel);
} }
...@@ -713,7 +672,6 @@ namespace VIZ.FGOUT.Module ...@@ -713,7 +672,6 @@ namespace VIZ.FGOUT.Module
set { _sliderMaxValue = value; this.RaisePropertyChanged(nameof(SliderMaxValue)); } set { _sliderMaxValue = value; this.RaisePropertyChanged(nameof(SliderMaxValue)); }
} }
/// <summary> /// <summary>
/// 开始位置可用性 /// 开始位置可用性
/// </summary> /// </summary>
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDISettingView/View/NDISettingPanelView.xaml
...@@ -22,13 +22,11 @@ ...@@ -22,13 +22,11 @@
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>
<behaviors:Interaction.Triggers> <behaviors:Interaction.Triggers>
<behaviors:EventTrigger EventName="Loaded"> <behaviors:EventTrigger EventName="Loaded">
<behaviors:InvokeCommandAction Command="{Binding LoadedCommand}" /> <behaviors:InvokeCommandAction Command="{Binding LoadedCommand}" />
</behaviors:EventTrigger> </behaviors:EventTrigger>
</behaviors:Interaction.Triggers> </behaviors:Interaction.Triggers>
<Border> <Border>
<Grid Grid.Row="1" Margin="45,60,40,0"> <Grid Grid.Row="1" Margin="45,60,40,0">
<Grid.RowDefinitions> <Grid.RowDefinitions>
...@@ -70,21 +68,18 @@ ...@@ -70,21 +68,18 @@
</DataTemplate> </DataTemplate>
</ComboBox.ItemTemplate> </ComboBox.ItemTemplate>
</ComboBox> </ComboBox>
<TextBlock <TextBlock
Grid.Row="2" Grid.Row="2"
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="18" FontSize="18"
Foreground="White" Foreground="White"
Text="预览视频输入" /> Text="预览视频输入" />
<!--<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Right"> <!--<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Right">
<TextBlock Text="仅显示本机视频输入" Foreground="#aaffffff" VerticalAlignment="Center"></TextBlock> <TextBlock Text="仅显示本机视频输入" Foreground="#aaffffff" VerticalAlignment="Center"></TextBlock>
<CheckBox Style="{StaticResource CheckBox_Setting}" VerticalAlignment="Center" <CheckBox Style="{StaticResource CheckBox_Setting}" VerticalAlignment="Center"
HorizontalAlignment="Right" Margin="10,0,0,0" HorizontalAlignment="Right" Margin="10,0,0,0"
IsChecked="{Binding Path=IsShowLocalStream,Mode=TwoWay}"></CheckBox> IsChecked="{Binding Path=IsShowLocalStream,Mode=TwoWay}"></CheckBox>
</StackPanel>--> </StackPanel>-->
<ComboBox <ComboBox
Grid.Row="3" Grid.Row="3"
Height="40" Height="40"
...@@ -102,9 +97,6 @@ ...@@ -102,9 +97,6 @@
</DataTemplate> </DataTemplate>
</ComboBox.ItemTemplate> </ComboBox.ItemTemplate>
</ComboBox> </ComboBox>
<TextBlock <TextBlock
Grid.Row="4" Grid.Row="4"
VerticalAlignment="Center" VerticalAlignment="Center"
...@@ -117,7 +109,6 @@ ...@@ -117,7 +109,6 @@
ItemsSource="{Binding Path=MatchTypes, Mode=OneWay}" ItemsSource="{Binding Path=MatchTypes, Mode=OneWay}"
SelectedValue="{Binding Path=SelectedMatchType, Mode=TwoWay}" SelectedValue="{Binding Path=SelectedMatchType, Mode=TwoWay}"
Style="{StaticResource ComboBox_Setting}" /> Style="{StaticResource ComboBox_Setting}" />
</Grid> </Grid>
</Border> </Border>
</UserControl> </UserControl>
VIZ.FGOUT/VIZ.FGOUT.Module/NDISettingView/View/NDISettingPanelView.xaml.cs
using System; using System.Windows.Controls;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using VIZ.Framework.Core; using VIZ.Framework.Core;
namespace VIZ.FGOUT.Module namespace VIZ.FGOUT.Module
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDISettingView/ViewModel/NDISettingPanelViewModel.cs
using System; using System.Collections.Generic;
using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Linq; using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Data; using System.Windows.Data;
using VIZ.Framework.Common;
using VIZ.Framework.Core;
using VIZ.FGOUT.Domain; using VIZ.FGOUT.Domain;
using VIZ.FGOUT.Storage; using VIZ.FGOUT.Storage;
using VIZ.Framework.Common;
using VIZ.Framework.Core;
namespace VIZ.FGOUT.Module namespace VIZ.FGOUT.Module
{ {
...@@ -89,7 +86,6 @@ namespace VIZ.FGOUT.Module ...@@ -89,7 +86,6 @@ namespace VIZ.FGOUT.Module
#endregion #endregion
#region NDIStreamInfosView -- NDI预览流信息视图 #region NDIStreamInfosView -- NDI预览流信息视图
private ICollectionView ndiPreStreamInfosView; private ICollectionView ndiPreStreamInfosView;
...@@ -118,10 +114,6 @@ namespace VIZ.FGOUT.Module ...@@ -118,10 +114,6 @@ namespace VIZ.FGOUT.Module
#endregion #endregion
#region NDIDelayInfos -- NDI延时信息 #region NDIDelayInfos -- NDI延时信息
//private List<NDIStreamDelayInfoModel> ndiDelayInfos; //private List<NDIStreamDelayInfoModel> ndiDelayInfos;
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/Enum/NDIViewScene.cs
using System; namespace VIZ.FGOUT.Module
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Module
{ {
/// <summary> /// <summary>
/// 视图场景 /// 视图场景
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/View/NDIView.xaml
...@@ -332,10 +332,7 @@ ...@@ -332,10 +332,7 @@
<Canvas x:Name="canvas1" Focusable="True" /> <Canvas x:Name="canvas1" Focusable="True" />
</Grid> </Grid>
</Border> </Border>
<!--</RadioButton>--> <!--</RadioButton>-->
</Grid> </Grid>
<!-- 顶部 功能区 --> <!-- 顶部 功能区 -->
...@@ -415,7 +412,6 @@ ...@@ -415,7 +412,6 @@
CommandParameter="{Binding ElementName=uc, Path=NDIKey, Mode=OneWay}" CommandParameter="{Binding ElementName=uc, Path=NDIKey, Mode=OneWay}"
Style="{StaticResource Button_Setting_Open}" /> Style="{StaticResource Button_Setting_Open}" />
</Border> </Border>
</StackPanel> </StackPanel>
<!-- AI功能区 --> <!-- AI功能区 -->
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/View/NDIView.xaml.cs
using System.Collections.Generic; using System;
using System.Collections.Generic;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Input; using System.Windows.Input;
...@@ -96,11 +97,30 @@ namespace VIZ.FGOUT.Module ...@@ -96,11 +97,30 @@ namespace VIZ.FGOUT.Module
/// Using a DependencyProperty as the backing store for NDIKey. This enables animation, styling, binding, etc... /// Using a DependencyProperty as the backing store for NDIKey. This enables animation, styling, binding, etc...
/// </summary> /// </summary>
public static readonly DependencyProperty NDIKeyProperty = public static readonly DependencyProperty NDIKeyProperty =
DependencyProperty.Register("NDIKey", typeof(string), typeof(NDIView), new PropertyMetadata(null)); DependencyProperty.Register(nameof(NDIKey), typeof(string), typeof(NDIView), new PropertyMetadata(null));
#endregion #endregion
#region VideoBorderBrush
public SolidColorBrush VideoBorderBrush
{
get => (SolidColorBrush)GetValue(VideoBorderBrushProperty);
set { SetValue(VideoBorderBrushProperty, value); }
}
public static readonly DependencyProperty VideoBorderBrushProperty =
DependencyProperty.Register(nameof(VideoBorderBrush), typeof(SolidColorBrush), typeof(NDIView), new PropertyMetadata(OnVideoBorderBrushChanged));
static void OnVideoBorderBrushChanged(DependencyObject sender, DependencyPropertyChangedEventArgs args)
{
((NDIView)sender).OnVideoBorderBrushChanged(args);
}
protected void OnVideoBorderBrushChanged(DependencyPropertyChangedEventArgs e)
{
video.BorderBrush = new SolidColorBrush((Color)ColorConverter.ConvertFromString(e.NewValue.ToString()));
}
#endregion
// 配置文件添加config // 配置文件添加config
private SetManualConfig manualConfig; private SetManualConfig manualConfig;
...@@ -223,7 +243,7 @@ namespace VIZ.FGOUT.Module ...@@ -223,7 +243,7 @@ namespace VIZ.FGOUT.Module
private void Border_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) private void Border_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
{ {
startPoint = e.GetPosition(this.canvas1); startPoint = e.GetPosition(this.canvas1);
//if (vm.IsDrawStartPlace) //if (vm.IsDrawStartPlace)
//{ //{
// myPath.Stroke = Brushes.Red; // myPath.Stroke = Brushes.Red;
...@@ -233,46 +253,49 @@ namespace VIZ.FGOUT.Module ...@@ -233,46 +253,49 @@ namespace VIZ.FGOUT.Module
//{ //{
// myPath.Stroke = Brushes.Green; // myPath.Stroke = Brushes.Green;
//} //}
//鼠标左键双击和单击在程序运行中无法彻底区分开，先注释
//鼠标左键双击删除上一个图形 //鼠标左键双击删除上一个图形
if (e.ClickCount == 2) //if (e.ClickCount == 2)
{ //{
isMouseDown = false; // isMouseDown = false;
if (vm.IsDrawStartPlace) // if (vm.IsDrawStartPlace)
{ // {
var startCount = polygonsStart.Count; // var startCount = polygonsStart.Count;
if (startCount > 0) // if (startCount > 0)
{ // {
polygonsStart[startCount - 1].Clear(); // polygonsStart[startCount - 1].Clear();
polygonsStart.RemoveAt(startCount - 1); // polygonsStart.RemoveAt(startCount - 1);
} // }
} // }
else if (vm.IsDrawEndPlace) // else if (vm.IsDrawEndPlace)
{ // {
if (polygonsEnd.Count > 0) // if (polygonsEnd.Count > 0)
{ // {
polygonsEnd[0].Clear(); // polygonsEnd[0].Clear();
polygonsEnd.RemoveAt(0); // polygonsEnd.RemoveAt(0);
} // }
} // }
else if (vm.IsDrawInvalidPlace) // else if (vm.IsDrawInvalidPlace)
{ // {
//var invalidCount = polygonsInvalid.Count; // //var invalidCount = polygonsInvalid.Count;
//if (invalidCount > 0) // //if (invalidCount > 0)
//{ // //{
// polygonsInvalid[invalidCount - 1].Clear(); // // polygonsInvalid[invalidCount - 1].Clear();
// polygonsInvalid.RemoveAt(invalidCount - 1); // // polygonsInvalid.RemoveAt(invalidCount - 1);
//} // //}
var invalidCount = rectsInvalid.Count; // var invalidCount = rectsInvalid.Count;
if (invalidCount > 0) // if (invalidCount > 0)
{ // {
rectsInvalid[invalidCount - 1] = new Rect(); // rectsInvalid[invalidCount - 1] = new Rect();
rectsInvalid.RemoveAt(invalidCount - 1); // rectsInvalid.RemoveAt(invalidCount - 1);
} // }
} // }
} //}
//else
//鼠标左键单击画点 //鼠标左键单击画点
else if (e.ClickCount == 1) if (e.ClickCount == 1)
{ {
isMouseDown = true; isMouseDown = true;
if (vm.IsDrawStartPlace) if (vm.IsDrawStartPlace)
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.Manual_NDI.cs
...@@ -153,7 +153,6 @@ namespace VIZ.FGOUT.Module ...@@ -153,7 +153,6 @@ namespace VIZ.FGOUT.Module
return; return;
DataStreamExtend dsExtend = new DataStreamExtend(); DataStreamExtend dsExtend = new DataStreamExtend();
//Replay //Replay
if (view.vm.IsReplay) if (view.vm.IsReplay)
{ {
...@@ -215,11 +214,9 @@ namespace VIZ.FGOUT.Module ...@@ -215,11 +214,9 @@ namespace VIZ.FGOUT.Module
view.video.UpdateVideoFrame(e.Frame); view.video.UpdateVideoFrame(e.Frame);
// 更新手动裁切框 // 更新手动裁切框
// 仅手动模式下处理 & 居中模式下处理 & 需要进行裁切 时才处理 // 仅手动模式下处理 & 居中模式下处理 & 需要进行裁切时才处理
if ((this.StrategyMode == AlgorithmStrategyMode.center_mode || this.StrategyMode == AlgorithmStrategyMode.manual_mode) && this.IsUseClip) if ((this.StrategyMode == AlgorithmStrategyMode.center_mode || this.StrategyMode == AlgorithmStrategyMode.manual_mode) && this.IsUseClip)
{
this.UpdateClipBoxWithManualAndCenter(); this.UpdateClipBoxWithManualAndCenter();
}
// 获取将要发送的裁切数据, 无论什么模式均要发送 // 获取将要发送的裁切数据, 无论什么模式均要发送
Navigation3DSmoothWithSavitzkyGolayResult sendValue = this.ManualController.GetSavitzkyGolayValue(e.Frame.TimeStamp, this.ClipBoxX + ApplicationDomainEx.VIDEO_CLIP_BOX_WIDTH / 2); Navigation3DSmoothWithSavitzkyGolayResult sendValue = this.ManualController.GetSavitzkyGolayValue(e.Frame.TimeStamp, this.ClipBoxX + ApplicationDomainEx.VIDEO_CLIP_BOX_WIDTH / 2);
...@@ -233,16 +230,11 @@ namespace VIZ.FGOUT.Module ...@@ -233,16 +230,11 @@ namespace VIZ.FGOUT.Module
return; return;
List<int> roi = this.GetManulRoi(); List<int> roi = this.GetManulRoi();
// 向算法发送裁切框 // 向算法发送裁切框
if (this.StrategyMode == AlgorithmStrategyMode.center_mode) if (this.StrategyMode == AlgorithmStrategyMode.center_mode)
{
AlgorithmSender.CenterMode(manager, this.ID, this.ViewConfig.IsSendToCrop, roi, this.AlgorithmConfig.SmoothCoeff); AlgorithmSender.CenterMode(manager, this.ID, this.ViewConfig.IsSendToCrop, roi, this.AlgorithmConfig.SmoothCoeff);
}
else if (this.StrategyMode == AlgorithmStrategyMode.manual_mode) else if (this.StrategyMode == AlgorithmStrategyMode.manual_mode)
{
AlgorithmSender.ManualMode(manager, this.ID, this.ViewConfig.IsSendToCrop, roi, this.AlgorithmConfig.SmoothCoeff); AlgorithmSender.ManualMode(manager, this.ID, this.ViewConfig.IsSendToCrop, roi, this.AlgorithmConfig.SmoothCoeff);
}
// 在需要发送裁切框时 // 在需要发送裁切框时
//if (this.viewConfig.IsSendToCrop) //if (this.viewConfig.IsSendToCrop)
......
VIZ.FGOUT/VIZ.FGOUT.Module/Setup/Provider/AppSetup_InitLiteDb.cs
using log4net; using log4net;
using System; using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using VIZ.Framework.Module;
using VIZ.FGOUT.Domain; using VIZ.FGOUT.Domain;
using VIZ.FGOUT.Storage; using VIZ.FGOUT.Storage;
using VIZ.Framework.Module;
namespace VIZ.FGOUT.Module namespace VIZ.FGOUT.Module
{ {
...@@ -36,12 +31,10 @@ namespace VIZ.FGOUT.Module ...@@ -36,12 +31,10 @@ namespace VIZ.FGOUT.Module
{ {
string floder = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "db"); string floder = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "db");
if (!System.IO.Directory.Exists(floder)) if (!System.IO.Directory.Exists(floder))
{
System.IO.Directory.CreateDirectory(floder); System.IO.Directory.CreateDirectory(floder);
}
string path = System.IO.Path.Combine(floder, "cache.db"); string path = System.IO.Path.Combine(floder, "cache.db");
ApplicationDomainEx.LiteDbContext = new Storage.LiteDbContext(path); ApplicationDomainEx.LiteDbContext = new LiteDbContext(path);
this.InitSystem(); this.InitSystem();
this.InitHotkey(); this.InitHotkey();
...@@ -51,7 +44,6 @@ namespace VIZ.FGOUT.Module ...@@ -51,7 +44,6 @@ namespace VIZ.FGOUT.Module
this.InitData(NDIViewKeys.CAM_2); this.InitData(NDIViewKeys.CAM_2);
//this.InitData(NDIViewKeys.CAM_3); //this.InitData(NDIViewKeys.CAM_3);
//this.InitData(NDIViewKeys.CAM_4); //this.InitData(NDIViewKeys.CAM_4);
return true; return true;
} }
...@@ -78,7 +70,6 @@ namespace VIZ.FGOUT.Module ...@@ -78,7 +70,6 @@ namespace VIZ.FGOUT.Module
viewConfig = new NdiViewConfig(); viewConfig = new NdiViewConfig();
viewConfig.ViewKey = viewKey; viewConfig.ViewKey = viewKey;
viewConfig.DisplayName = viewKey; viewConfig.DisplayName = viewKey;
ApplicationDomainEx.LiteDbContext.ViewConfig.Upsert(viewConfig); ApplicationDomainEx.LiteDbContext.ViewConfig.Upsert(viewConfig);
} }
...@@ -133,8 +124,6 @@ namespace VIZ.FGOUT.Module ...@@ -133,8 +124,6 @@ namespace VIZ.FGOUT.Module
// ApplicationDomainEx.LiteDbContext.AlgorithmCableway.Upsert(cablewayConfig); // ApplicationDomainEx.LiteDbContext.AlgorithmCableway.Upsert(cablewayConfig);
//} //}
} }
/// <summary> /// <summary>
...@@ -176,7 +165,5 @@ namespace VIZ.FGOUT.Module ...@@ -176,7 +165,5 @@ namespace VIZ.FGOUT.Module
// ApplicationDomainEx.LiteDbContext.SetPlaceConfig.Upsert(config); // ApplicationDomainEx.LiteDbContext.SetPlaceConfig.Upsert(config);
//} //}
} }
} }
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "8CDCEAC8E7DBDD5B779B71F4D323D7BC00631C2C10B999E6F39A213317218BE8" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "8FCDA1C31237DC58403A9103308D280A2E2A5FEA19851227240D8EC8A0B29CD4"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <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 335 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 337 "..\..\..\..\..\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 353 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 356 "..\..\..\..\..\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}" "8CDCEAC8E7DBDD5B779B71F4D323D7BC00631C2C10B999E6F39A213317218BE8" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "8FCDA1C31237DC58403A9103308D280A2E2A5FEA19851227240D8EC8A0B29CD4"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <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 335 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 337 "..\..\..\..\..\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 353 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 356 "..\..\..\..\..\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/NDISettingView/View/NDISettingPanelView.g.cs
#pragma checksum "..\..\..\..\..\NDISettingView\View\NDISettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "BD03401B7717F42ADA77CFE11FC4479C9EDCD8CA7560D6ECA9A9B2B57700C4FE" #pragma checksum "..\..\..\..\..\NDISettingView\View\NDISettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "529F60D9CD8245A5F2DE0596A96C40D772F418082EF57F471A9F2E86FA9299BE"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDISettingView/View/NDISettingPanelView.g.i.cs
#pragma checksum "..\..\..\..\..\NDISettingView\View\NDISettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "BD03401B7717F42ADA77CFE11FC4479C9EDCD8CA7560D6ECA9A9B2B57700C4FE" #pragma checksum "..\..\..\..\..\NDISettingView\View\NDISettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "529F60D9CD8245A5F2DE0596A96C40D772F418082EF57F471A9F2E86FA9299BE"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIView/View/NDIView.g.cs
#pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "50A3F2F42F19F0BA024180A4E588F55EAD42EB852476710A326DD09B9C860D0B" #pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "FBDA589E5BC274CD8D0C59AE6CB29B48F536D31CDBCDD6C42DF8B325792ABFD8"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
......
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}" "50A3F2F42F19F0BA024180A4E588F55EAD42EB852476710A326DD09B9C860D0B" #pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "FBDA589E5BC274CD8D0C59AE6CB29B48F536D31CDBCDD6C42DF8B325792ABFD8"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
......
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-808211288 22-1559853185
4414250355 4-137960189
90-747441034 90-1236168610
151697787199 151-737430311
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;
False True
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/LiteDbContext.cs
...@@ -26,7 +26,6 @@ namespace VIZ.FGOUT.Storage ...@@ -26,7 +26,6 @@ namespace VIZ.FGOUT.Storage
public LiteDbContext(string path) public LiteDbContext(string path)
{ {
this.Path = path; this.Path = path;
this.Database = new LiteDatabase(path); this.Database = new LiteDatabase(path);
// OpenCV视频部分 // OpenCV视频部分
this.VideoGroup = this.Database.GetCollection<VideoGroupEntity>(); this.VideoGroup = this.Database.GetCollection<VideoGroupEntity>();
...@@ -41,18 +40,16 @@ namespace VIZ.FGOUT.Storage ...@@ -41,18 +40,16 @@ namespace VIZ.FGOUT.Storage
this.ViewConfig = this.Database.GetCollection<NdiViewConfig>(); this.ViewConfig = this.Database.GetCollection<NdiViewConfig>();
// 系统设置 // 系统设置
this.SystemConfig = this.Database.GetCollection<SystemConfig>(); this.SystemConfig = this.Database.GetCollection<SystemConfig>();
// 热键设置
this.HotkeyConfig = this.Database.GetCollection<HotkeyConfig>(); this.HotkeyConfig = this.Database.GetCollection<HotkeyConfig>();
// 开始位置进行设置 // 开始位置进行设置
this.SetPlaceConfig = this.Database.GetCollection<SetPlaceConfig>(); this.SetPlaceConfig = this.Database.GetCollection<SetPlaceConfig>();
// 新开始位置进行设置 // 新开始位置进行设置
this.SetPlaceNewConfig = this.Database.GetCollection<SetPlaceNewConfig>(); this.SetPlaceNewConfig = this.Database.GetCollection<SetPlaceNewConfig>();
// 手动模式设置
//手动模式设置
this.SetManualConfig = this.Database.GetCollection<SetManualConfig>(); this.SetManualConfig = this.Database.GetCollection<SetManualConfig>();
// 掷标枪设置
//掷标枪
this.JavelinThrowConfig = this.Database.GetCollection<JavelinThrowConfig>(); this.JavelinThrowConfig = this.Database.GetCollection<JavelinThrowConfig>();
} }
// ----------------------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------------------
...@@ -128,7 +125,7 @@ namespace VIZ.FGOUT.Storage ...@@ -128,7 +125,7 @@ namespace VIZ.FGOUT.Storage
public ILiteCollection<SetPlaceConfig> SetPlaceConfig { get; private set; } public ILiteCollection<SetPlaceConfig> SetPlaceConfig { get; private set; }
/// <summary> /// <summary>
/// 设置位置新配置文件 /// 设置位置新配置文件(开始位置、结束位置为多边形)
/// </summary> /// </summary>
public ILiteCollection<SetPlaceNewConfig> SetPlaceNewConfig { get; private set; } public ILiteCollection<SetPlaceNewConfig> SetPlaceNewConfig { get; private set; }
...@@ -137,6 +134,9 @@ namespace VIZ.FGOUT.Storage ...@@ -137,6 +134,9 @@ namespace VIZ.FGOUT.Storage
/// </summary> /// </summary>
public ILiteCollection<SetManualConfig> SetManualConfig { get; private set; } public ILiteCollection<SetManualConfig> SetManualConfig { get; private set; }
/// <summary>
/// 掷标枪配置文件
/// </summary>
public ILiteCollection<JavelinThrowConfig> JavelinThrowConfig { get; private set; } public ILiteCollection<JavelinThrowConfig> JavelinThrowConfig { get; private set; }
/// <summary> /// <summary>
...@@ -154,14 +154,10 @@ namespace VIZ.FGOUT.Storage ...@@ -154,14 +154,10 @@ namespace VIZ.FGOUT.Storage
this.ViewConfig = null; this.ViewConfig = null;
this.SystemConfig = null; this.SystemConfig = null;
this.HotkeyConfig = null; this.HotkeyConfig = null;
this.SetPlaceConfig = null; this.SetPlaceConfig = null;
this.SetPlaceNewConfig = null; this.SetPlaceNewConfig = null;
this.SetManualConfig = null; this.SetManualConfig = null;
this.JavelinThrowConfig = null; this.JavelinThrowConfig = null;
this.Database?.Dispose(); this.Database?.Dispose();
} }
} }
......
VIZ.FGOUT/VIZ.FGOUT/CloseAlgorithmWindow.xaml.cs
using System; using System.Threading.Tasks;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
using VIZ.FGOUT.Domain; using VIZ.FGOUT.Domain;
using VIZ.FGOUT.Storage; using VIZ.FGOUT.Storage;
using VIZ.Framework.Core; using VIZ.Framework.Core;
...@@ -35,26 +24,20 @@ namespace VIZ.FGOUT ...@@ -35,26 +24,20 @@ namespace VIZ.FGOUT
Task.Run(() => Task.Run(() =>
{ {
//执行卸载流程 //执行卸载流程
AppSetup.UnLoad(); AppSetup.UnLoad();
//记录日志：系统关闭 //记录日志：系统关闭
ApplicationDomainEx.CsvContext.AppendSystemLog(null,null,SystemLogStringFormats.APPLICATION_SHUTDOWN); ApplicationDomainEx.CsvContext.AppendSystemLog(null,null,SystemLogStringFormats.APPLICATION_SHUTDOWN);
//执行退出流程 //执行退出流程
AppSetup.ShutDown(); AppSetup.ShutDown();
//关闭窗口 //关闭窗口
WPFHelper.BeginInvoke(() => WPFHelper.BeginInvoke(() =>
{ {
this.Close(); this.Close();
}); });
}); });
} }
} }
......
VIZ.FGOUT/VIZ.FGOUT/MainWindow.xaml.cs
...@@ -12,7 +12,6 @@ namespace VIZ.FGOUT ...@@ -12,7 +12,6 @@ namespace VIZ.FGOUT
public MainWindow() public MainWindow()
{ {
InitializeComponent(); InitializeComponent();
this.Closing += MainWindow_Closing; this.Closing += MainWindow_Closing;
this.Loaded += MainWindow_Loaded; this.Loaded += MainWindow_Loaded;
} }
...@@ -23,9 +22,7 @@ namespace VIZ.FGOUT ...@@ -23,9 +22,7 @@ namespace VIZ.FGOUT
AppSetupContext context = AppSetup.Load(this); AppSetupContext context = AppSetup.Load(this);
if (context.Exception != null) if (context.Exception != null)
{
MessageBox.Show($"执行 {context.ProviderDetail} 失败\r\n{context.Exception.Message}"); MessageBox.Show($"执行 {context.ProviderDetail} 失败\r\n{context.Exception.Message}");
}
if (!context.IsSuccess) if (!context.IsSuccess)
{ {
......
VIZ.FGOUT/VIZ.FGOUT/bin/x64/Debug/Logs/err.log
2023-09-26 10:26:05,535 [10] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径：'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确！ 2023-10-08 10:22:22,980 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径：'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确！
2023-09-26 10:41:23,812 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径：'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确！ 2023-10-08 10:31:29,231 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径：'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确！
2023-09-26 11:17:40,811 [10] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径：'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确！ 2023-10-08 10:31:54,665 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径：'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确！
2023-09-26 11:19:36,669 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径：'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确！ 2023-10-08 10:53:36,447 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径：'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确！
2023-09-26 14:26:19,241 [4] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径：'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确！ 2023-10-08 10:55:03,961 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径：'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确！
2023-09-26 16:27:53,182 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - System.InvalidOperationException: 集合已修改；可能无法执行枚举操作。 2023-10-08 10:57:34,195 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径：'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确！
在 System.ThrowHelper.ThrowInvalidOperationException(ExceptionResource resource) 2023-10-08 11:00:16,461 [10] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径：'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确！
在 System.Collections.Generic.List`1.Enumerator.MoveNextRare() 2023-10-08 15:09:13,302 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径：'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确！
在 System.Linq.Enumerable.FirstOrDefault[TSource](IEnumerable`1 source, Func`2 predicate) 2023-10-08 15:14:28,774 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径：'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确！
在 VIZ.FGOUT.Module.AlgorithmControllerBase.ExecuteRestartAlgorithm_StartUDP() 位置 D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIView\Controller\Algorithm\AlgorithmControllerBase.cs:行号 471 2023-10-08 15:14:48,045 [8] ERROR VIZ.Framework.Connection.UdpConnection - System.Net.Sockets.SocketException (0x80004005): 远程主机强迫关闭了一个现有的连接。
在 VIZ.FGOUT.Module.AlgorithmControllerBase.ExecuteRestartAlgorithm() 位置 D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIView\Controller\Algorithm\AlgorithmControllerBase.cs:行号 254 在 System.Net.Sockets.Socket.ReceiveFrom(Byte[] buffer, Int32 offset, Int32 size, SocketFlags socketFlags, EndPoint& remoteEP)
在 VIZ.FGOUT.Module.AlgorithmControllerBase.<RestartAlgorithm>b__14_0() 位置 D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIView\Controller\Algorithm\AlgorithmControllerBase.cs:行号 84 在 System.Net.Sockets.UdpClient.Receive(IPEndPoint& remoteEP)
2023-09-26 16:39:07,728 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径：'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确！ 在 VIZ.Framework.Connection.UdpConnection.ReceiveMessage() 位置 D:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\Protocol\UDP\UdpConnection.cs:行号 163
2023-10-08 15:14:49,720 [8] ERROR VIZ.Framework.Connection.UdpConnection - System.Net.Sockets.SocketException (0x80004005): 远程主机强迫关闭了一个现有的连接。
在 System.Net.Sockets.Socket.ReceiveFrom(Byte[] buffer, Int32 offset, Int32 size, SocketFlags socketFlags, EndPoint& remoteEP)
在 System.Net.Sockets.UdpClient.Receive(IPEndPoint& remoteEP)
在 VIZ.Framework.Connection.UdpConnection.ReceiveMessage() 位置 D:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\Protocol\UDP\UdpConnection.cs:行号 163
2023-10-08 15:14:50,303 [8] ERROR VIZ.Framework.Connection.UdpConnection - System.Net.Sockets.SocketException (0x80004005): 远程主机强迫关闭了一个现有的连接。
在 System.Net.Sockets.Socket.ReceiveFrom(Byte[] buffer, Int32 offset, Int32 size, SocketFlags socketFlags, EndPoint& remoteEP)
在 System.Net.Sockets.UdpClient.Receive(IPEndPoint& remoteEP)
在 VIZ.Framework.Connection.UdpConnection.ReceiveMessage() 位置 D:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\Protocol\UDP\UdpConnection.cs:行号 163
2023-10-08 15:14:51,973 [8] ERROR VIZ.Framework.Connection.UdpConnection - System.Net.Sockets.SocketException (0x80004005): 远程主机强迫关闭了一个现有的连接。
在 System.Net.Sockets.Socket.ReceiveFrom(Byte[] buffer, Int32 offset, Int32 size, SocketFlags socketFlags, EndPoint& remoteEP)
在 System.Net.Sockets.UdpClient.Receive(IPEndPoint& remoteEP)
在 VIZ.Framework.Connection.UdpConnection.ReceiveMessage() 位置 D:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\Protocol\UDP\UdpConnection.cs:行号 163
2023-10-08 15:15:13,574 [1] ERROR VIZ.Framework.Core.VCommand - System.Net.Sockets.SocketException (0x80004005): 由于套接字没有连接并且(当使用一个 sendto 调用发送数据报套接字时)没有提供地址，发送或接收数据的请求没有被接受。
在 System.Net.Sockets.UdpClient.Send(Byte[] dgram, Int32 bytes, String hostname, Int32 port)
在 VIZ.Framework.Connection.UdpEndpointManager.Send(Byte[] buffer) 位置 D:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\Protocol\UDP\UdpEndpointManager.cs:行号 61
在 VIZ.Framework.Connection.UdpEndpointManagerExpand.SendString(UdpEndpointManager manager, String msg, Encoding encoding) 位置 D:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\Protocol\UDP\UdpEndpointManagerExpand.cs:行号 34
在 VIZ.Framework.Connection.UdpEndpointManagerExpand.SendJson(UdpEndpointManager manager, Object obj) 位置 D:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\Protocol\UDP\UdpEndpointManagerExpand.cs:行号 67
在 VIZ.FGOUT.Module.NDIMainViewModel.MatImageCommand() 位置 D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIMainView\ViewModel\NDIMainViewModel.cs:行号 464
在 VIZ.Framework.Core.VCommand.Execute(Object parameter) 位置 D:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\Core\WPF\VCommand.cs:行号 108
2023-10-08 15:15:14,717 [1] ERROR VIZ.Framework.Core.VCommand - System.Net.Sockets.SocketException (0x80004005): 由于套接字没有连接并且(当使用一个 sendto 调用发送数据报套接字时)没有提供地址，发送或接收数据的请求没有被接受。
在 System.Net.Sockets.UdpClient.Send(Byte[] dgram, Int32 bytes, String hostname, Int32 port)
在 VIZ.Framework.Connection.UdpEndpointManager.Send(Byte[] buffer) 位置 D:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\Protocol\UDP\UdpEndpointManager.cs:行号 61
在 VIZ.Framework.Connection.UdpEndpointManagerExpand.SendString(UdpEndpointManager manager, String msg, Encoding encoding) 位置 D:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\Protocol\UDP\UdpEndpointManagerExpand.cs:行号 34
在 VIZ.Framework.Connection.UdpEndpointManagerExpand.SendJson(UdpEndpointManager manager, Object obj) 位置 D:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\Protocol\UDP\UdpEndpointManagerExpand.cs:行号 67
在 VIZ.FGOUT.Module.NDIMainViewModel.MatImageCommand() 位置 D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIMainView\ViewModel\NDIMainViewModel.cs:行号 464
在 VIZ.Framework.Core.VCommand.Execute(Object parameter) 位置 D:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\Core\WPF\VCommand.cs:行号 108
2023-10-08 15:54:11,581 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径：'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确！
2023-10-08 17:39:17,760 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径：'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确！
VIZ.FGOUT/VIZ.FGOUT/bin/x64/Debug/Logs/info.log
2023-09-26 14:27:04,663 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键： 2023-10-08 10:29:02,526 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：
2023-09-26 14:27:04,839 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键： 2023-10-08 10:29:02,728 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：Ctrl +
2023-09-26 14:27:06,957 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键： 2023-10-08 10:29:02,897 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：Ctrl + Alt + A
2023-09-26 14:27:25,741 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键： 2023-10-08 10:31:36,895 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：R
2023-09-26 14:27:25,895 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键： 2023-10-08 10:31:37,037 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：E
2023-09-26 14:27:26,965 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键： 2023-10-08 10:31:37,245 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：D
2023-09-26 14:27:27,098 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键： 2023-10-08 10:31:37,541 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：
2023-09-26 14:27:27,378 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键： 2023-10-08 10:31:38,207 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：
2023-09-26 14:27:27,931 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键： 2023-10-08 10:31:38,393 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：Ctrl + S
2023-09-26 14:27:28,063 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键： 2023-10-08 10:31:56,124 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：W
2023-09-26 14:27:28,173 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键： 2023-10-08 10:31:57,218 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：
2023-09-26 14:27:28,446 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：Ctrl + S 2023-10-08 10:31:57,701 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：
2023-09-26 16:28:46,993 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键： 2023-10-08 10:31:57,888 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：Ctrl + S
2023-09-26 16:28:47,218 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键： 2023-10-08 10:55:33,309 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：
2023-09-26 16:29:04,714 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键： 2023-10-08 10:55:33,450 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：Ctrl +
2023-10-08 10:55:33,531 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：Ctrl + Alt + A
2023-10-08 10:55:58,700 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：D7
2023-10-08 10:55:58,985 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：D0
2023-10-08 10:55:59,513 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：
2023-10-08 10:56:00,155 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：D1
2023-10-08 10:56:00,555 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：D7
2023-10-08 10:56:00,720 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：D5
2023-10-08 10:56:01,083 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：
2023-10-08 10:56:01,386 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：D1
2023-10-08 10:56:01,877 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：D6
2023-10-08 10:56:02,361 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：D0
2023-10-08 10:56:10,463 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：
2023-10-08 10:56:10,719 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：Ctrl + C
2023-10-08 10:56:18,476 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：
2023-10-08 10:56:18,593 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：Ctrl + V
2023-10-08 10:56:19,240 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：
2023-10-08 10:56:19,469 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：Ctrl + S
2023-10-08 10:56:25,629 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：
2023-10-08 10:56:25,781 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：Ctrl +
2023-10-08 10:56:26,020 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：Ctrl + Alt + A
2023-10-08 10:56:41,429 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：D1
2023-10-08 10:56:41,986 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：D8
2023-10-08 10:56:42,646 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：D4
2023-10-08 10:56:42,900 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：
2023-10-08 10:56:42,930 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：
2023-10-08 10:56:44,435 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：D8
2023-10-08 10:56:44,655 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：D0
2023-10-08 10:56:44,875 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：
2023-10-08 10:56:45,256 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：D1
2023-10-08 10:56:45,452 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：D0
2023-10-08 10:56:45,656 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：D5
2023-10-08 10:56:51,139 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：
2023-10-08 10:56:51,310 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：Ctrl + C
2023-10-08 10:56:53,535 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：
2023-10-08 10:56:53,704 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：Ctrl +
2023-10-08 10:56:53,977 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：Ctrl + Alt + A
2023-10-08 10:57:13,901 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：
2023-10-08 10:57:14,278 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：Ctrl + V
2023-10-08 10:57:19,214 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：
2023-10-08 10:57:19,624 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：Ctrl + C
2023-10-08 10:57:22,094 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：
2023-10-08 10:57:22,491 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：Ctrl + V
2023-10-08 10:57:22,994 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：
2023-10-08 10:57:23,166 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：Ctrl + S
2023-10-08 15:14:48,007 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"manual","signal":"detect","timecode":0,"id":"B0-25-AA-4E-C4-AE__CAM_1"}
2023-10-08 15:14:49,710 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"manual","signal":"detect","timecode":0,"id":"B0-25-AA-4E-C4-AE__CAM_1"}
2023-10-08 15:14:50,293 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"manual","signal":"detect","timecode":0,"id":"B0-25-AA-4E-C4-AE__CAM_1"}
2023-10-08 15:14:51,967 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"manual","signal":"detect","timecode":0,"id":"B0-25-AA-4E-C4-AE__CAM_2"}
VIZ.Framework/VIZ.Framework.Common/SharpDx/WIC/WicBitmapHelper.cs
using SharpDX.WIC; using SharpDX.Direct2D1;
using SharpDX.Direct2D1;
using SharpDX.DXGI; using SharpDX.DXGI;
using SharpDX.IO;
using SharpDX.WIC;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using SharpDX;
using System.IO; using System.IO;
using SharpDX.IO;
using System.Runtime.Remoting.Contexts;
namespace VIZ.Framework.Common namespace VIZ.Framework.Common
{ {
......
VIZ.Framework/VIZ.Framework.Common/VideoControl/Control/Plugin/ClipBox/ClipBoxPlugin.cs
using SharpDX.Direct2D1; using log4net;
using SharpDX.Direct2D1;
using SharpDX.Mathematics.Interop; using SharpDX.Mathematics.Interop;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using VIZ.Framework.Core; using VIZ.Framework.Core;
using log4net;
namespace VIZ.Framework.Common namespace VIZ.Framework.Common
{ {
......
VIZ.Framework/VIZ.Framework.Common/VideoControl/Control/Plugin/TrackingBox/Info/TrackingBoxInfo.cs
using SharpDX.Mathematics.Interop; using SharpDX.Mathematics.Interop;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.Framework.Common namespace VIZ.Framework.Common
{ {
......
VIZ.Framework/VIZ.Framework.Common/VideoControl/Control/Plugin/VideoPluginBase.cs
using SharpDX.Direct2D1; namespace VIZ.Framework.Common
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.Framework.Common
{ {
/// <summary> /// <summary>
/// 视频插件基类 /// 视频插件基类
......
VIZ.Framework/VIZ.Framework.Common/VideoControl/Control/VideoControlPluginNames.cs
using System; namespace VIZ.Framework.Common
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.Framework.Common
{ {
/// <summary> /// <summary>
/// 视频控件插件名称 /// 视频控件插件名称
......
VIZ.Framework/VIZ.Framework.Common/VideoControl/Control/VideoCustomRender.cs
...@@ -119,7 +119,6 @@ namespace VIZ.Framework.Common ...@@ -119,7 +119,6 @@ namespace VIZ.Framework.Common
context.Target = target; context.Target = target;
context.Mode = VideoRenderMode.UI; context.Mode = VideoRenderMode.UI;
context.DirectWriteFactory = this.directWriteFactory; context.DirectWriteFactory = this.directWriteFactory;
this.Render(context); this.Render(context);
} }
......
VIZ.Framework/VIZ.Framework.Common/VideoControl/Control/VideoRenderInfo.cs
...@@ -35,9 +35,7 @@ namespace VIZ.Framework.Common ...@@ -35,9 +35,7 @@ namespace VIZ.Framework.Common
{ {
if (this.IsDisopsed) if (this.IsDisopsed)
return; return;
this.IsDisopsed = true; this.IsDisopsed = true;
this.Frame?.Dispose(); this.Frame?.Dispose();
} }
} }
......
VIZ.Framework/VIZ.Framework.Common/VideoControl/Control/VideoRenderMode.cs
using System; namespace VIZ.Framework.Common
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.Framework.Common
{ {
/// <summary> /// <summary>
/// 视频渲染模式 /// 视频渲染模式
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment