Skip to content

F
FGOUT
Commit 394cd8f9 by 鲁志-悦动
Options

到中心点最小距离算法优化 And Replay、ReplayStart、ReplayStop、清除选区快捷键

parent 639d0e49
Showing with 445 additions and 70 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 ...@@ -10,11 +10,11 @@ none
false false
21870986562 2-725104376
31364711570 3947974750
17-1683084370 17-1462717611
Themes\Generic.xaml;Widgets\FootballFieldPanel\FootballFieldPanel.xaml; Themes\Generic.xaml;Widgets\FootballFieldPanel\FootballFieldPanel.xaml;
False True
VIZ.FGOUT/VIZ.FGOUT.Domain/Enum/NDIMainViewHotkeys.cs
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
public enum NDIMainViewHotkeys public enum NDIMainViewHotkeys
{ {
/// <summary> /// <summary>
/// In Point /// 入点
/// </summary> /// </summary>
I, I,
/// <summary> /// <summary>
/// Out Point /// 出点
/// </summary> /// </summary>
O, O,
...@@ -35,6 +35,26 @@ ...@@ -35,6 +35,26 @@
/// <summary> /// <summary>
/// 帧跳到出点位置 /// 帧跳到出点位置
/// </summary> /// </summary>
Down Down,
/// <summary>
/// Replay
/// </summary>
Replay,
/// <summary>
/// 清除选区
/// </summary>
CleanInPoints,
/// <summary>
/// Replay Start
/// </summary>
ReplayStart,
/// <summary>
/// Replay Stop
/// </summary>
ReplayStop
} }
} }
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/Controller/Hotkey/HotkeyController.cs
...@@ -182,26 +182,54 @@ namespace VIZ.FGOUT.Module ...@@ -182,26 +182,54 @@ namespace VIZ.FGOUT.Module
return AssembleHotkeyMode(NDIViewHotkeys.O); return AssembleHotkeyMode(NDIViewHotkeys.O);
} }
//上
if (string.Equals(this.Support.HotkeyConfig.Up, hotkey)) if (string.Equals(this.Support.HotkeyConfig.Up, hotkey))
{ {
return AssembleNDIMainViewHotkeyMode(NDIMainViewHotkeys.Up); return AssembleNDIMainViewHotkeyMode(NDIMainViewHotkeys.Up);
} }
//下
if (string.Equals(this.Support.HotkeyConfig.Down, hotkey)) if (string.Equals(this.Support.HotkeyConfig.Down, hotkey))
{ {
return AssembleNDIMainViewHotkeyMode(NDIMainViewHotkeys.Down); return AssembleNDIMainViewHotkeyMode(NDIMainViewHotkeys.Down);
} }
//左
if (string.Equals(this.Support.HotkeyConfig.Left, hotkey)) if (string.Equals(this.Support.HotkeyConfig.Left, hotkey))
{ {
return AssembleNDIMainViewHotkeyMode(NDIMainViewHotkeys.Left); return AssembleNDIMainViewHotkeyMode(NDIMainViewHotkeys.Left);
} }
//右
if (string.Equals(this.Support.HotkeyConfig.Right, hotkey)) if (string.Equals(this.Support.HotkeyConfig.Right, hotkey))
{ {
return AssembleNDIMainViewHotkeyMode(NDIMainViewHotkeys.Right); return AssembleNDIMainViewHotkeyMode(NDIMainViewHotkeys.Right);
} }
//Replay
if (string.Equals(this.Support.HotkeyConfig.Replay, hotkey))
{
return AssembleNDIMainViewHotkeyMode(NDIMainViewHotkeys.Replay);
}
//Replay Start
if (string.Equals(this.Support.HotkeyConfig.ReplayStart, hotkey))
{
return AssembleNDIMainViewHotkeyMode(NDIMainViewHotkeys.ReplayStart);
}
//Replay Stop
if (string.Equals(this.Support.HotkeyConfig.ReplayStop, hotkey))
{
return AssembleNDIMainViewHotkeyMode(NDIMainViewHotkeys.ReplayStop);
}
//清除选区
if (string.Equals(this.Support.HotkeyConfig.CleanInPoint, hotkey))
{
return AssembleNDIMainViewHotkeyMode(NDIMainViewHotkeys.CleanInPoints);
}
//位置标记删除命令 //位置标记删除命令
//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))
if (string.Equals(this.Support.HotkeyConfig.Delete, hotkey)) if (string.Equals(this.Support.HotkeyConfig.Delete, hotkey))
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
...@@ -89,7 +89,7 @@ namespace VIZ.FGOUT.Module ...@@ -89,7 +89,7 @@ namespace VIZ.FGOUT.Module
//Replay Stop //Replay Stop
this.ReplayStopCommand = new VCommand(this.ReplayStop); this.ReplayStopCommand = new VCommand(this.ReplayStop);
//Replay Restart //Replay Restart
this.ReplayReStartCommand = new VCommand(this.ReplayReStart); //this.ReplayReStartCommand = new VCommand(this.ReplayReStart);
//入点 //入点
this.InPointCommand = new VCommand(this.InPoint); this.InPointCommand = new VCommand(this.InPoint);
//出点 //出点
...@@ -935,47 +935,47 @@ namespace VIZ.FGOUT.Module ...@@ -935,47 +935,47 @@ namespace VIZ.FGOUT.Module
public VCommand ReplayStopCommand { get; set; } public VCommand ReplayStopCommand { get; set; }
public VCommand ReplayReStartCommand { get; set; } //public VCommand ReplayReStartCommand { get; set; }
private void ReplayReStart() //private void ReplayReStart()
{ //{
if (StartTime == 0) // if (StartTime == 0)
{ // {
MessageBoxEx.ShowDialog("请选择入点."); // MessageBoxEx.ShowDialog("请选择入点.");
return; // return;
} // }
if (EndTime == 0) // if (EndTime == 0)
{ // {
MessageBoxEx.ShowDialog("请选择出点."); // MessageBoxEx.ShowDialog("请选择出点.");
return; // return;
} // }
if (EndTime <= StartTime) // if (EndTime <= StartTime)
{ // {
MessageBoxEx.ShowDialog("出点应大于入点."); // MessageBoxEx.ShowDialog("出点应大于入点.");
return; // return;
} // }
var manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1__CLIP); // var manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1__CLIP);
if (manager == null) // if (manager == null)
{ // {
MessageBoxEx.ShowDialog("未获取到流的IP地址。"); // MessageBoxEx.ShowDialog("未获取到流的IP地址。");
return; // return;
} // }
var managerAlgorithm = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1); // var managerAlgorithm = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1);
if (managerAlgorithm == null) return; // if (managerAlgorithm == null) return;
var replayPackage = new ReplayPackage() // var replayPackage = new ReplayPackage()
{ // {
type = ClipPackageSignal.REPLAY, // type = ClipPackageSignal.REPLAY,
start_time = StartTime, // start_time = StartTime,
end_time = EndTime, // end_time = EndTime,
status = ReplayStatus.ReStart // status = ReplayStatus.ReStart
}; // };
managerAlgorithm.SendJson(replayPackage); // managerAlgorithm.SendJson(replayPackage);
manager.SendJson(replayPackage); // manager.SendJson(replayPackage);
MessageBoxEx.ShowDialog("Replay Restart OK."); // MessageBoxEx.ShowDialog("Replay Restart OK.");
} //}
private void ReplayStop() private void ReplayStop()
{ {
var manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1__CLIP); var manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1__CLIP);
...@@ -991,9 +991,11 @@ namespace VIZ.FGOUT.Module ...@@ -991,9 +991,11 @@ namespace VIZ.FGOUT.Module
status = ReplayStatus.Stop status = ReplayStatus.Stop
}; };
manager.SendJson(replayPackage); //MessageBoxEx.ShowDialog("Replay Stop OK.");
MessageBoxEx.ShowDialog("Replay Stop OK.");
ReplayIsChecked = false; ReplayIsChecked = false;
//当没有播放音视频的流时，是会有个被捕获的异常
manager.SendJson(replayPackage);
} }
public VCommand CleanInPointCommand { get; set; } public VCommand CleanInPointCommand { get; set; }
...@@ -1943,16 +1945,19 @@ namespace VIZ.FGOUT.Module ...@@ -1943,16 +1945,19 @@ namespace VIZ.FGOUT.Module
{ {
if (ReplayIsChecked) if (ReplayIsChecked)
{ {
//上
if (context.hotkey.Equals(NDIMainViewHotkeys.Up)) if (context.hotkey.Equals(NDIMainViewHotkeys.Up))
{ {
SliderStartValue = NDIViewModel.SliderStartValue; SliderStartValue = NDIViewModel.SliderStartValue;
_isDown = false; _isDown = false;
} }
//下
else if (context.hotkey.Equals(NDIMainViewHotkeys.Down)) else if (context.hotkey.Equals(NDIMainViewHotkeys.Down))
{ {
SliderEndValue = NDIViewModel.SliderEndValue; SliderEndValue = NDIViewModel.SliderEndValue;
_isDown = true; _isDown = true;
} }
//左
else if (context.hotkey.Equals(NDIMainViewHotkeys.Left)) else if (context.hotkey.Equals(NDIMainViewHotkeys.Left))
{ {
if (_isDown) if (_isDown)
...@@ -1961,6 +1966,7 @@ namespace VIZ.FGOUT.Module ...@@ -1961,6 +1966,7 @@ namespace VIZ.FGOUT.Module
NDIViewModel.SliderStartValue = --SliderStartValue; NDIViewModel.SliderStartValue = --SliderStartValue;
} }
//右
else if (context.hotkey.Equals(NDIMainViewHotkeys.Right)) else if (context.hotkey.Equals(NDIMainViewHotkeys.Right))
{ {
if (_isDown) if (_isDown)
...@@ -1968,6 +1974,36 @@ namespace VIZ.FGOUT.Module ...@@ -1968,6 +1974,36 @@ namespace VIZ.FGOUT.Module
else else
NDIViewModel.SliderStartValue = ++SliderStartValue; NDIViewModel.SliderStartValue = ++SliderStartValue;
} }
//Replay Start
else if (context.hotkey.Equals(NDIMainViewHotkeys.ReplayStart))
{
ReplayStart();
}
//Replay Stop
else if (context.hotkey.Equals(NDIMainViewHotkeys.ReplayStop))
{
ReplayStop();
}
//清除区域
else if (context.hotkey.Equals(NDIMainViewHotkeys.CleanInPoints))
{
CleanInPoint();
}
//Replay UnChecked
else if (context.hotkey.Equals(NDIMainViewHotkeys.Replay))
{
ReplayIsChecked = false;
ReplayUnchecked();
}
}
else
{
//Replay Checked
if (context.hotkey.Equals(NDIMainViewHotkeys.Replay))
{
ReplayIsChecked = true;
ReplayChecked();
}
} }
} }
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/View/NDIView.xaml.cs
...@@ -389,10 +389,11 @@ namespace VIZ.FGOUT.Module ...@@ -389,10 +389,11 @@ namespace VIZ.FGOUT.Module
if (info.SrcRect.Left >= 0 && info.SrcRect.Right >= 0 && info.SrcRect.Top >= 0 && info.SrcRect.Bottom >= 0) if (info.SrcRect.Left >= 0 && info.SrcRect.Right >= 0 && info.SrcRect.Top >= 0 && info.SrcRect.Bottom >= 0)
{ {
//计算四个方向到点的距离取绝对值 //计算四个方向到点的距离取绝对值
var difference = Math.Abs(x - info.SrcRect.Left) + Math.Abs(info.SrcRect.Right - x) //var difference = Math.Abs(x - info.SrcRect.Left) + Math.Abs(info.SrcRect.Right - x)
+ Math.Abs(y - info.SrcRect.Top) + Math.Abs(info.SrcRect.Bottom - y); // + Math.Abs(y - info.SrcRect.Top) + Math.Abs(info.SrcRect.Bottom - y);
//计算点到矩形中心点的距离的绝对值 //计算点到矩形中心点的距离的绝对值
//var difference = Math.Abs(x - (info.SrcRect.Right - info.SrcRect.Left)) + Math.Abs(y - (info.SrcRect.Bottom - info.SrcRect.Top)); //var difference = Math.Abs(x - (info.SrcRect.Right - info.SrcRect.Left)) + Math.Abs(y - (info.SrcRect.Bottom - info.SrcRect.Top));
var difference = Math.Sqrt(Math.Pow((((info.SrcRect.Right + info.SrcRect.Left)) / 2 - x), 2.0) + Math.Pow(((info.SrcRect.Bottom + info.SrcRect.Top) / 2 - y), 2.0));
if (difference < minDistance) if (difference < minDistance)
{ {
saveInfo = info; saveInfo = info;
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.Manual_NDI.cs
...@@ -23,7 +23,7 @@ namespace VIZ.FGOUT.Module ...@@ -23,7 +23,7 @@ namespace VIZ.FGOUT.Module
private readonly FrameBuffer _frameBuffer = new FrameBuffer(TimeSpan.FromSeconds(10)); private readonly FrameBuffer _frameBuffer = new FrameBuffer(TimeSpan.FromSeconds(10));
private readonly TrackingBoxInfoBuffer _trackingBoxInfoBuffer = private readonly TrackingBoxInfoBuffer _trackingBoxInfoBuffer =
new TrackingBoxInfoBuffer(TimeSpan.FromSeconds(90)); new TrackingBoxInfoBuffer(TimeSpan.FromSeconds(500));
public List<TrackingBoxInfo> _cam3Infos = new List<TrackingBoxInfo>(); public List<TrackingBoxInfo> _cam3Infos = new List<TrackingBoxInfo>();
...@@ -460,7 +460,7 @@ namespace VIZ.FGOUT.Module ...@@ -460,7 +460,7 @@ namespace VIZ.FGOUT.Module
{ {
buffer.Enqueue(frame); buffer.Enqueue(frame);
// 如果缓冲区超过容量，则移除最旧的帧 // 如果缓冲区超过容量，则移除最旧的帧
if (buffer.Count > 4500) if (buffer.Count > 25000)
buffer.Dequeue(); buffer.Dequeue();
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.Message.cs
...@@ -33,6 +33,7 @@ namespace VIZ.FGOUT.Module ...@@ -33,6 +33,7 @@ namespace VIZ.FGOUT.Module
_autoSend_Timer.Start(); _autoSend_Timer.Start();
AutoSendModel autoSendModel = new AutoSendModel(){ Interval = ALGORITHM_ReconfirmAutoSend_TIME }; AutoSendModel autoSendModel = new AutoSendModel(){ Interval = ALGORITHM_ReconfirmAutoSend_TIME };
ApplicationDomain.MessageManager.Send(autoSendModel);
} }
/// <summary> /// <summary>
......
VIZ.FGOUT/VIZ.FGOUT.Module/SystemSetting/View/HotkeySettingPanelView.xaml
...@@ -53,6 +53,8 @@ ...@@ -53,6 +53,8 @@
<RowDefinition Height="50" /> <RowDefinition Height="50" />
<RowDefinition Height="50" /> <RowDefinition Height="50" />
<RowDefinition Height="50" /> <RowDefinition Height="50" />
<RowDefinition Height="50" />
<RowDefinition Height="50" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="120" /> <ColumnDefinition Width="120" />
...@@ -179,6 +181,67 @@ ...@@ -179,6 +181,67 @@
Hotkey="{Binding Path=RightCmd, Mode=TwoWay}" Hotkey="{Binding Path=RightCmd, Mode=TwoWay}"
Style="{StaticResource HotkeyBox_Setting}" /> Style="{StaticResource HotkeyBox_Setting}" />
<!-- 回放 -->
<TextBlock
Grid.Row="4"
VerticalAlignment="Center"
FontSize="18"
Foreground="White"
Text="回放" />
<fcommon:HotkeyBox
Grid.Row="4"
Grid.Column="1"
Height="30"
Margin="0,0,20,0"
Hotkey="{Binding Path=ReplayCmd, Mode=TwoWay}"
Style="{StaticResource HotkeyBox_Setting}" />
<!-- 清除选区 -->
<TextBlock
Grid.Row="4"
Grid.Column="2"
VerticalAlignment="Center"
FontSize="18"
Foreground="White"
Text="清除选区" />
<fcommon:HotkeyBox
Grid.Row="4"
Grid.Column="3"
Height="30"
Margin="0,0,20,0"
Hotkey="{Binding Path=CleanInPointCmd, Mode=TwoWay}"
Style="{StaticResource HotkeyBox_Setting}" />
<!-- 播放 -->
<TextBlock
Grid.Row="5"
VerticalAlignment="Center"
FontSize="18"
Foreground="White"
Text="播放" />
<fcommon:HotkeyBox
Grid.Row="5"
Grid.Column="1"
Height="30"
Margin="0,0,20,0"
Hotkey="{Binding Path=ReplayStartCmd, Mode=TwoWay}"
Style="{StaticResource HotkeyBox_Setting}" />
<!-- 停止 -->
<TextBlock
Grid.Row="5"
Grid.Column="2"
VerticalAlignment="Center"
FontSize="18"
Foreground="White"
Text="停止" />
<fcommon:HotkeyBox
Grid.Row="5"
Grid.Column="3"
Height="30"
Margin="0,0,20,0"
Hotkey="{Binding Path=ReplayStopCmd, Mode=TwoWay}"
Style="{StaticResource HotkeyBox_Setting}" />
<!-- CAM 3 --> <!-- CAM 3 -->
<!--<TextBlock Text="CAM 3" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="1"></TextBlock> <!--<TextBlock Text="CAM 3" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="1"></TextBlock>
<fcommon:HotkeyBox Grid.Column="1" Hotkey="{Binding Path=AutoCAM3,Mode=TwoWay}" Height="30" Grid.Row="1" <fcommon:HotkeyBox Grid.Column="1" Hotkey="{Binding Path=AutoCAM3,Mode=TwoWay}" Height="30" Grid.Row="1"
......
VIZ.FGOUT/VIZ.FGOUT.Module/SystemSetting/ViewModel/HotkeySettingPanelViewModel.cs
...@@ -195,7 +195,85 @@ namespace VIZ.FGOUT.Module ...@@ -195,7 +195,85 @@ namespace VIZ.FGOUT.Module
#endregion #endregion
#region Replay快捷键
private string _replayCmd;
/// <summary>
/// ReplayCmd捷键
/// </summary>
[HotkeyProperty]
public string ReplayCmd
{
get { return _replayCmd; }
set
{
_replayCmd = value;
this.RaisePropertyChanged(nameof(ReplayCmd));
this.CheckHotkey(nameof(ReplayCmd), value);
}
}
#endregion
#region ReplayStart快捷键
private string _replayStartCmd;
/// <summary>
/// ReplayStart快捷键
/// </summary>
[HotkeyProperty]
public string ReplayStartCmd
{
get { return _replayStartCmd; }
set
{
_replayStartCmd = value;
this.RaisePropertyChanged(nameof(ReplayStartCmd));
this.CheckHotkey(nameof(ReplayStartCmd), value);
}
}
#endregion
#region ReplayStop快捷键
private string _replayStopCmd;
/// <summary>
/// ReplayStop快捷键
/// </summary>
[HotkeyProperty]
public string ReplayStopCmd
{
get { return _replayStopCmd; }
set
{
_replayStopCmd = value;
this.RaisePropertyChanged(nameof(ReplayStopCmd));
this.CheckHotkey(nameof(ReplayStopCmd), value);
}
}
#endregion
#region 清除选区快捷键
private string _cleanInPointCmd;
/// <summary>
/// 清除选区快捷键
/// </summary>
[HotkeyProperty]
public string CleanInPointCmd
{
get { return _cleanInPointCmd; }
set
{
_cleanInPointCmd = value;
this.RaisePropertyChanged(nameof(CleanInPointCmd));
this.CheckHotkey(nameof(CleanInPointCmd), value);
}
}
#endregion
// ====================================================================================== // ======================================================================================
// === Commond === // === Commond ===
...@@ -228,6 +306,10 @@ namespace VIZ.FGOUT.Module ...@@ -228,6 +306,10 @@ namespace VIZ.FGOUT.Module
this.DownCmd = this.HotkeyConfig.Down; this.DownCmd = this.HotkeyConfig.Down;
this.LeftCmd = this.HotkeyConfig.Left; this.LeftCmd = this.HotkeyConfig.Left;
this.RightCmd = this.HotkeyConfig.Right; this.RightCmd = this.HotkeyConfig.Right;
this.ReplayCmd = this.HotkeyConfig.Replay;
this.ReplayStopCmd = this.HotkeyConfig.ReplayStop;
this.ReplayStartCmd = this.HotkeyConfig.ReplayStart;
this.CleanInPointCmd = this.HotkeyConfig.CleanInPoint;
} }
#endregion #endregion
...@@ -262,6 +344,18 @@ namespace VIZ.FGOUT.Module ...@@ -262,6 +344,18 @@ namespace VIZ.FGOUT.Module
if (this.RightCmd!= this.HotkeyConfig.Right) if (this.RightCmd!= this.HotkeyConfig.Right)
return true; return true;
if (this.ReplayCmd != this.HotkeyConfig.Replay)
return true;
if (this.ReplayStartCmd != this.HotkeyConfig.ReplayStart)
return true;
if (this.ReplayStopCmd != this.HotkeyConfig.ReplayStop)
return true;
if (this.CleanInPointCmd != this.HotkeyConfig.CleanInPoint)
return true;
//// 算法裁切 //// 算法裁切
//if (this.AutoCAM1 != this.HotkeyConfig.AutoCAM1) //if (this.AutoCAM1 != this.HotkeyConfig.AutoCAM1)
// return true; // return true;
...@@ -354,6 +448,10 @@ namespace VIZ.FGOUT.Module ...@@ -354,6 +448,10 @@ namespace VIZ.FGOUT.Module
this.HotkeyConfig.Down = DownCmd; this.HotkeyConfig.Down = DownCmd;
this.HotkeyConfig.Left = LeftCmd; this.HotkeyConfig.Left = LeftCmd;
this.HotkeyConfig.Right = RightCmd; this.HotkeyConfig.Right = RightCmd;
this.HotkeyConfig.Replay = ReplayCmd;
this.HotkeyConfig.ReplayStart = ReplayStartCmd;
this.HotkeyConfig.ReplayStop = ReplayStopCmd;
this.HotkeyConfig.CleanInPoint = CleanInPointCmd;
// 更新配置 // 更新配置
ApplicationDomainEx.LiteDbContext.HotkeyConfig.Upsert(this.HotkeyConfig); ApplicationDomainEx.LiteDbContext.HotkeyConfig.Upsert(this.HotkeyConfig);
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/SystemSetting/View/HotkeySettingPanelView.g.cs
#pragma checksum "..\..\..\..\..\SystemSetting\View\HotkeySettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "6B3A42FDE5E02F371E3C4F4F0B7658EA77AC7D466EA2C40F8ACFEC43C5258876" #pragma checksum "..\..\..\..\..\SystemSetting\View\HotkeySettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "6BE88D65078AF1CFC8A2B520F11D0EC8C0EE28292B3C1C029B935E7986462B17"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/SystemSetting/View/HotkeySettingPanelView.g.i.cs
#pragma checksum "..\..\..\..\..\SystemSetting\View\HotkeySettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "6B3A42FDE5E02F371E3C4F4F0B7658EA77AC7D466EA2C40F8ACFEC43C5258876" #pragma checksum "..\..\..\..\..\SystemSetting\View\HotkeySettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "6BE88D65078AF1CFC8A2B520F11D0EC8C0EE28292B3C1C029B935E7986462B17"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/VIZ.FGOUT.Module_MarkupCompile.cache
...@@ -10,11 +10,11 @@ none ...@@ -10,11 +10,11 @@ none
false false
DEBUG;TRACE DEBUG;TRACE
241325682082 24-1226537834
4-699044453 4-1529606353
951167816992 95-2032219709
151674092382 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; 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.Storage/LiteDB/System/HotkeyConfig.cs
...@@ -50,5 +50,13 @@ ...@@ -50,5 +50,13 @@
public string Up { get; set; } = "Up"; public string Up { get; set; } = "Up";
public string Down { get; set; } = "Down"; public string Down { get; set; } = "Down";
public string Replay { get; set; } = "R";
public string ReplayStart { get; set; } = "K";
public string ReplayStop { get; set; } = "L";
public string CleanInPoint { get; set; } = "J";
} }
} }
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/obj/x64/Debug/VIZ.FGOUT_MarkupCompile.cache
...@@ -10,10 +10,10 @@ none ...@@ -10,10 +10,10 @@ 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 False
......
VIZ.Framework/VIZ.Framework.Common.Resource/obj/x64/Debug/VIZ.Framework.Common.Resource_MarkupCompile.cache
...@@ -10,10 +10,10 @@ none ...@@ -10,10 +10,10 @@ none
false false
DEBUG;TRACE DEBUG;TRACE
91711917753 9-721875057
3-1719726047 3-630027162
19-82108094 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; 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 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 ...@@ -10,11 +10,11 @@ none
false false
DEBUG;TRACE DEBUG;TRACE
15488264905 15-721109437
120494897808 120150095399
44-1238315823 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; 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
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