Skip to content

V
VIZ.H2V
Commit fc93396b by liulongfei
Options

1. 居中模式触碰摇杆切换至手动模式 

2. 样式修改
3. 添加是否显示或隐藏目标跟踪框选项
4. 添加手动非聚焦窗口裁切框颜色配置
parent d673cc62
Showing with 224 additions and 52 deletions
VIZ.H2V.Module.Resource/Style/CheckBox/CheckBox_WindowTop.xaml 0 → 100644
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Style x:Key="CheckBox_Eye" TargetType="CheckBox">
<Setter Property="FocusVisualStyle" Value="{x:Null}"></Setter>
<Setter Property="Width" Value="50"></Setter>
<Setter Property="Height" Value="40"></Setter>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="CheckBox">
<Grid x:Name="bd" SnapsToDevicePixels="True" Background="Transparent" >
<Image x:Name="img_hide" Width="24" Height="24" VerticalAlignment="Center" HorizontalAlignment="Center"
Source="/VIZ.H2V.Module.Resource;component/Icons/eye_hide_24x24.png" Visibility="Visible"></Image>
<Image x:Name="img_show" Width="24" Height="24" VerticalAlignment="Center" HorizontalAlignment="Center"
Source="/VIZ.H2V.Module.Resource;component/Icons/eye_show_24x24.png" Visibility="Hidden"></Image>
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsChecked" Value="True">
<Setter TargetName="img_hide" Property="Visibility" Value="Hidden"></Setter>
<Setter TargetName="img_show" Property="Visibility" Value="Visible"></Setter>
</Trigger>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="bd" Property="Background" Value="#22ffffff"></Setter>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</ResourceDictionary>
\ No newline at end of file
VIZ.H2V.Module.Resource/Style/RadioButton/RadioButton_NdiView.xaml
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
<Setter Property="FocusVisualStyle" Value="{x:Null}"></Setter> <Setter Property="FocusVisualStyle" Value="{x:Null}"></Setter>
<Setter Property="Foreground" Value="White"></Setter> <Setter Property="Foreground" Value="White"></Setter>
<Setter Property="BorderBrush" Value="White"></Setter> <Setter Property="BorderBrush" Value="White"></Setter>
<Setter Property="BorderThickness" Value="4"></Setter> <Setter Property="BorderThickness" Value="8"></Setter>
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="RadioButton"> <ControlTemplate TargetType="RadioButton">
......
VIZ.H2V.Module.Resource/VIZ.H2V.Module.Resource.csproj
...@@ -93,6 +93,10 @@ ...@@ -93,6 +93,10 @@
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="Style\CheckBox\CheckBox_WindowTop.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Style\CheckBox\CheckBox_Setting.xaml"> <Page Include="Style\CheckBox\CheckBox_Setting.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType> <SubType>Designer</SubType>
...@@ -246,5 +250,12 @@ ...@@ -246,5 +250,12 @@
<ItemGroup> <ItemGroup>
<Resource Include="Icons\status_yellow_25x22.png" /> <Resource Include="Icons\status_yellow_25x22.png" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Resource Include="Icons\eye_hide_24x24.png" />
<Resource Include="Icons\eye_show_24x24.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Icons\touch_32x32.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project> </Project>
\ No newline at end of file
VIZ.H2V.Module/NDIMainView/Controller/Navigation3DCheck/Navigation3DCheckController.cs
...@@ -110,8 +110,8 @@ namespace VIZ.H2V.Module ...@@ -110,8 +110,8 @@ namespace VIZ.H2V.Module
// 当前激活的视图 // 当前激活的视图
INDIViewService service = services.FirstOrDefault(p => p.IsActive); INDIViewService service = services.FirstOrDefault(p => p.IsActive);
// 如果当前模式不处于算法模式，那么不处理 // 仅处理 算法模式 or 居中模式 -> 手动模式
if (service.StrategyMode != AlgorithmStrategyMode.auto_mode) if (service.StrategyMode == AlgorithmStrategyMode.manual_mode)
return; return;
// 如果当前状态不处于裁切状态或，检测状态那么不处理 // 如果当前状态不处于裁切状态或，检测状态那么不处理
......
VIZ.H2V.Module/NDIMainView/View/NDIMainView.xaml
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/Button/Button_WindowTop.xaml"></ResourceDictionary> <ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/Button/Button_WindowTop.xaml"></ResourceDictionary>
<ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/CheckBox/CheckBox_WindowTop.xaml"></ResourceDictionary>
<ResourceDictionary Source="/VIZ.Framework.Common.Resource;component/Style/Button/Button_WindowTop.xaml"></ResourceDictionary> <ResourceDictionary Source="/VIZ.Framework.Common.Resource;component/Style/Button/Button_WindowTop.xaml"></ResourceDictionary>
<ResourceDictionary Source="/VIZ.Framework.Common.Resource;component/Style/ListBox/ListBox_None.xaml"></ResourceDictionary> <ResourceDictionary Source="/VIZ.Framework.Common.Resource;component/Style/ListBox/ListBox_None.xaml"></ResourceDictionary>
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
...@@ -46,6 +47,9 @@ ...@@ -46,6 +47,9 @@
<Grid Background="#ff12202d"> <Grid Background="#ff12202d">
<TextBlock Text="横转竖智能裁切系统" FontSize="12" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"></TextBlock> <TextBlock Text="横转竖智能裁切系统" FontSize="12" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"></TextBlock>
<StackPanel Orientation="Horizontal" Grid.Column="2" HorizontalAlignment="Right" VerticalAlignment="Top"> <StackPanel Orientation="Horizontal" Grid.Column="2" HorizontalAlignment="Right" VerticalAlignment="Top">
<CheckBox Height="30" Style="{StaticResource ResourceKey=CheckBox_Eye}"
IsChecked="{Binding Path=IsShowAlgorithmTargetBox,Mode=TwoWay}"></CheckBox>
<Rectangle Width="2" Fill="#EEFFFFFF" Height="18" Margin="20,0,20,0"></Rectangle>
<Button Command="{Binding Path=InitTallyCommand}" ToolTip="初始Tally" <Button Command="{Binding Path=InitTallyCommand}" ToolTip="初始Tally"
Style="{StaticResource Button_Tally}" Height="30"></Button> Style="{StaticResource Button_Tally}" Height="30"></Button>
<Button Command="{Binding Path=InitNavigation3DCommand}" ToolTip="初始化摇杆" <Button Command="{Binding Path=InitNavigation3DCommand}" ToolTip="初始化摇杆"
......
VIZ.H2V.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
...@@ -207,6 +207,40 @@ namespace VIZ.H2V.Module ...@@ -207,6 +207,40 @@ namespace VIZ.H2V.Module
#endregion #endregion
#region IsShowAlgorithmTargetBox -- 是否显示算法目标框
private bool isShowAlgorithmTargetBox;
/// <summary>
/// 是否显示算法目标框
/// </summary>
public bool IsShowAlgorithmTargetBox
{
get { return isShowAlgorithmTargetBox; }
set
{
isShowAlgorithmTargetBox = value;
this.RaisePropertyChanged(nameof(IsShowAlgorithmTargetBox));
this.UpdateIsShowAlgorithmTargetBox();
}
}
/// <summary>
/// 更新是否显示算法目标框
/// </summary>
private void UpdateIsShowAlgorithmTargetBox()
{
// 更新配置
SystemConfig config = ApplicationDomainEx.LiteDbContext.SystemConfig.FindAll().FirstOrDefault();
config.IsShowAlgorithmTargetBox = this.IsShowAlgorithmTargetBox;
ApplicationDomainEx.LiteDbContext.SystemConfig.Update(config);
// 更新至每个视图
List<INDIViewService> services = ApplicationDomainEx.ServiceManager.GetServiceList<INDIViewService>();
services.ForEach(p => p.UpdateIsShowAlgorithmTargetBox(this.IsShowAlgorithmTargetBox));
}
#endregion
// ====================================================================================== // ======================================================================================
// === Command === // === Command ===
// ====================================================================================== // ======================================================================================
...@@ -228,6 +262,9 @@ namespace VIZ.H2V.Module ...@@ -228,6 +262,9 @@ namespace VIZ.H2V.Module
// 开始初始化服务状态 // 开始初始化服务状态
this.BeginInitServiceStatus(); this.BeginInitServiceStatus();
// 初始化系统配置
this.InitSystemConfig();
} }
#endregion #endregion
...@@ -503,5 +540,18 @@ namespace VIZ.H2V.Module ...@@ -503,5 +540,18 @@ namespace VIZ.H2V.Module
{ {
this.ClipStatusMinFps = this.NDIViewServices.Min(p => p.ClipFPS.FPS); this.ClipStatusMinFps = this.NDIViewServices.Min(p => p.ClipFPS.FPS);
} }
/// <summary>
/// 初始化系统设置
/// </summary>
private void InitSystemConfig()
{
SystemConfig config = ApplicationDomainEx.LiteDbContext.SystemConfig.FindAll().FirstOrDefault();
if (config == null)
return;
this.isShowAlgorithmTargetBox = config.IsShowAlgorithmTargetBox;
this.RaisePropertyChanged(nameof(IsShowAlgorithmTargetBox));
}
} }
} }
VIZ.H2V.Module/NDIView/Service/INDIViewService.cs
...@@ -111,6 +111,12 @@ namespace VIZ.H2V.Module ...@@ -111,6 +111,12 @@ namespace VIZ.H2V.Module
void UpdateTallyConfig(GPIOModel gpioModel); void UpdateTallyConfig(GPIOModel gpioModel);
/// <summary> /// <summary>
/// 更新是否显示算法目标框
/// </summary>
/// <param name="isShow">是否显示</param>
void UpdateIsShowAlgorithmTargetBox(bool isShow);
/// <summary>
/// 停止算法 /// 停止算法
/// </summary> /// </summary>
void StopAlgorithm(); void StopAlgorithm();
......
VIZ.H2V.Module/NDIView/View/NDIView.xaml
...@@ -138,9 +138,12 @@ ...@@ -138,9 +138,12 @@
<RowDefinition Height="180"></RowDefinition> <RowDefinition Height="180"></RowDefinition>
<RowDefinition Height="60"></RowDefinition> <RowDefinition Height="60"></RowDefinition>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<!-- ************************************************************ -->
<!-- 该参无意义，暂时注释 -->
<!--<CheckBox FontSize="16" Content="裁切策略：" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center" <!--<CheckBox FontSize="16" Content="裁切策略：" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"
IsChecked="{Binding Path=IsUseClip,Mode=TwoWay}" IsChecked="{Binding Path=IsUseClip,Mode=TwoWay}"
Style="{StaticResource CheckBox_NdiView}"></CheckBox>--> Style="{StaticResource CheckBox_NdiView}"></CheckBox>-->
<!-- ************************************************************ -->
<Rectangle Grid.Row="1" Grid.RowSpan="10" Fill="#ff181d2b"></Rectangle> <Rectangle Grid.Row="1" Grid.RowSpan="10" Fill="#ff181d2b"></Rectangle>
<Border Grid.Row="1" IsEnabled="{Binding IsUseClip,Mode=OneWay}"> <Border Grid.Row="1" IsEnabled="{Binding IsUseClip,Mode=OneWay}">
<Grid> <Grid>
...@@ -149,22 +152,20 @@ ...@@ -149,22 +152,20 @@
<RowDefinition Height="60"></RowDefinition> <RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="60"></RowDefinition> <RowDefinition Height="60"></RowDefinition>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<RadioButton FontSize="16" Foreground="White" <RadioButton Content="A" FontSize="16" Foreground="White"
ToolTip="{Binding Path=StrategyDisplayName,Mode=OneWay}" ToolTip="A" Grid.Row="0"
Style="{StaticResource RadioButton_NdiView}" Style="{StaticResource RadioButton_NdiView}"
IsChecked="{Binding IsAutoModeChecked,Mode=TwoWay}"> IsChecked="{Binding IsAutoModeChecked,Mode=TwoWay}">
<TextBlock Text="{Binding Path=StrategyDisplayName,Mode=OneWay}" Margin="0,0,10,0" TextWrapping="NoWrap"
TextTrimming="CharacterEllipsis"></TextBlock>
</RadioButton> </RadioButton>
<RadioButton Content="居中" FontSize="16" Foreground="White" <RadioButton Content="M" FontSize="16" Foreground="White"
ToolTip="居中" Grid.Row="1" ToolTip="M" Grid.Row="1"
Style="{StaticResource RadioButton_NdiView}" Style="{StaticResource RadioButton_NdiView}"
IsChecked="{Binding IsCenterModeChecked,Mode=TwoWay}"> IsChecked="{Binding IsCenterModeChecked,Mode=TwoWay}">
</RadioButton> </RadioButton>
<RadioButton Content="手动" FontSize="16" Foreground="White" <RadioButton Content="H" FontSize="16" Foreground="White"
ToolTip="手动" Grid.Row="2" ToolTip="H" Grid.Row="2"
IsChecked="{Binding Path=IsManualModeChecked,Mode=TwoWay}" IsChecked="{Binding Path=IsManualModeChecked,Mode=TwoWay}"
Style="{StaticResource RadioButton_NdiView}"> Style="{StaticResource RadioButton_NdiView}">
</RadioButton> </RadioButton>
</Grid> </Grid>
</Border> </Border>
...@@ -173,7 +174,7 @@ ...@@ -173,7 +174,7 @@
<!-- 机位对应特殊面板区域 --> <!-- 机位对应特殊面板区域 -->
<Grid Grid.Row="1"> <Grid Grid.Row="1">
<!-- 单人机位 ===== 目标检测按钮 --> <!-- 单人机位 ===== 目标检测按钮 -->
<Button Content="选择目标" Grid.Row="1" VerticalAlignment="Bottom" Style="{StaticResource Button_Setting}" <Button Grid.Row="1" VerticalAlignment="Bottom" Style="{StaticResource Button_Setting}"
Height="40" Width="120" HorizontalAlignment="Right" Margin="0,0,10,0" Height="40" Width="120" HorizontalAlignment="Right" Margin="0,0,10,0"
Command="{Binding Path=DetectCommand}"> Command="{Binding Path=DetectCommand}">
<Button.IsEnabled> <Button.IsEnabled>
...@@ -190,6 +191,10 @@ ...@@ -190,6 +191,10 @@
<Binding Path="StrategyType"></Binding> <Binding Path="StrategyType"></Binding>
</MultiBinding> </MultiBinding>
</Button.Visibility> </Button.Visibility>
<Button.Content>
<Image Width="24" Height="24" HorizontalAlignment="Center" VerticalAlignment="Center"
Source="/VIZ.H2V.Module.Resource;component/Icons/touch_32x32.png"></Image>
</Button.Content>
</Button> </Button>
</Grid> </Grid>
<!-- 视频区域 --> <!-- 视频区域 -->
...@@ -298,15 +303,6 @@ ...@@ -298,15 +303,6 @@
<!-- AI功能区 --> <!-- AI功能区 -->
<StackPanel Orientation="Vertical" VerticalAlignment="Bottom" Grid.Row="1"> <StackPanel Orientation="Vertical" VerticalAlignment="Bottom" Grid.Row="1">
<!-- 错误标记 -->
<!--<Border Margin="0,10,0,8">
<Button Width="32" Height="32"
Style="{StaticResource Button_Function}"
IsEnabled="{Binding Path=ViewStatus,Converter={StaticResource NDIViewStatus2IsEnabledConverter_SettingButton}}"
Command="{Binding AlgorithmErrorTagCommand}">
<Image Width="24" Height="24" Source="/VIZ.H2V.Module.Resource;component/Icons/ai_close_24x24.png"></Image>
</Button>
</Border>-->
<!-- 重启算法 --> <!-- 重启算法 -->
<Border Margin="0,10,0,0" ToolTip="重启算法" Background="Transparent"> <Border Margin="0,10,0,0" ToolTip="重启算法" Background="Transparent">
<Button Width="32" Height="32" <Button Width="32" Height="32"
......
VIZ.H2V.Module/NDIView/VieweModel/NDIViewModel.Manual_NDI.cs
...@@ -91,7 +91,14 @@ namespace VIZ.H2V.Module ...@@ -91,7 +91,14 @@ namespace VIZ.H2V.Module
ClipBoxInfo clipBox = new ClipBoxInfo(); ClipBoxInfo clipBox = new ClipBoxInfo();
clipBox.DrawingBorderWidth = this.CLIP_BOX_BORDER_WIDTH; clipBox.DrawingBorderWidth = this.CLIP_BOX_BORDER_WIDTH;
clipBox.SrcRect = new RawRectangleF((float)(this.ClipBoxX), 0, (float)(this.ClipBoxX) + (float)this.CLIP_BOX_WIDTH, renderInfo.Frame.Height); clipBox.SrcRect = new RawRectangleF((float)(this.ClipBoxX), 0, (float)(this.ClipBoxX) + (float)this.CLIP_BOX_WIDTH, renderInfo.Frame.Height);
clipBox.DrawingBorderColor = (this.StrategyMode == AlgorithmStrategyMode.manual_mode && this.IsActive) ? this.ClipBoxStrokeColor_Manual : this.ClipBoxStrokeColor_Normal; if (this.StrategyMode == AlgorithmStrategyMode.manual_mode)
{
clipBox.DrawingBorderColor = this.IsActive ? this.ClipBoxStrokeColor_Manual : this.ClipBoxStrokeColor_ManualNotfoucs;
}
else
{
clipBox.DrawingBorderColor = ClipBoxStrokeColor_Normal;
}
clipBox.MaskColor = this.CLIP_BOX_MASK_COLOR; clipBox.MaskColor = this.CLIP_BOX_MASK_COLOR;
clipBox.CenterAxisWidth = (float)this.CLIP_BOX_CENTER_AXIS_WIDTH; clipBox.CenterAxisWidth = (float)this.CLIP_BOX_CENTER_AXIS_WIDTH;
clipBox.CenterAxisColor = this.ClipBoxCenterAxisColor; clipBox.CenterAxisColor = this.ClipBoxCenterAxisColor;
......
VIZ.H2V.Module/NDIView/VieweModel/NDIViewModel.Message.cs
...@@ -221,7 +221,7 @@ namespace VIZ.H2V.Module ...@@ -221,7 +221,7 @@ namespace VIZ.H2V.Module
private void OnAlgorithmMessage__crop_roi__target_bbox(AlgorithmMessage__crop_roi msg, VideoRenderInfo renderInfo, NDIView view) private void OnAlgorithmMessage__crop_roi__target_bbox(AlgorithmMessage__crop_roi msg, VideoRenderInfo renderInfo, NDIView view)
{ {
// 没有目标框 || 配置是否显示目标框 // 没有目标框 || 配置是否显示目标框
if (msg.target_bbox == null || !this.ALGORITHM_IS_SHOW_TARGET_BOX) if (msg.target_bbox == null || !this.IsShowAlgorithmTargetBox)
{ {
view.video.ClearTrackingBox(); view.video.ClearTrackingBox();
......
VIZ.H2V.Module/NDIView/VieweModel/NDIViewModel.Property.cs
...@@ -84,11 +84,6 @@ namespace VIZ.H2V.Module ...@@ -84,11 +84,6 @@ namespace VIZ.H2V.Module
private readonly double VIDEO_MANUAL_CORRECTION_OPACITY = ApplicationDomainEx.IniStorage.GetValue<VideoConfig, double>(p => p.VIDEO_MANUAL_CORRECTION_OPACITY); private readonly double VIDEO_MANUAL_CORRECTION_OPACITY = ApplicationDomainEx.IniStorage.GetValue<VideoConfig, double>(p => p.VIDEO_MANUAL_CORRECTION_OPACITY);
/// <summary> /// <summary>
/// 是否显示目标框
/// </summary>
private readonly bool ALGORITHM_IS_SHOW_TARGET_BOX = ApplicationDomainEx.IniStorage.GetValue<AlgorithmConfig, bool>(p => p.ALGORITHM_IS_SHOW_TARGET_BOX);
/// <summary>
/// 剪切框颜色 -- 正常 /// 剪切框颜色 -- 正常
/// </summary> /// </summary>
private RawColor4 ClipBoxStrokeColor_Normal; private RawColor4 ClipBoxStrokeColor_Normal;
...@@ -105,6 +100,11 @@ namespace VIZ.H2V.Module ...@@ -105,6 +100,11 @@ namespace VIZ.H2V.Module
private RawColor4 ClipBoxStrokeColor_Manual; private RawColor4 ClipBoxStrokeColor_Manual;
/// <summary> /// <summary>
/// 剪切框颜色 -- 手动 无焦点
/// </summary>
private RawColor4 ClipBoxStrokeColor_ManualNotfoucs;
/// <summary>
/// 剪切框中心轴颜色 /// 剪切框中心轴颜色
/// </summary> /// </summary>
private RawColor4 ClipBoxCenterAxisColor; private RawColor4 ClipBoxCenterAxisColor;
...@@ -361,6 +361,20 @@ namespace VIZ.H2V.Module ...@@ -361,6 +361,20 @@ namespace VIZ.H2V.Module
#endregion #endregion
#region IsShowAlgorithmTargetBox -- 是否显示算法目标框
private bool isShowAlgorithmTargetBox;
/// <summary>
/// 是否显示算法目标框
/// </summary>
public bool IsShowAlgorithmTargetBox
{
get { return isShowAlgorithmTargetBox; }
set { isShowAlgorithmTargetBox = value; this.RaisePropertyChanged(nameof(IsShowAlgorithmTargetBox)); }
}
#endregion
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
#region IsUseClip -- 是否使用裁切 #region IsUseClip -- 是否使用裁切
......
VIZ.H2V.Module/NDIView/VieweModel/NDIViewModel.cs
...@@ -288,6 +288,7 @@ namespace VIZ.H2V.Module ...@@ -288,6 +288,7 @@ namespace VIZ.H2V.Module
this.ClipBoxStrokeColor_Normal = SharpDxColorHelper.FromString(config.ClipNormalColor); this.ClipBoxStrokeColor_Normal = SharpDxColorHelper.FromString(config.ClipNormalColor);
this.ClipBoxStrokeColor_Exception = SharpDxColorHelper.FromString(config.ClipExceptionColor); this.ClipBoxStrokeColor_Exception = SharpDxColorHelper.FromString(config.ClipExceptionColor);
this.ClipBoxStrokeColor_Manual = SharpDxColorHelper.FromString(config.ClipManualColor); this.ClipBoxStrokeColor_Manual = SharpDxColorHelper.FromString(config.ClipManualColor);
this.ClipBoxStrokeColor_ManualNotfoucs = SharpDxColorHelper.FromString(config.ClipManualNotfocusColor);
// 手动裁切中心轴颜色 // 手动裁切中心轴颜色
RawColor4 clipBoxCenterAxisColor = SharpDxColorHelper.FromString(config.ClipCenterAxisColor); RawColor4 clipBoxCenterAxisColor = SharpDxColorHelper.FromString(config.ClipCenterAxisColor);
...@@ -303,6 +304,9 @@ namespace VIZ.H2V.Module ...@@ -303,6 +304,9 @@ namespace VIZ.H2V.Module
RawColor4 manualCorrectionColor = SharpDxColorHelper.FromString(config.ManualCorrectionColor); RawColor4 manualCorrectionColor = SharpDxColorHelper.FromString(config.ManualCorrectionColor);
manualCorrectionColor.A = (float)this.VIDEO_MANUAL_CORRECTION_OPACITY; manualCorrectionColor.A = (float)this.VIDEO_MANUAL_CORRECTION_OPACITY;
this.ManualCorrectionColor = manualCorrectionColor; this.ManualCorrectionColor = manualCorrectionColor;
// 是否显示目标裁切框
this.IsShowAlgorithmTargetBox = config.IsShowAlgorithmTargetBox;
} }
/// <summary> /// <summary>
...@@ -374,6 +378,25 @@ namespace VIZ.H2V.Module ...@@ -374,6 +378,25 @@ namespace VIZ.H2V.Module
} }
/// <summary> /// <summary>
/// 更新是否显示算法目标框
/// </summary>
/// <param name="isShow">是否显示</param>
public void UpdateIsShowAlgorithmTargetBox(bool isShow)
{
this.IsShowAlgorithmTargetBox = isShow;
if (isShow)
return;
// 清理现在的目标框
NDIView view = this.GetView<NDIView>();
if (view == null)
return;
view.video.ClearTrackingBox();
}
/// <summary>
/// 停止算法 /// 停止算法
/// </summary> /// </summary>
public void StopAlgorithm() public void StopAlgorithm()
......
VIZ.H2V.Module/SystemSetting/View/StyleSettingPanelView.xaml
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
xmlns:toolkit="http://schemas.xceed.com/wpf/xaml/toolkit" xmlns:toolkit="http://schemas.xceed.com/wpf/xaml/toolkit"
d:DataContext="{d:DesignInstance Type=local:StyleSettingPanelViewModel}" d:DataContext="{d:DesignInstance Type=local:StyleSettingPanelViewModel}"
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>
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<Grid Margin="45,60,40,0"> <Grid Margin="45,60,40,0">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="60"></RowDefinition> <RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="180"></RowDefinition> <RowDefinition Height="240"></RowDefinition>
<RowDefinition Height="60"></RowDefinition> <RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="60"></RowDefinition> <RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="60"></RowDefinition> <RowDefinition Height="60"></RowDefinition>
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
<RowDefinition Height="60"></RowDefinition> <RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="60"></RowDefinition> <RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="60"></RowDefinition> <RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="60"></RowDefinition>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="200"></ColumnDefinition> <ColumnDefinition Width="200"></ColumnDefinition>
...@@ -65,6 +66,9 @@ ...@@ -65,6 +66,9 @@
<!-- 手动 --> <!-- 手动 -->
<TextBlock Text="手动" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="2"></TextBlock> <TextBlock Text="手动" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="2"></TextBlock>
<fcommon:ColorPickButton Grid.Column="1" Color="{Binding Path=ClipManualColor,Mode=TwoWay}" Height="30" Grid.Row="2"></fcommon:ColorPickButton> <fcommon:ColorPickButton Grid.Column="1" Color="{Binding Path=ClipManualColor,Mode=TwoWay}" Height="30" Grid.Row="2"></fcommon:ColorPickButton>
<!-- 手动 无焦点 -->
<TextBlock Text="手动无焦点" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="3"></TextBlock>
<fcommon:ColorPickButton Grid.Column="1" Color="{Binding Path=ClipManualNotfocusColor,Mode=TwoWay}" Height="30" Grid.Row="3"></fcommon:ColorPickButton>
</Grid> </Grid>
<Rectangle Grid.Row="1" VerticalAlignment="Bottom" Height="2" Fill="#ff364051"></Rectangle> <Rectangle Grid.Row="1" VerticalAlignment="Bottom" Height="2" Fill="#ff364051"></Rectangle>
<!-- 边线检测框颜色 --> <!-- 边线检测框颜色 -->
...@@ -154,7 +158,7 @@ ...@@ -154,7 +158,7 @@
<ColumnDefinition Width="500"></ColumnDefinition> <ColumnDefinition Width="500"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition> <ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="是否在触碰摇杆时由自动模式切换至手动模式" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="2"></TextBlock> <TextBlock Text="是否在触碰摇杆时切换至手动模式" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="2"></TextBlock>
<CheckBox Grid.Column="1" Style="{StaticResource CheckBox_Setting}" HorizontalAlignment="Right" <CheckBox Grid.Column="1" Style="{StaticResource CheckBox_Setting}" HorizontalAlignment="Right"
IsChecked="{Binding Path=IsWhenNavigationTouchedChangeToManualMode,Mode=TwoWay}"></CheckBox> IsChecked="{Binding Path=IsWhenNavigationTouchedChangeToManualMode,Mode=TwoWay}"></CheckBox>
</Grid> </Grid>
......
VIZ.H2V.Module/SystemSetting/ViewModel/StyleSettingPanelViewModel.cs
...@@ -76,6 +76,20 @@ namespace VIZ.H2V.Module ...@@ -76,6 +76,20 @@ namespace VIZ.H2V.Module
#endregion #endregion
#region ClipManualNotfocusColor -- 手动无焦点剪切框颜色
private Color clipManualNotfocusColor;
/// <summary>
/// 手动无焦点剪切框颜色
/// </summary>
public Color ClipManualNotfocusColor
{
get { return clipManualNotfocusColor; }
set { clipManualNotfocusColor = value; this.RaisePropertyChanged(nameof(ClipManualNotfocusColor)); }
}
#endregion
#region BorderSceneColor -- 边线检测区域颜色 #region BorderSceneColor -- 边线检测区域颜色
private Color borderSceneColor; private Color borderSceneColor;
...@@ -212,6 +226,7 @@ namespace VIZ.H2V.Module ...@@ -212,6 +226,7 @@ namespace VIZ.H2V.Module
this.ClipNormalColor = (Color)ColorConverter.ConvertFromString(this.SystemConfig.ClipNormalColor); this.ClipNormalColor = (Color)ColorConverter.ConvertFromString(this.SystemConfig.ClipNormalColor);
this.ClipExceptionColor = (Color)ColorConverter.ConvertFromString(this.SystemConfig.ClipExceptionColor); this.ClipExceptionColor = (Color)ColorConverter.ConvertFromString(this.SystemConfig.ClipExceptionColor);
this.ClipManualColor = (Color)ColorConverter.ConvertFromString(this.SystemConfig.ClipManualColor); this.ClipManualColor = (Color)ColorConverter.ConvertFromString(this.SystemConfig.ClipManualColor);
this.ClipManualNotfocusColor = (Color)ColorConverter.ConvertFromString(this.SystemConfig.ClipManualNotfocusColor);
this.BorderSceneColor = (Color)ColorConverter.ConvertFromString(this.SystemConfig.BorderSceneColor); this.BorderSceneColor = (Color)ColorConverter.ConvertFromString(this.SystemConfig.BorderSceneColor);
this.ManualCorrectionColor = (Color)ColorConverter.ConvertFromString(this.SystemConfig.ManualCorrectionColor); this.ManualCorrectionColor = (Color)ColorConverter.ConvertFromString(this.SystemConfig.ManualCorrectionColor);
this.ClipCenterAxisColor = (Color)ColorConverter.ConvertFromString(this.SystemConfig.ClipCenterAxisColor); this.ClipCenterAxisColor = (Color)ColorConverter.ConvertFromString(this.SystemConfig.ClipCenterAxisColor);
...@@ -265,6 +280,9 @@ namespace VIZ.H2V.Module ...@@ -265,6 +280,9 @@ namespace VIZ.H2V.Module
if (this.ClipManualColor.ToString() != this.SystemConfig.ClipManualColor) if (this.ClipManualColor.ToString() != this.SystemConfig.ClipManualColor)
return true; return true;
if (this.ClipManualNotfocusColor.ToString() != this.SystemConfig.ClipManualNotfocusColor)
return true;
if (this.BorderSceneColor.ToString() != this.SystemConfig.BorderSceneColor) if (this.BorderSceneColor.ToString() != this.SystemConfig.BorderSceneColor)
return true; return true;
...@@ -299,6 +317,7 @@ namespace VIZ.H2V.Module ...@@ -299,6 +317,7 @@ namespace VIZ.H2V.Module
this.SystemConfig.ClipNormalColor = this.ClipNormalColor.ToString(); this.SystemConfig.ClipNormalColor = this.ClipNormalColor.ToString();
this.SystemConfig.ClipExceptionColor = this.ClipExceptionColor.ToString(); this.SystemConfig.ClipExceptionColor = this.ClipExceptionColor.ToString();
this.SystemConfig.ClipManualColor = this.ClipManualColor.ToString(); this.SystemConfig.ClipManualColor = this.ClipManualColor.ToString();
this.SystemConfig.ClipManualNotfocusColor = this.ClipManualNotfocusColor.ToString();
this.SystemConfig.BorderSceneColor = this.BorderSceneColor.ToString(); this.SystemConfig.BorderSceneColor = this.BorderSceneColor.ToString();
this.SystemConfig.ManualCorrectionColor = this.ManualCorrectionColor.ToString(); this.SystemConfig.ManualCorrectionColor = this.ManualCorrectionColor.ToString();
this.SystemConfig.ClipCenterAxisColor = this.ClipCenterAxisColor.ToString(); this.SystemConfig.ClipCenterAxisColor = this.ClipCenterAxisColor.ToString();
......
VIZ.H2V.Storage/Init/Config/AlgorithmConfig.cs
...@@ -23,11 +23,5 @@ namespace VIZ.H2V.Storage ...@@ -23,11 +23,5 @@ namespace VIZ.H2V.Storage
/// </summary> /// </summary>
[Ini(Section = "Algorithm", DefaultValue = "30000", Type = typeof(int))] [Ini(Section = "Algorithm", DefaultValue = "30000", Type = typeof(int))]
public string ALGORITHM_STOP_TIMEOUT { get; set; } public string ALGORITHM_STOP_TIMEOUT { get; set; }
/// <summary>
/// 是否显示目标框
/// </summary>
[Ini(Section = "Algorithm", DefaultValue = "true", Type = typeof(bool))]
public string ALGORITHM_IS_SHOW_TARGET_BOX { get; set; }
} }
} }
VIZ.H2V.Storage/LiteDB/System/SystemConfig.cs
...@@ -33,6 +33,11 @@ namespace VIZ.H2V.Storage ...@@ -33,6 +33,11 @@ namespace VIZ.H2V.Storage
public string ClipManualColor { get; set; } = "#ffd9001b"; public string ClipManualColor { get; set; } = "#ffd9001b";
/// <summary> /// <summary>
/// 手动裁切框颜色 不聚焦
/// </summary>
public string ClipManualNotfocusColor { get; set; } = "#ffEE9611";
/// <summary>
/// 裁切框中心轴颜色 /// 裁切框中心轴颜色
/// </summary> /// </summary>
public string ClipCenterAxisColor { get; set; } = "#FFFF0000"; public string ClipCenterAxisColor { get; set; } = "#FFFF0000";
...@@ -71,6 +76,11 @@ namespace VIZ.H2V.Storage ...@@ -71,6 +76,11 @@ namespace VIZ.H2V.Storage
public bool IsWhenNavigationTouchedChangeToManualMode { get; set; } = false; public bool IsWhenNavigationTouchedChangeToManualMode { get; set; } = false;
/// <summary> /// <summary>
/// 是否显示算法目标框
/// </summary>
public bool IsShowAlgorithmTargetBox { get; set; } = true;
/// <summary>
/// Tally信息 -- 窗口1 /// Tally信息 -- 窗口1
/// </summary> /// </summary>
public TallyInfo TallyInfo1 { get; set; } = new TallyInfo(); public TallyInfo TallyInfo1 { get; set; } = new TallyInfo();
......
VIZ.H2V/Properties/AssemblyInfo.cs
...@@ -65,24 +65,24 @@ using VIZ.Framework.Core; ...@@ -65,24 +65,24 @@ using VIZ.Framework.Core;
// MAC地址校验 // MAC地址校验
// ------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------
// 开发机： // 开发机：
[assembly: ApplicationMacCheck("00-2B-67-7C-4E-DA")] //[assembly: ApplicationMacCheck("00-2B-67-7C-4E-DA")]
[assembly: ApplicationMacCheck("3C-58-C2-D7-DC-15")] //[assembly: ApplicationMacCheck("3C-58-C2-D7-DC-15")]
[assembly: ApplicationMacCheck("3E-58-C2-D7-DC-14")] //[assembly: ApplicationMacCheck("3E-58-C2-D7-DC-14")]
[assembly: ApplicationMacCheck("3C-58-C2-D7-DC-14")] //[assembly: ApplicationMacCheck("3C-58-C2-D7-DC-14")]
[assembly: ApplicationMacCheck("00-01-00-01-26-62-61-CC-00-2B-67-7C-4E-DA")] //[assembly: ApplicationMacCheck("00-01-00-01-26-62-61-CC-00-2B-67-7C-4E-DA")]
// ------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------
// 环达 H2V-N1 // 环达 H2V-N1
[assembly: ApplicationMacCheck("04-7B-CB-46-0F-8E")] //[assembly: ApplicationMacCheck("04-7B-CB-46-0F-8E")]
[assembly: ApplicationMacCheck("00-01-00-01-2A-25-A7-FF-E0-4F-43-E6-5B-9F")] //[assembly: ApplicationMacCheck("00-01-00-01-2A-25-A7-FF-E0-4F-43-E6-5B-9F")]
// ------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------
// 环达 H2V-N2 // 环达 H2V-N2
[assembly: ApplicationMacCheck("04-7B-CB-46-0D-C9")] //[assembly: ApplicationMacCheck("04-7B-CB-46-0D-C9")]
[assembly: ApplicationMacCheck("00-01-00-01-2A-25-95-B7-E0-4F-43-E6-5B-9F")] //[assembly: ApplicationMacCheck("00-01-00-01-2A-25-95-B7-E0-4F-43-E6-5B-9F")]
// ------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------
// 霄云中心 H2V-001 // 霄云中心 H2V-001
[assembly: ApplicationMacCheck("E0-4F-43-E6-4F-82")] //[assembly: ApplicationMacCheck("E0-4F-43-E6-4F-82")]
[assembly: ApplicationMacCheck("00-01-00-01-2A-33-A8-0D-E0-4F-43-E6-4F-82")] //[assembly: ApplicationMacCheck("00-01-00-01-2A-33-A8-0D-E0-4F-43-E6-4F-82")]
// 霄云中心 H2V-002 // 霄云中心 H2V-002
[assembly: ApplicationMacCheck("E0-4F-43-E6-48-7C")] //[assembly: ApplicationMacCheck("E0-4F-43-E6-48-7C")]
[assembly: ApplicationMacCheck("00-01-00-01-2A-9B-9E-40-E0-4F-43-E6-48-7C")] //[assembly: ApplicationMacCheck("00-01-00-01-2A-9B-9E-40-E0-4F-43-E6-48-7C")]
// ===================================================================================================== // =====================================================================================================
\ No newline at end of file
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