Commit d57b0cc6 by liulongfei

部分ui调整

parent fc93396b
...@@ -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="8"></Setter> <Setter Property="BorderThickness" Value="6"></Setter>
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="RadioButton"> <ControlTemplate TargetType="RadioButton">
......
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
<Image Source="/VIZ.H2V.Module.Resource;component/Icons/status_25x22.png" <Image Source="/VIZ.H2V.Module.Resource;component/Icons/status_25x22.png"
Visibility="{Binding AlgorithmStatusMinFps,Converter={StaticResource ServiceFps2VisibilityConverter_Normal}}"></Image> Visibility="{Binding AlgorithmStatusMinFps,Converter={StaticResource ServiceFps2VisibilityConverter_Normal}}"></Image>
</Grid> </Grid>
<TextBlock Text="算法服务" VerticalAlignment="Center" Foreground="White" FontSize="12" Margin="10,0,0,0"></TextBlock> <TextBlock Text="系统" VerticalAlignment="Center" Foreground="White" FontSize="12" Margin="10,0,0,0"></TextBlock>
</StackPanel> </StackPanel>
<!-- 剪切服务监控 --> <!-- 剪切服务监控 -->
<StackPanel Orientation="Horizontal" Background="Transparent" Grid.Column="1" <StackPanel Orientation="Horizontal" Background="Transparent" Grid.Column="1"
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
<Image Source="/VIZ.H2V.Module.Resource;component/Icons/status_25x22.png" <Image Source="/VIZ.H2V.Module.Resource;component/Icons/status_25x22.png"
Visibility="{Binding ClipStatusMinFps,Converter={StaticResource ServiceFps2VisibilityConverter_Normal}}"></Image> Visibility="{Binding ClipStatusMinFps,Converter={StaticResource ServiceFps2VisibilityConverter_Normal}}"></Image>
</Grid> </Grid>
<TextBlock Text="裁切服务" VerticalAlignment="Center" Foreground="White" FontSize="12" Margin="10,0,0,0"></TextBlock> <TextBlock Text="界面" VerticalAlignment="Center" Foreground="White" FontSize="12" Margin="10,0,0,0"></TextBlock>
</StackPanel> </StackPanel>
<!-- 计算机监控 --> <!-- 计算机监控 -->
<StackPanel Orientation="Horizontal" Grid.Column="2"> <StackPanel Orientation="Horizontal" Grid.Column="2">
......
...@@ -105,7 +105,8 @@ namespace VIZ.H2V.Module ...@@ -105,7 +105,8 @@ namespace VIZ.H2V.Module
TrackingBoxInfo info = new TrackingBoxInfo(); TrackingBoxInfo info = new TrackingBoxInfo();
info.SrcRect = rect; info.SrcRect = rect;
info.DrawingBorderWidth = this.DETECT_BOX_BORDER_WIDTH; info.DrawingBorderWidth = this.DETECT_BOX_BORDER_WIDTH;
info.DrawingBorderColor = this.DETECT_BOX_BORDER_COLOR; // 检测框在显示目标框时显示,否则采用透明色
info.DrawingBorderColor = this.IsShowAlgorithmTargetBox ? this.DETECT_BOX_BORDER_COLOR : this.DETECT_BOX_BORDER_COLOR_TRANSPARENT;
infos.Add(info); infos.Add(info);
} }
......
...@@ -69,6 +69,11 @@ namespace VIZ.H2V.Module ...@@ -69,6 +69,11 @@ namespace VIZ.H2V.Module
private readonly RawColor4 DETECT_BOX_BORDER_COLOR = ApplicationDomainEx.IniStorage.GetValue<VideoConfig, RawColor4>(p => p.VIDEO_DETECT_BOX_BORDER_COLOR); private readonly RawColor4 DETECT_BOX_BORDER_COLOR = ApplicationDomainEx.IniStorage.GetValue<VideoConfig, RawColor4>(p => p.VIDEO_DETECT_BOX_BORDER_COLOR);
/// <summary> /// <summary>
/// 检测框边框颜色 透明
/// </summary>
private readonly RawColor4 DETECT_BOX_BORDER_COLOR_TRANSPARENT = SharpDxColorHelper.FromString("#00000000");
/// <summary>
/// 检测边框宽度(单位:像素) /// 检测边框宽度(单位:像素)
/// </summary> /// </summary>
private readonly int DETECT_BOX_BORDER_WIDTH = ApplicationDomainEx.IniStorage.GetValue<VideoConfig, int>(p => p.VIDEO_DETECT_BOX_BORDER_WIDTH); private readonly int DETECT_BOX_BORDER_WIDTH = ApplicationDomainEx.IniStorage.GetValue<VideoConfig, int>(p => p.VIDEO_DETECT_BOX_BORDER_WIDTH);
......
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