Skip to content

F
FGOUT
Commit d22b021e by 鲁志-悦动
Options

Replay上下左右快捷键实现

parent dbbd0b98
Showing with 248 additions and 24 deletions
VIZ.FGOUT/VIZ.FGOUT.Domain/Enum/NDIMainViewHotkeys.cs 0 → 100644
namespace VIZ.FGOUT.Domain
{
public enum NDIMainViewHotkeys
{
/// <summary>
/// In Point
/// </summary>
I,
/// <summary>
/// Out Point
/// </summary>
O,
/// <summary>
/// 删除位置标记
/// </summary>
Delete,
/// <summary>
/// 帧左移
/// </summary>
Left,
/// <summary>
/// 帧右移
/// </summary>
Right,
/// <summary>
/// 帧跳到入点位置
/// </summary>
Up,
/// <summary>
/// 帧跳到出点位置
/// </summary>
Down
}
}
VIZ.FGOUT/VIZ.FGOUT.Domain/Enum/NDIMainViewKeys.cs 0 → 100644
namespace VIZ.FGOUT.Domain
{
/// <summary>
/// NDI视图键
/// </summary>
public static class NDIMainViewKeys
{
/// <summary>
/// 主视图
/// </summary>
public const string MainView = "MainView";
}
}
VIZ.FGOUT/VIZ.FGOUT.Domain/Enum/NDIViewKeys.cs
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
/// </summary> /// </summary>
public const string MainView = "MainView"; public const string MainView = "MainView";
/// <summary> /// <summary>
/// 预览1 /// 预览1
/// </summary> /// </summary>
......
VIZ.FGOUT/VIZ.FGOUT.Domain/VIZ.FGOUT.Domain.csproj
...@@ -63,6 +63,8 @@ ...@@ -63,6 +63,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="ApplicationDomainEx.cs" /> <Compile Include="ApplicationDomainEx.cs" />
<Compile Include="Enum\NDIMainViewKeys.cs" />
<Compile Include="Enum\NDIMainViewHotkeys.cs" />
<Compile Include="Enum\NDIViewKeys.cs" /> <Compile Include="Enum\NDIViewKeys.cs" />
<Compile Include="Enum\NDIViewStatus.cs" /> <Compile Include="Enum\NDIViewStatus.cs" />
<Compile Include="Enum\NDIViewHotkeys.cs" /> <Compile Include="Enum\NDIViewHotkeys.cs" />
......
VIZ.FGOUT/VIZ.FGOUT.Domain/obj/x64/Debug/VIZ.FGOUT.Domain.csproj.CoreCompileInputs.cache
8267e03e49dcbba58f17538229cc9b6e6e557449 3499a5f618af3dcba82fa90554564593ef66ce2b
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/Controller/Hotkey/HotkeyController.cs
...@@ -111,6 +111,22 @@ namespace VIZ.FGOUT.Module ...@@ -111,6 +111,22 @@ namespace VIZ.FGOUT.Module
} }
/// <summary> /// <summary>
/// NDIMainView组装HotkeyMode
/// </summary>
private bool AssembleNDIMainViewHotkeyMode(NDIMainViewHotkeys hotkey)
{
var service = ApplicationDomain.ServiceManager.GetService<INDIMainViewService>(NDIMainViewKeys.MainView);
if (service == null) return false;
var context = new NDIMainViewHotkeyContext()
{
hotkey = hotkey
};
service.NDIMainViewHotkeyMode(context);
return true;
}
/// <summary>
/// 组装HotkeyMode /// 组装HotkeyMode
/// </summary> /// </summary>
private bool AssembleHotkeyMode(NDIViewHotkeys hotkey) private bool AssembleHotkeyMode(NDIViewHotkeys hotkey)
...@@ -166,6 +182,27 @@ namespace VIZ.FGOUT.Module ...@@ -166,6 +182,27 @@ namespace VIZ.FGOUT.Module
return AssembleHotkeyMode(NDIViewHotkeys.O); return AssembleHotkeyMode(NDIViewHotkeys.O);
} }
if (string.Equals(this.Support.HotkeyConfig.Up, hotkey))
{
return AssembleNDIMainViewHotkeyMode(NDIMainViewHotkeys.Up);
}
if (string.Equals(this.Support.HotkeyConfig.Down, hotkey))
{
return AssembleNDIMainViewHotkeyMode(NDIMainViewHotkeys.Down);
}
if (string.Equals(this.Support.HotkeyConfig.Left, hotkey))
{
return AssembleNDIMainViewHotkeyMode(NDIMainViewHotkeys.Left);
}
if (string.Equals(this.Support.HotkeyConfig.Right, hotkey))
{
return AssembleNDIMainViewHotkeyMode(NDIMainViewHotkeys.Right);
}
//位置标记删除命令 //位置标记删除命令
if (string.Equals("Ctrl + Z", hotkey) || string.Equals(this.Support.HotkeyConfig.Delete, hotkey)) if (string.Equals("Ctrl + Z", hotkey) || string.Equals(this.Support.HotkeyConfig.Delete, hotkey))
{ {
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/Info/NDIMainViewHotkeyContext.cs 0 → 100644
using VIZ.FGOUT.Domain;
namespace VIZ.FGOUT.Module
{
/// <summary>
/// NDIView热键上下文
/// </summary>
public class NDIMainViewHotkeyContext
{
public NDIMainViewHotkeys hotkey { get; set; }
}
}
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/Service/INDIMainViewService.cs
...@@ -19,5 +19,11 @@ namespace VIZ.FGOUT.Module ...@@ -19,5 +19,11 @@ namespace VIZ.FGOUT.Module
/// </summary> /// </summary>
/// <param name="isEnabled">是否生效</param> /// <param name="isEnabled">是否生效</param>
void SetNavigation3DCheckEnabled(bool isEnabled); void SetNavigation3DCheckEnabled(bool isEnabled);
/// <summary>
/// NDIMainView热键模式
/// </summary>
/// <param name="context"></param>
void NDIMainViewHotkeyMode(NDIMainViewHotkeyContext context);
} }
} }
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml
...@@ -384,7 +384,7 @@ ...@@ -384,7 +384,7 @@
Height="40" Height="40"
Margin="0,10,0,0" Margin="0,10,0,0"
Content="Replay" Content="Replay"
IsChecked="{Binding ReplayIsChecked, Mode=OneWay}" IsChecked="{Binding ReplayIsChecked, Mode=TwoWay}"
Style="{StaticResource ToggleButtonStyle}"> Style="{StaticResource ToggleButtonStyle}">
<b:Interaction.Triggers> <b:Interaction.Triggers>
<b:EventTrigger EventName="Checked"> <b:EventTrigger EventName="Checked">
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
using log4net; using log4net;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics.Eventing.Reader;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Web.WebSockets;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Interop; using System.Windows.Interop;
...@@ -49,7 +49,8 @@ namespace VIZ.FGOUT.Module ...@@ -49,7 +49,8 @@ namespace VIZ.FGOUT.Module
// 注册系统检测循环 // 注册系统检测循环
ApplicationDomainEx.LoopManager.Register("NDIMainViewModel.UpdateSystemMonitor", 1, this.UpdateSystemMonitor); ApplicationDomainEx.LoopManager.Register("NDIMainViewModel.UpdateSystemMonitor", 1, this.UpdateSystemMonitor);
// 注册服务 // 注册服务
ApplicationDomainEx.ServiceManager.AddService(NDIViewKeys.MainView, this); //ApplicationDomainEx.ServiceManager.AddService(NDIViewKeys.MainView, this);
ApplicationDomainEx.ServiceManager.AddService(NDIMainViewKeys.MainView, this);
} }
/// <summary> /// <summary>
...@@ -1775,5 +1776,38 @@ namespace VIZ.FGOUT.Module ...@@ -1775,5 +1776,38 @@ namespace VIZ.FGOUT.Module
this.IsOneScreenMode = config.IsOneScreenMode; this.IsOneScreenMode = config.IsOneScreenMode;
} }
private bool _isDown = true;
public void NDIMainViewHotkeyMode(NDIMainViewHotkeyContext context)
{
if (ReplayIsChecked)
{
if (context.hotkey.Equals(NDIMainViewHotkeys.Up))
{
SliderStartValue = NDIViewModel.SliderStartValue;
_isDown = false;
}
else if (context.hotkey.Equals(NDIMainViewHotkeys.Down))
{
SliderEndValue = NDIViewModel.SliderEndValue;
_isDown = true;
}
else if (context.hotkey.Equals(NDIMainViewHotkeys.Left))
{
if (_isDown)
SliderEndValue--;
else
SliderStartValue--;
}
else if (context.hotkey.Equals(NDIMainViewHotkeys.Right))
{
if(_isDown)
SliderEndValue++;
else
SliderStartValue++;
}
}
}
} }
} }
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.Manual_NDI.cs
...@@ -175,7 +175,7 @@ namespace VIZ.FGOUT.Module ...@@ -175,7 +175,7 @@ namespace VIZ.FGOUT.Module
view.vm.IsSliderEndClicked = false; view.vm.IsSliderEndClicked = false;
} }
//Replay状态下 //在Replay状态下
if (view.vm.IsReplay) if (view.vm.IsReplay)
{ {
Queue<MatExtend> buffer = _frameBuffer.GetFrames(); Queue<MatExtend> buffer = _frameBuffer.GetFrames();
...@@ -208,11 +208,13 @@ namespace VIZ.FGOUT.Module ...@@ -208,11 +208,13 @@ namespace VIZ.FGOUT.Module
} }
//} //}
} }
else if(view.vm.IsStartValue) //如果是Start滑块在动
else if (view.vm.IsStartValue)
{ {
//view.vm.IsStartValue =false; //view.vm.IsStartValue =false;
index = SliderValue; index = SliderValue;
} }
//如果是End滑块在动
else if (view.vm.IsEndValue) else if (view.vm.IsEndValue)
{ {
//view.vm.IsEndValue = false; //view.vm.IsEndValue = false;
...@@ -240,6 +242,7 @@ namespace VIZ.FGOUT.Module ...@@ -240,6 +242,7 @@ namespace VIZ.FGOUT.Module
dsExtend.DataStream.Write(lowResolutionData, 0, newLength); dsExtend.DataStream.Write(lowResolutionData, 0, newLength);
dsExtend.DataStream.Position = 0; dsExtend.DataStream.Position = 0;
//如果是Start滑块在动
if (view.vm.IsStartValue) if (view.vm.IsStartValue)
StartTime = dse.TimeStamp; StartTime = dse.TimeStamp;
else if (view.vm.IsEndValue) else if (view.vm.IsEndValue)
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.cs
...@@ -199,8 +199,10 @@ namespace VIZ.FGOUT.Module ...@@ -199,8 +199,10 @@ namespace VIZ.FGOUT.Module
//二次确认抛弃 //二次确认抛弃
ApplicationDomain.MessageManager.Register<ReconfirmAbandonModel>(this, this.ReconfirmAbandon); ApplicationDomain.MessageManager.Register<ReconfirmAbandonModel>(this, this.ReconfirmAbandon);
//二次确认发送 //二次确认发送
ApplicationDomain.MessageManager.Register<ReconfirmSendModel>(this, this.ReconfirmSend); ApplicationDomain.MessageManager.Register<ReconfirmSendModel>(this, this.ReconfirmSend);
//二次确认自动发送间隔时间 //二次确认自动发送间隔时间
ApplicationDomain.MessageManager.Register<ReconfirmAutoSendIntervalTimeModel>(this, this.ReconfirmAutoSendIntervalTime); ApplicationDomain.MessageManager.Register<ReconfirmAutoSendIntervalTimeModel>(this, this.ReconfirmAutoSendIntervalTime);
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module/SystemSetting/ViewModel/StyleSettingPanelViewModel.cs
...@@ -445,8 +445,8 @@ namespace VIZ.FGOUT.Module ...@@ -445,8 +445,8 @@ namespace VIZ.FGOUT.Module
ApplicationDomainEx.Navigation3DMapping.Name = this.SelectedNavigation3DMappingGroupModel.Name; ApplicationDomainEx.Navigation3DMapping.Name = this.SelectedNavigation3DMappingGroupModel.Name;
ApplicationDomainEx.Navigation3DMapping.Multiple = this.Navigation3DMappingMultiple; ApplicationDomainEx.Navigation3DMapping.Multiple = this.Navigation3DMappingMultiple;
ApplicationDomainEx.Navigation3DMapping.Mappings = this.SelectedNavigation3DMappingGroupModel.Mappings; ApplicationDomainEx.Navigation3DMapping.Mappings = this.SelectedNavigation3DMappingGroupModel.Mappings;
ApplicationDomainEx.ServiceManager.GetService<INDIMainViewService>(NDIViewKeys.MainView).SetNavigation3DCheckEnabled(this.IsWhenNavigationTouchedChangeToManualMode); //ApplicationDomainEx.ServiceManager.GetService<INDIMainViewService>(NDIViewKeys.MainView).SetNavigation3DCheckEnabled(this.IsWhenNavigationTouchedChangeToManualMode);
ApplicationDomainEx.ServiceManager.GetService<INDIMainViewService>(NDIMainViewKeys.MainView).SetNavigation3DCheckEnabled(this.IsWhenNavigationTouchedChangeToManualMode);
// 返回 // 返回
return true; return true;
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module/VIZ.FGOUT.Module.csproj
...@@ -133,6 +133,7 @@ ...@@ -133,6 +133,7 @@
<Compile Include="NDIMainView\Controller\Hotkey\IHotkeySupport.cs" /> <Compile Include="NDIMainView\Controller\Hotkey\IHotkeySupport.cs" />
<Compile Include="NDIMainView\Controller\Loop\ILoopSupport.cs" /> <Compile Include="NDIMainView\Controller\Loop\ILoopSupport.cs" />
<Compile Include="NDIMainView\Controller\Loop\LoopController.cs" /> <Compile Include="NDIMainView\Controller\Loop\LoopController.cs" />
<Compile Include="NDIMainView\Info\NDIMainViewHotkeyContext.cs" />
<Compile Include="NDIMainView\Service\INDIMainViewService.cs" /> <Compile Include="NDIMainView\Service\INDIMainViewService.cs" />
<Compile Include="NDIMainView\ViewModel\NDIMainViewModel.cs" /> <Compile Include="NDIMainView\ViewModel\NDIMainViewModel.cs" />
<Compile Include="NDIMainView\View\NDIMainView.xaml.cs"> <Compile Include="NDIMainView\View\NDIMainView.xaml.cs">
...@@ -195,7 +196,7 @@ ...@@ -195,7 +196,7 @@
<Compile Include="NDIView\Enum\NDIViewScene.cs" /> <Compile Include="NDIView\Enum\NDIViewScene.cs" />
<Compile Include="NDIView\Info\ChangeStrategyContext.cs" /> <Compile Include="NDIView\Info\ChangeStrategyContext.cs" />
<Compile Include="NDIView\Info\ClearVideoControlContext.cs" /> <Compile Include="NDIView\Info\ClearVideoControlContext.cs" />
<Compile Include="NDIView\Info\ReplayHotkeyContext.cs" /> <Compile Include="NDIView\Info\NDIViewHotkeyContext.cs" />
<Compile Include="NDIView\Service\INDIViewService.cs" /> <Compile Include="NDIView\Service\INDIViewService.cs" />
<Compile Include="NDIView\ViewModel\NDIViewModel.Command.cs" /> <Compile Include="NDIView\ViewModel\NDIViewModel.Command.cs" />
<Compile Include="NDIView\ViewModel\NDIViewModel.cs" /> <Compile Include="NDIView\ViewModel\NDIViewModel.cs" />
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "00FCD7D89DA29839EA9C560AE3F87499AA11AE2896966BABE4001E595BE3F24C" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "92032BE26A79275C32F9A1DAAF9EDD381648C4FAF81BFCBC15AB4A4AD1709510"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
......
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}" "00FCD7D89DA29839EA9C560AE3F87499AA11AE2896966BABE4001E595BE3F24C" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "92032BE26A79275C32F9A1DAAF9EDD381648C4FAF81BFCBC15AB4A4AD1709510"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/VIZ.FGOUT.Module.csproj.CoreCompileInputs.cache
69436a2e992008153b5ec637b10b2846c6374a85 480abb7b1a422fdbaee41f210119e22e93f94f54
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/VIZ.FGOUT.Module_MarkupCompile.cache
...@@ -12,7 +12,7 @@ DEBUG;TRACE ...@@ -12,7 +12,7 @@ DEBUG;TRACE
241325682082 241325682082
4-699044453 4-699044453
94542122908 951167816992
151674092382 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\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; 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;
......
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.FGOUT/VIZ.FGOUT.Storage/LiteDB/System/HotkeyConfig.cs
using NPOI.SS.Formula.Functions; namespace VIZ.FGOUT.Storage
namespace VIZ.FGOUT.Storage
{ {
/// <summary> /// <summary>
/// 热键配置 /// 热键配置
...@@ -44,5 +42,13 @@ namespace VIZ.FGOUT.Storage ...@@ -44,5 +42,13 @@ namespace VIZ.FGOUT.Storage
/// 手动开始/结束抠像命令 /// 手动开始/结束抠像命令
/// </summary> /// </summary>
public string Space { get; set;} = "Space"; public string Space { get; set;} = "Space";
public string Left { get; set; } = "Left";
public string Right { get; set; } = "Right";
public string Up { get; set; } = "Up";
public string Down { get; set; } = "Down";
} }
} }
VIZ.FGOUT/VIZ.FGOUT/bin/x64/Debug/Logs/err.log
This source diff could not be displayed because it is too large. You can view the blob instead.
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.
VIZ.FGOUT/VIZ.FGOUT/obj/x64/Debug/VIZ.FGOUT_MarkupCompile.cache
...@@ -10,11 +10,11 @@ none ...@@ -10,11 +10,11 @@ none
false false
DEBUG;TRACE DEBUG;TRACE
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\App.xaml C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\App.xaml
2-1347366880 21265083526
6968741766 6-790135758
43-1958993781 421356718200
CloseAlgorithmWindow.xaml;MainWindow.xaml; CloseAlgorithmWindow.xaml;MainWindow.xaml;
False True
VIZ.Framework/VIZ.Framework.Common/Widgets/HotkeyBox/HotkeyHelper.cs
...@@ -118,6 +118,15 @@ namespace VIZ.Framework.Common ...@@ -118,6 +118,15 @@ namespace VIZ.Framework.Common
return sb.ToString(); return sb.ToString();
} }
if (e.KeyCode == System.Windows.Forms.Keys.Left
|| e.KeyCode == System.Windows.Forms.Keys.Right
|| e.KeyCode == System.Windows.Forms.Keys.Up
|| e.KeyCode == System.Windows.Forms.Keys.Down)
{
sb.Append($"{e.KeyCode}");
return sb.ToString();
}
return sb.ToString(); return sb.ToString();
} }
} }
......
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.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\MessageBoxEx.xaml;;
FC:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\MessageBox\MessageBoxExWindow.xaml;; FC:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\MessageBox\MessageBoxExWindow.xaml;;
......
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