Skip to content

F
FGOUT
Commit 65ad393a by 王永辉
Options

UE控制页面优化 And 主页面排版调整

parent b53afded
Showing with 216 additions and 55 deletions
VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Clip/Signal/Send/UEPackage.cs
...@@ -24,35 +24,37 @@ namespace VIZ.FGOUT.Connection.UDP.Clip.Signal.Send ...@@ -24,35 +24,37 @@ namespace VIZ.FGOUT.Connection.UDP.Clip.Signal.Send
public class EnableStats public class EnableStats
{ {
public int bEnableSpline { get; set; } = 1; public bool bEnableSpline { get; set; } = true;
public int bShowHeight { get; set; } = 1; public bool bShowHeight { get; set; } = true;
public int bShowSpeed { get; set; } = 1; public bool bShowSpeed { get; set; } = true;
public int bEnableZoom { get; set; } = 1; public bool bEnableZoom { get; set; } = true;
} }
public class SplineSets public class SplineSets
{ {
public int bLineBehind { get; set; } = 0; public bool bLineBehind { get; set; } = false;
} }
public class ZoomSets public class ZoomSets
{ {
public string ZoomEase { get; set; } = "SinusoidalInOut"; public string ZoomEase { get; set; } = "SinusoidalInOut";
public string MoveEase { get; set; } = "SinusoidalInOut"; public string MoveEase { get; set; } = "SinusoidalInOut";
public int Scale { get; set; } = 50; public double Scale { get; set; } = 50;
public double SafeScale { get; set; } = 0.9; public double SafeScale { get; set; } = 0.9;
public double ZoomIn { get; set; } = 3; public double ZoomIn { get; set; } = 3;
public double ZoomOut { get; set; } = 3; public double ZoomOut { get; set; } = 3;
public double Move { get; set; } = 3; public double Move { get; set; } = 3;
public int bMovementOnlyX { get; set; } = 0; public double delay_zoomin_move { get; set; } = 1;
public double delay_move_zoomout { get; set; } = 1;
public bool bMovementOnlyX { get; set; } = false;
public int MovementOnlyXPosition { get; set; } = 0; public int MovementOnlyXPosition { get; set; } = 0;
public int bMovementOnlyY { get; set; } = 0; public bool bMovementOnlyY { get; set; } = false;
public int MovementOnlyYPosition { get; set; } = 0; public int MovementOnlyYPosition { get; set; } = 0;
} }
public class Datas public class Datas
{ {
public int bIsManualMode { get; set; } = 0; public bool bIsManualMode { get; set; } = false;
public List<Position> Positions { get; set;} = new List<Position>(); public List<Position> Positions { get; set;} = new List<Position>();
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/Style/Button/Button_Setting.xaml
...@@ -146,9 +146,9 @@ ...@@ -146,9 +146,9 @@
<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="110" /> <Setter Property="Width" Value="60" />
<Setter Property="Height" Value="37" /> <Setter Property="Height" Value="30" />
<Setter Property="HorizontalAlignment" Value="Center" /> <Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="VerticalAlignment" Value="Center" /> <Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Background" Value="#626669" /> <Setter Property="Background" Value="#626669" />
<Setter Property="BorderBrush" Value="Transparent" /> <Setter Property="BorderBrush" Value="Transparent" />
......
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/Style/ComboBox/ComboBox_Setting.xaml
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
</Setter> </Setter>
</Style> </Style>
<Style x:Key="ToggleButtonStyle" TargetType="ToggleButton"> <Style x:Key="ToggleButtonForComboBox" TargetType="ToggleButton">
<Setter Property="FocusVisualStyle" Value="{x:Null}" /> <Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
...@@ -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="150" /> <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" />
...@@ -155,9 +155,8 @@ ...@@ -155,9 +155,8 @@
x:Name="toggleButton" x:Name="toggleButton"
Grid.ColumnSpan="2" Grid.ColumnSpan="2"
IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
Style="{StaticResource ToggleButtonStyle}" /> Style="{StaticResource ToggleButtonForComboBox}" />
<ContentPresenter <ContentPresenter
Margin="12,0"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Center" VerticalAlignment="Center"
Content="{TemplateBinding SelectionBoxItem}" Content="{TemplateBinding SelectionBoxItem}"
......
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/Style/RadioButton/RadioButton_Setting.xaml
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Style TargetType="RadioButton" x:Key="RadioButton_Setting"> <Style x:Key="RadioButton_Setting" TargetType="RadioButton">
<Setter Property="FocusVisualStyle" Value="{x:Null}"></Setter> <Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="RadioButton"> <ControlTemplate TargetType="RadioButton">
<Border x:Name="bd_inner" Background="Transparent"> <Border x:Name="bd_inner" Background="Transparent">
<Border x:Name="bd" Background="Transparent"> <Border x:Name="bd" Background="Transparent">
<ContentPresenter HorizontalAlignment="Left" VerticalAlignment="Center" Margin="45,0,10,0"></ContentPresenter> <ContentPresenter
Margin="45,0,10,0"
HorizontalAlignment="Left"
VerticalAlignment="Center" />
</Border> </Border>
</Border> </Border>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
<Trigger Property="IsChecked" Value="True"> <Trigger Property="IsChecked" Value="True">
<Setter TargetName="bd" Property="Background" Value="#ff825611"></Setter> <Setter TargetName="bd" Property="Background" Value="#ff825611" />
</Trigger> </Trigger>
<Trigger Property="IsMouseOver" Value="True"> <Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="bd_inner" Property="Background" Value="#22ffffff"></Setter> <Setter TargetName="bd_inner" Property="Background" Value="#22ffffff" />
</Trigger> </Trigger>
</ControlTemplate.Triggers> </ControlTemplate.Triggers>
</ControlTemplate> </ControlTemplate>
...@@ -24,9 +26,16 @@ ...@@ -24,9 +26,16 @@
</Setter> </Setter>
<Style.Triggers> <Style.Triggers>
<Trigger Property="IsEnabled" Value="False"> <Trigger Property="IsEnabled" Value="False">
<Setter Property="Opacity" Value="0.7"></Setter> <Setter Property="Opacity" Value="0.7" />
</Trigger> </Trigger>
</Style.Triggers> </Style.Triggers>
</Style> </Style>
<Style x:Key="RadioButtonStyle" TargetType="RadioButton">
<Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Foreground" Value="White" />
<Setter Property="FontSize" Value="14" />
</Style>
</ResourceDictionary> </ResourceDictionary>
\ No newline at end of file
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/Style/TextBlock/TextBlock_Setting.xaml 0 → 100644
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Style x:Key="TextBlockStyle" TargetType="TextBlock">
<Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="FontSize" Value="14" />
<Setter Property="Foreground" Value="White" />
</Style>
</ResourceDictionary>
\ No newline at end of file
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/Style/TextBox/TextBox_Setting.xaml
...@@ -47,8 +47,9 @@ ...@@ -47,8 +47,9 @@
<Setter Property="HorizontalAlignment" Value="Left" /> <Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="VerticalAlignment" Value="Center" /> <Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Height" Value="30" /> <Setter Property="Height" Value="30" />
<Setter Property="Width" Value="90" /> <Setter Property="Width" Value="120" />
<Setter Property="VerticalContentAlignment" Value="Center" /> <Setter Property="VerticalContentAlignment" 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="Template"> <Setter Property="Template">
......
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/Style/ToogleButton/ToogleButton_Setting.xaml 0 → 100644
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Style x:Key="FalseOrTrueToggleButtonStyle" TargetType="{x:Type ToggleButton}">
<Setter Property="Foreground" Value="#E46464" />
<Setter Property="Background" Value="Black" />
<Setter Property="FontSize" Value="14" />
<Setter Property="BorderBrush" Value="Gray" />
<Setter Property="Content" Value="False" />
<Setter Property="Height" Value="30" />
<Setter Property="Width" Value="120" />
<Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ToggleButton}">
<Grid>
<Border
x:Name="border"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="1.5"
CornerRadius="6"
SnapsToDevicePixels="true">
<ContentPresenter
x:Name="contentPresenter"
Margin="{TemplateBinding Padding}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Focusable="False"
RecognizesAccessKey="True"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
</Border>
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsChecked" Value="True">
<Setter Property="Foreground" Value="White" />
<Setter Property="Content" Value="True" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style x:Key="EnableOrDisableToggleButtonStyle" TargetType="{x:Type ToggleButton}">
<Setter Property="Foreground" Value="#E46464" />
<Setter Property="Background" Value="Black" />
<Setter Property="FontSize" Value="14" />
<Setter Property="Width" Value="120" />
<Setter Property="BorderBrush" Value="Gray" />
<Setter Property="Content" Value="Disable" />
<Setter Property="Height" Value="30" />
<Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ToggleButton}">
<Grid>
<Border
x:Name="border"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="1.5"
CornerRadius="6"
SnapsToDevicePixels="true">
<ContentPresenter
x:Name="contentPresenter"
Margin="{TemplateBinding Padding}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Focusable="False"
RecognizesAccessKey="True"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
</Border>
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsChecked" Value="True">
<Setter Property="Foreground" Value="#80F470" />
<Setter Property="Content" Value="Enable" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style x:Key="LineFrontOrBehindToggleButtonStyle" TargetType="{x:Type ToggleButton}">
<Setter Property="Foreground" Value="White" />
<Setter Property="Background" Value="Black" />
<Setter Property="FontSize" Value="14" />
<Setter Property="Width" Value="120" />
<Setter Property="BorderBrush" Value="Gray" />
<Setter Property="Content" Value="LineFront" />
<Setter Property="Height" Value="30" />
<Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ToggleButton}">
<Grid>
<Border
x:Name="border"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="1.5"
CornerRadius="6"
SnapsToDevicePixels="true">
<ContentPresenter
x:Name="contentPresenter"
Margin="{TemplateBinding Padding}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Focusable="False"
RecognizesAccessKey="True"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
</Border>
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsChecked" Value="True">
<Setter Property="Foreground" Value="White" />
<Setter Property="Content" Value="LineBehind" />
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="Foreground" Value="Gray" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</ResourceDictionary>
\ No newline at end of file
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/VIZ.FGOUT.Module.Resource.csproj
...@@ -201,10 +201,18 @@ ...@@ -201,10 +201,18 @@
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType> <SubType>Designer</SubType>
</Page> </Page>
<Page Include="Style\TextBlock\TextBlock_Setting.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Style\TextBox\TextBox_Setting.xaml"> <Page Include="Style\TextBox\TextBox_Setting.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType> <SubType>Designer</SubType>
</Page> </Page>
<Page Include="Style\ToogleButton\ToogleButton_Setting.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\Generic.xaml"> <Page Include="Themes\Generic.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType> <SubType>Designer</SubType>
......
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/obj/x64/Debug/VIZ.FGOUT.Module.Resource.csproj.FileListAbsolute.txt
...@@ -496,3 +496,5 @@ D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\VIZ.FGOUT.Mo ...@@ -496,3 +496,5 @@ D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\VIZ.FGOUT.Mo
D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\VIZ.FGOUT.Module.Resource.csproj.CopyComplete D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\VIZ.FGOUT.Module.Resource.csproj.CopyComplete
D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\VIZ.FGOUT.Module.Resource.dll D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\VIZ.FGOUT.Module.Resource.dll
D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\VIZ.FGOUT.Module.Resource.pdb D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\VIZ.FGOUT.Module.Resource.pdb
D:\wyh\FGOUT\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\ToogleButton\ToogleButton_Setting.baml
D:\wyh\FGOUT\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\TextBlock\TextBlock_Setting.baml
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/obj/x64/Debug/VIZ.FGOUT.Module.Resource_MarkupCompile.cache
...@@ -10,11 +10,11 @@ none ...@@ -10,11 +10,11 @@ none
false false
DEBUG;TRACE DEBUG;TRACE
16498493296 18560433975
1-1441241311 1470602451
11-1602666439 11-350624472
23304678694 241319896476
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\TextBox\TextBox_Setting.xaml;Themes\Generic.xaml;Toolkit\NumericUpDown\NumericUpDown.xaml; Style\Button\Button_NdiView.xaml;Style\Button\Button_Setting.xaml;Style\Button\Button_WindowTop.xaml;Style\CheckBox\CheckBox_NdiView.xaml;Style\CheckBox\CheckBox_Setting.xaml;Style\CheckBox\CheckBox_WindowTop.xaml;Style\ComboBox\ComboBox_Setting.xaml;Style\HotkeyBox\HotkeyBox_Setting.xaml;Style\MessageBox\MessageBoxEx.xaml;Style\RadioButton\RadioButton_FootballSide.xaml;Style\RadioButton\RadioButton_NdiView.xaml;Style\RadioButton\RadioButton_Setting.xaml;Style\Slider\Slider_Setting.xaml;Style\TextBlock\TextBlock_Setting.xaml;Style\TextBox\TextBox_Setting.xaml;Style\ToogleButton\ToogleButton_Setting.xaml;Themes\Generic.xaml;Toolkit\NumericUpDown\NumericUpDown.xaml;
True False
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/obj/x64/Debug/VIZ.FGOUT.Module.Resource_MarkupCompile.i.cache
...@@ -4,17 +4,17 @@ ...@@ -4,17 +4,17 @@
library library
C# C#
.cs .cs
D:\Projects\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\ D:\wyh\FGOUT\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\
VIZ.FGOUT.Module.Resource VIZ.FGOUT.Module.Resource
none none
false false
DEBUG;TRACE DEBUG;TRACE
16153409119 18560433975
1470602451 1470602451
121374819015 121374819015
23-1212766390 23-676971786
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\TextBox\TextBox_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 False
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml
...@@ -115,12 +115,17 @@ ...@@ -115,12 +115,17 @@
<RowDefinition Height="*" /> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="230*" /> <!--<ColumnDefinition Width="230*" />
<ColumnDefinition Width="209*" /> <ColumnDefinition Width="209*" />
<ColumnDefinition Width="21*" /> <ColumnDefinition Width="21*" />-->
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<WrapPanel Grid.Row="0" Grid.Column="0"> <WrapPanel
Grid.Row="1"
Grid.Column="0"
Margin="135,0,0,0">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
...@@ -168,7 +173,10 @@ ...@@ -168,7 +173,10 @@
</Grid> </Grid>
</WrapPanel> </WrapPanel>
<WrapPanel Grid.Row="0" Grid.Column="1"> <WrapPanel
Grid.Row="1"
Grid.Column="1"
Margin="125,0,0,0">
<Grid> <Grid>
...@@ -295,7 +303,7 @@ ...@@ -295,7 +303,7 @@
<local:NDIView <local:NDIView
x:Name="cam1" x:Name="cam1"
Grid.Row="1" Grid.Row="0"
Grid.Column="0" Grid.Column="0"
Margin="15,10,10,10" Margin="15,10,10,10"
MouseLeftButtonDown="cam1_MouseLeftButtonDown" MouseLeftButtonDown="cam1_MouseLeftButtonDown"
...@@ -313,7 +321,7 @@ ...@@ -313,7 +321,7 @@
<!-- CAM_1 会作为单一窗口时的主窗口 --> <!-- CAM_1 会作为单一窗口时的主窗口 -->
<local:NDIView <local:NDIView
x:Name="cam2" x:Name="cam2"
Grid.Row="1" Grid.Row="0"
Grid.Column="1" Grid.Column="1"
Margin="15,10,10,10" Margin="15,10,10,10"
MouseLeftButtonDown="cam2_MouseLeftButtonDown" MouseLeftButtonDown="cam2_MouseLeftButtonDown"
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "759DD8B3A1AA280562738CAE4EFCAC9A16C58AB9563E88D728D35F20FF6B5BA7" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0347975785EB8D0B2CAB944BBEB7B3F6D1C8069AB7CA02C4A73B61DBC4120CF3"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <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 297 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 299 "..\..\..\..\..\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 315 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 317 "..\..\..\..\..\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}" "759DD8B3A1AA280562738CAE4EFCAC9A16C58AB9563E88D728D35F20FF6B5BA7" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0347975785EB8D0B2CAB944BBEB7B3F6D1C8069AB7CA02C4A73B61DBC4120CF3"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <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 297 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 299 "..\..\..\..\..\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 315 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 317 "..\..\..\..\..\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/VIZ.FGOUT.Module_MarkupCompile.lref
 D:\wyh\FGOUT\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\obj\x64\Debug\GeneratedInternalTypeHelper.g.cs
FD:\wyh\FGOUT\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIMainView\View\NDIMainView.xaml;; FD:\wyh\FGOUT\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIMainView\View\NDIMainView.xaml;;
FD:\wyh\FGOUT\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIPreviewView\View\NDIPreviewView.xaml;; FD:\wyh\FGOUT\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIPreviewView\View\NDIPreviewView.xaml;;
......
VIZ.FGOUT/VIZ.FGOUT.Storage/LiteDB/UEPresets/JavelinThrowConfig.cs
using System; namespace VIZ.FGOUT.Storage
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Storage
{ {
public class JavelinThrowConfig public class JavelinThrowConfig
{ {
......
VIZ.FGOUT/VIZ.FGOUT/bin/x64/Debug/Logs/info.log
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment