Skip to content

V
VIZ.H2V
Commit 18eab6b0 by liulongfei
Options

错误标记热键，移除不必要的算法配置项

parent 4a171c48
Showing with 312 additions and 160 deletions
VIZ.H2V.Module/NDIMainView/Controller/Hotkey/HotkeyController.cs
...@@ -101,6 +101,10 @@ namespace VIZ.H2V.Module ...@@ -101,6 +101,10 @@ namespace VIZ.H2V.Module
// 窗口焦点 // 窗口焦点
if (this.ExecuteActive(hotkey)) if (this.ExecuteActive(hotkey))
return; return;
// 错误标记
if (this.ExecuteErrorTag(hotkey))
return;
} }
/// <summary> /// <summary>
...@@ -271,5 +275,44 @@ namespace VIZ.H2V.Module ...@@ -271,5 +275,44 @@ namespace VIZ.H2V.Module
return true; return true;
} }
/// <summary>
/// 处理错误标记
/// </summary>
/// <param name="hotkey">热键</param>
/// <returns>是否处理完成</returns>
private bool ExecuteErrorTag(string hotkey)
{
INDIViewService service = null;
if (string.Equals(this.Support.HotkeyConfig.ErrorTagCAM1, hotkey))
{
service = ApplicationDomainEx.ServiceManager.GetService<INDIViewService>(NDIViewKeys.CAM_1);
}
if (string.Equals(this.Support.HotkeyConfig.ErrorTagCAM2, hotkey))
{
service = ApplicationDomainEx.ServiceManager.GetService<INDIViewService>(NDIViewKeys.CAM_2);
}
if (string.Equals(this.Support.HotkeyConfig.ErrorTagCAM3, hotkey))
{
service = ApplicationDomainEx.ServiceManager.GetService<INDIViewService>(NDIViewKeys.CAM_3);
}
if (string.Equals(this.Support.HotkeyConfig.ErrorTagCAM4, hotkey))
{
service = ApplicationDomainEx.ServiceManager.GetService<INDIViewService>(NDIViewKeys.CAM_4);
}
if (string.Equals(this.Support.HotkeyConfig.ErrorTagActivedCAM, hotkey))
{
service = NDIViewModel.ActiveViewModel;
}
if (service == null)
return false;
// 发送错误标记
service.SendErrorTag();
return true;
}
} }
} }
VIZ.H2V.Module/NDISettingView/View/Algorithm/AlgorithmCablewayPanelView.xaml
...@@ -151,38 +151,6 @@ ...@@ -151,38 +151,6 @@
</ComboBox.ItemTemplate> </ComboBox.ItemTemplate>
</ComboBox> </ComboBox>
</Grid> </Grid>
<!-- 场景 -->
<Grid Grid.Row="7">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="380"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<TextBlock Text="边线场景" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="6"></TextBlock>
<ComboBox Grid.Column="1" Style="{StaticResource ComboBox_Setting}" Height="40"
ItemsSource="{Binding Path=BorderScences,Mode=OneWay}"
SelectedValue="{Binding Path=SelectedBorderScence,Mode=TwoWay}">
<ComboBox.ItemTemplate>
<DataTemplate>
<Grid Background="Transparent" IsHitTestVisible="False">
<TextBlock Text="{Binding DisplayName}" VerticalAlignment="Center" HorizontalAlignment="Left"
Grid.Column="3" Foreground="White" FontSize="14"></TextBlock>
</Grid>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
</Grid>
<!-- 手动校准半径 -->
<Grid Grid.Row="8">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="380"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<TextBlock Text="手动校准半径（像素）" Foreground="White" FontSize="18" VerticalAlignment="Center"></TextBlock>
<toolkit:DoubleUpDown Grid.Column="1" Minimum="200" Maximum="400" Increment="1" Height="40"
Value="{Binding Path=ManualCorrectionRadius,Mode=TwoWay}"></toolkit:DoubleUpDown>
</Grid>
</Grid> </Grid>
</Border> </Border>
</UserControl> </UserControl>
\ No newline at end of file
VIZ.H2V.Module/NDISettingView/View/Algorithm/AlgorithmNearPanelView.xaml
...@@ -151,38 +151,6 @@ ...@@ -151,38 +151,6 @@
</ComboBox.ItemTemplate> </ComboBox.ItemTemplate>
</ComboBox> </ComboBox>
</Grid> </Grid>
<!-- 场景 -->
<Grid Grid.Row="7">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="380"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<TextBlock Text="边线场景" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="6"></TextBlock>
<ComboBox Grid.Column="1" Style="{StaticResource ComboBox_Setting}" Height="40"
ItemsSource="{Binding Path=BorderScences,Mode=OneWay}"
SelectedValue="{Binding Path=SelectedBorderScence,Mode=TwoWay}">
<ComboBox.ItemTemplate>
<DataTemplate>
<Grid Background="Transparent" IsHitTestVisible="False">
<TextBlock Text="{Binding DisplayName}" VerticalAlignment="Center" HorizontalAlignment="Left"
Grid.Column="3" Foreground="White" FontSize="14"></TextBlock>
</Grid>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
</Grid>
<!-- 手动校准半径 -->
<Grid Grid.Row="8">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="380"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<TextBlock Text="手动校准半径（像素）" Foreground="White" FontSize="18" VerticalAlignment="Center"></TextBlock>
<toolkit:DoubleUpDown Grid.Column="1" Minimum="200" Maximum="400" Increment="1" Height="40"
Value="{Binding Path=ManualCorrectionRadius,Mode=TwoWay}"></toolkit:DoubleUpDown>
</Grid>
</Grid> </Grid>
</Border> </Border>
</UserControl> </UserControl>
VIZ.H2V.Module/NDISettingView/View/Algorithm/AlgorithmSixteenPanelView.xaml
...@@ -151,38 +151,6 @@ ...@@ -151,38 +151,6 @@
</ComboBox.ItemTemplate> </ComboBox.ItemTemplate>
</ComboBox> </ComboBox>
</Grid> </Grid>
<!-- 场景 -->
<Grid Grid.Row="7">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="380"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<TextBlock Text="边线场景" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="6"></TextBlock>
<ComboBox Grid.Column="1" Style="{StaticResource ComboBox_Setting}" Height="40"
ItemsSource="{Binding Path=BorderScences,Mode=OneWay}"
SelectedValue="{Binding Path=SelectedBorderScence,Mode=TwoWay}">
<ComboBox.ItemTemplate>
<DataTemplate>
<Grid Background="Transparent" IsHitTestVisible="False">
<TextBlock Text="{Binding DisplayName}" VerticalAlignment="Center" HorizontalAlignment="Left"
Grid.Column="3" Foreground="White" FontSize="14"></TextBlock>
</Grid>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
</Grid>
<!-- 手动校准半径 -->
<Grid Grid.Row="8">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="380"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<TextBlock Text="手动校准半径（像素）" Foreground="White" FontSize="18" VerticalAlignment="Center"></TextBlock>
<toolkit:DoubleUpDown Grid.Column="1" Minimum="200" Maximum="400" Increment="1" Height="40"
Value="{Binding Path=ManualCorrectionRadius,Mode=TwoWay}"></toolkit:DoubleUpDown>
</Grid>
</Grid> </Grid>
</Border> </Border>
</UserControl> </UserControl>
\ No newline at end of file
VIZ.H2V.Module/NDISettingView/View/Algorithm/AlgorithmTacticsPanelView.xaml
...@@ -151,38 +151,6 @@ ...@@ -151,38 +151,6 @@
</ComboBox.ItemTemplate> </ComboBox.ItemTemplate>
</ComboBox> </ComboBox>
</Grid> </Grid>
<!-- 场景 -->
<Grid Grid.Row="7">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="380"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<TextBlock Text="边线场景" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="6"></TextBlock>
<ComboBox Grid.Column="1" Style="{StaticResource ComboBox_Setting}" Height="40"
ItemsSource="{Binding Path=BorderScences,Mode=OneWay}"
SelectedValue="{Binding Path=SelectedBorderScence,Mode=TwoWay}">
<ComboBox.ItemTemplate>
<DataTemplate>
<Grid Background="Transparent" IsHitTestVisible="False">
<TextBlock Text="{Binding DisplayName}" VerticalAlignment="Center" HorizontalAlignment="Left"
Grid.Column="3" Foreground="White" FontSize="14"></TextBlock>
</Grid>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
</Grid>
<!-- 手动校准半径 -->
<Grid Grid.Row="8">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="380"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<TextBlock Text="手动校准半径（像素）" Foreground="White" FontSize="18" VerticalAlignment="Center"></TextBlock>
<toolkit:DoubleUpDown Grid.Column="1" Minimum="200" Maximum="400" Increment="1" Height="40"
Value="{Binding Path=ManualCorrectionRadius,Mode=TwoWay}"></toolkit:DoubleUpDown>
</Grid>
</Grid> </Grid>
</Border> </Border>
</UserControl> </UserControl>
\ No newline at end of file
VIZ.H2V.Module/NDIView/Service/INDIViewService.cs
...@@ -126,5 +126,10 @@ namespace VIZ.H2V.Module ...@@ -126,5 +126,10 @@ namespace VIZ.H2V.Module
/// </summary> /// </summary>
/// <param name="context">清理视频控件上下文</param> /// <param name="context">清理视频控件上下文</param>
void ClearVideoControl(ClearVideoControlContext context); void ClearVideoControl(ClearVideoControlContext context);
/// <summary>
/// 发送错误标记
/// </summary>
void SendErrorTag();
} }
} }
VIZ.H2V.Module/NDIView/VieweModel/NDIViewModel.Command.cs
...@@ -534,6 +534,17 @@ namespace VIZ.H2V.Module ...@@ -534,6 +534,17 @@ namespace VIZ.H2V.Module
box.Add((int)boxInfo.SrcRect.Bottom); box.Add((int)boxInfo.SrcRect.Bottom);
this.AlgorithmControllerDic[this.StrategyType].ErrorTag(box, renderInfo.Frame.TimeStamp); this.AlgorithmControllerDic[this.StrategyType].ErrorTag(box, renderInfo.Frame.TimeStamp);
//====================================================================
// CODE: SYSTEM_LOG | 记录日志
//====================================================================
// 记录日志： 算法错误标记 | [类型：{0}]，<坐标：({1},{2},{3},{4}), 时码: {5}>
string system_log = string.Format(SystemLogStringFormats.ALGORITHM_ERROR_TAG,
this.StrategyType.GetDescription(),
box[0], box[1], box[2], box[3],
renderInfo.Frame.TimeStamp);
ApplicationDomainEx.CsvContext.AppendSystemLog(this.ViewKey, this.DisplayName, system_log);
//====================================================================
} }
#endregion #endregion
......
VIZ.H2V.Module/NDIView/VieweModel/NDIViewModel.Message.cs
...@@ -59,6 +59,14 @@ namespace VIZ.H2V.Module ...@@ -59,6 +59,14 @@ namespace VIZ.H2V.Module
break; break;
} }
} }
//====================================================================
// CODE: SYSTEM_LOG | 记录日志
//====================================================================
// 记录日志： 算法初始化完成
string system_log = string.Format(SystemLogStringFormats.ALGORITHM_CHECKED_OK, this.StrategyType.GetDescription(), this.ViewKey);
ApplicationDomainEx.CsvContext.AppendSystemLog(this.ViewKey, this.DisplayName, system_log);
//====================================================================
} }
/// <summary> /// <summary>
......
VIZ.H2V.Module/NDIView/VieweModel/NDIViewModel.cs
...@@ -11,6 +11,7 @@ using VIZ.Framework.Common; ...@@ -11,6 +11,7 @@ using VIZ.Framework.Common;
using VIZ.Framework.Core; using VIZ.Framework.Core;
using VIZ.H2V.Domain; using VIZ.H2V.Domain;
using VIZ.H2V.Storage; using VIZ.H2V.Storage;
using Xceed.Wpf.Toolkit.Primitives;
namespace VIZ.H2V.Module namespace VIZ.H2V.Module
{ {
...@@ -381,6 +382,14 @@ namespace VIZ.H2V.Module ...@@ -381,6 +382,14 @@ namespace VIZ.H2V.Module
} }
/// <summary> /// <summary>
/// 发送错误标记
/// </summary>
public void SendErrorTag()
{
this.AlgorithmErrorTag();
}
/// <summary>
/// 加载 -- 更新模式属性 /// 加载 -- 更新模式属性
/// </summary> /// </summary>
private void UpdateModeProperty() private void UpdateModeProperty()
......
VIZ.H2V.Module/SystemSetting/View/HotkeySettingPanelView.xaml
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors" xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors"
d:DataContext="{d:DesignInstance Type=local:HotkeySettingPanelViewModel}" d:DataContext="{d:DesignInstance Type=local:HotkeySettingPanelViewModel}"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="800" d:DesignWidth="800"> d:DesignHeight="900" d:DesignWidth="800">
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
...@@ -26,23 +26,25 @@ ...@@ -26,23 +26,25 @@
<Border> <Border>
<Grid Margin="45,60,40,0"> <Grid Margin="45,60,40,0">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="60"></RowDefinition> <RowDefinition Height="50"></RowDefinition>
<RowDefinition Height="120"></RowDefinition> <RowDefinition Height="100"></RowDefinition>
<RowDefinition Height="60"></RowDefinition> <RowDefinition Height="50"></RowDefinition>
<RowDefinition Height="120"></RowDefinition> <RowDefinition Height="100"></RowDefinition>
<RowDefinition Height="60"></RowDefinition> <RowDefinition Height="50"></RowDefinition>
<RowDefinition Height="120"></RowDefinition> <RowDefinition Height="100"></RowDefinition>
<RowDefinition Height="60"></RowDefinition> <RowDefinition Height="50"></RowDefinition>
<RowDefinition Height="120"></RowDefinition> <RowDefinition Height="100"></RowDefinition>
<RowDefinition Height="50"></RowDefinition>
<RowDefinition Height="150"></RowDefinition>
<RowDefinition Height="*"></RowDefinition> <RowDefinition Height="*"></RowDefinition>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<!-- 算法裁切快捷键 --> <!-- 算法裁切快捷键 -->
<TextBlock Text="算法裁切快捷键" Foreground="White" FontSize="20" VerticalAlignment="Center"></TextBlock> <TextBlock Text="算法裁切快捷键" Foreground="#AAFFFFFF" FontSize="20" VerticalAlignment="Center"></TextBlock>
<Rectangle Height="1" VerticalAlignment="Bottom" Fill="#ff3d4758"></Rectangle> <Rectangle Height="1" VerticalAlignment="Bottom" Fill="#ff3d4758"></Rectangle>
<Grid Grid.Row="1"> <Grid Grid.Row="1">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="60"></RowDefinition> <RowDefinition Height="50"></RowDefinition>
<RowDefinition Height="60"></RowDefinition> <RowDefinition Height="50"></RowDefinition>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="120"></ColumnDefinition> <ColumnDefinition Width="120"></ColumnDefinition>
...@@ -69,12 +71,12 @@ ...@@ -69,12 +71,12 @@
</Grid> </Grid>
<!-- 居中裁切快捷键 --> <!-- 居中裁切快捷键 -->
<TextBlock Text="居中裁切快捷键" Foreground="White" FontSize="20" VerticalAlignment="Center" Grid.Row="2"></TextBlock> <TextBlock Text="居中裁切快捷键" Foreground="#AAFFFFFF" FontSize="20" VerticalAlignment="Center" Grid.Row="2"></TextBlock>
<Rectangle Grid.Row="2" VerticalAlignment="Bottom" Height="2" Fill="#ff364051"></Rectangle> <Rectangle Grid.Row="2" VerticalAlignment="Bottom" Height="2" Fill="#ff364051"></Rectangle>
<Grid Grid.Row="3"> <Grid Grid.Row="3">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="60"></RowDefinition> <RowDefinition Height="50"></RowDefinition>
<RowDefinition Height="60"></RowDefinition> <RowDefinition Height="50"></RowDefinition>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="120"></ColumnDefinition> <ColumnDefinition Width="120"></ColumnDefinition>
...@@ -101,12 +103,12 @@ ...@@ -101,12 +103,12 @@
</Grid> </Grid>
<!-- 手动裁切快捷键 --> <!-- 手动裁切快捷键 -->
<TextBlock Text="手动裁切快捷键" Foreground="White" FontSize="20" VerticalAlignment="Center" Grid.Row="4"></TextBlock> <TextBlock Text="手动裁切快捷键" Foreground="#AAFFFFFF" FontSize="20" VerticalAlignment="Center" Grid.Row="4"></TextBlock>
<Rectangle Grid.Row="4" VerticalAlignment="Bottom" Height="2" Fill="#ff364051"></Rectangle> <Rectangle Grid.Row="4" VerticalAlignment="Bottom" Height="2" Fill="#ff364051"></Rectangle>
<Grid Grid.Row="5"> <Grid Grid.Row="5">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="60"></RowDefinition> <RowDefinition Height="50"></RowDefinition>
<RowDefinition Height="60"></RowDefinition> <RowDefinition Height="50"></RowDefinition>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="120"></ColumnDefinition> <ColumnDefinition Width="120"></ColumnDefinition>
...@@ -133,12 +135,12 @@ ...@@ -133,12 +135,12 @@
</Grid> </Grid>
<!-- 窗口聚焦快捷键 --> <!-- 窗口聚焦快捷键 -->
<TextBlock Text="窗口聚焦快捷键" Foreground="White" FontSize="20" VerticalAlignment="Center" Grid.Row="6"></TextBlock> <TextBlock Text="窗口聚焦快捷键" Foreground="#AAFFFFFF" FontSize="20" VerticalAlignment="Center" Grid.Row="6"></TextBlock>
<Rectangle Grid.Row="6" VerticalAlignment="Bottom" Height="2" Fill="#ff364051"></Rectangle> <Rectangle Grid.Row="6" VerticalAlignment="Bottom" Height="2" Fill="#ff364051"></Rectangle>
<Grid Grid.Row="7"> <Grid Grid.Row="7">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="60"></RowDefinition> <RowDefinition Height="50"></RowDefinition>
<RowDefinition Height="60"></RowDefinition> <RowDefinition Height="50"></RowDefinition>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="120"></ColumnDefinition> <ColumnDefinition Width="120"></ColumnDefinition>
...@@ -163,6 +165,44 @@ ...@@ -163,6 +165,44 @@
<fcommon:HotkeyBox Grid.Column="3" Hotkey="{Binding Path=ActiveCAM4,Mode=TwoWay}" Height="30" Grid.Row="1" <fcommon:HotkeyBox Grid.Column="3" Hotkey="{Binding Path=ActiveCAM4,Mode=TwoWay}" Height="30" Grid.Row="1"
Style="{StaticResource HotkeyBox_Setting}" Margin="0,0,20,0"></fcommon:HotkeyBox> Style="{StaticResource HotkeyBox_Setting}" Margin="0,0,20,0"></fcommon:HotkeyBox>
</Grid> </Grid>
<!-- 标记误检快捷键 -->
<TextBlock Text="标记误检快捷键" Foreground="#AAFFFFFF" FontSize="20" VerticalAlignment="Center" Grid.Row="8"></TextBlock>
<Rectangle Grid.Row="8" VerticalAlignment="Bottom" Height="2" Fill="#ff364051"></Rectangle>
<Grid Grid.Row="9">
<Grid.RowDefinitions>
<RowDefinition Height="50"></RowDefinition>
<RowDefinition Height="50"></RowDefinition>
<RowDefinition Height="50"></RowDefinition>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="120"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
<ColumnDefinition Width="120"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<!-- CAM 1 -->
<TextBlock Text="CAM 1" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="0"></TextBlock>
<fcommon:HotkeyBox Grid.Column="1" Hotkey="{Binding Path=ErrorTagCAM1,Mode=TwoWay}" Height="30"
Style="{StaticResource HotkeyBox_Setting}" Margin="0,0,20,0"></fcommon:HotkeyBox>
<!-- CAM 2 -->
<TextBlock Text="CAM 2" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="0" Grid.Column="2"></TextBlock>
<fcommon:HotkeyBox Grid.Column="3" Hotkey="{Binding Path=ErrorTagCAM2,Mode=TwoWay}" Height="30" Grid.Row="0"
Style="{StaticResource HotkeyBox_Setting}" Margin="0,0,20,0"></fcommon:HotkeyBox>
<!-- CAM 3 -->
<TextBlock Text="CAM 3" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="1"></TextBlock>
<fcommon:HotkeyBox Grid.Column="1" Hotkey="{Binding Path=ErrorTagCAM3,Mode=TwoWay}" Height="30" Grid.Row="1"
Style="{StaticResource HotkeyBox_Setting}" Margin="0,0,20,0"></fcommon:HotkeyBox>
<!-- CAM 4 -->
<TextBlock Text="CAM 4" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="1" Grid.Column="2"></TextBlock>
<fcommon:HotkeyBox Grid.Column="3" Hotkey="{Binding Path=ErrorTagCAM4,Mode=TwoWay}" Height="30" Grid.Row="1"
Style="{StaticResource HotkeyBox_Setting}" Margin="0,0,20,0"></fcommon:HotkeyBox>
<!-- 当前激活窗口 -->
<TextBlock Text="当前激活窗口" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="2"></TextBlock>
<fcommon:HotkeyBox Grid.Column="1" Hotkey="{Binding Path=ErrorTagActivedCAM,Mode=TwoWay}" Height="30" Grid.Row="2"
Style="{StaticResource HotkeyBox_Setting}" Margin="0,0,20,0"></fcommon:HotkeyBox>
</Grid>
</Grid> </Grid>
</Border> </Border>
</UserControl> </UserControl>
\ No newline at end of file
VIZ.H2V.Module/SystemSetting/ViewModel/HotkeySettingPanelViewModel.cs
...@@ -43,7 +43,7 @@ namespace VIZ.H2V.Module ...@@ -43,7 +43,7 @@ namespace VIZ.H2V.Module
private string autoCAM1; private string autoCAM1;
/// <summary> /// <summary>
/// /算法模式 视图1 /// 算法模式 视图1
/// </summary> /// </summary>
[HotkeyProperty] [HotkeyProperty]
public string AutoCAM1 public string AutoCAM1
...@@ -376,6 +376,84 @@ namespace VIZ.H2V.Module ...@@ -376,6 +376,84 @@ namespace VIZ.H2V.Module
#endregion #endregion
// -----------------------------------------------------------------------
// 错误标记
#region ErrorTagCAM1 -- 错误标记 视图1
private string errorTagCAM1;
/// <summary>
/// 错误标记 视图1
/// </summary>
[HotkeyProperty]
public string ErrorTagCAM1
{
get { return errorTagCAM1; }
set { errorTagCAM1 = value; this.RaisePropertyChanged(nameof(ErrorTagCAM1)); }
}
#endregion
#region ErrorTagCAM2 -- 错误标记 视图2
private string errorTagCAM2;
/// <summary>
/// 错误标记 视图2
/// </summary>
[HotkeyProperty]
public string ErrorTagCAM2
{
get { return errorTagCAM2; }
set { errorTagCAM2 = value; this.RaisePropertyChanged(nameof(ErrorTagCAM2)); }
}
#endregion
#region ErrorTagCAM3 -- 错误标记 视图3
private string errorTagCAM3;
/// <summary>
/// 错误标记 视图3
/// </summary>
[HotkeyProperty]
public string ErrorTagCAM3
{
get { return errorTagCAM3; }
set { errorTagCAM3 = value; this.RaisePropertyChanged(nameof(ErrorTagCAM3)); }
}
#endregion
#region ErrorTagCAM4 -- 错误标记 视图4
private string errorTagCAM4;
/// <summary>
/// 错误标记 视图4
/// </summary>
[HotkeyProperty]
public string ErrorTagCAM4
{
get { return errorTagCAM4; }
set { errorTagCAM4 = value; this.RaisePropertyChanged(nameof(ErrorTagCAM4)); }
}
#endregion
#region ErrorTagActivedCAM -- 错误标记 当前激活的视图
private string errorTagActivedCAM;
/// <summary>
/// 错误标记 当前激活的视图
/// </summary>
[HotkeyProperty]
public string ErrorTagActivedCAM
{
get { return errorTagActivedCAM; }
set { errorTagActivedCAM = value; this.RaisePropertyChanged(nameof(ErrorTagActivedCAM)); }
}
#endregion
// ====================================================================================== // ======================================================================================
// === Commond === // === Commond ===
// ====================================================================================== // ======================================================================================
...@@ -397,25 +475,36 @@ namespace VIZ.H2V.Module ...@@ -397,25 +475,36 @@ namespace VIZ.H2V.Module
this.HotkeyConfig = ApplicationDomainEx.LiteDbContext.HotkeyConfig.FindAll().FirstOrDefault(); this.HotkeyConfig = ApplicationDomainEx.LiteDbContext.HotkeyConfig.FindAll().FirstOrDefault();
// 算法裁切
this.AutoCAM1 = this.HotkeyConfig.AutoCAM1; this.AutoCAM1 = this.HotkeyConfig.AutoCAM1;
this.AutoCAM2 = this.HotkeyConfig.AutoCAM2; this.AutoCAM2 = this.HotkeyConfig.AutoCAM2;
this.AutoCAM3 = this.HotkeyConfig.AutoCAM3; this.AutoCAM3 = this.HotkeyConfig.AutoCAM3;
this.AutoCAM4 = this.HotkeyConfig.AutoCAM4; this.AutoCAM4 = this.HotkeyConfig.AutoCAM4;
// 居中裁切
this.CenterCAM1 = this.HotkeyConfig.CenterCAM1; this.CenterCAM1 = this.HotkeyConfig.CenterCAM1;
this.CenterCAM2 = this.HotkeyConfig.CenterCAM2; this.CenterCAM2 = this.HotkeyConfig.CenterCAM2;
this.CenterCAM3 = this.HotkeyConfig.CenterCAM3; this.CenterCAM3 = this.HotkeyConfig.CenterCAM3;
this.CenterCAM4 = this.HotkeyConfig.CenterCAM4; this.CenterCAM4 = this.HotkeyConfig.CenterCAM4;
// 手动裁切
this.ManualCAM1 = this.HotkeyConfig.ManualCAM1; this.ManualCAM1 = this.HotkeyConfig.ManualCAM1;
this.ManualCAM2 = this.HotkeyConfig.ManualCAM2; this.ManualCAM2 = this.HotkeyConfig.ManualCAM2;
this.ManualCAM3 = this.HotkeyConfig.ManualCAM3; this.ManualCAM3 = this.HotkeyConfig.ManualCAM3;
this.ManualCAM4 = this.HotkeyConfig.ManualCAM4; this.ManualCAM4 = this.HotkeyConfig.ManualCAM4;
// 激活视图
this.ActiveCAM1 = this.HotkeyConfig.ActiveCAM1; this.ActiveCAM1 = this.HotkeyConfig.ActiveCAM1;
this.ActiveCAM2 = this.HotkeyConfig.ActiveCAM2; this.ActiveCAM2 = this.HotkeyConfig.ActiveCAM2;
this.ActiveCAM3 = this.HotkeyConfig.ActiveCAM3; this.ActiveCAM3 = this.HotkeyConfig.ActiveCAM3;
this.ActiveCAM4 = this.HotkeyConfig.ActiveCAM4; this.ActiveCAM4 = this.HotkeyConfig.ActiveCAM4;
// 错误标记
this.ErrorTagCAM1 = this.HotkeyConfig.ErrorTagCAM1;
this.ErrorTagCAM2 = this.HotkeyConfig.ErrorTagCAM2;
this.ErrorTagCAM3 = this.HotkeyConfig.ErrorTagCAM3;
this.ErrorTagCAM4 = this.HotkeyConfig.ErrorTagCAM4;
this.ErrorTagActivedCAM = this.HotkeyConfig.ErrorTagActivedCAM;
} }
#endregion #endregion
...@@ -426,6 +515,7 @@ namespace VIZ.H2V.Module ...@@ -426,6 +515,7 @@ namespace VIZ.H2V.Module
/// <returns>是否需要保存</returns> /// <returns>是否需要保存</returns>
public bool IsNeedSave() public bool IsNeedSave()
{ {
// 算法裁切
if (this.AutoCAM1 != this.HotkeyConfig.AutoCAM1) if (this.AutoCAM1 != this.HotkeyConfig.AutoCAM1)
return true; return true;
if (this.AutoCAM2 != this.HotkeyConfig.AutoCAM2) if (this.AutoCAM2 != this.HotkeyConfig.AutoCAM2)
...@@ -435,6 +525,7 @@ namespace VIZ.H2V.Module ...@@ -435,6 +525,7 @@ namespace VIZ.H2V.Module
if (this.AutoCAM4 != this.HotkeyConfig.AutoCAM4) if (this.AutoCAM4 != this.HotkeyConfig.AutoCAM4)
return true; return true;
// 居中裁切
if (this.CenterCAM1 != this.HotkeyConfig.CenterCAM1) if (this.CenterCAM1 != this.HotkeyConfig.CenterCAM1)
return true; return true;
if (this.CenterCAM2 != this.HotkeyConfig.CenterCAM2) if (this.CenterCAM2 != this.HotkeyConfig.CenterCAM2)
...@@ -444,6 +535,7 @@ namespace VIZ.H2V.Module ...@@ -444,6 +535,7 @@ namespace VIZ.H2V.Module
if (this.CenterCAM4 != this.HotkeyConfig.CenterCAM4) if (this.CenterCAM4 != this.HotkeyConfig.CenterCAM4)
return true; return true;
// 手动裁切
if (this.ManualCAM1 != this.HotkeyConfig.ManualCAM1) if (this.ManualCAM1 != this.HotkeyConfig.ManualCAM1)
return true; return true;
if (this.ManualCAM2 != this.HotkeyConfig.ManualCAM2) if (this.ManualCAM2 != this.HotkeyConfig.ManualCAM2)
...@@ -453,6 +545,7 @@ namespace VIZ.H2V.Module ...@@ -453,6 +545,7 @@ namespace VIZ.H2V.Module
if (this.ManualCAM4 != this.HotkeyConfig.ManualCAM4) if (this.ManualCAM4 != this.HotkeyConfig.ManualCAM4)
return true; return true;
// 激活视图
if (this.ActiveCAM1 != this.HotkeyConfig.ActiveCAM1) if (this.ActiveCAM1 != this.HotkeyConfig.ActiveCAM1)
return true; return true;
if (this.ActiveCAM2 != this.HotkeyConfig.ActiveCAM2) if (this.ActiveCAM2 != this.HotkeyConfig.ActiveCAM2)
...@@ -462,6 +555,19 @@ namespace VIZ.H2V.Module ...@@ -462,6 +555,19 @@ namespace VIZ.H2V.Module
if (this.ActiveCAM4 != this.HotkeyConfig.ActiveCAM4) if (this.ActiveCAM4 != this.HotkeyConfig.ActiveCAM4)
return true; return true;
// 错误标记
if (this.ErrorTagCAM1 != this.HotkeyConfig.ErrorTagCAM1)
return true;
if (this.ErrorTagCAM2 != this.HotkeyConfig.ErrorTagCAM2)
return true;
if (this.ErrorTagCAM3 != this.HotkeyConfig.ErrorTagCAM3)
return true;
if (this.ErrorTagCAM4 != this.HotkeyConfig.ErrorTagCAM4)
return true;
if (this.ErrorTagActivedCAM != this.HotkeyConfig.ErrorTagActivedCAM)
return true;
// 不需要保存
return false; return false;
} }
...@@ -471,26 +577,38 @@ namespace VIZ.H2V.Module ...@@ -471,26 +577,38 @@ namespace VIZ.H2V.Module
/// <returns>是否成功保存</returns> /// <returns>是否成功保存</returns>
public bool Save() public bool Save()
{ {
// 算法裁切
this.HotkeyConfig.AutoCAM1 = this.AutoCAM1; this.HotkeyConfig.AutoCAM1 = this.AutoCAM1;
this.HotkeyConfig.AutoCAM2 = this.AutoCAM2; this.HotkeyConfig.AutoCAM2 = this.AutoCAM2;
this.HotkeyConfig.AutoCAM3 = this.AutoCAM3; this.HotkeyConfig.AutoCAM3 = this.AutoCAM3;
this.HotkeyConfig.AutoCAM4 = this.AutoCAM4; this.HotkeyConfig.AutoCAM4 = this.AutoCAM4;
// 居中裁切
this.HotkeyConfig.CenterCAM1 = this.CenterCAM1; this.HotkeyConfig.CenterCAM1 = this.CenterCAM1;
this.HotkeyConfig.CenterCAM2 = this.CenterCAM2; this.HotkeyConfig.CenterCAM2 = this.CenterCAM2;
this.HotkeyConfig.CenterCAM3 = this.CenterCAM3; this.HotkeyConfig.CenterCAM3 = this.CenterCAM3;
this.HotkeyConfig.CenterCAM4 = this.CenterCAM4; this.HotkeyConfig.CenterCAM4 = this.CenterCAM4;
// 手动裁切
this.HotkeyConfig.ManualCAM1 = this.ManualCAM1; this.HotkeyConfig.ManualCAM1 = this.ManualCAM1;
this.HotkeyConfig.ManualCAM2 = this.ManualCAM2; this.HotkeyConfig.ManualCAM2 = this.ManualCAM2;
this.HotkeyConfig.ManualCAM3 = this.ManualCAM3; this.HotkeyConfig.ManualCAM3 = this.ManualCAM3;
this.HotkeyConfig.ManualCAM4 = this.ManualCAM4; this.HotkeyConfig.ManualCAM4 = this.ManualCAM4;
// 激活视图
this.HotkeyConfig.ActiveCAM1 = this.ActiveCAM1; this.HotkeyConfig.ActiveCAM1 = this.ActiveCAM1;
this.HotkeyConfig.ActiveCAM2 = this.ActiveCAM2; this.HotkeyConfig.ActiveCAM2 = this.ActiveCAM2;
this.HotkeyConfig.ActiveCAM3 = this.ActiveCAM3; this.HotkeyConfig.ActiveCAM3 = this.ActiveCAM3;
this.HotkeyConfig.ActiveCAM4 = this.ActiveCAM4; this.HotkeyConfig.ActiveCAM4 = this.ActiveCAM4;
// 错误标记
this.HotkeyConfig.ErrorTagCAM1 = this.ErrorTagCAM1;
this.HotkeyConfig.ErrorTagCAM2 = this.ErrorTagCAM2;
this.HotkeyConfig.ErrorTagCAM3 = this.ErrorTagCAM3;
this.HotkeyConfig.ErrorTagCAM4 = this.ErrorTagCAM4;
this.HotkeyConfig.ErrorTagActivedCAM = this.ErrorTagActivedCAM;
// 更新配置
ApplicationDomainEx.LiteDbContext.HotkeyConfig.Upsert(this.HotkeyConfig); ApplicationDomainEx.LiteDbContext.HotkeyConfig.Upsert(this.HotkeyConfig);
INDIMainViewService service = ApplicationDomainEx.ServiceManager.GetService<INDIMainViewService>(NDIViewKeys.MainView); INDIMainViewService service = ApplicationDomainEx.ServiceManager.GetService<INDIMainViewService>(NDIViewKeys.MainView);
......
VIZ.H2V.Storage/CSV/CsvContext.cs
...@@ -8,6 +8,7 @@ using System.Text; ...@@ -8,6 +8,7 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using CsvHelper; using CsvHelper;
using CsvHelper.Configuration; using CsvHelper.Configuration;
using log4net;
using VIZ.Framework.Core; using VIZ.Framework.Core;
using VIZ.Framework.Storage; using VIZ.Framework.Storage;
...@@ -19,6 +20,11 @@ namespace VIZ.H2V.Storage ...@@ -19,6 +20,11 @@ namespace VIZ.H2V.Storage
public class CsvContext public class CsvContext
{ {
/// <summary> /// <summary>
/// 日志
/// </summary>
private readonly static ILog log = LogManager.GetLogger(typeof(CsvContext));
/// <summary>
/// 算法信息 /// 算法信息
/// </summary> /// </summary>
[Csv(Scene = CsvScene.Read)] [Csv(Scene = CsvScene.Read)]
...@@ -213,15 +219,22 @@ namespace VIZ.H2V.Storage ...@@ -213,15 +219,22 @@ namespace VIZ.H2V.Storage
/// <param name="operation">操作内容</param> /// <param name="operation">操作内容</param>
public void AppendSystemLog(string viewKey, string displayName, string operation) public void AppendSystemLog(string viewKey, string displayName, string operation)
{ {
SystemLog log = new SystemLog(); try
log.ViewKey = viewKey; {
log.DisplayName = displayName; SystemLog log = new SystemLog();
log.Operation = operation; log.ViewKey = viewKey;
log.DateTime = DateTime.Now; log.DisplayName = displayName;
log.Operation = operation;
log.DateTime = DateTime.Now;
lock (SystemLogs) lock (SystemLogs)
{
SystemLogs.Enqueue(log);
}
}
catch (Exception ex)
{ {
SystemLogs.Enqueue(log); log.Error(ex);
} }
} }
......
VIZ.H2V.Storage/CSV/Log/SystemLogStringFormats.cs
...@@ -52,8 +52,18 @@ namespace VIZ.H2V.Storage ...@@ -52,8 +52,18 @@ namespace VIZ.H2V.Storage
public const string ALGORITHM_PROCESS_LOST = "算法进程消失, [类型：{0}]"; public const string ALGORITHM_PROCESS_LOST = "算法进程消失, [类型：{0}]";
/// <summary> /// <summary>
/// 算法初始化完成
/// </summary>
public const string ALGORITHM_CHECKED_OK = "算法初始化完成, [类型：{0}] [视图: {1}]";
/// <summary>
/// 算法切换模式 /// 算法切换模式
/// </summary> /// </summary>
public const string ALGORITHM_CHANGE_MODE = "算法切换模式：[类型：{0}], <模式：{1}>"; public const string ALGORITHM_CHANGE_MODE = "算法切换模式：[类型：{0}], <模式：{1}>";
/// <summary>
/// 算法错误标记
/// </summary>
public const string ALGORITHM_ERROR_TAG = "算法错误标记，[类型：{0}]，<坐标：({1},{2},{3},{4}), 时码: {5}>";
} }
} }
VIZ.H2V.Storage/LiteDB/System/HotkeyConfig.cs
...@@ -96,5 +96,30 @@ namespace VIZ.H2V.Storage ...@@ -96,5 +96,30 @@ namespace VIZ.H2V.Storage
/// 窗口聚焦 视图4 /// 窗口聚焦 视图4
/// </summary> /// </summary>
public string ActiveCAM4 { get; set; } = "F4"; public string ActiveCAM4 { get; set; } = "F4";
/// <summary>
/// 错误标记 视图1
/// </summary>
public string ErrorTagCAM1 { get; set; } = "Ctrl + D1";
/// <summary>
/// 错误标记 视图2
/// </summary>
public string ErrorTagCAM2 { get; set; } = "Ctrl + D2";
/// <summary>
/// 错误标记 视图3
/// </summary>
public string ErrorTagCAM3 { get; set; } = "Ctrl + D3";
/// <summary>
/// 错误标记 视图4
/// </summary>
public string ErrorTagCAM4 { get; set; } = "Ctrl + D4";
/// <summary>
/// 错误标记 当前激活的视图
/// </summary>
public string ErrorTagActivedCAM { get; set; } = "Q";
} }
} }
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