Skip to content

F
FGOUT
Commit 2071c2c7 by 鲁志-悦动
Options

主页面右下角功能区域调宽 And 自动发送倒计时贴右侧边缘放 And 系统版本放到主页面右下角

parent bb72eb1a
Showing with 148 additions and 87 deletions
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
22-1578589972 221979955803
1-1441241311 1470602451
11-1602666439 11-350624472
23-2035776870 24-1321085892
Resources\StringResource.zh-CN.xaml;Resources\StringResource.en.xaml;Style\Button\Button_NdiView.xaml;Style\Button\Button_Setting.xaml;Style\Button\Button_WindowTop.xaml;Style\CheckBox\CheckBox_NdiView.xaml;Style\CheckBox\CheckBox_RaidoButtonStyle.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_NdiMainViewBlue.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; Resources\StringResource.zh-CN.xaml;Resources\StringResource.en.xaml;Style\Button\Button_NdiView.xaml;Style\Button\Button_Setting.xaml;Style\Button\Button_WindowTop.xaml;Style\CheckBox\CheckBox_NdiView.xaml;Style\CheckBox\CheckBox_RaidoButtonStyle.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_NdiMainViewBlue.xaml;Style\RadioButton\RadioButton_NdiView.xaml;Style\RadioButton\RadioButton_Setting.xaml;Style\Slider\Slider_Setting.xaml;Style\TextBlock\TextBlock_Setting.xaml;Style\TextBox\TextBox_Setting.xaml;Style\ToogleButton\ToogleButton_Setting.xaml;Themes\Generic.xaml;Toolkit\NumericUpDown\NumericUpDown.xaml;
True False
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml
...@@ -156,14 +156,14 @@ ...@@ -156,14 +156,14 @@
Grid.Row="2" Grid.Row="2"
Grid.Column="1" Grid.Column="1"
VerticalScrollBarVisibility="Disabled"> VerticalScrollBarVisibility="Disabled">
<Grid Margin="70,0,0,0"> <Grid Margin="70,0">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition /> <ColumnDefinition />
<ColumnDefinition /> <ColumnDefinition />
<ColumnDefinition /> <ColumnDefinition />
<ColumnDefinition /> <ColumnDefinition />
<ColumnDefinition /> <ColumnDefinition />
<ColumnDefinition Width="*" /> <!--<ColumnDefinition Width="*" />-->
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<!--<RowDefinition Height="70" /> <!--<RowDefinition Height="70" />
...@@ -786,7 +786,7 @@ ...@@ -786,7 +786,7 @@
Content="{DynamicResource Send}" Content="{DynamicResource Send}"
Style="{StaticResource ButtonStyle}" /> Style="{StaticResource ButtonStyle}" />
<TextBlock <TextBlock
Margin="50,0,0,0" Margin="110,0,0,0"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="14" FontSize="14"
...@@ -888,67 +888,6 @@ ...@@ -888,67 +888,6 @@
Content="Out Point" Content="Out Point"
Style="{StaticResource ButtonStyle}" Style="{StaticResource ButtonStyle}"
Visibility="{Binding ReplaySendVisibility, Mode=TwoWay}" />--> Visibility="{Binding ReplaySendVisibility, Mode=TwoWay}" />-->
<!-- Replay -->
<Border
Grid.Row="4"
Grid.ColumnSpan="5"
Margin="0,10,0,0"
BorderBrush="Gray"
BorderThickness="1">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<ToggleButton
Grid.Column="0"
Width="100"
Height="40"
Content="{DynamicResource Replay}"
IsChecked="{Binding ReplayIsChecked, Mode=TwoWay}"
Style="{StaticResource ToggleButtonStyle}">
<b:Interaction.Triggers>
<b:EventTrigger EventName="Checked">
<b:InvokeCommandAction Command="{Binding ReplayCheckedCommand}" />
</b:EventTrigger>
<b:EventTrigger EventName="Unchecked">
<b:InvokeCommandAction Command="{Binding ReplayUncheckedCommand}" />
</b:EventTrigger>
</b:Interaction.Triggers>
</ToggleButton>
<Button
Grid.Column="1"
Width="100"
Height="40"
Margin="0,0,0,0"
HorizontalAlignment="Stretch"
Command="{Binding Path=CleanInPointCommand}"
Content="{DynamicResource CleanInPoint}"
Style="{StaticResource ButtonStyle}"
Visibility="{Binding ReplaySendVisibility, Mode=TwoWay}" />
<Button
Grid.Column="2"
Width="100"
Height="40"
Margin="0,0,0,0"
Command="{Binding Path=ReplayStartCommand}"
Content="{DynamicResource Play}"
Style="{StaticResource ButtonStyle}"
Visibility="{Binding ReplaySendVisibility, Mode=TwoWay}" />
<Button
Grid.Column="3"
Width="100"
Height="40"
Margin="0,0,0,0"
Command="{Binding Path=ReplayStopCommand}"
Content="{DynamicResource Stop}"
Style="{StaticResource ButtonStyle}"
Visibility="{Binding ReplaySendVisibility, Mode=TwoWay}" />
</Grid>
</Border>
<!-- 三个常用算法参数 --> <!-- 三个常用算法参数 -->
<Border <Border
Grid.Row="3" Grid.Row="3"
...@@ -1024,6 +963,87 @@ ...@@ -1024,6 +963,87 @@
Style="{StaticResource ButtonStyle}" /> Style="{StaticResource ButtonStyle}" />
</Grid> </Grid>
</Border> </Border>
<!-- Replay -->
<Border
Grid.Row="4"
Grid.ColumnSpan="5"
Margin="0,10,0,0"
BorderBrush="Gray"
BorderThickness="1">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<ToggleButton
Grid.Column="0"
Width="100"
Height="40"
Content="{DynamicResource Replay}"
IsChecked="{Binding ReplayIsChecked, Mode=TwoWay}"
Style="{StaticResource ToggleButtonStyle}">
<b:Interaction.Triggers>
<b:EventTrigger EventName="Checked">
<b:InvokeCommandAction Command="{Binding ReplayCheckedCommand}" />
</b:EventTrigger>
<b:EventTrigger EventName="Unchecked">
<b:InvokeCommandAction Command="{Binding ReplayUncheckedCommand}" />
</b:EventTrigger>
</b:Interaction.Triggers>
</ToggleButton>
<Button
Grid.Column="1"
Width="100"
Height="40"
Margin="0,0,0,0"
HorizontalAlignment="Stretch"
Command="{Binding Path=CleanInPointCommand}"
Content="{DynamicResource CleanInPoint}"
Style="{StaticResource ButtonStyle}"
Visibility="{Binding ReplaySendVisibility, Mode=TwoWay}" />
<Button
Grid.Column="2"
Width="100"
Height="40"
Margin="0,0,0,0"
Command="{Binding Path=ReplayStartCommand}"
Content="{DynamicResource Play}"
Style="{StaticResource ButtonStyle}"
Visibility="{Binding ReplaySendVisibility, Mode=TwoWay}" />
<Button
Grid.Column="3"
Width="100"
Height="40"
Margin="0,0,0,0"
Command="{Binding Path=ReplayStopCommand}"
Content="{DynamicResource Stop}"
Style="{StaticResource ButtonStyle}"
Visibility="{Binding ReplaySendVisibility, Mode=TwoWay}" />
</Grid>
</Border>
<!-- 系统版本 -->
<StackPanel
Grid.Row="5"
Grid.Column="4"
HorizontalAlignment="Right"
Orientation="Horizontal">
<TextBlock
VerticalAlignment="Center"
FontSize="14"
Foreground="White"
Text="{DynamicResource SystemVersion}" />
<TextBlock
Margin="0,0,0,0"
VerticalAlignment="Center"
FontSize="14"
Foreground="White"
Text="{Binding Path=SystemVersion}" />
</StackPanel>
</Grid> </Grid>
</ScrollViewer> </ScrollViewer>
<!--</WrapPanel>--> <!--</WrapPanel>-->
...@@ -1557,6 +1577,7 @@ ...@@ -1557,6 +1577,7 @@
Maximum="{Binding SliderMaximum}" Maximum="{Binding SliderMaximum}"
Minimum="0" Minimum="0"
SliderHeight="30" SliderHeight="30"
SliderTickFrequency="10"
SliderWidth="810" SliderWidth="810"
StartValue="{Binding SliderStartValue, Mode=TwoWay}" StartValue="{Binding SliderStartValue, Mode=TwoWay}"
Visibility="{Binding SliderVisibility}" /> Visibility="{Binding SliderVisibility}" />
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
...@@ -4,10 +4,10 @@ using Newtonsoft.Json; ...@@ -4,10 +4,10 @@ using Newtonsoft.Json;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Reflection;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Forms;
using System.Windows.Interop; using System.Windows.Interop;
using VIZ.FGOUT.Connection; using VIZ.FGOUT.Connection;
using VIZ.FGOUT.Connection.UDP.Clip.Signal.Send; using VIZ.FGOUT.Connection.UDP.Clip.Signal.Send;
...@@ -72,6 +72,20 @@ namespace VIZ.FGOUT.Module ...@@ -72,6 +72,20 @@ namespace VIZ.FGOUT.Module
//初始化语言 //初始化语言
InitLanguage(); InitLanguage();
//初始化系统版本
InitSystemVersion();
}
/// <summary>
/// 初始化系统版本
/// </summary>
private void InitSystemVersion()
{
string str = Assembly.GetEntryAssembly().GetCustomAttribute<AssemblyFileVersionAttribute>()?.Version;
Version.TryParse(str, out Version version);
this.SystemVersion = $"{version.Major}.{version.Minor}.{version.Build}";
} }
//Dictionary<string, string> dics = new Dictionary<string, string> //Dictionary<string, string> dics = new Dictionary<string, string>
...@@ -395,7 +409,13 @@ namespace VIZ.FGOUT.Module ...@@ -395,7 +409,13 @@ namespace VIZ.FGOUT.Module
} }
} }
else else
{
//1
AutoSendCount--; AutoSendCount--;
this.RaisePropertyChanged(nameof(AutoSendCount));
//2
//AutoSendCount -=1;
}
}); });
} }
catch (Exception ex) catch (Exception ex)
...@@ -1926,6 +1946,7 @@ namespace VIZ.FGOUT.Module ...@@ -1926,6 +1946,7 @@ namespace VIZ.FGOUT.Module
} }
_startDt = DateTime.Now; _startDt = DateTime.Now;
//log.Info("StartValue =" + _sliderStartValue); //log.Info("StartValue =" + _sliderStartValue);
_isDown = false;
} }
} }
...@@ -1955,6 +1976,7 @@ namespace VIZ.FGOUT.Module ...@@ -1955,6 +1976,7 @@ namespace VIZ.FGOUT.Module
} }
} }
_endDt = DateTime.Now; _endDt = DateTime.Now;
_isDown = true;
} }
} }
...@@ -2179,6 +2201,20 @@ namespace VIZ.FGOUT.Module ...@@ -2179,6 +2201,20 @@ namespace VIZ.FGOUT.Module
#endregion #endregion
#region SystemVersion -- 系统版本
private string systemVersion;
/// <summary>
/// 系统版本
/// </summary>
public string SystemVersion
{
get { return systemVersion; }
set { systemVersion = value; this.RaisePropertyChanged(nameof(SystemVersion)); }
}
#endregion
// ====================================================================================== // ======================================================================================
// === Public Function === // === Public Function ===
// ====================================================================================== // ======================================================================================
......
VIZ.FGOUT/VIZ.FGOUT.Module/Themes/SliderArrange.xaml
...@@ -432,6 +432,7 @@ ...@@ -432,6 +432,7 @@
IsSnapToTickEnabled="True" IsSnapToTickEnabled="True"
Maximum="{Binding ElementName=UC_Arrange, Path=Maximum}" Maximum="{Binding ElementName=UC_Arrange, Path=Maximum}"
Minimum="{Binding ElementName=UC_Arrange, Path=Minimum}" Minimum="{Binding ElementName=UC_Arrange, Path=Minimum}"
MouseLeave="SL_Bat1_OnMouseLeave"
SelectionEnd="{Binding ElementName=UC_Arrange, Path=EndValue}" SelectionEnd="{Binding ElementName=UC_Arrange, Path=EndValue}"
SelectionStart="{Binding ElementName=UC_Arrange, Path=StartValue}" SelectionStart="{Binding ElementName=UC_Arrange, Path=StartValue}"
Style="{DynamicResource SliderStyle1}" Style="{DynamicResource SliderStyle1}"
...@@ -448,7 +449,7 @@ ...@@ -448,7 +449,7 @@
Width="{Binding ElementName=UC_Arrange, Path=SliderWidth}" Width="{Binding ElementName=UC_Arrange, Path=SliderWidth}"
Margin="2" Margin="2"
VerticalAlignment="Center" VerticalAlignment="Center"
CacheMode="BitmapCache" CacheMode="BitmapCache" MouseLeave="SL_Bat2_OnMouseLeave"
FocusVisualStyle="{x:Null}" FocusVisualStyle="{x:Null}"
IsSelectionRangeEnabled="True" IsSelectionRangeEnabled="True"
IsSnapToTickEnabled="True" IsSnapToTickEnabled="True"
......
VIZ.FGOUT/VIZ.FGOUT.Module/Themes/SliderArrange.xaml.cs
...@@ -131,7 +131,6 @@ namespace VIZ.FGOUT.Module ...@@ -131,7 +131,6 @@ namespace VIZ.FGOUT.Module
#endregion #endregion
#region 前台交互 #region 前台交互
/// <summary> /// <summary>
...@@ -199,5 +198,14 @@ namespace VIZ.FGOUT.Module ...@@ -199,5 +198,14 @@ namespace VIZ.FGOUT.Module
#endregion #endregion
private void SL_Bat1_OnMouseLeave(object sender, MouseEventArgs e)
{
//((Slider)sender).MoveFocus(new TraversalRequest(FocusNavigationDirection.Previous));
}
private void SL_Bat2_OnMouseLeave(object sender, MouseEventArgs e)
{
//((Slider)sender).MoveFocus(new TraversalRequest(FocusNavigationDirection.Next));
}
} }
} }
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "126F1AF2ECAD94E5253CE99CBFDC9A46E91FBE7FAF4EFD597C8C99033B333D71" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "5ED2281BFAD7278DC4E1E0401BB1D7E92E53A3154842C5877B5A5456A8903623"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module { ...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1284 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1304 "..\..\..\..\..\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;
...@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module { ...@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1469 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1489 "..\..\..\..\..\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;
...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module { ...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1484 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1504 "..\..\..\..\..\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 cam3; internal VIZ.FGOUT.Module.NDIView cam3;
......
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}" "126F1AF2ECAD94E5253CE99CBFDC9A46E91FBE7FAF4EFD597C8C99033B333D71" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "5ED2281BFAD7278DC4E1E0401BB1D7E92E53A3154842C5877B5A5456A8903623"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module { ...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1284 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1304 "..\..\..\..\..\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;
...@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module { ...@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1469 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1489 "..\..\..\..\..\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;
...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module { ...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1484 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1504 "..\..\..\..\..\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 cam3; internal VIZ.FGOUT.Module.NDIView cam3;
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/VIZ.FGOUT.Module_MarkupCompile.lref
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\obj\x64\Debug\GeneratedInternalTypeHelper.g.cs 
FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIMainView\View\NDIMainView.xaml;; FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIMainView\View\NDIMainView.xaml;;
FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIPreviewView\View\NDIPreviewView.xaml;; FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIPreviewView\View\NDIPreviewView.xaml;;
......
VIZ.Framework/VIZ.Framework.Core/Core/WPF/ModelBase.cs
using System; using System.ComponentModel;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
namespace VIZ.Framework.Core namespace VIZ.Framework.Core
......
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