Skip to content

F
FGOUT
Commit c6a35440 by 鲁志-悦动
Options

手动模式下Replay点击播放开始倒计时两轮时间后停止

parent 3b9da37e
Showing with 284 additions and 72 deletions
VIZ.FGOUT/VIZ.FGOUT.Common/obj/x64/Debug/GeneratedInternalTypeHelper.g.cs

//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
// 运行时版本:4.0.30319.42000
//
// 对此文件的更改可能会导致不正确的行为，并且如果
// 重新生成代码，这些更改将会丢失。
// </auto-generated>
//------------------------------------------------------------------------------
namespace XamlGeneratedNamespace {
/// <summary>
/// GeneratedInternalTypeHelper
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
/// <summary>
/// CreateInstance
/// </summary>
protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic)
| (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
}
/// <summary>
/// GetPropertyValue
/// </summary>
protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
}
/// <summary>
/// SetPropertyValue
/// </summary>
protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
}
/// <summary>
/// CreateDelegate
/// </summary>
protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod
| (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
delegateType,
handler}, null)));
}
/// <summary>
/// AddEventHandler
/// </summary>
protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
eventInfo.AddEventHandler(target, handler);
}
}
}
VIZ.FGOUT/VIZ.FGOUT.Common/obj/x64/Debug/VIZ.FGOUT.Common_MarkupCompile.cache
......@@ -10,11 +10,11 @@ none
false
21870986562
2-725104376
31364711570
17-1683084370
3947974750
17-1462717611
Themes\Generic.xaml;Widgets\FootballFieldPanel\FootballFieldPanel.xaml;
False
True
VIZ.FGOUT/VIZ.FGOUT.Common/obj/x64/Debug/VIZ.FGOUT.Common_MarkupCompile.lref
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\obj\x64\Debug\GeneratedInternalTypeHelper.g.cs

FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\Themes\Generic.xaml;;
FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\Widgets\FootballFieldPanel\FootballFieldPanel.xaml;;
......
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/Style/Slider/Slider_Setting.xaml
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Style x:Key="RepeatButtonTransparent" TargetType="{x:Type RepeatButton}">
<Setter Property="OverridesDefaultStyle" Value="true"/>
<Setter Property="Background" Value="Transparent"/>
<Setter Property="Focusable" Value="false"/>
<Setter Property="IsTabStop" Value="false"/>
<Setter Property="OverridesDefaultStyle" Value="true" />
<Setter Property="Background" Value="Transparent" />
<Setter Property="Focusable" Value="false" />
<Setter Property="IsTabStop" Value="false" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type RepeatButton}">
<Border Background="Transparent">
<Rectangle Fill="{TemplateBinding Background}" Height="3" Width="{TemplateBinding Width}"/>
<Rectangle
Width="{TemplateBinding Width}"
Height="3"
Fill="{TemplateBinding Background}" />
</Border>
</ControlTemplate>
</Setter.Value>
......@@ -18,46 +20,97 @@
</Style>
<ControlTemplate x:Key="Slider_Setting_ThumbHorizontal" TargetType="{x:Type Thumb}">
<Grid HorizontalAlignment="Center" UseLayoutRounding="True" VerticalAlignment="Center" Background="Transparent">
<Ellipse Width="20" Height="20" Fill="#ffffc000"></Ellipse>
<Grid
HorizontalAlignment="Center"
VerticalAlignment="Center"
Background="Transparent"
UseLayoutRounding="True">
<Ellipse
Width="20"
Height="20"
Fill="#ffffc000" />
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="true">
<Setter Property="Opacity" Value="1"></Setter>
<Setter Property="Opacity" Value="1" />
</Trigger>
<Trigger Property="IsDragging" Value="true">
<Setter Property="Opacity" Value="1"></Setter>
<Setter Property="Opacity" Value="1" />
</Trigger>
<Trigger Property="IsEnabled" Value="false">
<Setter Property="Opacity" Value="0.35"></Setter>
<Setter Property="Opacity" Value="0.35" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
<ControlTemplate x:Key="Slider_Setting_Horizontal" TargetType="{x:Type Slider}">
<Grid SnapsToDevicePixels="True" Background="Transparent">
<Grid Background="Transparent" SnapsToDevicePixels="True">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" MinHeight="{TemplateBinding MinHeight}"/>
<RowDefinition Height="Auto" MinHeight="{TemplateBinding MinHeight}" />
</Grid.RowDefinitions>
<Track x:Name="PART_Track">
<Track.DecreaseRepeatButton>
<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource RepeatButtonTransparent}" Background="#ffffc000"/>
<RepeatButton
Background="#ffffc000"
Command="{x:Static Slider.DecreaseLarge}"
Style="{StaticResource RepeatButtonTransparent}" />
</Track.DecreaseRepeatButton>
<Track.IncreaseRepeatButton>
<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource RepeatButtonTransparent}" Background="White"/>
<RepeatButton
Background="White"
Command="{x:Static Slider.IncreaseLarge}"
Style="{StaticResource RepeatButtonTransparent}" />
</Track.IncreaseRepeatButton>
<Track.Thumb>
<Thumb x:Name="Thumb" Focusable="False" Height="20" OverridesDefaultStyle="True" Template="{StaticResource Slider_Setting_ThumbHorizontal}"
VerticalAlignment="Center" Width="20"/>
<Thumb
x:Name="Thumb"
Width="20"
Height="20"
VerticalAlignment="Center"
Focusable="False"
OverridesDefaultStyle="True"
Template="{StaticResource Slider_Setting_ThumbHorizontal}" />
</Track.Thumb>
</Track>
</Grid>
</ControlTemplate>
<Style x:Key="Slider_Setting" TargetType="{x:Type Slider}">
<Setter Property="FocusVisualStyle" Value="{x:Null}"></Setter>
<Setter Property="Background" Value="Transparent"/>
<Setter Property="Template" Value="{StaticResource Slider_Setting_Horizontal}"></Setter>
<Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Setter Property="Background" Value="Transparent" />
<Setter Property="Template" Value="{StaticResource Slider_Setting_Horizontal}" />
</Style>
<!-- 滑块 -->
<Style x:Key="SliderThumbStyle" TargetType="{x:Type Thumb}">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Thumb}" />
</Setter.Value>
</Setter>
</Style>
<!-- 减少 -->
<Style x:Key="Slider_DecreaseRepeatBtnStyle" TargetType="RepeatButton" />
<!-- 增加 -->
<Style x:Key="Slider_IncreaseRepeatBtnStyle" TargetType="RepeatButton" />
<!-- Slider样式 -->
<Style x:Key="SliderStyle" TargetType="{x:Type Slider}">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="Slider">
<Track Name="PART_Track">
<Track.DecreaseRepeatButton>
<RepeatButton Style="{StaticResource Slider_DecreaseRepeatBtnStyle}" />
</Track.DecreaseRepeatButton>
<Track.Thumb>
<Thumb Style="{StaticResource SliderThumbStyle}" />
</Track.Thumb>
<Track.IncreaseRepeatButton>
<RepeatButton Style="{StaticResource Slider_IncreaseRepeatBtnStyle}" />
</Track.IncreaseRepeatButton>
</Track>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</ResourceDictionary>
\ No newline at end of file
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/obj/x64/Debug/VIZ.FGOUT.Module.Resource_MarkupCompile.cache
......@@ -10,11 +10,11 @@ none
false
DEBUG;TRACE
20-1486193684
1470602451
11-350624472
24-1321085892
201334349489
1-1441241311
11-1602666439
23-2035776870
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;
False
True
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
......@@ -239,9 +239,9 @@ namespace VIZ.FGOUT.Module
private void AutoSendIntervalTimeChanged(AutoSendModel model)
{
//_tempAutoSendCount = AutoSendCount = (model.Interval / 1000) + 1;
//_autoSend_Timer.Stop();
//_autoSend_Timer.Start();
AutoSendCount = (model.Interval / 1000);
_autoSend_Timer.Stop();
_autoSend_Timer.Start();
//WPFHelper.BeginInvoke(() =>
//{
......@@ -251,11 +251,11 @@ namespace VIZ.FGOUT.Module
//Refresh();
WPFHelper.BeginInvoke(() =>
{
TimeCountActVisibility = Visibility.Visible;
TimeCountDefaultVisibility = Visibility.Collapsed;
});
//WPFHelper.BeginInvoke(() =>
//{
// TimeCountActVisibility = Visibility.Visible;
// TimeCountDefaultVisibility = Visibility.Collapsed;
//});
}
/// <summary>
......@@ -334,14 +334,41 @@ namespace VIZ.FGOUT.Module
_autoSend_Timer.Elapsed += UpdateAutoSendTimer_Tick;
}
int _count = 0;
int _tempAutoSendCount = 3;
private void StartAutoSendTimer()
{
AutoSendCount = AutoSendIntervalTime - 1;
var minus = NDIViewModel.EndTime - NDIViewModel.StartTime;
if (minus > 0)
Task.Delay((int)minus * 2).Wait();
_tempAutoSendCount = AutoSendCount = AutoSendIntervalTime - 1;
//var minus = NDIViewModel.EndTime - NDIViewModel.StartTime;
//if (minus > 0)
//{
// //1
// //Task.Factory.StartNew(() =>
// //{
// // Task.Delay((int)(minus * 30)).Wait();
// //});
// //2
// Task.Delay((int)(minus * 2)).Wait();
// //3
// //WPFHelper.BeginInvoke(() =>
// //{
// // Thread.Sleep((int)(minus * 30));
// //});
// //4
// //WPFHelper.BeginInvoke(() =>
// //{
// // Task.Delay((int)(minus * 30)).Wait();
// //});
//}
_count = 1;
_autoSend_Timer.Stop();
_autoSend_Timer.Start();
}
private void UpdateAutoSendTimer_Tick(object sender, EventArgs e)
......@@ -350,8 +377,18 @@ namespace VIZ.FGOUT.Module
{
WPFHelper.BeginInvoke(() =>
{
if (AutoSendCount == 1)
if (AutoSendCount == 0)
{
if(_count==2)
_autoSend_Timer.Stop();
else
{
_count++;
AutoSendCount = _tempAutoSendCount;
}
}
else
AutoSendCount--;
});
}
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.Manual_NDI.cs
......@@ -263,7 +263,7 @@ namespace VIZ.FGOUT.Module
Width = dse.Mat.Width,
Height = dse.Mat.Height,
Length = newLength,
TimeStamp = NDIViewModel.ReplayTimeStamp = dse.TimeStamp
TimeStamp = ReplayTimeStamp = dse.TimeStamp
};
dsExtend.DataStream.Write(lowResolutionData, 0, newLength);
dsExtend.DataStream.Position = 0;
......
VIZ.FGOUT/VIZ.FGOUT.Module/Themes/SliderArrange.xaml.cs
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
namespace VIZ.FGOUT.Module
{
......@@ -31,10 +32,7 @@ namespace VIZ.FGOUT.Module
/// </summary>
private Rect StartRect
{
get
{
return (Rect)GetValue(StartRectProperty);
}
get { return (Rect)GetValue(StartRectProperty); }
set { SetValue(StartRectProperty, value); }
}
private static readonly DependencyProperty StartRectProperty =
......@@ -163,6 +161,8 @@ namespace VIZ.FGOUT.Module
if (e.NewValue > EndValue) // 检查值范围
StartValue = EndValue; // 超出，重设为最大值
ClipSilder();
//SL_Bat1.Foreground = new SolidColorBrush(Colors.Red);
//SL_Bat1.Background = new SolidColorBrush(Colors.Red);
}
private void SL_Bat2_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
......@@ -170,6 +170,7 @@ namespace VIZ.FGOUT.Module
if (e.NewValue < StartValue)
EndValue = StartValue;
ClipSilder();
//SL_Bat2.Background = new SolidColorBrush(Colors.Red);
}
//private void TextBox_KeyUp1(object sender, System.Windows.Input.KeyEventArgs e)
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/VIZ.FGOUT.Module_MarkupCompile.cache
......@@ -10,11 +10,11 @@ none
false
DEBUG;TRACE
241325682082
4-699044453
951167816992
151674092382
24-1226537834
4-1529606353
95-2032219709
151915249285
NDIMainView\View\NDIMainView.xaml;NDIPreviewView\View\NDIPreviewView.xaml;NDISettingView\View\AlgorithmSettingPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmCablewayPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmNearPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmSinglePanelView.xaml;NDISettingView\View\Algorithm\AlgorithmSixteenPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmTacticsPanelView.xaml;NDISettingView\View\NDISettingPanelView.xaml;NDISettingView\View\NDISettingView.xaml;NDIView\View\NDIView.xaml;SystemSetting\View\AboutPanelView.xaml;SystemSetting\View\CheckDataPanelView.xaml;SystemSetting\View\HotkeySettingPanelView.xaml;SystemSetting\View\MattingImagePanelView.xaml;SystemSetting\View\NewWindowView.xaml;SystemSetting\View\PackageSettingPanelView.xaml;SystemSetting\View\PreviewSettingPanelView.xaml;SystemSetting\View\ReplayPanelView.xaml;SystemSetting\View\StyleSettingPanelView.xaml;SystemSetting\View\SystemSettingView.xaml;SystemSetting\View\UEControlPanelView.xaml;SystemSetting\View\UESettingPanelView.xaml;Themes\SliderArrange.xaml;
False
True
VIZ.FGOUT/VIZ.FGOUT/obj/x64/Debug/VIZ.FGOUT_MarkupCompile.cache
......@@ -10,11 +10,11 @@ none
false
DEBUG;TRACE
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\App.xaml
2-1347366880
21265083526
6968741766
43-1958993781
6-790135758
421356718200
CloseAlgorithmWindow.xaml;MainWindow.xaml;
False
True
VIZ.Framework/VIZ.Framework.Common.Resource/obj/x64/Debug/VIZ.Framework.Common.Resource_MarkupCompile.cache
......@@ -10,10 +10,10 @@ none
false
DEBUG;TRACE
91711917753
9-721875057
3-1719726047
19-82108094
3-630027162
19-1136530284
Path\ArrowPathResource.xaml;Style\Button\Button_MessageBox.xaml;Style\Button\Button_Normal.xaml;Style\Button\Button_WindowTop.xaml;Style\GridSplitter\GridSplitter_None.xaml;Style\ListBox\ListBox_None.xaml;Style\ScrollView\ScrollView_Default.xaml;Style\TextBox\TextBox_None.xaml;Themes\Generic.xaml;
False
......
VIZ.Framework/VIZ.Framework.Common/obj/x64/Debug/GeneratedInternalTypeHelper.g.cs

//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
// 运行时版本:4.0.30319.42000
//
// 对此文件的更改可能会导致不正确的行为，并且如果
// 重新生成代码，这些更改将会丢失。
// </auto-generated>
//------------------------------------------------------------------------------
namespace XamlGeneratedNamespace {
/// <summary>
/// GeneratedInternalTypeHelper
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
/// <summary>
/// CreateInstance
/// </summary>
protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic)
| (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
}
/// <summary>
/// GetPropertyValue
/// </summary>
protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
}
/// <summary>
/// SetPropertyValue
/// </summary>
protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
}
/// <summary>
/// CreateDelegate
/// </summary>
protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod
| (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
delegateType,
handler}, null)));
}
/// <summary>
/// AddEventHandler
/// </summary>
protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
eventInfo.AddEventHandler(target, handler);
}
}
}
VIZ.Framework/VIZ.Framework.Common/obj/x64/Debug/VIZ.Framework.Common_MarkupCompile.cache
......@@ -10,11 +10,11 @@ none
false
DEBUG;TRACE
15488264905
15-721109437
1212046750213
44-1238315823
121-1133520871
44-785521425
MessageBox\MessageBoxEx.xaml;MessageBox\MessageBoxExWindow.xaml;Themes\Generic.xaml;VideoControl\Control\VideoControl.xaml;Widgets\ColorPickButton\ColorPickButton.xaml;Widgets\ColorPickButton\ColorPickWindow.xaml;Widgets\GPIOPinTestControl\GPIOPinTestControl.xaml;Widgets\HotkeyBox\HotkeyBox.xaml;Widgets\IconButton\IconButton.xaml;Widgets\LabelValue\LabelValue.xaml;Widgets\NavigationControl\NavigationControl.xaml;Widgets\ResizeImageControl\ResizeImageControl.xaml;Widgets\ShowMessageControl\ShowMessageControl.xaml;Widgets\VideoTimeBar\VideoTimeBar.xaml;Widgets\ViewLoader\ViewLoader.xaml;
False
True
VIZ.Framework/VIZ.Framework.Common/obj/x64/Debug/VIZ.Framework.Common_MarkupCompile.lref
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\obj\x64\Debug\GeneratedInternalTypeHelper.g.cs

FC:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\MessageBox\MessageBoxEx.xaml;;
FC:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\MessageBox\MessageBoxExWindow.xaml;;
......
VIZ.Framework/VIZ.Framework.Module/obj/x64/Debug/VIZ.Framework.Module_MarkupCompile.cache
......@@ -10,11 +10,11 @@ none
false
DEBUG;TRACE
11882902973
1-731644535
212023628146
25699837507
212002329545
25439653939
Themes\Generic.xaml;
False
True
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