Skip to content

F
FGOUT
Commit c6c02484 by 鲁志-悦动
Options

在非Replay的情况下按空格键不弹出子窗口 And 挂起、继续常亮 And 重置弹个窗“算法已重置。”

parent 65840e9f
Showing with 135 additions and 203 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
2-725104376
21870986562
3947974750
17-1462717611
31364711570
17-1683084370
Themes\Generic.xaml;Widgets\FootballFieldPanel\FootballFieldPanel.xaml;
True
False
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml
......@@ -1329,7 +1329,7 @@
FontSize="14"
Foreground="White"
Text="{DynamicResource Algorithm}" />
<Button
<!--<Button
Width="100"
Height="40"
Margin="10,0,0,0"
......@@ -1342,7 +1342,33 @@
Margin="15,0"
Command="{Binding Path=GoOnCommand}"
Content="{DynamicResource GoOn}"
Style="{StaticResource ButtonStyle}" />
Style="{StaticResource ButtonStyle}" />-->
<ToggleButton
Width="100"
Height="40"
Margin="0,0,0,0"
Content="{DynamicResource HoldOn}"
IsChecked="{Binding HoldOnIsChecked}"
Style="{StaticResource ToggleButtonStyle}">
<b:Interaction.Triggers>
<b:EventTrigger EventName="Checked">
<b:InvokeCommandAction Command="{Binding HoldonCommand}" />
</b:EventTrigger>
</b:Interaction.Triggers>
</ToggleButton>
<ToggleButton
Width="100"
Height="40"
Margin="10,0"
Content="{DynamicResource GoOn}"
IsChecked="{Binding GoOnIsChecked}"
Style="{StaticResource ToggleButtonStyle}">
<b:Interaction.Triggers>
<b:EventTrigger EventName="Checked">
<b:InvokeCommandAction Command="{Binding GoOnCommand}" />
</b:EventTrigger>
</b:Interaction.Triggers>
</ToggleButton>
<Button
Width="100"
Height="40"
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
......@@ -205,13 +205,13 @@ namespace VIZ.FGOUT.Module
////Replay出点值
//ApplicationDomain.MessageManager.Register<ReplayEndValueModel>(this, this.ReplayEndValueFromNDIViewModel);
//接收自动发送消息
//ApplicationDomain.MessageManager.Register<AutoSendModel>(this, this.AutoSendIntervalTimeChanged);
//接收自动发送消息，触发倒计时
ApplicationDomain.MessageManager.Register<AutoSendModel>(this, this.AutoSendIntervalTimeChanged);
//接收更新主页面Title体育项目名和位置标记消息
ApplicationDomain.MessageManager.Register<UpdateTitleAndPositionMarkModel>(this, this.UpdateTitleAndPositionMarkMethod);
// 算法落盘开始、结束时间戳消息
// 算法落盘开始、结束时间戳消息(在NDIViewModel已注册了接收方法)
//ApplicationDomain.MessageManager.Register<AlgorithmMessage__start_end>(this, this.OnAlgorithmMessage__start_end);
}
......@@ -241,7 +241,8 @@ namespace VIZ.FGOUT.Module
private void AutoSendIntervalTimeChanged(AutoSendModel model)
{
AutoSendCount = (model.Interval / 1000);
_tempAutoSendCount = AutoSendCount = AutoSendIntervalTime - 1;
//AutoSendCount = (model.Interval / 1000);
_autoSend_Timer.Stop();
_autoSend_Timer.Start();
......@@ -338,40 +339,40 @@ namespace VIZ.FGOUT.Module
int _count = 0;
int _tempAutoSendCount = 3;
private void StartAutoSendTimer()
{
_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 StartAutoSendTimer()
//{
// _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)
{
......@@ -379,10 +380,9 @@ namespace VIZ.FGOUT.Module
{
WPFHelper.BeginInvoke(() =>
{
if (AutoSendCount == 0)
{
if(_count==2)
if (_count == 1)
_autoSend_Timer.Stop();
else
{
......@@ -1057,6 +1057,8 @@ namespace VIZ.FGOUT.Module
}
}
public static int CountDownValue = 3;
private int _autoSendCount = 3;
public int AutoSendCount
{
......@@ -1105,6 +1107,26 @@ namespace VIZ.FGOUT.Module
#region 算法GoOn And Holdon And MattStart And MattEnd
private bool _goOnIsChecked;
/// <summary>
/// GoOn是否选中
/// </summary>
public bool GoOnIsChecked
{
get => _goOnIsChecked;
set { _goOnIsChecked = value; this.RaisePropertyChanged(nameof(GoOnIsChecked)); }
}
private bool _holdOnIsChecked;
/// <summary>
/// Holdon是否选中
/// </summary>
public bool HoldOnIsChecked
{
get => _holdOnIsChecked;
set { _holdOnIsChecked = value; this.RaisePropertyChanged(nameof(HoldOnIsChecked)); }
}
public VCommand GoOnCommand { get; set; }
/// <summary>
......@@ -1115,6 +1137,8 @@ namespace VIZ.FGOUT.Module
var manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1);
if (manager == null) return;
manager.SendJson(new AlgorithmPackage_Figout_model() { signal = AlgorithmPackageSignal.GO_ON });
GoOnIsChecked = true;
HoldOnIsChecked = false;
}
public VCommand HoldonCommand { get; set; }
......@@ -1126,6 +1150,8 @@ namespace VIZ.FGOUT.Module
var manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1);
if (manager == null) return;
manager.SendJson(new AlgorithmPackage_Figout_model() { signal = AlgorithmPackageSignal.HOLD_ON });
GoOnIsChecked = false;
HoldOnIsChecked = true;
}
public VCommand ResetCommand { get; set; }
......@@ -1135,6 +1161,7 @@ namespace VIZ.FGOUT.Module
var manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1);
if (manager == null) return;
manager.SendJson(new AlgorithmPackage_Figout_model() { signal = AlgorithmPackageSignal.Reset });
MessageBoxEx.ShowDialog("算法已重置。");
}
/// <summary>
......@@ -1363,7 +1390,7 @@ namespace VIZ.FGOUT.Module
//MessageBoxEx.ShowDialog("Replay Start OK.");
StartAutoSendTimer();
//StartAutoSendTimer();
}
public VCommand InPointCommand { get; set; }
......@@ -2148,20 +2175,19 @@ namespace VIZ.FGOUT.Module
return;
//MessageBox.Show(HotkeyHelper.GetHotkey(e));
//// 屏蔽空格键
//if (e.KeyCode == System.Windows.Forms.Keys.Space)
//{
// e.Handled = true;
//}
// 除Replay情况下屏蔽空格键
// 屏蔽空格键
if (e.KeyCode == System.Windows.Forms.Keys.Space && !ReplayIsChecked)
e.Handled = true;
WPFHelper.BeginInvoke(() =>
{
// 空格键特殊处理
// 空格键特殊处理这个无法阻止一点击空格键就会弹出已打开过的子菜单
//// 空格键特殊处理
//if (e.KeyCode == System.Windows.Forms.Keys.Space)
//{
// this.hotkeyController.ExecuteSpaceDown();
// return;
//}
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "FEF3F4EFF902892C019AA6201378DA317EA4496E8167D9B4844456E22284FDDB"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "AFE42B99853E26767984F713CB7D706EAB707EF8F96350441DAC6E57FB1787D7"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1409 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1435 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2;
......@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1424 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1450 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
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}" "FEF3F4EFF902892C019AA6201378DA317EA4496E8167D9B4844456E22284FDDB"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "AFE42B99853E26767984F713CB7D706EAB707EF8F96350441DAC6E57FB1787D7"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1409 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1435 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2;
......@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1424 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1450 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3;
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/VIZ.FGOUT.Module_MarkupCompile.cache
......@@ -10,11 +10,11 @@ none
false
DEBUG;TRACE
25-429057470
4-1529606353
97-1757238199
151915249285
25-1434354873
4-699044453
97-187026604
151674092382
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\LanguagePanelView.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;
True
False
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
21265083526
2-1347366880
6-790135758
421356718200
6968741766
43-1958993781
CloseAlgorithmWindow.xaml;MainWindow.xaml;
True
False
VIZ.Framework/VIZ.Framework.Common.Resource/obj/x64/Debug/VIZ.Framework.Common.Resource_MarkupCompile.cache
......@@ -10,10 +10,10 @@ none
false
DEBUG;TRACE
9-721875057
91711917753
3-630027162
19-1136530284
3-1719726047
201914760168
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
15-721109437
15488264905
121-1133520871
150238613261
1212046750213
150843184444
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;
True
False
VIZ.Framework/VIZ.Framework.Module/obj/x64/Debug/VIZ.Framework.Module_MarkupCompile.cache
......@@ -10,11 +10,11 @@ none
false
DEBUG;TRACE
1-731644535
11882902973
212002329545
25439653939
212023628146
26-1598261527
Themes\Generic.xaml;
True
False
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