Skip to content

F
FGOUT
Commit 6243e93a by 鲁志-悦动
Options

Shift+方向键可以每次多帧调整 And 快捷键支持Esc And 二次确认点击抛弃、自动发送倒计时停止 And 修复一级界面的密度参数一键确认后光标自动进入下一参数框的缺陷

parent 9f3e22e3
Showing with 269 additions and 136 deletions
VIZ.FGOUT/VIZ.FGOUT.Domain/Enum/NDIMainViewHotkeys.cs
...@@ -80,6 +80,16 @@ ...@@ -80,6 +80,16 @@
/// <summary> /// <summary>
/// GoOn /// GoOn
/// </summary> /// </summary>
GoOn GoOn,
/// <summary>
/// 快速左移
/// </summary>
FastLeft,
/// <summary>
/// 快速右移
/// </summary>
FastRight
} }
} }
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/Controller/Hotkey/HotkeyController.cs
...@@ -267,6 +267,18 @@ namespace VIZ.FGOUT.Module ...@@ -267,6 +267,18 @@ namespace VIZ.FGOUT.Module
return AssembleHotkeyMode(NDIViewHotkeys.Delete); return AssembleHotkeyMode(NDIViewHotkeys.Delete);
} }
//快左
if (string.Equals(this.Support.HotkeyConfig.FastLeft, hotkey))
{
return AssembleNDIMainViewHotkeyMode(NDIMainViewHotkeys.FastLeft);
}
//快右
if (string.Equals(this.Support.HotkeyConfig.FastRight, hotkey))
{
return AssembleNDIMainViewHotkeyMode(NDIMainViewHotkeys.FastRight);
}
//INDIViewService service = null; //INDIViewService service = null;
//如果不是手动，返回false //如果不是手动，返回false
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml
...@@ -948,7 +948,7 @@ ...@@ -948,7 +948,7 @@
Style="{StaticResource TextBoxStyle}" Style="{StaticResource TextBoxStyle}"
Text="{Binding Matting_interval, Mode=TwoWay}"> Text="{Binding Matting_interval, Mode=TwoWay}">
<b:Interaction.Behaviors> <b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdateBehavior /> <local:TextBoxEnterKeyUpdatePreBehavior />
</b:Interaction.Behaviors> </b:Interaction.Behaviors>
<b:Interaction.Triggers> <b:Interaction.Triggers>
<b:EventTrigger EventName="KeyDown"> <b:EventTrigger EventName="KeyDown">
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
...@@ -675,7 +675,12 @@ namespace VIZ.FGOUT.Module ...@@ -675,7 +675,12 @@ namespace VIZ.FGOUT.Module
//发送给算法 //发送给算法
manager.SendJson(alPackage); manager.SendJson(alPackage);
if (isMessage) if (isMessage)
{
WPFHelper.BeginInvoke(() =>
{
MessageBoxEx.ShowDialog("算法参数保存成功。"); MessageBoxEx.ShowDialog("算法参数保存成功。");
});
}
//再放回去 //再放回去
var algorithmMessage = JsonConvert.SerializeObject(alPackage, JSON_SERIALIZER_SETTINGS); var algorithmMessage = JsonConvert.SerializeObject(alPackage, JSON_SERIALIZER_SETTINGS);
...@@ -1214,9 +1219,13 @@ namespace VIZ.FGOUT.Module ...@@ -1214,9 +1219,13 @@ namespace VIZ.FGOUT.Module
//TimeCountActVisibility = Visibility.Collapsed; //TimeCountActVisibility = Visibility.Collapsed;
//TimeCountDefaultVisibility = Visibility.Visible; //TimeCountDefaultVisibility = Visibility.Visible;
WPFHelper.BeginInvoke(() =>
{
MessageBoxEx.ShowDialog("二次确认抛弃完成。"); MessageBoxEx.ShowDialog("二次确认抛弃完成。");
});
AutoSendCount = AutoSendIntervalTime; AutoSendCount = AutoSendIntervalTime;
_autoSend_Timer.Stop();
} }
private void AutoAbandon() private void AutoAbandon()
...@@ -1233,9 +1242,14 @@ namespace VIZ.FGOUT.Module ...@@ -1233,9 +1242,14 @@ namespace VIZ.FGOUT.Module
{ {
//ReconfirmSendParamsCommon(ReconfirmStatus.Send); //ReconfirmSendParamsCommon(ReconfirmStatus.Send);
ApplicationDomain.MessageManager.Send(_reconfirmSendModel); ApplicationDomain.MessageManager.Send(_reconfirmSendModel);
WPFHelper.BeginInvoke(() =>
{
MessageBoxEx.ShowDialog("二次确认发送成功。"); MessageBoxEx.ShowDialog("二次确认发送成功。");
});
AutoSendCount = AutoSendIntervalTime; AutoSendCount = AutoSendIntervalTime;
_autoSend_Timer.Stop();
} }
private void AutoSend() private void AutoSend()
...@@ -1427,7 +1441,7 @@ namespace VIZ.FGOUT.Module ...@@ -1427,7 +1441,7 @@ namespace VIZ.FGOUT.Module
var manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1); var manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1);
if (manager == null) return; if (manager == null) return;
manager.SendJson(new AlgorithmPackage_Figout_model() { signal = AlgorithmPackageSignal.Reset }); manager.SendJson(new AlgorithmPackage_Figout_model() { signal = AlgorithmPackageSignal.Reset });
MessageBoxEx.ShowDialog("算法已重置。"); WPFHelper.BeginInvoke(() => { MessageBoxEx.ShowDialog("算法已重置。"); });
} }
/// <summary> /// <summary>
...@@ -1630,17 +1644,17 @@ namespace VIZ.FGOUT.Module ...@@ -1630,17 +1644,17 @@ namespace VIZ.FGOUT.Module
{ {
if (NDIViewModel.StartTime == 0) if (NDIViewModel.StartTime == 0)
{ {
MessageBoxEx.ShowDialog("请选择入点."); WPFHelper.BeginInvoke(() => { MessageBoxEx.ShowDialog("请选择入点."); });
return; return;
} }
if (NDIViewModel.EndTime == 0) if (NDIViewModel.EndTime == 0)
{ {
MessageBoxEx.ShowDialog("请选择出点."); WPFHelper.BeginInvoke(() => { MessageBoxEx.ShowDialog("请选择出点."); });
return; return;
} }
if (NDIViewModel.EndTime <= NDIViewModel.StartTime) if (NDIViewModel.EndTime <= NDIViewModel.StartTime)
{ {
MessageBoxEx.ShowDialog("出点应大于入点."); WPFHelper.BeginInvoke(() => { MessageBoxEx.ShowDialog("出点应大于入点."); });
return; return;
} }
...@@ -1728,8 +1742,7 @@ namespace VIZ.FGOUT.Module ...@@ -1728,8 +1742,7 @@ namespace VIZ.FGOUT.Module
//MessageBoxEx.ShowDialog("开发中..."); //MessageBoxEx.ShowDialog("开发中...");
//return; //return;
MessageBoxExResult result = MessageBoxEx.ShowDialog("提示", "重启算法进程大概需要1分钟，是否继续?", MessageBoxExButtons.YES_CANCEL); MessageBoxExResult result = MessageBoxEx.ShowDialog("提示", "重启算法进程大概需要1分钟，是否继续?", MessageBoxExButtons.YES_CANCEL);
if (result == MessageBoxExResult.CANCEL) if (result == MessageBoxExResult.CANCEL) return;
return;
//// 清理视频控件 //// 清理视频控件
//ClearVideoControlContext clear_context = new ClearVideoControlContext(false, true); //ClearVideoControlContext clear_context = new ClearVideoControlContext(false, true);
...@@ -1780,8 +1793,7 @@ namespace VIZ.FGOUT.Module ...@@ -1780,8 +1793,7 @@ namespace VIZ.FGOUT.Module
//MessageBoxEx.ShowDialog("开发中..."); //MessageBoxEx.ShowDialog("开发中...");
//return; //return;
MessageBoxExResult result = MessageBoxEx.ShowDialog("提示", "是否关闭算法?", MessageBoxExButtons.YES_CANCEL); MessageBoxExResult result = MessageBoxEx.ShowDialog("提示", "是否关闭算法?", MessageBoxExButtons.YES_CANCEL);
if (result == MessageBoxExResult.CANCEL) if (result == MessageBoxExResult.CANCEL) return;
return;
//// 清理视频控件 //// 清理视频控件
//ClearVideoControlContext clear_context = new ClearVideoControlContext(false, true); //ClearVideoControlContext clear_context = new ClearVideoControlContext(false, true);
...@@ -2353,8 +2365,7 @@ namespace VIZ.FGOUT.Module ...@@ -2353,8 +2365,7 @@ namespace VIZ.FGOUT.Module
private void Close() private void Close()
{ {
MessageBoxExResult result = MessageBoxEx.ShowDialog("提示", "确定退出？", MessageBoxExButtons.YES_CANCEL, this.GetWindow()); MessageBoxExResult result = MessageBoxEx.ShowDialog("提示", "确定退出？", MessageBoxExButtons.YES_CANCEL, this.GetWindow());
if (result != MessageBoxExResult.YES) if (result != MessageBoxExResult.YES) return;
return;
this.GetWindow().Close(); this.GetWindow().Close();
} }
...@@ -2521,9 +2532,9 @@ namespace VIZ.FGOUT.Module ...@@ -2521,9 +2532,9 @@ namespace VIZ.FGOUT.Module
// 屏蔽空格键 // 屏蔽空格键
if (e.KeyCode == System.Windows.Forms.Keys.Space) if (e.KeyCode == System.Windows.Forms.Keys.Space)
e.Handled = true; e.Handled = true;
// 屏蔽回车键 // 屏蔽禁用回车键
else if (e.KeyCode == System.Windows.Forms.Keys.Return || e.KeyCode == System.Windows.Forms.Keys.Enter) //else if (e.KeyCode == System.Windows.Forms.Keys.Return || e.KeyCode == System.Windows.Forms.Keys.Enter)
e.Handled = true; // e.Handled = true;
WPFHelper.BeginInvoke(() => WPFHelper.BeginInvoke(() =>
{ {
...@@ -2659,34 +2670,34 @@ namespace VIZ.FGOUT.Module ...@@ -2659,34 +2670,34 @@ namespace VIZ.FGOUT.Module
//_startDt = DateTime.Now; //_startDt = DateTime.Now;
_endDt = DateTime.Now; _endDt = DateTime.Now;
} }
////加速左 //加速左
//else if (context.hotkey.Equals("Shift + Left")) else if (context.hotkey.Equals(NDIMainViewHotkeys.FastLeft))
//{ {
// if (_isDown) if (_isDown)
// { {
// NDIViewModel.SliderEndValue = --SliderEndValue; NDIViewModel.SliderEndValue = SliderEndValue -= 10;
// _endDt = DateTime.Now; _endDt = DateTime.Now;
// } }
// else else
// { {
// NDIViewModel.SliderStartValue = --SliderStartValue; NDIViewModel.SliderStartValue = SliderStartValue -= 10;
// _startDt = DateTime.Now; _startDt = DateTime.Now;
// } }
//} }
////加速右 //加速右
//else if (context.hotkey.Equals("Shift + Right")) else if (context.hotkey.Equals(NDIMainViewHotkeys.FastRight))
//{ {
// if (_isDown) if (_isDown)
// { {
// NDIViewModel.SliderEndValue = ++SliderEndValue; NDIViewModel.SliderEndValue = SliderEndValue += 10;
// _endDt = DateTime.Now; _endDt = DateTime.Now;
// } }
// else else
// { {
// NDIViewModel.SliderStartValue = ++SliderStartValue; NDIViewModel.SliderStartValue = SliderStartValue += 10;
// _startDt = DateTime.Now; _startDt = DateTime.Now;
// } }
//} }
//左 //左
else if (context.hotkey.Equals(NDIMainViewHotkeys.Left)) else if (context.hotkey.Equals(NDIMainViewHotkeys.Left))
{ {
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDISettingView/ViewModel/Algorithm/AlgorithmCablewayPanelViewModel.cs
...@@ -224,7 +224,7 @@ namespace VIZ.FGOUT.Module ...@@ -224,7 +224,7 @@ namespace VIZ.FGOUT.Module
// 校验 // 校验
if (this.PersonAreaProportionWeight + this.ConfidenceWeight + this.PositionToCenterWeight > 100) if (this.PersonAreaProportionWeight + this.ConfidenceWeight + this.PositionToCenterWeight > 100)
{ {
MessageBoxEx.ShowDialog("占比权重总和应该在100以内", this.GetWindow()); WPFHelper.BeginInvoke(() => { MessageBoxEx.ShowDialog("占比权重总和应该在100以内", this.GetWindow()); });
return false; return false;
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDISettingView/ViewModel/Algorithm/AlgorithmNearPanelViewModel.cs
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
using VIZ.FGOUT.Domain; using VIZ.FGOUT.Domain;
using VIZ.FGOUT.Storage; using VIZ.FGOUT.Storage;
using VIZ.Framework.Common; using VIZ.Framework.Common;
using VIZ.Framework.Core;
namespace VIZ.FGOUT.Module namespace VIZ.FGOUT.Module
{ {
...@@ -219,7 +220,9 @@ namespace VIZ.FGOUT.Module ...@@ -219,7 +220,9 @@ namespace VIZ.FGOUT.Module
// 校验 // 校验
if (this.PersonAreaProportionWeight + this.ConfidenceWeight + this.PositionToCenterWeight != 100) if (this.PersonAreaProportionWeight + this.ConfidenceWeight + this.PositionToCenterWeight != 100)
{ {
WPFHelper.BeginInvoke(() => {
MessageBoxEx.ShowDialog("占比权重总和应该为100", this.GetWindow()); MessageBoxEx.ShowDialog("占比权重总和应该为100", this.GetWindow());
});
return false; return false;
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDISettingView/ViewModel/Algorithm/AlgorithmSixteenPanelViewModel.cs
...@@ -224,7 +224,7 @@ namespace VIZ.FGOUT.Module ...@@ -224,7 +224,7 @@ namespace VIZ.FGOUT.Module
// 校验 // 校验
if (this.PersonAreaProportionWeight + this.ConfidenceWeight + this.PositionToCenterWeight > 100) if (this.PersonAreaProportionWeight + this.ConfidenceWeight + this.PositionToCenterWeight > 100)
{ {
MessageBoxEx.ShowDialog("占比权重总和应该在100以内", this.GetWindow()); WPFHelper.BeginInvoke(() => { MessageBoxEx.ShowDialog("占比权重总和应该在100以内", this.GetWindow()); });
return false; return false;
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDISettingView/ViewModel/Algorithm/AlgorithmTacticsPanelViewModel.cs
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
using VIZ.FGOUT.Domain; using VIZ.FGOUT.Domain;
using VIZ.FGOUT.Storage; using VIZ.FGOUT.Storage;
using VIZ.Framework.Common; using VIZ.Framework.Common;
using VIZ.Framework.Core;
namespace VIZ.FGOUT.Module namespace VIZ.FGOUT.Module
{ {
...@@ -219,7 +220,10 @@ namespace VIZ.FGOUT.Module ...@@ -219,7 +220,10 @@ namespace VIZ.FGOUT.Module
// 校验 // 校验
if (this.PersonAreaProportionWeight + this.ConfidenceWeight + this.PositionToCenterWeight > 100) if (this.PersonAreaProportionWeight + this.ConfidenceWeight + this.PositionToCenterWeight > 100)
{ {
WPFHelper.BeginInvoke(() =>
{
MessageBoxEx.ShowDialog("占比权重总和应该在100以内", this.GetWindow()); MessageBoxEx.ShowDialog("占比权重总和应该在100以内", this.GetWindow());
});
return false; return false;
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.cs
...@@ -277,7 +277,10 @@ namespace VIZ.FGOUT.Module ...@@ -277,7 +277,10 @@ namespace VIZ.FGOUT.Module
} }
else else
{ {
WPFHelper.BeginInvoke(() =>
{
MessageBoxEx.ShowDialog("双人比赛项目应选择两个入点."); MessageBoxEx.ShowDialog("双人比赛项目应选择两个入点.");
});
return; return;
} }
} }
...@@ -294,7 +297,7 @@ namespace VIZ.FGOUT.Module ...@@ -294,7 +297,7 @@ namespace VIZ.FGOUT.Module
if (!isInPoint) if (!isInPoint)
{ {
MessageBoxEx.ShowDialog("没有获取到入点跟踪框信息。"); WPFHelper.BeginInvoke(() => { MessageBoxEx.ShowDialog("没有获取到入点跟踪框信息。"); });
return; return;
} }
...@@ -321,7 +324,10 @@ namespace VIZ.FGOUT.Module ...@@ -321,7 +324,10 @@ namespace VIZ.FGOUT.Module
{ {
if (_RecordStartTime != StartTime) if (_RecordStartTime != StartTime)
{ {
WPFHelper.BeginInvoke(() =>
{
MessageBoxEx.ShowDialog("入点和入点标记框位置不一致。"); MessageBoxEx.ShowDialog("入点和入点标记框位置不一致。");
});
return true; return true;
} }
...@@ -707,12 +713,18 @@ namespace VIZ.FGOUT.Module ...@@ -707,12 +713,18 @@ namespace VIZ.FGOUT.Module
var message = "是不是没按鼠标右键保存？"; var message = "是不是没按鼠标右键保存？";
if (nDIView.polygonsEnd.Count < 1) if (nDIView.polygonsEnd.Count < 1)
{ {
WPFHelper.BeginInvoke(() =>
{
MessageBoxEx.ShowDialog("结束标记没有数据，" + message); MessageBoxEx.ShowDialog("结束标记没有数据，" + message);
});
return; return;
} }
if (nDIView.polygonsStart.Count < 2) if (nDIView.polygonsStart.Count < 2)
{ {
WPFHelper.BeginInvoke(() =>
{
MessageBoxEx.ShowDialog("开始标记不足2个，" + message); MessageBoxEx.ShowDialog("开始标记不足2个，" + message);
});
return; return;
} }
} }
...@@ -746,7 +758,7 @@ namespace VIZ.FGOUT.Module ...@@ -746,7 +758,7 @@ namespace VIZ.FGOUT.Module
package.ignore = Coordinate(nDIView.polygonsInvalid, srcWidth, srcHeight); package.ignore = Coordinate(nDIView.polygonsInvalid, srcWidth, srcHeight);
manager.SendJson(package); manager.SendJson(package);
MessageBoxEx.ShowDialog("发送成功。"); WPFHelper.BeginInvoke(() => { MessageBoxEx.ShowDialog("发送成功。"); });
#endregion #endregion
...@@ -815,7 +827,10 @@ namespace VIZ.FGOUT.Module ...@@ -815,7 +827,10 @@ namespace VIZ.FGOUT.Module
manager.SendJson(package); manager.SendJson(package);
//MessageBoxEx.ShowDialog("发送成功 IP = " + manager.IP + " Port =" + manager.Port); //MessageBoxEx.ShowDialog("发送成功 IP = " + manager.IP + " Port =" + manager.Port);
WPFHelper.BeginInvoke(() =>
{
MessageBoxEx.ShowDialog("发送成功"); MessageBoxEx.ShowDialog("发送成功");
});
} }
private List<List<List<int>>> Coordinate(List<PointCollection> points, double srcWidth, double srcHeight) private List<List<List<int>>> Coordinate(List<PointCollection> points, double srcWidth, double srcHeight)
...@@ -946,7 +961,7 @@ namespace VIZ.FGOUT.Module ...@@ -946,7 +961,7 @@ namespace VIZ.FGOUT.Module
//this.manualConfig.IsStartMat = savePlaceModel.IsStartMat; //this.manualConfig.IsStartMat = savePlaceModel.IsStartMat;
//ApplicationDomainEx.LiteDbContext.SetManualConfig.Upsert(this.manualConfig); //ApplicationDomainEx.LiteDbContext.SetManualConfig.Upsert(this.manualConfig);
MessageBoxEx.ShowDialog("保存成功"); WPFHelper.BeginInvoke(() => { MessageBoxEx.ShowDialog("保存成功"); });
} }
#region 注释的代码 #region 注释的代码
......
VIZ.FGOUT/VIZ.FGOUT.Module/SystemSetting/View/HotkeySettingPanelView.xaml
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<Grid Margin="45,60,40,0"> <Grid Margin="45,60,40,0">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="60" /> <RowDefinition Height="60" />
<RowDefinition Height="500" /> <RowDefinition Height="550" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<!-- 算法裁切快捷键 --> <!-- 算法裁切快捷键 -->
<!--<TextBlock <!--<TextBlock
...@@ -64,6 +64,7 @@ ...@@ -64,6 +64,7 @@
<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" />
...@@ -347,8 +348,45 @@ ...@@ -347,8 +348,45 @@
InputMethod.IsInputMethodEnabled="False" InputMethod.IsInputMethodEnabled="False"
Style="{StaticResource HotkeyBox_Setting}" /> Style="{StaticResource HotkeyBox_Setting}" />
<Button <!-- 快左 -->
<TextBlock
Grid.Row="9"
Grid.Column="0"
VerticalAlignment="Center"
FontSize="18"
Foreground="White"
Text="快左"
Visibility="Hidden" />
<fcommon:HotkeyBox
Grid.Row="9" Grid.Row="9"
Grid.Column="1"
Height="30"
Margin="0,0,20,0"
Hotkey="{Binding Path=FastLeftCmd, Mode=TwoWay}"
Style="{StaticResource HotkeyBox_Setting}"
Visibility="Hidden" />
<!-- 快右 -->
<TextBlock
Grid.Row="9"
Grid.Column="2"
VerticalAlignment="Center"
FontSize="18"
Foreground="White"
Text="快右"
Visibility="Hidden" />
<fcommon:HotkeyBox
Grid.Row="9"
Grid.Column="3"
Height="30"
Margin="0,0,20,0"
Hotkey="{Binding Path=FastRightCmd, Mode=TwoWay}"
InputMethod.IsInputMethodEnabled="False"
Style="{StaticResource HotkeyBox_Setting}"
Visibility="Hidden" />
<Button
Grid.Row="10"
Grid.Column="2" Grid.Column="2"
Grid.ColumnSpan="2" Grid.ColumnSpan="2"
Width="105" Width="105"
......
VIZ.FGOUT/VIZ.FGOUT.Module/SystemSetting/ViewModel/HotkeySettingPanelViewModel.cs
...@@ -396,6 +396,46 @@ namespace VIZ.FGOUT.Module ...@@ -396,6 +396,46 @@ namespace VIZ.FGOUT.Module
#endregion #endregion
#region 快左
private string _fastLeft;
/// <summary>
/// 快左
/// </summary>
[HotkeyProperty]
public string FastLeftCmd
{
get { return _fastLeft; }
set
{
_fastLeft = value;
this.RaisePropertyChanged(nameof(FastLeftCmd));
this.CheckHotkey(nameof(FastLeftCmd), value);
}
}
#endregion
#region 快右
private string _fastRight;
/// <summary>
/// 快右
/// </summary>
[HotkeyProperty]
public string FastRightCmd
{
get { return _fastRight; }
set
{
_fastRight = value;
this.RaisePropertyChanged(nameof(FastRightCmd));
this.CheckHotkey(nameof(FastRightCmd), value);
}
}
#endregion
// ====================================================================================== // ======================================================================================
// === Commond === // === Commond ===
// ====================================================================================== // ======================================================================================
...@@ -436,6 +476,8 @@ namespace VIZ.FGOUT.Module ...@@ -436,6 +476,8 @@ namespace VIZ.FGOUT.Module
this.HoldOnCmd = this.HotkeyConfig.HoldOn; this.HoldOnCmd = this.HotkeyConfig.HoldOn;
this.ResetCmd = this.HotkeyConfig.Reset; this.ResetCmd = this.HotkeyConfig.Reset;
this.DeleteCmd = this.HotkeyConfig.Delete; this.DeleteCmd = this.HotkeyConfig.Delete;
this.FastLeftCmd = this.HotkeyConfig.FastLeft;
this.FastRightCmd = this.HotkeyConfig.FastRight;
} }
#endregion #endregion
...@@ -464,6 +506,8 @@ namespace VIZ.FGOUT.Module ...@@ -464,6 +506,8 @@ namespace VIZ.FGOUT.Module
this.HoldOnCmd = "H"; this.HoldOnCmd = "H";
this.ResetCmd = "F"; this.ResetCmd = "F";
this.DeleteCmd = "Delete"; this.DeleteCmd = "Delete";
this.FastLeftCmd = "Shift + Left";
this.FastRightCmd = "Shift + Right";
Save(); Save();
} }
...@@ -530,6 +574,12 @@ namespace VIZ.FGOUT.Module ...@@ -530,6 +574,12 @@ namespace VIZ.FGOUT.Module
if (this.DeleteCmd != this.HotkeyConfig.Delete) if (this.DeleteCmd != this.HotkeyConfig.Delete)
return true; return true;
if(this.FastLeftCmd != this.HotkeyConfig.FastLeft)
return true;
if(this.FastRightCmd != this.HotkeyConfig.FastRight)
return true;
//// 算法裁切 //// 算法裁切
//if (this.AutoCAM1 != this.HotkeyConfig.AutoCAM1) //if (this.AutoCAM1 != this.HotkeyConfig.AutoCAM1)
// return true; // return true;
...@@ -604,6 +654,8 @@ namespace VIZ.FGOUT.Module ...@@ -604,6 +654,8 @@ namespace VIZ.FGOUT.Module
this.HotkeyConfig.Reset = ResetCmd; this.HotkeyConfig.Reset = ResetCmd;
this.HotkeyConfig.GoOn = GoOnCmd; this.HotkeyConfig.GoOn = GoOnCmd;
this.HotkeyConfig.Delete = DeleteCmd; this.HotkeyConfig.Delete = DeleteCmd;
this.HotkeyConfig.FastLeft = FastLeftCmd;
this.HotkeyConfig.FastRight = FastRightCmd;
// 更新配置 // 更新配置
ApplicationDomainEx.LiteDbContext.HotkeyConfig.Upsert(this.HotkeyConfig); ApplicationDomainEx.LiteDbContext.HotkeyConfig.Upsert(this.HotkeyConfig);
......
VIZ.FGOUT/VIZ.FGOUT.Module/Themes/TextBoxEnterKeyUpdatePreBehavior.cs 0 → 100644
using Microsoft.Xaml.Behaviors;
using System.Windows.Controls;
using System.Windows.Input;
namespace VIZ.FGOUT.Module
{
public class TextBoxEnterKeyUpdatePreBehavior : Behavior<TextBox>
{
protected override void OnAttached()
{
if (AssociatedObject != null)
{
base.OnAttached();
AssociatedObject.KeyDown += AssociatedObject_KeyDown;
}
}
protected override void OnDetaching()
{
if (AssociatedObject != null)
{
AssociatedObject.KeyDown -= AssociatedObject_KeyDown;
base.OnDetaching();
}
}
private void AssociatedObject_KeyDown(object sender, KeyEventArgs e)
{
if (sender is TextBox textBox)
{
if (e.Key == Key.Return)
{
if (e.Key == Key.Enter)
{
textBox.MoveFocus(new TraversalRequest(FocusNavigationDirection.Previous));
}
}
}
}
}
}
VIZ.FGOUT/VIZ.FGOUT.Module/VIZ.FGOUT.Module.csproj
...@@ -273,6 +273,7 @@ ...@@ -273,6 +273,7 @@
<Compile Include="Themes\SliderArrange.xaml.cs"> <Compile Include="Themes\SliderArrange.xaml.cs">
<DependentUpon>SliderArrange.xaml</DependentUpon> <DependentUpon>SliderArrange.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Themes\TextBoxEnterKeyUpdatePreBehavior.cs" />
<Compile Include="Themes\TextBoxEnterKeyUpdateBehavior.cs" /> <Compile Include="Themes\TextBoxEnterKeyUpdateBehavior.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "FB363BFA72333ACE197297FF9CD1AF8CE9ABE233154A3E62ABDD03395037B1A5" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "FECE7EC3BCF545ACA0597EA45D753BB9E33A03F9E1E228A91ECC7BFC72BC6952"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <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}" "FB363BFA72333ACE197297FF9CD1AF8CE9ABE233154A3E62ABDD03395037B1A5" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "FECE7EC3BCF545ACA0597EA45D753BB9E33A03F9E1E228A91ECC7BFC72BC6952"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/SystemSetting/View/HotkeySettingPanelView.g.cs
#pragma checksum "..\..\..\..\..\SystemSetting\View\HotkeySettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "6CCD4CB7A2AF36A739B4773C02A62562ED65DC2B793D9E996B687AA117DC0E2A" #pragma checksum "..\..\..\..\..\SystemSetting\View\HotkeySettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "1FB38020B98170E44D648CD4DA22B97409411A50CD8E7510F0556A994E6B72DA"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <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}" "6CCD4CB7A2AF36A739B4773C02A62562ED65DC2B793D9E996B687AA117DC0E2A" #pragma checksum "..\..\..\..\..\SystemSetting\View\HotkeySettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "1FB38020B98170E44D648CD4DA22B97409411A50CD8E7510F0556A994E6B72DA"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/VIZ.FGOUT.Module.csproj.CoreCompileInputs.cache
11e1bf39176a68b81241b16db1f983754dad879ca8a35ea485d3114701f5e8ed ba191734d45adb3f5aa173c25a05bb6f90d91da6f2d3424ca71b878426306191
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
25-1434354873 25-429057470
4-699044453 4-1529606353
97-187026604 98391250289
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\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; 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;
False True
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
...@@ -68,5 +68,9 @@ ...@@ -68,5 +68,9 @@
public string Reset { get; set; } = "F"; public string Reset { get; set; } = "F";
public string GoOn { get; set; } = "G"; public string GoOn { get; set; } = "G";
public string FastLeft { get; set;} = "Shift + Left";
public string FastRight { get; set; } = "Shift + Right";
} }
} }
VIZ.Framework/VIZ.Framework.Common/Widgets/HotkeyBox/HotkeyHelper.cs
...@@ -81,14 +81,14 @@ namespace VIZ.Framework.Common ...@@ -81,14 +81,14 @@ namespace VIZ.Framework.Common
// sb.Append($"{e.Key}"); // sb.Append($"{e.Key}");
//} //}
if (e.SystemKey == Key.Enter) //if (e.SystemKey == Key.Enter)
{ //{
sb.Append($"{e.SystemKey}"); // sb.Append($"{e.SystemKey}");
} //}
if (e.Key == Key.Enter) //if (e.Key == Key.Enter)
{ //{
sb.Append($"{e.Key}"); // sb.Append($"{e.Key}");
} //}
// Esc // Esc
if (e.SystemKey == Key.Escape) if (e.SystemKey == Key.Escape)
...@@ -212,11 +212,11 @@ namespace VIZ.Framework.Common ...@@ -212,11 +212,11 @@ namespace VIZ.Framework.Common
} }
//Enter //Enter
if (e.KeyCode == System.Windows.Forms.Keys.Enter) //if (e.KeyCode == System.Windows.Forms.Keys.Enter)
{ //{
sb.Append($"{e.KeyCode}"); // sb.Append($"{e.KeyCode}");
return sb.ToString(); // return sb.ToString();
} //}
//Esc //Esc
if (e.KeyCode == System.Windows.Forms.Keys.Escape) if (e.KeyCode == System.Windows.Forms.Keys.Escape)
......
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