Skip to content

F
FGOUT
Commit 967e1b72 by 鲁志-悦动
Options

修复“NDI设置把算法参数放到上面后CAM2流选择变成算法参数”的缺陷 And 主页面文本输入框修改为只接收数字，不会再输入字母

parent fbcc6b7f
Showing with 335 additions and 186 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.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/obj/x64/Debug/VIZ.FGOUT.Module.Resource_MarkupCompile.cache
......@@ -10,11 +10,11 @@ none
false
DEBUG;TRACE
22-1578589972
1-1441241311
11-1602666439
23-2035776870
221979955803
1470602451
11-350624472
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;
True
False
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml
......@@ -793,11 +793,13 @@
Foreground="White"
Text="{DynamicResource AutoSend}" />
<TextBox
x:Name="_AutoSendIntervalTime_"
Width="30"
Margin="5,0"
Background="#378CFF"
FontSize="14"
InputMethod.IsInputMethodEnabled="False"
PreviewTextInput="AutoSendIntervalTime_OnPreviewTextInput"
Style="{StaticResource TextBoxStyle}"
Text="{Binding AutoSendIntervalTime, Mode=TwoWay}">
<b:Interaction.Triggers>
......@@ -818,6 +820,13 @@
Style="{StaticResource TextBoxStyle}"
Text="{Binding AutoSendCount, Mode=TwoWay}" />
<!--<ListBox
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
ItemsSource="{Binding MessageCollection}" />-->
<!--<TextBlock
Width="30"
Height="30"
......@@ -921,9 +930,11 @@
Foreground="White"
Text="{DynamicResource IntervalFrame}" />
<TextBox
x:Name="_Matting_interval_"
Grid.Column="2"
Width="60"
InputMethod.IsInputMethodEnabled="False"
PreviewTextInput="Matting_interval_OnPreviewTextInput"
Style="{StaticResource TextBoxStyle}"
Text="{Binding Matting_interval, Mode=TwoWay}">
<b:Interaction.Behaviors>
......@@ -939,9 +950,11 @@
Foreground="White"
Text="{DynamicResource IntervalPixel}" />
<TextBox
x:Name="_Moving_pixel_"
Grid.Column="4"
Width="60"
InputMethod.IsInputMethodEnabled="False"
PreviewTextInput="Moving_pixel_OnPreviewTextInput"
Style="{StaticResource TextBoxStyle}"
Text="{Binding Moving_pixel, Mode=TwoWay}">
<b:Interaction.Behaviors>
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml.cs
using System.Windows;
using System.Text.RegularExpressions;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
using VIZ.FGOUT.Domain;
......@@ -20,7 +21,7 @@ namespace VIZ.FGOUT.Module
private void cam2_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
{
vm.invalidPlaceModel.Key = vm.endPlaceModel.Key = vm.startPlaceModel.Key = vm.sendPlaceModel.Key = NDIViewKeys.CAM_2;
//vm.invalidPlaceModel.Key = vm.endPlaceModel.Key = vm.startPlaceModel.Key = vm.sendPlaceModel.Key = NDIViewKeys.CAM_2;
}
private void cam1_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
......@@ -47,5 +48,36 @@ namespace VIZ.FGOUT.Module
{
_AutoMode_.IsChecked = true;
}
private void AutoSendIntervalTime_OnPreviewTextInput(object sender, TextCompositionEventArgs e)
{
OnPreviewTextInputCommon(sender, e);
}
private void Matting_interval_OnPreviewTextInput(object sender, TextCompositionEventArgs e)
{
OnPreviewTextInputCommon(sender, e);
}
private void Moving_pixel_OnPreviewTextInput(object sender, TextCompositionEventArgs e)
{
OnPreviewTextInputCommon(sender, e);
}
private void OnPreviewTextInputCommon(object sender, TextCompositionEventArgs e)
{
var textBox = sender as TextBox;
if (textBox == null) return;
var regexStr = string.Empty;
//匹配正整数
regexStr = "^[0-9]*$";
Regex numbeRegex = new Regex(regexStr);
e.Handled =
!numbeRegex.IsMatch(
textBox.Text.Insert(
textBox.SelectionStart, e.Text));
textBox.Text = textBox.Text.Trim();
}
}
}
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
......@@ -3,12 +3,14 @@ using log4net;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Reflection;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Interop;
using System.Windows.Threading;
using VIZ.FGOUT.Connection;
using VIZ.FGOUT.Connection.UDP.Clip.Signal.Send;
using VIZ.FGOUT.Domain;
......@@ -86,6 +88,10 @@ namespace VIZ.FGOUT.Module
Version.TryParse(str, out Version version);
this.SystemVersion = $"{version.Major}.{version.Minor}.{version.Build}";
//_tempAutoSendCount = AutoSendCount = AutoSendIntervalTime - 1;
//_autoSend_Timer.Stop();
//_autoSend_Timer.Start();
}
//Dictionary<string, string> dics = new Dictionary<string, string>
......@@ -392,30 +398,61 @@ namespace VIZ.FGOUT.Module
// _autoSend_Timer.Start();
//}
public ObservableCollection<string> MessageCollection { get; set; }
//private void UpdateAutoSendTimer_Tick(object sender, EventArgs e)
//{
// try
// {
// Application.Current.Dispatcher.BeginInvoke(new Action(() =>
// //WPFHelper.BeginInvoke(() =>
// {
// if (AutoSendCount == 0)
// {
// _autoSend_Timer.Stop();
// }
// else
// {
// AutoSendCount -= 1;
// MessageCollection = new ObservableCollection<string>(){ AutoSendCount.ToString() };
// }
// }));
// }
// catch (Exception ex)
// {
// log.Error(ex);
// }
//}
private void UpdateAutoSendTimer_Tick(object sender, EventArgs e)
{
try
{
WPFHelper.BeginInvoke(() =>
//UIDispatcher = DispatcherHelper.CheckBeginInvokeOnUI;
DispatcherHelper.UIDispatcher.InvokeAsync(() =>
//Application.Current.Dispatcher.BeginInvoke(new Action(() =>
//WPFHelper.BeginInvoke(() =>
{
if (AutoSendCount == 0)
{
if (_count == 1)
_autoSend_Timer.Stop();
else
{
_count++;
AutoSendCount = _tempAutoSendCount;
}
//if (_count == 1)
_autoSend_Timer.Stop();
//else
//{
// _count++;
// AutoSendCount = _tempAutoSendCount;
//}
}
else
{
//1
AutoSendCount--;
this.RaisePropertyChanged(nameof(AutoSendCount));
//AutoSendCount--;
//this.RaisePropertyChanged(nameof(AutoSendCount));
//2
//AutoSendCount -=1;
AutoSendCount -= 1;
}
//});
//}));
});
}
catch (Exception ex)
......@@ -1084,6 +1121,8 @@ namespace VIZ.FGOUT.Module
TimeCountDefaultVisibility = Visibility.Visible;
MessageBoxEx.ShowDialog("二次确认抛弃完成。");
AutoSendCount = AutoSendIntervalTime;
}
public VCommand SendCommand { get; set; }
......@@ -1096,6 +1135,8 @@ namespace VIZ.FGOUT.Module
//ReconfirmSendParamsCommon(ReconfirmStatus.Send);
ApplicationDomain.MessageManager.Send(_reconfirmSendModel);
MessageBoxEx.ShowDialog("二次确认发送成功。");
AutoSendCount = AutoSendIntervalTime;
}
private Visibility _timeCountDefaultVisibility = Visibility.Visible;
......@@ -1363,8 +1404,8 @@ namespace VIZ.FGOUT.Module
_isReplayChecked = false;
//_autoSend_Timer.Stop();
TimeCountActVisibility = Visibility.Collapsed;
TimeCountDefaultVisibility = Visibility.Visible;
//TimeCountActVisibility = Visibility.Collapsed;
//TimeCountDefaultVisibility = Visibility.Visible;
}
public VCommand ReplayUncheckedCommand { get; set; }
......@@ -1391,8 +1432,8 @@ namespace VIZ.FGOUT.Module
if (manager == null) return;
manager.SendJson(replayPackage);
TimeCountActVisibility = Visibility.Collapsed;
TimeCountDefaultVisibility = Visibility.Visible;
//TimeCountActVisibility = Visibility.Collapsed;
//TimeCountDefaultVisibility = Visibility.Visible;
}
#endregion
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDISettingView/View/NDISettingView.xaml
......@@ -65,7 +65,7 @@
Content="{DynamicResource ParameterSettings}"
FontSize="20"
Foreground="White"
IsChecked="True"
IsChecked="{Binding RbAlgorithmIsChecked, Mode=TwoWay}"
Style="{StaticResource RadioButton_Setting}"
Visibility="{Binding IsCam1Visibility}" />
<RadioButton
......@@ -75,6 +75,7 @@
Content="{DynamicResource VideoInput}"
FontSize="20"
Foreground="White"
IsChecked="{Binding RbNDIIsChecked, Mode=TwoWay}"
Style="{StaticResource RadioButton_Setting}" />
</StackPanel>
<Button
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDISettingView/ViewModel/NDISettingViewModel.cs
......@@ -162,9 +162,18 @@ namespace VIZ.FGOUT.Module
this.ViewConfig = config;
if (this.ViewKey.Equals(NDIViewKeys.CAM_2) || this.ViewKey.Equals(NDIViewKeys.CAM_4))
{
IsCam1Visibility = Visibility.Collapsed;
RbAlgorithmIsChecked = false;
RbNDIIsChecked = true;
}
else if (this.ViewKey.Equals(NDIViewKeys.CAM_1))
{
IsCam1Visibility = Visibility.Visible;
RbAlgorithmIsChecked = true;
RbNDIIsChecked = false;
}
}
}
......@@ -180,6 +189,20 @@ namespace VIZ.FGOUT.Module
set { _isCam1Visibility = value; this.RaisePropertyChanged(nameof(IsCam1Visibility)); }
}
private bool _rbAlgorithmIsChecked = true;
public bool RbAlgorithmIsChecked
{
get { return _rbAlgorithmIsChecked; }
set { _rbAlgorithmIsChecked = value; this.RaisePropertyChanged(nameof(RbAlgorithmIsChecked)); }
}
private bool _rbNDIIsChecked;
public bool RbNDIIsChecked
{
get { return _rbNDIIsChecked; }
set { _rbNDIIsChecked = value; this.RaisePropertyChanged(nameof(RbNDIIsChecked)); }
}
#region CancelCommand -- 取消命令
/// <summary>
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.cs
......@@ -368,8 +368,7 @@ namespace VIZ.FGOUT.Module
private void ReconfirmAutoSendIntervalTime(ReconfirmAutoSendIntervalTimeModel reconfirmAutoSendIntervalTimeModel)
{
if (this.ViewKey != NDIViewKeys.CAM_1)
return;
if (this.ViewKey != NDIViewKeys.CAM_1) return;
_autoSend_Timer.Interval = ALGORITHM_ReconfirmAutoSend_TIME = reconfirmAutoSendIntervalTimeModel.IntervalTime * 1000;
}
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "634F63C08AD0C384415688FC8411F116BACB16D670470084C02D67A85896C86A"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "DC19E82BBEF6FF2A37423187F34F82C16C0355D5BAA6E4960901B75C5256F333"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -74,7 +74,31 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1307 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 796 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox _AutoSendIntervalTime_;
#line default
#line hidden
#line 933 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox _Matting_interval_;
#line default
#line hidden
#line 953 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox _Moving_pixel_;
#line default
#line hidden
#line 1320 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1;
......@@ -82,7 +106,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1492 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1505 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2;
......@@ -90,7 +114,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1507 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1520 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3;
......@@ -156,12 +180,39 @@ namespace VIZ.FGOUT.Module {
#line hidden
return;
case 4:
this.cam1 = ((VIZ.FGOUT.Module.NDIView)(target));
this._AutoSendIntervalTime_ = ((System.Windows.Controls.TextBox)(target));
#line 802 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._AutoSendIntervalTime_.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.AutoSendIntervalTime_OnPreviewTextInput);
#line default
#line hidden
return;
case 5:
this.cam2 = ((VIZ.FGOUT.Module.NDIView)(target));
this._Matting_interval_ = ((System.Windows.Controls.TextBox)(target));
#line 937 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._Matting_interval_.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.Matting_interval_OnPreviewTextInput);
#line default
#line hidden
return;
case 6:
this._Moving_pixel_ = ((System.Windows.Controls.TextBox)(target));
#line 957 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._Moving_pixel_.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.Moving_pixel_OnPreviewTextInput);
#line default
#line hidden
return;
case 7:
this.cam1 = ((VIZ.FGOUT.Module.NDIView)(target));
return;
case 8:
this.cam2 = ((VIZ.FGOUT.Module.NDIView)(target));
return;
case 9:
this.cam3 = ((VIZ.FGOUT.Module.NDIView)(target));
return;
}
......
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}" "634F63C08AD0C384415688FC8411F116BACB16D670470084C02D67A85896C86A"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "DC19E82BBEF6FF2A37423187F34F82C16C0355D5BAA6E4960901B75C5256F333"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -74,7 +74,31 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1307 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 796 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox _AutoSendIntervalTime_;
#line default
#line hidden
#line 933 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox _Matting_interval_;
#line default
#line hidden
#line 953 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox _Moving_pixel_;
#line default
#line hidden
#line 1320 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1;
......@@ -82,7 +106,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1492 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1505 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2;
......@@ -90,7 +114,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1507 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1520 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3;
......@@ -156,12 +180,39 @@ namespace VIZ.FGOUT.Module {
#line hidden
return;
case 4:
this.cam1 = ((VIZ.FGOUT.Module.NDIView)(target));
this._AutoSendIntervalTime_ = ((System.Windows.Controls.TextBox)(target));
#line 802 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._AutoSendIntervalTime_.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.AutoSendIntervalTime_OnPreviewTextInput);
#line default
#line hidden
return;
case 5:
this.cam2 = ((VIZ.FGOUT.Module.NDIView)(target));
this._Matting_interval_ = ((System.Windows.Controls.TextBox)(target));
#line 937 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._Matting_interval_.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.Matting_interval_OnPreviewTextInput);
#line default
#line hidden
return;
case 6:
this._Moving_pixel_ = ((System.Windows.Controls.TextBox)(target));
#line 957 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._Moving_pixel_.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.Moving_pixel_OnPreviewTextInput);
#line default
#line hidden
return;
case 7:
this.cam1 = ((VIZ.FGOUT.Module.NDIView)(target));
return;
case 8:
this.cam2 = ((VIZ.FGOUT.Module.NDIView)(target));
return;
case 9:
this.cam3 = ((VIZ.FGOUT.Module.NDIView)(target));
return;
}
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDISettingView/View/NDISettingView.g.cs
#pragma checksum "..\..\..\..\..\NDISettingView\View\NDISettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "73469FFA974139AFC12C541768EF8867F11126E859B99308408A3C3E99E96EA9"
#pragma checksum "..\..\..\..\..\NDISettingView\View\NDISettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "D969758D66E51E988F33E1FBE79ADF7543EC57F1D554DC895264C8F3601BDABA"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDISettingView/View/NDISettingView.g.i.cs
#pragma checksum "..\..\..\..\..\NDISettingView\View\NDISettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "73469FFA974139AFC12C541768EF8867F11126E859B99308408A3C3E99E96EA9"
#pragma checksum "..\..\..\..\..\NDISettingView\View\NDISettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "D969758D66E51E988F33E1FBE79ADF7543EC57F1D554DC895264C8F3601BDABA"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......
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/App.xaml.cs
using System;
using System.Windows;
using VIZ.FGOUT.Module;
using VIZ.Framework.Core;
using VIZ.Framework.Module;
namespace VIZ.FGOUT
......@@ -39,6 +40,8 @@ namespace VIZ.FGOUT
}
//记录日志： 系统启动
// ApplicationDomainEx.CsvContext.AppendSystemLog(null,null,SystemLogStringFormats.APPLICATION_SETUP);
DispatcherHelper.Initialize();
}
}
}
VIZ.FGOUT/VIZ.FGOUT/Properties/AssemblyInfo.cs
......@@ -55,5 +55,5 @@ using System.Windows;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.3.0")]
[assembly: AssemblyFileVersion("1.0.3.0")]
[assembly: AssemblyVersion("1.0.4.0")]
[assembly: AssemblyFileVersion("1.0.4.0")]
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.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.Core/Core/WPF/DispatcherHelper.cs 0 → 100644
using System;
using System.Text;
using System.Windows.Threading;
namespace VIZ.Framework.Core
{
public static class DispatcherHelper
{
public static Dispatcher UIDispatcher { get; private set; }
/// <summary>
/// 对于UI线程上的其他操作，也可以参考调用<see cref="P:GalaSoft.MvvmLight.Threading.DispatcherHelper.UIDispatcher" />
/// </summary>
public static void CheckBeginInvokeOnUI(Action action)
{
if (action == null)
return;
CheckDispatcher();
if (UIDispatcher.CheckAccess())
action();
else
UIDispatcher.BeginInvoke(action);
}
private static void CheckDispatcher()
{
if (UIDispatcher == null)
{
var stringBuilder = new StringBuilder("The DispatcherHelper is not initialized.\r\n")
.Append("Call DispatcherHelper.Initialize() in the static App constructor.");
throw new InvalidOperationException(stringBuilder.ToString());
}
}
public static DispatcherOperation RunAsync(Action action)
{
CheckDispatcher();
return UIDispatcher.BeginInvoke(action);
}
public static void Initialize()
{
if (UIDispatcher != null && UIDispatcher.Thread.IsAlive)
return;
UIDispatcher = Dispatcher.CurrentDispatcher;
}
public static void Reset()
{
UIDispatcher = null;
Initialize();
}
}
}
VIZ.Framework/VIZ.Framework.Core/VIZ.Framework.Core.csproj
......@@ -168,6 +168,7 @@
<Compile Include="Core\VIZ\Engine\VizEngineModel.cs" />
<Compile Include="Core\VIZ\Engine\VizEngineModelCommandExpand.cs" />
<Compile Include="Core\Win32\Win32Helper.cs" />
<Compile Include="Core\WPF\DispatcherHelper.cs" />
<Compile Include="Core\Xml\XmlExpand.cs" />
<Compile Include="Expand\GPIO\Core\USB2GPIO.cs" />
<Compile Include="Expand\GPIO\Core\USBDevice.cs" />
......
VIZ.Framework/VIZ.Framework.Core/obj/x64/Debug/VIZ.Framework.Core.csproj.CoreCompileInputs.cache
222d5e17be9af1409bd4b9b277a9cafd7272f8c62fab6d91305268089ce83be6
e94cf0020199263a4ce2876c030ec832940b1bf57b01eab48f2b3bcf54dec8a5
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