Skip to content

F
FGOUT
Commit a77ec563 by 鲁志-悦动
Options

三行参数设置快捷键，默认v,b,n

parent 90bc17e8
Showing with 768 additions and 88 deletions
VIZ.FGOUT/VIZ.FGOUT.Domain/Enum/NDIMainViewHotkeys.cs
......@@ -90,6 +90,21 @@
/// <summary>
/// 快速右移
/// </summary>
FastRight
FastRight,
/// <summary>
/// 算法参数第一行
/// </summary>
FirstLine,
/// <summary>
/// 算法参数第二行
/// </summary>
SecondLine,
/// <summary>
/// 算法参数第三行
/// </summary>
ThridLine
}
}
VIZ.FGOUT/VIZ.FGOUT.Domain/Message/Setting/SelectedFourModel.cs 0 → 100644
namespace VIZ.FGOUT.Domain
{
public class SelectedFourModel
{
public bool IsSelected { get; set; }
}
}
VIZ.FGOUT/VIZ.FGOUT.Domain/Message/Setting/SelectedThreeModel.cs 0 → 100644
namespace VIZ.FGOUT.Domain
{
public class SelectedThreeModel
{
public bool IsSelected { get; set; }
}
}
VIZ.FGOUT/VIZ.FGOUT.Domain/Message/Setting/SelectedTwoModel.cs 0 → 100644
namespace VIZ.FGOUT.Domain
{
public class SelectedTwoModel
{
public bool IsSelected { get; set; }
}
}
VIZ.FGOUT/VIZ.FGOUT.Domain/VIZ.FGOUT.Domain.csproj
......@@ -108,6 +108,9 @@
<Compile Include="Message\Setting\SaveMarkModel.cs" />
<Compile Include="Message\Setting\SavePlaceModel.cs" />
<Compile Include="Message\Setting\SelectedModel.cs" />
<Compile Include="Message\Setting\SelectedThreeModel.cs" />
<Compile Include="Message\Setting\SelectedFourModel.cs" />
<Compile Include="Message\Setting\SelectedTwoModel.cs" />
<Compile Include="Message\Setting\SendPlaceModel.cs" />
<Compile Include="Message\Setting\SendSelectedModel.cs" />
<Compile Include="Message\Setting\ShowInvalidPlaceModel.cs" />
......
VIZ.FGOUT/VIZ.FGOUT.Domain/obj/x64/Debug/VIZ.FGOUT.Domain.csproj.CoreCompileInputs.cache
be411a1d13757dd8127a5e9c5c6b14f3b756312cfe5e66ab937f67a80bcd9d56
9765853d4e2fdd5df9f659f13472c13b3d718658d40c058f62bf0a3c94834ab2
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/Resources/StringResource.en.xaml
......@@ -75,10 +75,17 @@
<sys:String x:Key="DefaultHotkey">RestoreDefault</sys:String>
<sys:String x:Key="CutZone">CutZone</sys:String>
<sys:String x:Key="PullBox">PullBox</sys:String>
<sys:String x:Key="PullBoxOne">PullBox1</sys:String>
<sys:String x:Key="PullBoxTwo">PullBox2</sys:String>
<sys:String x:Key="PullBoxThree">PullBox3</sys:String>
<sys:String x:Key="PullBoxFour">PullBox4</sys:String>
<sys:String x:Key="Cut">Cut</sys:String>
<sys:String x:Key="NotCut">NotCut</sys:String>
<sys:String x:Key="ClipParameter">ClipParameter</sys:String>
<sys:String x:Key="DynamicIn">DynamicIn</sys:String>
<sys:String x:Key="DynamicOut">DynamicOut</sys:String>
<sys:String x:Key="StaticFrame">StaticFrame</sys:String>
<sys:String x:Key="FirstLine">FirstLine</sys:String>
<sys:String x:Key="SecondLine">SecondLine</sys:String>
<sys:String x:Key="ThirdLine">ThirdLine</sys:String>
</ResourceDictionary>
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/Resources/StringResource.zh-cn.xaml
......@@ -74,10 +74,17 @@
<sys:String x:Key="DefaultHotkey">恢复默认</sys:String>
<sys:String x:Key="CutZone">裁切区域</sys:String>
<sys:String x:Key="PullBox">拖框</sys:String>
<sys:String x:Key="PullBoxOne">拖框1</sys:String>
<sys:String x:Key="PullBoxTwo">拖框2</sys:String>
<sys:String x:Key="PullBoxThree">拖框3</sys:String>
<sys:String x:Key="PullBoxFour">拖框4</sys:String>
<sys:String x:Key="Cut">裁切</sys:String>
<sys:String x:Key="NotCut">不裁切</sys:String>
<sys:String x:Key="ClipParameter">音视频参数</sys:String>
<sys:String x:Key="DynamicIn">动进</sys:String>
<sys:String x:Key="DynamicOut">动出</sys:String>
<sys:String x:Key="StaticFrame">静帧</sys:String>
<sys:String x:Key="FirstLine">第一行算法参</sys:String>
<sys:String x:Key="SecondLine">第二行算法参</sys:String>
<sys:String x:Key="ThirdLine">第三行算法参</sys:String>
</ResourceDictionary>
\ No newline at end of file
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/obj/x64/Debug/VIZ.FGOUT.Module.Resource.csproj.FileListAbsolute.txt
......@@ -588,10 +588,15 @@ C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\VIZ.FGOUT.Mo
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\VIZ.FGOUT.Module.Resource.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\VIZ.FGOUT.Module.Resource.pdb
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\CheckBox\CheckBox_WindowTop.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\CheckBox\CheckBox_RaidoButtonStyle.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\VIZ.FGOU.942AC757.Up2Date
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Resources\StringResource.zh-CN.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Resources\StringResource.en.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\ComboBox\ComboBox_Setting.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\HotkeyBox\HotkeyBox_Setting.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\MessageBox\MessageBoxEx.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\RadioButton\RadioButton_FootballSide.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\RadioButton\RadioButton_NdiMainViewBlue.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\RadioButton\RadioButton_NdiView.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\RadioButton\RadioButton_Setting.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\Slider\Slider_Setting.baml
......@@ -600,8 +605,3 @@ C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\TextBo
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\ToogleButton\ToogleButton_Setting.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Toolkit\NumericUpDown\NumericUpDown.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Themes\Generic.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\RadioButton\RadioButton_NdiMainViewBlue.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\CheckBox\CheckBox_RaidoButtonStyle.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\VIZ.FGOU.942AC757.Up2Date
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Resources\StringResource.zh-CN.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Resources\StringResource.en.baml
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/Controller/Hotkey/HotkeyController.cs
......@@ -279,6 +279,24 @@ namespace VIZ.FGOUT.Module
return AssembleNDIMainViewHotkeyMode(NDIMainViewHotkeys.FastRight);
}
//第一行算法参数
if (string.Equals(this.Support.HotkeyConfig.FirstLine, hotkey))
{
return AssembleNDIMainViewHotkeyMode(NDIMainViewHotkeys.FirstLine);
}
//第二行算法参数
if (string.Equals(this.Support.HotkeyConfig.SecondLine, hotkey))
{
return AssembleNDIMainViewHotkeyMode(NDIMainViewHotkeys.SecondLine);
}
//第三行算法参数
if (string.Equals(this.Support.HotkeyConfig.ThirdLine, hotkey))
{
return AssembleNDIMainViewHotkeyMode(NDIMainViewHotkeys.ThridLine);
}
//INDIViewService service = null;
//如果不是手动，返回false
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/View/NDIView.xaml.cs
......@@ -6,6 +6,7 @@ using System.Windows.Controls;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Shapes;
using System.Windows.Shell;
using VIZ.FGOUT.Domain;
using VIZ.Framework.Common;
using VIZ.Framework.Core;
......@@ -48,6 +49,9 @@ namespace VIZ.FGOUT.Module
//裁切
public Rect rectSelected;
public Rect rectSelectedTwo;
public Rect rectSelectedThree;
public Rect rectSelectedFour;
public List<Rect> rectsSelected = new List<Rect>();
//Rectangle rectSelected = new Rectangle();
......@@ -628,6 +632,7 @@ namespace VIZ.FGOUT.Module
}
}
private Brush _brush;
public Path _currMarkPath;
bool _isMove;
/// <summary>
......@@ -680,41 +685,152 @@ namespace VIZ.FGOUT.Module
}
//裁切
if (vm.IsSelected && this.NDIKey == NDIViewKeys.CAM_1)
//if (vm.IsSelected)
//{
// this.canvas1.Children.Remove(vm.path1);
// //var rect = rectSelected;
// //if (rect.Width > 0)
// //{
// // Path tempPath = new Path();
// // foreach (UIElement uec in this.canvas1.Children)
// // {
// // var path = uec as Path;
// // if (path?.Stroke == Brushes.Yellow)
// // {
// // tempPath = path;
// // }
// // }
// // this.canvas1.Children.Remove(tempPath);
// //}
// var currentPoint = e.GetPosition(this.canvas1);
// ////1
// ////rectSelected = new Rect(startPoint, e.GetPosition(this.canvas1));
// //rectSelected = new Rect(startPoint, currentPoint);
// //2
// var startX = startPoint.X;
// var startY = startPoint.Y;
// var width = Math.Abs(currentPoint.X - startX);
// var height = width * 9 / 16;
// var rg = new RectangleGeometry
// {
// Rect = new Rect(startX, startY, width, height)
// };
// //rectSelected = new Rect(startPoint, currentPoint);
// rectSelected = new Rect(startX, startY, width, height);
// if (_currMarkPath == null)
// {
// _currMarkPath = new Path
// {
// Stroke = Brushes.Yellow,
// StrokeThickness = 1,
// Data = rg
// };
// //this.canvas1.Children.Clear();
// this.canvas1.Children.Add(_currMarkPath);
// }
// else
// {
// _currMarkPath.Data = rg;
// }
//}
//else if (vm.IsSelectedTwo)
//{
// this.canvas1.Children.Remove(vm.path1);
// var currentPoint = e.GetPosition(this.canvas1);
// var startX = startPoint.X;
// var startY = startPoint.Y;
// var width = Math.Abs(currentPoint.X - startX);
// var height = width * 9 / 16;
// var rg = new RectangleGeometry
// {
// Rect = new Rect(startX, startY, width, height)
// };
// //rectSelectedTwo = new Rect(startPoint, currentPoint);
// rectSelectedTwo = new Rect(startX, startY, width, height);
// if (_currMarkPath == null)
// {
// _currMarkPath = new Path
// {
// Stroke = Brushes.Orange,
// StrokeThickness = 1,
// Data = rg
// };
// //this.canvas1.Children.Clear();
// this.canvas1.Children.Add(_currMarkPath);
// }
// else
// {
// _currMarkPath.Data = rg;
// }
//}
if (this.NDIKey == NDIViewKeys.CAM_1)
{
var currentPoint = e.GetPosition(this.canvas1);
////1
////rectSelected = new Rect(startPoint, e.GetPosition(this.canvas1));
//rectSelected = new Rect(startPoint, currentPoint);
//2
var startX = startPoint.X;
var startY = startPoint.Y;
var width = Math.Abs(currentPoint.X - startX);
var height = width * 9 / 16;
var rg = new RectangleGeometry
if (vm.IsSelected || vm.IsSelectedTwo || vm.IsSelectedThree || vm.IsSelectedFour)
{
Rect = new Rect(startX, startY, width, height)
};
this.canvas1.Children.Remove(vm.path1);
rectSelected = new Rect(startPoint, currentPoint);
var currentPoint = e.GetPosition(this.canvas1);
if (_currMarkPath == null)
{
_currMarkPath = new Path
var startX = startPoint.X;
var startY = startPoint.Y;
var width = Math.Abs(currentPoint.X - startX);
var height = width * 9 / 16;
var rg = new RectangleGeometry
{
Stroke = Brushes.Yellow,
StrokeThickness = 1,
Data = rg
Rect = new Rect(startX, startY, width, height)
};
this.canvas1.Children.Add(_currMarkPath);
}
else
{
_currMarkPath.Data = rg;
if (vm.IsSelected)
{
_brush = Brushes.Yellow;
rectSelected = new Rect(startX, startY, width, height);
}
else if (vm.IsSelectedTwo)
{
_brush = Brushes.Orange;
rectSelectedTwo = new Rect(startX, startY, width, height);
}
else if (vm.IsSelectedThree)
{
_brush = Brushes.Cyan;
rectSelectedThree = new Rect(startX, startY, width, height);
}
else if (vm.IsSelectedFour)
{
rectSelectedFour = new Rect(startX, startY, width, height);
_brush = Brushes.Pink;
}
if (_currMarkPath == null)
{
_currMarkPath = new Path
{
Stroke = _brush,
StrokeThickness = 1,
Data = rg
};
this.canvas1.Children.Add(_currMarkPath);
}
else
{
_currMarkPath.Data = rg;
}
}
}
}
}
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.cs
......@@ -215,10 +215,18 @@ namespace VIZ.FGOUT.Module
//ApplicationDomain.MessageManager.Register<ReconfirmAutoSendIntervalTimeModel>(this, this.ReconfirmAutoSendIntervalTime);
//裁切区域发送命令
ApplicationDomain.MessageManager.Register<SelectedFourModel>(this, this.SelectedFour);
ApplicationDomain.MessageManager.Register<SelectedThreeModel>(this, this.SelectedThree);
ApplicationDomain.MessageManager.Register<SelectedTwoModel>(this, this.SelectedTwo);
ApplicationDomain.MessageManager.Register<SelectedModel>(this, this.Selected);
ApplicationDomain.MessageManager.Register<SendSelectedModel>(this, this.SendSelected);
}
public Rect RectSelectedSaved;
public Rect RectSelectedSavedTwo;
public Rect RectSelectedSavedThree;
public Rect RectSelectedSavedFour;
private CutPackage _package;
/// <summary>
/// 发送裁切框数据
......@@ -229,7 +237,24 @@ namespace VIZ.FGOUT.Module
if (this.ViewKey != NDIViewKeys.CAM_1) return;
NDIView nDIView = this.GetView<NDIView>();
var rect = nDIView.rectSelected;
Rect rect = new Rect();
if (IsSelected)
{
rect = RectSelectedSaved = nDIView.rectSelected;
}
else if (IsSelectedTwo)
{
rect = RectSelectedSavedTwo = nDIView.rectSelectedTwo;
}
else if (IsSelectedThree)
{
rect = RectSelectedSavedThree = nDIView.rectSelectedThree;
}
else if (IsSelectedFour)
{
rect = RectSelectedSavedFour = nDIView.rectSelectedFour;
}
if (rect.Width > 0)
{
// 发送UDP命令给音视频
......@@ -254,6 +279,111 @@ namespace VIZ.FGOUT.Module
}
private void SelectedFour(SelectedFourModel selectedFourModel)
{
if (this.ViewKey != NDIViewKeys.CAM_1) return;
IsSelectedFour = selectedFourModel.IsSelected;
//没有选中的时候，清除框
NDIView nDIView = this.GetView<NDIView>();
if (IsSelectedFour)
{
nDIView.rectSelectedFour = RectSelectedSavedFour;
AddRects(nDIView, RectSelectedSavedFour, Brushes.Pink);
}
else
{
var rect = nDIView.rectSelectedFour;
if (rect.Width > 0)
{
Path tempPath = new Path();
foreach (UIElement uec in nDIView.canvas1.Children)
{
var path = uec as Path;
if (path?.Stroke == Brushes.Pink)
{
tempPath = path;
}
}
nDIView.canvas1.Children.Remove(tempPath);
nDIView.rectSelectedFour = new Rect();
nDIView._currMarkPath = null;
}
_package = null;
}
}
private void SelectedThree(SelectedThreeModel selectedThreeModel)
{
if (this.ViewKey != NDIViewKeys.CAM_1) return;
IsSelectedThree = selectedThreeModel.IsSelected;
//没有选中的时候，清除框
NDIView nDIView = this.GetView<NDIView>();
if (IsSelectedThree)
{
nDIView.rectSelectedThree = RectSelectedSavedThree;
AddRects(nDIView, RectSelectedSavedThree, Brushes.Cyan);
}
else
{
var rect = nDIView.rectSelectedThree;
if (rect.Width > 0)
{
Path tempPath = new Path();
foreach (UIElement uec in nDIView.canvas1.Children)
{
var path = uec as Path;
if (path?.Stroke == Brushes.Cyan)
{
tempPath = path;
}
}
nDIView.canvas1.Children.Remove(tempPath);
nDIView.rectSelectedThree = new Rect();
nDIView._currMarkPath = null;
}
_package = null;
}
}
public bool IsSelectedFour;
public bool IsSelectedThree;
public bool IsSelectedTwo;
private void SelectedTwo(SelectedTwoModel selectedTwoModel)
{
if (this.ViewKey != NDIViewKeys.CAM_1) return;
IsSelectedTwo = selectedTwoModel.IsSelected;
//没有选中的时候，清除框
NDIView nDIView = this.GetView<NDIView>();
if (IsSelectedTwo)
{
nDIView.rectSelectedTwo = RectSelectedSavedTwo;
AddRects(nDIView, RectSelectedSavedTwo, Brushes.Orange);
}
else
{
var rect = nDIView.rectSelectedTwo;
if (rect.Width > 0)
{
Path tempPath = new Path();
foreach (UIElement uec in nDIView.canvas1.Children)
{
var path = uec as Path;
if (path?.Stroke == Brushes.Orange)
{
tempPath = path;
}
}
nDIView.canvas1.Children.Remove(tempPath);
nDIView.rectSelectedTwo = new Rect();
nDIView._currMarkPath = null;
}
_package = null;
}
}
public bool IsSelected;
private void Selected(SelectedModel selectedModel)
{
......@@ -261,10 +391,15 @@ namespace VIZ.FGOUT.Module
if (this.ViewKey != NDIViewKeys.CAM_1) return;
IsSelected = selectedModel.IsSelected;
//没有选中的时候，清除框
if (!IsSelected)
{
NDIView nDIView = this.GetView<NDIView>();
NDIView nDIView = this.GetView<NDIView>();
if (IsSelected)
{
nDIView.rectSelected = RectSelectedSaved;
AddRects(nDIView, nDIView.rectSelected, Brushes.Yellow);
}
else
{
var rect = nDIView.rectSelected;
if (rect.Width > 0)
{
......@@ -1628,18 +1763,41 @@ namespace VIZ.FGOUT.Module
polygon.Points = points;
}
private void AddRects(NDIView view, System.Windows.Rect points, Brush brush)
//private void AddRects(NDIView view, Rect points, Brush brush)
//{
// PathGeometry aa = new PathGeometry();
// aa.AddGeometry(new RectangleGeometry(points));
// var myPath = new Path
// {
// Fill = Brushes.Transparent,
// Stroke = Brushes.Red,
// StrokeThickness = 1,
// Data = aa
// };
// view.canvas1.Children.Add(myPath);
//}
public Path path1;
private void AddRects(NDIView view, Rect points, Brush brush)
{
PathGeometry aa = new PathGeometry();
aa.AddGeometry(new RectangleGeometry(points));
var myPath = new Path
//var myPath = new Path
//{
// Fill = Brushes.Transparent,
// Stroke = brush,
// StrokeThickness = 1,
// Data = aa
//};
//view.canvas1.Children.Add(myPath);
path1 = new Path
{
Fill = Brushes.Transparent,
Stroke = Brushes.Red,
Stroke = brush,
StrokeThickness = 1,
Data = aa
};
view.canvas1.Children.Add(myPath);
view.canvas1.Children.Add(path1);
}
/// <summary>
......@@ -2011,6 +2169,23 @@ namespace VIZ.FGOUT.Module
// foreach (var points in view.rectsReplay)
// AddRects(view, points, Brushes.Red);
//}
if (IsSelected)
{
AddRects(view, view.rectSelected, Brushes.Yellow);
}
else if (IsSelectedTwo)
{
AddRects(view, view.rectSelectedTwo, Brushes.Orange);
}
else if (IsSelectedThree)
{
AddRects(view, view.rectSelectedThree, Brushes.Cyan);
}
else if (IsSelectedFour)
{
AddRects(view, view.rectSelectedFour, Brushes.Pink);
}
}
/// <summary>
......
VIZ.FGOUT/VIZ.FGOUT.Module/SystemSetting/View/HotkeySettingPanelView.xaml
......@@ -35,7 +35,7 @@
<Grid Margin="45,60,40,0">
<Grid.RowDefinitions>
<RowDefinition Height="60" />
<RowDefinition Height="550" />
<RowDefinition Height="650" />
</Grid.RowDefinitions>
<!-- 算法裁切快捷键 -->
<!--<TextBlock
......@@ -65,6 +65,8 @@
<RowDefinition Height="50" />
<RowDefinition Height="50" />
<RowDefinition Height="50" />
<RowDefinition Height="50" />
<RowDefinition Height="50" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="120" />
......@@ -348,8 +350,56 @@
InputMethod.IsInputMethodEnabled="False"
Style="{StaticResource HotkeyBox_Setting}" />
<Button
<!-- 第一行算法参数 -->
<TextBlock
Grid.Row="9"
Grid.Column="0"
VerticalAlignment="Center"
FontSize="18"
Foreground="White"
Text="{DynamicResource FirstLine}" />
<fcommon:HotkeyBox
Grid.Row="9"
Grid.Column="1"
Height="30"
Margin="0,0,20,0"
Hotkey="{Binding Path=FirstLineCmd, Mode=TwoWay}"
Style="{StaticResource HotkeyBox_Setting}" />
<!-- 第二行算法参数 -->
<TextBlock
Grid.Row="9"
Grid.Column="2"
VerticalAlignment="Center"
FontSize="18"
Foreground="White"
Text="{DynamicResource SecondLine}" />
<fcommon:HotkeyBox
Grid.Row="9"
Grid.Column="3"
Height="30"
Margin="0,0,20,0"
Hotkey="{Binding Path=SecondLineCmd, Mode=TwoWay}"
Style="{StaticResource HotkeyBox_Setting}" />
<!-- 第三行算法参数 -->
<TextBlock
Grid.Row="10"
Grid.Column="0"
VerticalAlignment="Center"
FontSize="18"
Foreground="White"
Text="{DynamicResource ThirdLine}" />
<fcommon:HotkeyBox
Grid.Row="10"
Grid.Column="1"
Height="30"
Margin="0,0,20,0"
Hotkey="{Binding Path=ThirdLineCmd, Mode=TwoWay}"
Style="{StaticResource HotkeyBox_Setting}" />
<Button
Grid.Row="11"
Grid.Column="2"
Grid.ColumnSpan="2"
Width="105"
......@@ -362,7 +412,7 @@
<!-- 快左 -->
<TextBlock
Grid.Row="10"
Grid.Row="11"
Grid.Column="0"
VerticalAlignment="Center"
FontSize="18"
......@@ -370,7 +420,7 @@
Text="快左"
Visibility="Hidden" />
<fcommon:HotkeyBox
Grid.Row="10"
Grid.Row="11"
Grid.Column="1"
Height="30"
Margin="0,0,20,0"
......
VIZ.FGOUT/VIZ.FGOUT.Module/SystemSetting/ViewModel/HotkeySettingPanelViewModel.cs
......@@ -396,6 +396,66 @@ namespace VIZ.FGOUT.Module
#endregion
#region 第一行算法参数快捷键
private string _firstLineCmd;
/// <summary>
/// 第一行算法参数快捷键
/// </summary>
[HotkeyProperty]
public string FirstLineCmd
{
get { return _firstLineCmd; }
set
{
_firstLineCmd = value;
this.RaisePropertyChanged(nameof(FirstLineCmd));
this.CheckHotkey(nameof(FirstLineCmd), value);
}
}
#endregion
#region 第二行算法参数快捷键
private string _secondLineCmd;
/// <summary>
/// 第二行算法参数快捷键
/// </summary>
[HotkeyProperty]
public string SecondLineCmd
{
get { return _secondLineCmd; }
set
{
_secondLineCmd = value;
this.RaisePropertyChanged(nameof(SecondLineCmd));
this.CheckHotkey(nameof(SecondLineCmd), value);
}
}
#endregion
#region 第三行算法参数快捷键
private string _thridLineCmd;
/// <summary>
/// 第三行算法参数快捷键
/// </summary>
[HotkeyProperty]
public string ThirdLineCmd
{
get { return _thridLineCmd; }
set
{
_thridLineCmd = value;
this.RaisePropertyChanged(nameof(ThirdLineCmd));
this.CheckHotkey(nameof(ThirdLineCmd), value);
}
}
#endregion
#region 快左
private string _fastLeft;
......@@ -478,6 +538,9 @@ namespace VIZ.FGOUT.Module
this.DeleteCmd = this.HotkeyConfig.Delete;
this.FastLeftCmd = this.HotkeyConfig.FastLeft;
this.FastRightCmd = this.HotkeyConfig.FastRight;
this.FirstLineCmd = this.HotkeyConfig.FirstLine;
this.SecondLineCmd = this.HotkeyConfig.SecondLine;
this.ThirdLineCmd = this.HotkeyConfig.ThirdLine;
}
#endregion
......@@ -508,6 +571,9 @@ namespace VIZ.FGOUT.Module
this.DeleteCmd = "Delete";
this.FastLeftCmd = "Shift + Left";
this.FastRightCmd = "Shift + Right";
this.FirstLineCmd = "V";
this.SecondLineCmd = "B";
this.ThirdLineCmd = "N";
Save();
}
......@@ -580,6 +646,15 @@ namespace VIZ.FGOUT.Module
if(this.FastRightCmd != this.HotkeyConfig.FastRight)
return true;
if (this.FirstLineCmd != this.HotkeyConfig.FirstLine)
return true;
if (this.SecondLineCmd != this.HotkeyConfig.SecondLine)
return true;
if (this.ThirdLineCmd != this.HotkeyConfig.ThirdLine)
return true;
//// 算法裁切
//if (this.AutoCAM1 != this.HotkeyConfig.AutoCAM1)
// return true;
......@@ -656,6 +731,9 @@ namespace VIZ.FGOUT.Module
this.HotkeyConfig.Delete = DeleteCmd;
this.HotkeyConfig.FastLeft = FastLeftCmd;
this.HotkeyConfig.FastRight = FastRightCmd;
this.HotkeyConfig.FirstLine = FirstLineCmd;
this.HotkeyConfig.SecondLine = SecondLineCmd;
this.HotkeyConfig.ThirdLine = ThirdLineCmd;
// 更新配置
ApplicationDomainEx.LiteDbContext.HotkeyConfig.Upsert(this.HotkeyConfig);
......
VIZ.FGOUT/VIZ.FGOUT.Module/Themes/TextBoxEnterKeyUpdateLeftBehavior.cs 0 → 100644
using Microsoft.Xaml.Behaviors;
using System.Windows.Controls;
using System.Windows.Input;
namespace VIZ.FGOUT.Module
{
public class TextBoxEnterKeyUpdateLeftBehavior : 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.Left));
}
}
}
}
}
}
VIZ.FGOUT/VIZ.FGOUT.Module/Themes/TextBoxEnterKeyUpdateRightBehavior.cs 0 → 100644
using Microsoft.Xaml.Behaviors;
using System.Windows.Controls;
using System.Windows.Input;
namespace VIZ.FGOUT.Module
{
public class TextBoxEnterKeyUpdateRightBehavior : 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.Right));
}
}
}
}
}
}
VIZ.FGOUT/VIZ.FGOUT.Module/VIZ.FGOUT.Module.csproj
......@@ -273,6 +273,8 @@
<Compile Include="Themes\SliderArrange.xaml.cs">
<DependentUpon>SliderArrange.xaml</DependentUpon>
</Compile>
<Compile Include="Themes\TextBoxEnterKeyUpdateRightBehavior.cs" />
<Compile Include="Themes\TextBoxEnterKeyUpdateLeftBehavior.cs" />
<Compile Include="Themes\TextBoxEnterKeyUpdateUpBehavior.cs" />
<Compile Include="Themes\TextBoxEnterKeyUpdateDownBehavior.cs" />
<Compile Include="Themes\TextBoxEnterKeyUpdatePreBehavior.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}" "C6B73F41F42B841B0ADA3567D0417B42DCA6214070E5A8637741E4AD789E5067"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "483570659CA859114E4D1C106B3AFE246FBC36A99FDBE61864022E7AC88DA897"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 262 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 264 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton _AutoMode_;
......@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 325 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 327 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton _ManualMode_;
......@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1587 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1765 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1;
......@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1772 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1950 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2;
......@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1787 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1965 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3;
......@@ -140,7 +140,7 @@ namespace VIZ.FGOUT.Module {
case 2:
this._AutoMode_ = ((System.Windows.Controls.RadioButton)(target));
#line 267 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 269 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._AutoMode_.Click += new System.Windows.RoutedEventHandler(this.AutoMode_OnClick);
#line default
......@@ -149,7 +149,7 @@ namespace VIZ.FGOUT.Module {
case 3:
this._ManualMode_ = ((System.Windows.Controls.RadioButton)(target));
#line 329 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 331 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._ManualMode_.Click += new System.Windows.RoutedEventHandler(this.ManualMode_OnClick);
#line default
......@@ -157,7 +157,7 @@ namespace VIZ.FGOUT.Module {
return;
case 4:
#line 823 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 825 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
......@@ -165,7 +165,7 @@ namespace VIZ.FGOUT.Module {
return;
case 5:
#line 976 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 887 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
......@@ -173,7 +173,7 @@ namespace VIZ.FGOUT.Module {
return;
case 6:
#line 1013 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 924 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
......@@ -181,7 +181,7 @@ namespace VIZ.FGOUT.Module {
return;
case 7:
#line 1041 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 952 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
......@@ -189,7 +189,7 @@ namespace VIZ.FGOUT.Module {
return;
case 8:
#line 1194 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1031 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
......@@ -197,7 +197,7 @@ namespace VIZ.FGOUT.Module {
return;
case 9:
#line 1215 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1068 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
......@@ -205,19 +205,67 @@ namespace VIZ.FGOUT.Module {
return;
case 10:
#line 1236 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1096 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
#line hidden
return;
case 11:
this.cam1 = ((VIZ.FGOUT.Module.NDIView)(target));
#line 1136 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
#line hidden
return;
case 12:
this.cam2 = ((VIZ.FGOUT.Module.NDIView)(target));
#line 1173 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
#line hidden
return;
case 13:
#line 1201 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
#line hidden
return;
case 14:
#line 1335 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
#line hidden
return;
case 15:
#line 1356 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
#line hidden
return;
case 16:
#line 1377 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
#line hidden
return;
case 17:
this.cam1 = ((VIZ.FGOUT.Module.NDIView)(target));
return;
case 18:
this.cam2 = ((VIZ.FGOUT.Module.NDIView)(target));
return;
case 19:
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}" "C6B73F41F42B841B0ADA3567D0417B42DCA6214070E5A8637741E4AD789E5067"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "483570659CA859114E4D1C106B3AFE246FBC36A99FDBE61864022E7AC88DA897"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 262 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 264 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton _AutoMode_;
......@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 325 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 327 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton _ManualMode_;
......@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1587 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1765 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1;
......@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1772 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1950 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2;
......@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1787 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1965 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3;
......@@ -140,7 +140,7 @@ namespace VIZ.FGOUT.Module {
case 2:
this._AutoMode_ = ((System.Windows.Controls.RadioButton)(target));
#line 267 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 269 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._AutoMode_.Click += new System.Windows.RoutedEventHandler(this.AutoMode_OnClick);
#line default
......@@ -149,7 +149,7 @@ namespace VIZ.FGOUT.Module {
case 3:
this._ManualMode_ = ((System.Windows.Controls.RadioButton)(target));
#line 329 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 331 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._ManualMode_.Click += new System.Windows.RoutedEventHandler(this.ManualMode_OnClick);
#line default
......@@ -157,7 +157,7 @@ namespace VIZ.FGOUT.Module {
return;
case 4:
#line 823 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 825 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
......@@ -165,7 +165,7 @@ namespace VIZ.FGOUT.Module {
return;
case 5:
#line 976 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 887 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
......@@ -173,7 +173,7 @@ namespace VIZ.FGOUT.Module {
return;
case 6:
#line 1013 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 924 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
......@@ -181,7 +181,7 @@ namespace VIZ.FGOUT.Module {
return;
case 7:
#line 1041 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 952 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
......@@ -189,7 +189,7 @@ namespace VIZ.FGOUT.Module {
return;
case 8:
#line 1194 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1031 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
......@@ -197,7 +197,7 @@ namespace VIZ.FGOUT.Module {
return;
case 9:
#line 1215 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1068 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
......@@ -205,19 +205,67 @@ namespace VIZ.FGOUT.Module {
return;
case 10:
#line 1236 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1096 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
#line hidden
return;
case 11:
this.cam1 = ((VIZ.FGOUT.Module.NDIView)(target));
#line 1136 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
#line hidden
return;
case 12:
this.cam2 = ((VIZ.FGOUT.Module.NDIView)(target));
#line 1173 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
#line hidden
return;
case 13:
#line 1201 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
#line hidden
return;
case 14:
#line 1335 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
#line hidden
return;
case 15:
#line 1356 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
#line hidden
return;
case 16:
#line 1377 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default
#line hidden
return;
case 17:
this.cam1 = ((VIZ.FGOUT.Module.NDIView)(target));
return;
case 18:
this.cam2 = ((VIZ.FGOUT.Module.NDIView)(target));
return;
case 19:
this.cam3 = ((VIZ.FGOUT.Module.NDIView)(target));
return;
}
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/SystemSetting/View/HotkeySettingPanelView.g.cs
#pragma checksum "..\..\..\..\..\SystemSetting\View\HotkeySettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "725F92D6D061C34E0D64FEB5BF1DE93BA7C9ECCCB30D43D95378E39B4D0B13A5"
#pragma checksum "..\..\..\..\..\SystemSetting\View\HotkeySettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "199A2F0FC3CB3D88F6CDB5B79CD223269AE6BDDDE32BD9B383D11C4D9E09B1FB"
//------------------------------------------------------------------------------
// <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}" "725F92D6D061C34E0D64FEB5BF1DE93BA7C9ECCCB30D43D95378E39B4D0B13A5"
#pragma checksum "..\..\..\..\..\SystemSetting\View\HotkeySettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "199A2F0FC3CB3D88F6CDB5B79CD223269AE6BDDDE32BD9B383D11C4D9E09B1FB"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/VIZ.FGOUT.Module.csproj.CoreCompileInputs.cache
7028a22ce086f820cb5c8f70c19072a1b5b3b695c4adcb24a14c5206a54d086f
ff2619e730532a9c0a906123f3d3f02c373d4cbaca4907418a8f4a9cc385105c
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/VIZ.FGOUT.Module_MarkupCompile.cache
......@@ -12,7 +12,7 @@ DEBUG;TRACE
25-1434354873
4-699044453
100279871941
102565772642
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;
......
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\NDIPreviewView\View\NDIPreviewView.xaml;;
......
VIZ.FGOUT/VIZ.FGOUT.Storage/LiteDB/System/HotkeyConfig.cs
......@@ -72,5 +72,12 @@
public string FastLeft { get; set;} = "Shift + Left";
public string FastRight { get; set; } = "Shift + Right";
public string FirstLine { get; set; } = "V";
public string SecondLine { get; set; } = "B";
public string ThirdLine { get; set; } = "N";
}
}
VIZ.FGOUT/VIZ.FGOUT/Properties/AssemblyInfo.cs
......@@ -55,5 +55,5 @@ using System.Windows;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.28.0")]
[assembly: AssemblyFileVersion("1.0.28.0")]
[assembly: AssemblyVersion("1.0.37.0")]
[assembly: AssemblyFileVersion("1.0.37.0")]
VIZ.Framework/VIZ.Framework.Common/obj/x64/Release/VIZ.Framework.Common_MarkupCompile.lref
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\obj\x64\Release\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;;
......
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