Commit afcbe060 by 鲁志-悦动

主页和系统设置页面优化

parent b5f91136
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
<Setter Property="FocusVisualStyle" Value="{x:Null}" /> <Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Setter Property="Foreground" Value="White" /> <Setter Property="Foreground" Value="White" />
<Setter Property="FontSize" Value="14" /> <Setter Property="FontSize" Value="14" />
<Setter Property="Width" Value="60" /> <!--<Setter Property="Width" Value="60" />-->
<Setter Property="Height" Value="30" /> <Setter Property="Height" Value="30" />
<Setter Property="HorizontalAlignment" Value="Left" /> <Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="VerticalAlignment" Value="Center" /> <Setter Property="VerticalAlignment" Value="Center" />
......
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
<Setter Property="Height" Value="30" /> <Setter Property="Height" Value="30" />
<Setter Property="HorizontalAlignment" Value="Left" /> <Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="HorizontalContentAlignment" Value="Center" /> <Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="Width" Value="120" /> <!--<Setter Property="Width" Value="120" />-->
<Setter Property="Background" Value="#282A2C" /> <Setter Property="Background" Value="#282A2C" />
<Setter Property="BorderBrush" Value="Gray" /> <Setter Property="BorderBrush" Value="Gray" />
<Setter Property="BorderThickness" Value="1" /> <Setter Property="BorderThickness" Value="1" />
......
...@@ -15,7 +15,8 @@ ...@@ -15,7 +15,8 @@
</Border> </Border>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
<Trigger Property="IsChecked" Value="True"> <Trigger Property="IsChecked" Value="True">
<Setter TargetName="bd" Property="Background" Value="#ff825611" /> <!--<Setter TargetName="bd" Property="Background" Value="#ff825611" />-->
<Setter TargetName="bd" Property="Background" Value="#378CFF" />
</Trigger> </Trigger>
<Trigger Property="IsMouseOver" Value="True"> <Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="bd_inner" Property="Background" Value="#22ffffff" /> <Setter TargetName="bd_inner" Property="Background" Value="#22ffffff" />
......
...@@ -52,6 +52,9 @@ ...@@ -52,6 +52,9 @@
<Setter Property="HorizontalContentAlignment" Value="Center" /> <Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="CaretBrush" Value="White" /> <Setter Property="CaretBrush" Value="White" />
<Setter Property="Background" Value="#282A2C" /> <Setter Property="Background" Value="#282A2C" />
<Setter Property="BorderBrush" Value="Gray" />
<Setter Property="BorderThickness" Value="1" />
<Setter Property="SnapsToDevicePixels" Value="True" />
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="{x:Type TextBox}"> <ControlTemplate TargetType="{x:Type TextBox}">
...@@ -66,9 +69,9 @@ ...@@ -66,9 +69,9 @@
<Border <Border
x:Name="border" x:Name="border"
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
BorderBrush="Gray" BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="1" BorderThickness="{TemplateBinding BorderThickness}"
SnapsToDevicePixels="True"> SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
<ScrollViewer <ScrollViewer
x:Name="PART_ContentHost" x:Name="PART_ContentHost"
VerticalAlignment="Center" VerticalAlignment="Center"
......
...@@ -2,5 +2,14 @@ ...@@ -2,5 +2,14 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 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"
xmlns:local="clr-namespace:VIZ.FGOUT.Module.Resource"> xmlns:local="clr-namespace:VIZ.FGOUT.Module.Resource">
<!-- 按钮背景色 -->
<SolidColorBrush x:Key="ButtonBackground" Color="#626669" />
<!-- 按钮鼠标移到上方背景色 -->
<SolidColorBrush x:Key="ButtonMouseoverBackground" Color="#378CFF" />
<!-- 标题栏背景色 -->
<SolidColorBrush x:Key="TitleBarBackground" Color="#16191C" />
<!-- 左边栏背景色 -->
<!--<SolidColorBrush x:Key="LeftColumnBackground" Color="#16191C" />-->
<!-- 左边内容区域背景色 -->
<SolidColorBrush x:Key="RightContentAreaBackground" Color="#373D41" />
</ResourceDictionary> </ResourceDictionary>
...@@ -10,11 +10,11 @@ none ...@@ -10,11 +10,11 @@ none
false false
DEBUG;TRACE DEBUG;TRACE
18560433975 181380438361
1470602451 1-1441241311
11-350624472 11-1602666439
24771590698 23-1982761867
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;
False True
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
mc:Ignorable="d"> mc:Ignorable="d">
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <!--<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/Button/Button_WindowTop.xaml" /> <ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/Button/Button_WindowTop.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/CheckBox/CheckBox_WindowTop.xaml" /> <ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/CheckBox/CheckBox_WindowTop.xaml" />
<ResourceDictionary Source="/VIZ.Framework.Common.Resource;component/Style/Button/Button_WindowTop.xaml" /> <ResourceDictionary Source="/VIZ.Framework.Common.Resource;component/Style/Button/Button_WindowTop.xaml" />
...@@ -27,7 +27,8 @@ ...@@ -27,7 +27,8 @@
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/Button/Button_Setting.xaml" /> <ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/Button/Button_Setting.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/ToogleButton/ToogleButton_Setting.xaml" /> <ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/ToogleButton/ToogleButton_Setting.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/TextBlock/TextBlock_Setting.xaml" /> <ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/TextBlock/TextBlock_Setting.xaml" />
</ResourceDictionary.MergedDictionaries> <ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Themes/Generic.xaml" />
</ResourceDictionary.MergedDictionaries>-->
<fcore:ByteSizeConverter <fcore:ByteSizeConverter
x:Key="ByteSizeConverter" x:Key="ByteSizeConverter"
InType="B" InType="B"
...@@ -63,7 +64,7 @@ ...@@ -63,7 +64,7 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<!-- 顶部 --> <!-- 顶部 -->
<TextBox x:Name="tbFocus" Visibility="Collapsed" /> <TextBox x:Name="tbFocus" Visibility="Collapsed" />
<Grid Background="#ff12202d"> <Grid Background="{StaticResource TitleBarBackground}">
<!--<StackPanel Orientation="Horizontal" HorizontalAlignment="Left"> <!--<StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
<CheckBox Height="30" Style="{StaticResource CheckBox_One_Four}" ToolTip="窗口模式" <CheckBox Height="30" Style="{StaticResource CheckBox_One_Four}" ToolTip="窗口模式"
IsChecked="{Binding Path=IsOneScreenMode,Mode=TwoWay}"></CheckBox> IsChecked="{Binding Path=IsOneScreenMode,Mode=TwoWay}"></CheckBox>
...@@ -422,7 +423,7 @@ ...@@ -422,7 +423,7 @@
VideoBorderBrush="#B85069" /> VideoBorderBrush="#B85069" />
</Grid> </Grid>
<!-- 底部 --> <!-- 底部 -->
<Border Grid.Row="2" Background="#ff12202d"> <Border Grid.Row="2" Background="{StaticResource TitleBarBackground}">
<Grid Margin="110,0,110,0"> <Grid Margin="110,0,110,0">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="120" /> <ColumnDefinition Width="120" />
...@@ -577,7 +578,6 @@ ...@@ -577,7 +578,6 @@
</ListBox> </ListBox>
</ToolTip> </ToolTip>
</StackPanel.ToolTip> </StackPanel.ToolTip>
<Grid <Grid
Width="18" Width="18"
Height="18" Height="18"
......
...@@ -19,12 +19,12 @@ ...@@ -19,12 +19,12 @@
mc:Ignorable="d"> mc:Ignorable="d">
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <!--<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/Button/Button_NdiView.xaml" /> <ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/Button/Button_NdiView.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/Button/Button_Setting.xaml" /> <ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/Button/Button_Setting.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/CheckBox/CheckBox_NdiView.xaml" /> <ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/CheckBox/CheckBox_NdiView.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/RadioButton/RadioButton_NdiView.xaml" /> <ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/RadioButton/RadioButton_NdiView.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>-->
<fcore:Bool2VisibilityConverter x:Key="Bool2VisibilityConverter" /> <fcore:Bool2VisibilityConverter x:Key="Bool2VisibilityConverter" />
<fcore:Bool2BoolConverter x:Key="Bool2BoolConverter" /> <fcore:Bool2BoolConverter x:Key="Bool2BoolConverter" />
<fcore:StringAppendConverter x:Key="StringAppendConverter" /> <fcore:StringAppendConverter x:Key="StringAppendConverter" />
...@@ -260,14 +260,13 @@ ...@@ -260,14 +260,13 @@
<Grid Grid.Row="1"> <Grid Grid.Row="1">
<!-- 单人机位 ===== 目标检测按钮 --> <!-- 单人机位 ===== 目标检测按钮 -->
<Button <Button
Grid.Row="1" Width="32"
Width="100" Height="32"
Height="40" Margin="0,0,0,0"
Margin="0,0,10,0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Bottom" VerticalAlignment="Bottom"
Command="{Binding Path=DetectCommand}" Command="{Binding Path=DetectCommand}"
Style="{StaticResource Button_Setting}"> Style="{StaticResource ButtonStyle}">
<!--<Button.IsEnabled> <!--<Button.IsEnabled>
<MultiBinding Converter="{StaticResource NDIViewProperty2BoolConverter_DetectButton}"> <MultiBinding Converter="{StaticResource NDIViewProperty2BoolConverter_DetectButton}">
<Binding Path="ViewStatus"></Binding> <Binding Path="ViewStatus"></Binding>
...@@ -396,11 +395,11 @@ ...@@ -396,11 +395,11 @@
<RowDefinition Height="*" /> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<!-- 功能区 --> <!-- 功能区 -->
<StackPanel <StackPanel VerticalAlignment="Top" Orientation="Vertical">
VerticalAlignment="Top" <!--<Border
Background="Black" Background="{StaticResource ButtonBackground}"
Orientation="Vertical"> CornerRadius="6"
<Border ToolTip="设置"> ToolTip="设置">
<Button <Button
Width="32" Width="32"
Height="32" Height="32"
...@@ -408,22 +407,33 @@ ...@@ -408,22 +407,33 @@
Command="{Binding Path=SettingCommand, Mode=OneWay}" Command="{Binding Path=SettingCommand, Mode=OneWay}"
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 ToolTip="设置">
<Button
Width="32"
Height="32"
Command="{Binding Path=SettingCommand, Mode=OneWay}"
CommandParameter="{Binding ElementName=uc, Path=NDIKey, Mode=OneWay}"
Style="{StaticResource ButtonStyle}">
<Image
Width="24"
Height="24"
Source="/VIZ.FGOUT.Module.Resource;component/Icons/edit_48x48.png" />
</Button>
</Border> </Border>
</StackPanel> </StackPanel>
<!-- AI功能区 --> <!-- AI功能区 -->
<StackPanel <StackPanel
Grid.Row="1" Grid.Row="1"
VerticalAlignment="Bottom" VerticalAlignment="Bottom"
Background="Black"
Orientation="Vertical"> Orientation="Vertical">
<!-- 重启算法 --> <!-- 重启算法 -->
<Border Margin="0,10,0,0" ToolTip="重启算法"> <Border ToolTip="重启算法">
<Button <Button
Width="32" Width="32"
Height="32" Height="32"
Command="{Binding RestartCommand}" Command="{Binding RestartCommand}"
Style="{StaticResource Button_Function}"> Style="{StaticResource ButtonStyle}">
<Image <Image
Width="24" Width="24"
Height="24" Height="24"
...@@ -431,12 +441,12 @@ ...@@ -431,12 +441,12 @@
</Button> </Button>
</Border> </Border>
<!-- 关闭算法 --> <!-- 关闭算法 -->
<Border Margin="0,10,0,0" ToolTip="关闭算法"> <Border ToolTip="关闭算法">
<Button <Button
Width="32" Width="32"
Height="32" Height="32"
Command="{Binding StopCommand}" Command="{Binding StopCommand}"
Style="{StaticResource Button_Function}"> Style="{StaticResource ButtonStyle}">
<Image <Image
Width="24" Width="24"
Height="24" Height="24"
......
using OpenCvSharp; using OpenCvSharp;
using OpenCvSharp.Flann;
using SharpDX; using SharpDX;
using SharpDX.Mathematics.Interop; using SharpDX.Mathematics.Interop;
using System; using System;
...@@ -152,7 +153,7 @@ namespace VIZ.FGOUT.Module ...@@ -152,7 +153,7 @@ namespace VIZ.FGOUT.Module
if (view == null) if (view == null)
return; return;
DataStreamExtend dsExtend = new DataStreamExtend();
//Replay //Replay
if (view.vm.IsReplay) if (view.vm.IsReplay)
{ {
...@@ -172,6 +173,7 @@ namespace VIZ.FGOUT.Module ...@@ -172,6 +173,7 @@ namespace VIZ.FGOUT.Module
byte[] lowResolutionData = new byte[dse.Width * dse.Height * 4]; byte[] lowResolutionData = new byte[dse.Width * dse.Height * 4];
var newLength = lowResolutionData.Length; var newLength = lowResolutionData.Length;
Marshal.Copy(dse.Data, lowResolutionData, 0, newLength); Marshal.Copy(dse.Data, lowResolutionData, 0, newLength);
DataStreamExtend dsExtend = new DataStreamExtend();
dsExtend.DataStream = new DataStream((int)newLength, true, true); dsExtend.DataStream = new DataStream((int)newLength, true, true);
dsExtend.DataStream.Write(lowResolutionData, 0, newLength); dsExtend.DataStream.Write(lowResolutionData, 0, newLength);
dsExtend.DataStream.Position = 0; dsExtend.DataStream.Position = 0;
...@@ -210,9 +212,28 @@ namespace VIZ.FGOUT.Module ...@@ -210,9 +212,28 @@ namespace VIZ.FGOUT.Module
//时间戳获取 //时间戳获取
timecode = e.Frame.TimeStamp; timecode = e.Frame.TimeStamp;
// 更新画面 4K流优化
//var mat2 = new Mat(e.Frame.Height, e.Frame.Width, MatType.CV_8UC4, e.Frame.DataStream.DataPointer);
//var resizedFrame2 = new Mat();
//Cv2.Resize(mat2, resizedFrame2, new Size(mat2.Width / 4, mat2.Height / 4));
//byte[] lowResolutionData = new byte[resizedFrame2.Width * resizedFrame2.Height * 4];
//var newLength = lowResolutionData.Length;
//Marshal.Copy(resizedFrame2.Data, lowResolutionData, 0, newLength);
//DataStreamExtend dsExtend = new DataStreamExtend();
//dsExtend.DataStream = new DataStream((int)newLength, true, true);
//dsExtend.DataStream.Write(lowResolutionData, 0, newLength);
//dsExtend.DataStream.Position = 0;
//dsExtend.Width = resizedFrame2.Width;
//dsExtend.Height = resizedFrame2.Height;
//dsExtend.Length = newLength;
//dsExtend.TimeStamp = NDIViewModel.ReplayTimeStamp = e.Frame.TimeStamp;
//view.video.UpdateVideoFrame(dsExtend);
// 更新画面 // 更新画面
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)
......
...@@ -18,14 +18,14 @@ ...@@ -18,14 +18,14 @@
mc:Ignorable="d"> mc:Ignorable="d">
<Window.Resources> <Window.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <!--<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/ComboBox/ComboBox_Setting.xaml" /> <ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/ComboBox/ComboBox_Setting.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/Button/Button_Setting.xaml" /> <ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/Button/Button_Setting.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/TextBox/TextBox_Setting.xaml" /> <ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/TextBox/TextBox_Setting.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/ToogleButton/ToogleButton_Setting.xaml" /> <ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/ToogleButton/ToogleButton_Setting.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/RadioButton/RadioButton_Setting.xaml" /> <ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/RadioButton/RadioButton_Setting.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/TextBlock/TextBlock_Setting.xaml" /> <ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/TextBlock/TextBlock_Setting.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>-->
<x:Array x:Key="TrueOrFalse" Type="sys:String"> <x:Array x:Key="TrueOrFalse" Type="sys:String">
<sys:String>False</sys:String> <sys:String>False</sys:String>
<sys:String>True</sys:String> <sys:String>True</sys:String>
...@@ -289,7 +289,6 @@ ...@@ -289,7 +289,6 @@
Content="{Binding DetailContent, Mode=TwoWay}" Content="{Binding DetailContent, Mode=TwoWay}"
Style="{StaticResource ButtonStyle}" /> Style="{StaticResource ButtonStyle}" />
</StackPanel>--> </StackPanel>-->
<ComboBox <ComboBox
Grid.Row="6" Grid.Row="6"
Grid.Column="1" Grid.Column="1"
...@@ -340,7 +339,6 @@ ...@@ -340,7 +339,6 @@
<ColumnDefinition Width="2*" /> <ColumnDefinition Width="2*" />
<ColumnDefinition Width="3*" /> <ColumnDefinition Width="3*" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock <TextBlock
VerticalAlignment="Center" VerticalAlignment="Center"
Foreground="White" Foreground="White"
...@@ -370,7 +368,6 @@ ...@@ -370,7 +368,6 @@
Grid.Column="1" Grid.Column="1"
Style="{StaticResource TextBoxStyle}" Style="{StaticResource TextBoxStyle}"
Text="{Binding Scale, Mode=TwoWay}" /> Text="{Binding Scale, Mode=TwoWay}" />
<TextBlock <TextBlock
Grid.Row="2" Grid.Row="2"
Grid.Column="0" Grid.Column="0"
......
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "65C390DA595172441A927C3F477B2EAA641D9045954EE506502B10A778A4DB94" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "D0BB5FFE537A6B5200A19D083AB7A774B1D7251007C3825FCC8E4913135B82D0"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -50,7 +50,7 @@ namespace VIZ.FGOUT.Module { ...@@ -50,7 +50,7 @@ namespace VIZ.FGOUT.Module {
public partial class NDIMainView : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { public partial class NDIMainView : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
#line 65 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 66 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox tbFocus; internal System.Windows.Controls.TextBox tbFocus;
...@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module { ...@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 372 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 373 "..\..\..\..\..\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 416 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 417 "..\..\..\..\..\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;
......
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "65C390DA595172441A927C3F477B2EAA641D9045954EE506502B10A778A4DB94" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "D0BB5FFE537A6B5200A19D083AB7A774B1D7251007C3825FCC8E4913135B82D0"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -50,7 +50,7 @@ namespace VIZ.FGOUT.Module { ...@@ -50,7 +50,7 @@ namespace VIZ.FGOUT.Module {
public partial class NDIMainView : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { public partial class NDIMainView : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
#line 65 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 66 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox tbFocus; internal System.Windows.Controls.TextBox tbFocus;
...@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module { ...@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 372 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 373 "..\..\..\..\..\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 416 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 417 "..\..\..\..\..\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;
......
#pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "2E895A9F8852E3CD79C4C1D5D416B2F73F23312925CCE85C1000FB55EDCB434D" #pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "AC4C5282E6DD55F2DF5E47D88A070C42ABA40818F40EB1AF5CBD0D6EEA1BC1F0"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -60,7 +60,7 @@ namespace VIZ.FGOUT.Module { ...@@ -60,7 +60,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 303 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 302 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Border Border; internal System.Windows.Controls.Border Border;
...@@ -68,7 +68,7 @@ namespace VIZ.FGOUT.Module { ...@@ -68,7 +68,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 323 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 322 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.Framework.Common.VideoControl video; internal VIZ.Framework.Common.VideoControl video;
...@@ -76,7 +76,7 @@ namespace VIZ.FGOUT.Module { ...@@ -76,7 +76,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 329 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 328 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Canvas canvas1; internal System.Windows.Controls.Canvas canvas1;
...@@ -119,49 +119,49 @@ namespace VIZ.FGOUT.Module { ...@@ -119,49 +119,49 @@ namespace VIZ.FGOUT.Module {
case 2: case 2:
this.Border = ((System.Windows.Controls.Border)(target)); this.Border = ((System.Windows.Controls.Border)(target));
#line 305 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 304 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.KeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyDown); this.Border.KeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyDown);
#line default #line default
#line hidden #line hidden
#line 306 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 305 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.KeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyUp); this.Border.KeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyUp);
#line default #line default
#line hidden #line hidden
#line 307 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 306 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewKeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyDown); this.Border.PreviewKeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyDown);
#line default #line default
#line hidden #line hidden
#line 308 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 307 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewKeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyUp); this.Border.PreviewKeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyUp);
#line default #line default
#line hidden #line hidden
#line 309 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 308 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonDown); this.Border.PreviewMouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonDown);
#line default #line default
#line hidden #line hidden
#line 310 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 309 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonUp); this.Border.PreviewMouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonUp);
#line default #line default
#line hidden #line hidden
#line 311 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 310 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseMove += new System.Windows.Input.MouseEventHandler(this.Border_MouseMove); this.Border.PreviewMouseMove += new System.Windows.Input.MouseEventHandler(this.Border_MouseMove);
#line default #line default
#line hidden #line hidden
#line 312 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 311 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseRightButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_OnPreviewMouseRightButtonDown); this.Border.PreviewMouseRightButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_OnPreviewMouseRightButtonDown);
#line default #line default
......
#pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "2E895A9F8852E3CD79C4C1D5D416B2F73F23312925CCE85C1000FB55EDCB434D" #pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "AC4C5282E6DD55F2DF5E47D88A070C42ABA40818F40EB1AF5CBD0D6EEA1BC1F0"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -60,7 +60,7 @@ namespace VIZ.FGOUT.Module { ...@@ -60,7 +60,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 303 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 302 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Border Border; internal System.Windows.Controls.Border Border;
...@@ -68,7 +68,7 @@ namespace VIZ.FGOUT.Module { ...@@ -68,7 +68,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 323 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 322 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.Framework.Common.VideoControl video; internal VIZ.Framework.Common.VideoControl video;
...@@ -76,7 +76,7 @@ namespace VIZ.FGOUT.Module { ...@@ -76,7 +76,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 329 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 328 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Canvas canvas1; internal System.Windows.Controls.Canvas canvas1;
...@@ -119,49 +119,49 @@ namespace VIZ.FGOUT.Module { ...@@ -119,49 +119,49 @@ namespace VIZ.FGOUT.Module {
case 2: case 2:
this.Border = ((System.Windows.Controls.Border)(target)); this.Border = ((System.Windows.Controls.Border)(target));
#line 305 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 304 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.KeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyDown); this.Border.KeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyDown);
#line default #line default
#line hidden #line hidden
#line 306 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 305 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.KeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyUp); this.Border.KeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyUp);
#line default #line default
#line hidden #line hidden
#line 307 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 306 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewKeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyDown); this.Border.PreviewKeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyDown);
#line default #line default
#line hidden #line hidden
#line 308 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 307 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewKeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyUp); this.Border.PreviewKeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyUp);
#line default #line default
#line hidden #line hidden
#line 309 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 308 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonDown); this.Border.PreviewMouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonDown);
#line default #line default
#line hidden #line hidden
#line 310 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 309 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonUp); this.Border.PreviewMouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonUp);
#line default #line default
#line hidden #line hidden
#line 311 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 310 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseMove += new System.Windows.Input.MouseEventHandler(this.Border_MouseMove); this.Border.PreviewMouseMove += new System.Windows.Input.MouseEventHandler(this.Border_MouseMove);
#line default #line default
#line hidden #line hidden
#line 312 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 311 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseRightButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_OnPreviewMouseRightButtonDown); this.Border.PreviewMouseRightButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_OnPreviewMouseRightButtonDown);
#line default #line default
......
#pragma checksum "..\..\..\..\..\SystemSetting\View\MattingImagePanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "3687BE20F239B764215751DDDE8B0B3D8D0D7030ABC1302C4D08564F129D2336" #pragma checksum "..\..\..\..\..\SystemSetting\View\MattingImagePanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "4C3AF8BFD2A83126A3AC9D6F911DC2B20B43E9ED4EE3E883939BFF90C4BF35FF"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
......
#pragma checksum "..\..\..\..\..\SystemSetting\View\MattingImagePanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "3687BE20F239B764215751DDDE8B0B3D8D0D7030ABC1302C4D08564F129D2336" #pragma checksum "..\..\..\..\..\SystemSetting\View\MattingImagePanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "4C3AF8BFD2A83126A3AC9D6F911DC2B20B43E9ED4EE3E883939BFF90C4BF35FF"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
......
#pragma checksum "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "9C32FAA6BAEFABBE61D93639A77AE0882F5269C8AAA3231CEEB8C61D903C1B05" #pragma checksum "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "5D8872D97DDBD98B769566573B5E5BF6AE24B4D801ED0A63E40F71AFCF22A270"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -48,7 +48,7 @@ namespace VIZ.FGOUT.Module { ...@@ -48,7 +48,7 @@ namespace VIZ.FGOUT.Module {
public partial class SystemSettingView : System.Windows.Window, System.Windows.Markup.IComponentConnector { public partial class SystemSettingView : System.Windows.Window, System.Windows.Markup.IComponentConnector {
#line 45 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml" #line 60 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbMatting; internal System.Windows.Controls.RadioButton rbMatting;
...@@ -56,7 +56,7 @@ namespace VIZ.FGOUT.Module { ...@@ -56,7 +56,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 47 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml" #line 69 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbCheckData; internal System.Windows.Controls.RadioButton rbCheckData;
...@@ -64,7 +64,7 @@ namespace VIZ.FGOUT.Module { ...@@ -64,7 +64,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 49 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml" #line 77 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbPackage; internal System.Windows.Controls.RadioButton rbPackage;
...@@ -72,7 +72,7 @@ namespace VIZ.FGOUT.Module { ...@@ -72,7 +72,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 51 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml" #line 85 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbHotkey; internal System.Windows.Controls.RadioButton rbHotkey;
...@@ -80,7 +80,7 @@ namespace VIZ.FGOUT.Module { ...@@ -80,7 +80,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 53 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml" #line 93 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbAbout; internal System.Windows.Controls.RadioButton rbAbout;
...@@ -119,7 +119,7 @@ namespace VIZ.FGOUT.Module { ...@@ -119,7 +119,7 @@ namespace VIZ.FGOUT.Module {
{ {
case 1: case 1:
#line 28 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml" #line 34 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
((System.Windows.Controls.Grid)(target)).MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.Grid_MouseDown); ((System.Windows.Controls.Grid)(target)).MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.Grid_MouseDown);
#line default #line default
......
#pragma checksum "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "9C32FAA6BAEFABBE61D93639A77AE0882F5269C8AAA3231CEEB8C61D903C1B05" #pragma checksum "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "5D8872D97DDBD98B769566573B5E5BF6AE24B4D801ED0A63E40F71AFCF22A270"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -48,7 +48,7 @@ namespace VIZ.FGOUT.Module { ...@@ -48,7 +48,7 @@ namespace VIZ.FGOUT.Module {
public partial class SystemSettingView : System.Windows.Window, System.Windows.Markup.IComponentConnector { public partial class SystemSettingView : System.Windows.Window, System.Windows.Markup.IComponentConnector {
#line 45 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml" #line 60 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbMatting; internal System.Windows.Controls.RadioButton rbMatting;
...@@ -56,7 +56,7 @@ namespace VIZ.FGOUT.Module { ...@@ -56,7 +56,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 47 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml" #line 69 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbCheckData; internal System.Windows.Controls.RadioButton rbCheckData;
...@@ -64,7 +64,7 @@ namespace VIZ.FGOUT.Module { ...@@ -64,7 +64,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 49 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml" #line 77 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbPackage; internal System.Windows.Controls.RadioButton rbPackage;
...@@ -72,7 +72,7 @@ namespace VIZ.FGOUT.Module { ...@@ -72,7 +72,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 51 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml" #line 85 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbHotkey; internal System.Windows.Controls.RadioButton rbHotkey;
...@@ -80,7 +80,7 @@ namespace VIZ.FGOUT.Module { ...@@ -80,7 +80,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 53 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml" #line 93 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbAbout; internal System.Windows.Controls.RadioButton rbAbout;
...@@ -119,7 +119,7 @@ namespace VIZ.FGOUT.Module { ...@@ -119,7 +119,7 @@ namespace VIZ.FGOUT.Module {
{ {
case 1: case 1:
#line 28 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml" #line 34 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
((System.Windows.Controls.Grid)(target)).MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.Grid_MouseDown); ((System.Windows.Controls.Grid)(target)).MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.Grid_MouseDown);
#line default #line default
......
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;;
......
<Application x:Class="VIZ.FGOUT.App" <Application
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" x:Class="VIZ.FGOUT.App"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:local="clr-namespace:VIZ.FGOUT" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
StartupUri="MainWindow.xaml"> xmlns:local="clr-namespace:VIZ.FGOUT"
StartupUri="MainWindow.xaml">
<Application.Resources> <Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/Button/Button_NdiView.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/CheckBox/CheckBox_NdiView.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/RadioButton/RadioButton_NdiView.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/ComboBox/ComboBox_Setting.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/TextBox/TextBox_Setting.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/RadioButton/RadioButton_Setting.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/CheckBox/CheckBox_WindowTop.xaml" />
<ResourceDictionary Source="/VIZ.Framework.Common.Resource;component/Style/Button/Button_WindowTop.xaml" />
<ResourceDictionary Source="/VIZ.Framework.Common.Resource;component/Style/ListBox/ListBox_None.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/CheckBox/CheckBox_Setting.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/Button/Button_Setting.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/ToogleButton/ToogleButton_Setting.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/TextBlock/TextBlock_Setting.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Themes/Generic.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources> </Application.Resources>
</Application> </Application>
using System; using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
using System.Linq;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
using VIZ.FGOUT.Domain;
using VIZ.FGOUT.Module; using VIZ.FGOUT.Module;
using VIZ.FGOUT.Storage;
using VIZ.Framework.Module; using VIZ.Framework.Module;
namespace VIZ.FGOUT namespace VIZ.FGOUT
...@@ -21,53 +14,31 @@ namespace VIZ.FGOUT ...@@ -21,53 +14,31 @@ namespace VIZ.FGOUT
public App() public App()
{ {
//计算机资源 //计算机资源
AppSetup.AppendSetup(new AppSetup_ComputerResource());
AppSetup.AppendSetup(new AppSetup_ComputerResource());
//初始化LiteDB //初始化LiteDB
AppSetup.AppendSetup(new AppSetup_InitLiteDb()); AppSetup.AppendSetup(new AppSetup_InitLiteDb());
//初始化CSV //初始化CSV
AppSetup.AppendSetup(new AppSetup_InitCsv()); AppSetup.AppendSetup(new AppSetup_InitCsv());
//初始化NDI //初始化NDI
AppSetup.AppendSetup(new AppSetup_InitNDI());
AppSetup.AppendSetup(new AppSetup_InitNDI());
//初始化算法进程 //初始化算法进程
AppSetup.AppendSetup(new AppSetup_Algorithm()); AppSetup.AppendSetup(new AppSetup_Algorithm());
// 初始化UDP // 初始化UDP
AppSetup.AppendSetup(new AppSetup_InitUDP()); AppSetup.AppendSetup(new AppSetup_InitUDP());
//初始化系统监控 //初始化系统监控
AppSetup.AppendSetup(new AppSetup_Monitor()); AppSetup.AppendSetup(new AppSetup_Monitor());
//执行启动流程 //执行启动流程
AppSetupContext context = AppSetup.Setup(); AppSetupContext context = AppSetup.Setup();
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)
{ {
Environment.Exit(-1); Environment.Exit(-1);
} }
//记录日志: 系统启动 //记录日志: 系统启动
// ApplicationDomainEx.CsvContext.AppendSystemLog(null,null,SystemLogStringFormats.APPLICATION_SETUP);
// ApplicationDomainEx.CsvContext.AppendSystemLog(null,null,SystemLogStringFormats.APPLICATION_SETUP);
} }
} }
} }
This source diff could not be displayed because it is too large. You can view the blob instead.
#pragma checksum "..\..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "DC113CD72C198D9B5F73EC0416337604982829A51AA66DEFB4F9C75A678C86DB" #pragma checksum "..\..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "B14D83B6500681617F7229B31D83C773154C1484C3C7852EEFDDCD0D478DF203"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -40,18 +40,31 @@ namespace VIZ.FGOUT { ...@@ -40,18 +40,31 @@ namespace VIZ.FGOUT {
/// </summary> /// </summary>
public partial class App : System.Windows.Application { public partial class App : System.Windows.Application {
private bool _contentLoaded;
/// <summary> /// <summary>
/// InitializeComponent /// InitializeComponent
/// </summary> /// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()] [System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
public void InitializeComponent() { public void InitializeComponent() {
if (_contentLoaded) {
return;
}
_contentLoaded = true;
#line 5 "..\..\..\App.xaml" #line 6 "..\..\..\App.xaml"
this.StartupUri = new System.Uri("MainWindow.xaml", System.UriKind.Relative); this.StartupUri = new System.Uri("MainWindow.xaml", System.UriKind.Relative);
#line default #line default
#line hidden #line hidden
System.Uri resourceLocater = new System.Uri("/VIZ.FGOUT;component/app.xaml", System.UriKind.Relative);
#line 1 "..\..\..\App.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
#line default
#line hidden
} }
/// <summary> /// <summary>
......
#pragma checksum "..\..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "DC113CD72C198D9B5F73EC0416337604982829A51AA66DEFB4F9C75A678C86DB" #pragma checksum "..\..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "B14D83B6500681617F7229B31D83C773154C1484C3C7852EEFDDCD0D478DF203"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -40,18 +40,31 @@ namespace VIZ.FGOUT { ...@@ -40,18 +40,31 @@ namespace VIZ.FGOUT {
/// </summary> /// </summary>
public partial class App : System.Windows.Application { public partial class App : System.Windows.Application {
private bool _contentLoaded;
/// <summary> /// <summary>
/// InitializeComponent /// InitializeComponent
/// </summary> /// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()] [System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
public void InitializeComponent() { public void InitializeComponent() {
if (_contentLoaded) {
return;
}
_contentLoaded = true;
#line 5 "..\..\..\App.xaml" #line 6 "..\..\..\App.xaml"
this.StartupUri = new System.Uri("MainWindow.xaml", System.UriKind.Relative); this.StartupUri = new System.Uri("MainWindow.xaml", System.UriKind.Relative);
#line default #line default
#line hidden #line hidden
System.Uri resourceLocater = new System.Uri("/VIZ.FGOUT;component/app.xaml", System.UriKind.Relative);
#line 1 "..\..\..\App.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
#line default
#line hidden
} }
/// <summary> /// <summary>
......
...@@ -680,3 +680,4 @@ D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\bin\x64\Debug\dll\x86\OpenCvSharpExtern.dl ...@@ -680,3 +680,4 @@ D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\bin\x64\Debug\dll\x86\OpenCvSharpExtern.dl
D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\bin\x64\Debug\dll\x86\opencv_videoio_ffmpeg480.dll D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\bin\x64\Debug\dll\x86\opencv_videoio_ffmpeg480.dll
D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\bin\x64\Debug\dll\x64\OpenCvSharpExtern.dll D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\bin\x64\Debug\dll\x64\OpenCvSharpExtern.dll
D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\bin\x64\Debug\dll\x64\opencv_videoio_ffmpeg480_64.dll D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\bin\x64\Debug\dll\x64\opencv_videoio_ffmpeg480_64.dll
D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\obj\x64\Debug\App.baml
 
FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\App.xaml;;
FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\CloseAlgorithmWindow.xaml;; FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\CloseAlgorithmWindow.xaml;;
FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\MainWindow.xaml;; FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\MainWindow.xaml;;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment