Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
V
VIZ.H2V
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
刘龙飞
VIZ.H2V
Commits
0856c806
Commit
0856c806
authored
Aug 20, 2022
by
liulongfei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1. 边线检测区域颜色
2. 平滑系数描述更改
parent
caa2df5f
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
110 additions
and
41 deletions
+110
-41
VIZ.H2V.Module/NDISettingView/View/Algorithm/AlgorithmCablewayPanelView.xaml
+13
-7
VIZ.H2V.Module/NDISettingView/View/Algorithm/AlgorithmNearPanelView.xaml
+13
-7
VIZ.H2V.Module/NDISettingView/View/Algorithm/AlgorithmSinglePanelView.xaml
+14
-8
VIZ.H2V.Module/NDISettingView/View/Algorithm/AlgorithmSixteenPanelView.xaml
+13
-7
VIZ.H2V.Module/NDISettingView/View/Algorithm/AlgorithmTacticsPanelView.xaml
+13
-7
VIZ.H2V.Module/NDIView/VieweModel/NDIViewModel.Message.cs
+1
-1
VIZ.H2V.Module/NDIView/VieweModel/NDIViewModel.Property.cs
+5
-0
VIZ.H2V.Module/NDIView/VieweModel/NDIViewModel.cs
+5
-0
VIZ.H2V.Module/SystemSetting/View/StyleSettingPanelView.xaml
+12
-2
VIZ.H2V.Module/SystemSetting/ViewModel/StyleSettingPanelViewModel.cs
+19
-0
VIZ.H2V.Storage/LiteDB/System/SystemConfig.cs
+2
-2
No files found.
VIZ.H2V.Module/NDISettingView/View/Algorithm/AlgorithmCablewayPanelView.xaml
View file @
0856c806
...
...
@@ -34,7 +34,7 @@
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="240"></RowDefinition>
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="
6
0"></RowDefinition>
<RowDefinition Height="
7
0"></RowDefinition>
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="60"></RowDefinition>
...
...
@@ -77,21 +77,27 @@
<TextBlock Text="距离画面中心的位置" Margin="10,0,0,0" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="3" Grid.Column="1"></TextBlock>
</Grid>
<!--
平滑系数
-->
<TextBlock Text="
平滑系数
" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="2"></TextBlock>
<!--
裁切框移动
-->
<TextBlock Text="
裁切框移动
" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="2"></TextBlock>
<Grid Grid.Row="3">
<Grid.RowDefinitions>
<RowDefinition Height="30"></RowDefinition>
<RowDefinition Height="*"></RowDefinition>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="80"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
<ColumnDefinition Width="80"></ColumnDefinition>
<ColumnDefinition Width="80"></ColumnDefinition>
</Grid.ColumnDefinitions>
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="0.001" Foreground="White" FontSize="16"></TextBlock>
<Slider Grid.Column="1" VerticalAlignment="Center" Margin="10,0,10,0" Style="{StaticResource Slider_Setting}"
<TextBlock Text="非常平滑,移动速度慢" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" VerticalAlignment="Center"></TextBlock>
<TextBlock Text="一般平滑,移动速度快" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center"></TextBlock>
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="0.001" Foreground="White" FontSize="16" Grid.Row="1"></TextBlock>
<Slider Grid.Column="1" VerticalAlignment="Center" Margin="10,0,10,0" Style="{StaticResource Slider_Setting}" Grid.Row="1"
Minimum="0.001" Maximum="0.05" IsSnapToTickEnabled="True" TickFrequency="0.001"
Value="{Binding Path=SmoothCoeff,Mode=TwoWay}"></Slider>
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="0.05" Foreground="White" FontSize="16" Grid.Column="2"></TextBlock>
<fcommon:NumberBox Grid.Column="3" Height="40" IsShowUpAndDownButton="False"
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="0.05" Foreground="White" FontSize="16" Grid.Column="2"
Grid.Row="1"
></TextBlock>
<fcommon:NumberBox Grid.Column="3" Height="40" IsShowUpAndDownButton="False"
Grid.Row="1"
MinValue="0.001" MaxValue="0.05" Interval="0.001"
Value="{Binding Path=SmoothCoeff,Mode=TwoWay}"></fcommon:NumberBox>
</Grid>
...
...
VIZ.H2V.Module/NDISettingView/View/Algorithm/AlgorithmNearPanelView.xaml
View file @
0856c806
...
...
@@ -34,7 +34,7 @@
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="240"></RowDefinition>
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="
6
0"></RowDefinition>
<RowDefinition Height="
7
0"></RowDefinition>
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="60"></RowDefinition>
...
...
@@ -77,21 +77,27 @@
<TextBlock Text="距离画面中心的位置" Margin="10,0,0,0" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="3" Grid.Column="1"></TextBlock>
</Grid>
<!--
平滑系数
-->
<TextBlock Text="
平滑系数
" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="2"></TextBlock>
<!--
裁切框移动
-->
<TextBlock Text="
裁切框移动
" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="2"></TextBlock>
<Grid Grid.Row="3">
<Grid.RowDefinitions>
<RowDefinition Height="30"></RowDefinition>
<RowDefinition Height="*"></RowDefinition>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="80"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
<ColumnDefinition Width="80"></ColumnDefinition>
<ColumnDefinition Width="80"></ColumnDefinition>
</Grid.ColumnDefinitions>
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="0.001" Foreground="White" FontSize="16"></TextBlock>
<Slider Grid.Column="1" VerticalAlignment="Center" Margin="10,0,10,0" Style="{StaticResource Slider_Setting}"
<TextBlock Text="非常平滑,移动速度慢" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" VerticalAlignment="Center"></TextBlock>
<TextBlock Text="一般平滑,移动速度快" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center"></TextBlock>
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="0.001" Foreground="White" FontSize="16" Grid.Row="1"></TextBlock>
<Slider Grid.Column="1" VerticalAlignment="Center" Margin="10,0,10,0" Style="{StaticResource Slider_Setting}" Grid.Row="1"
Minimum="0.001" Maximum="0.05" IsSnapToTickEnabled="True" TickFrequency="0.001"
Value="{Binding Path=SmoothCoeff,Mode=TwoWay}"></Slider>
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="0.05" Foreground="White" FontSize="16" Grid.Column="2"></TextBlock>
<fcommon:NumberBox Grid.Column="3" Height="40" IsShowUpAndDownButton="False"
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="0.05" Foreground="White" FontSize="16" Grid.Column="2"
Grid.Row="1"
></TextBlock>
<fcommon:NumberBox Grid.Column="3" Height="40" IsShowUpAndDownButton="False"
Grid.Row="1"
MinValue="0.001" MaxValue="0.05" Interval="0.001"
Value="{Binding Path=SmoothCoeff,Mode=TwoWay}"></fcommon:NumberBox>
</Grid>
...
...
VIZ.H2V.Module/NDISettingView/View/Algorithm/AlgorithmSinglePanelView.xaml
View file @
0856c806
...
...
@@ -31,28 +31,34 @@
<Grid Margin="45,0,40,0">
<Grid.RowDefinitions>
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="
6
0"></RowDefinition>
<RowDefinition Height="
7
0"></RowDefinition>
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="*"></RowDefinition>
</Grid.RowDefinitions>
<!--
平滑系数
-->
<TextBlock Text="
平滑系数" Foreground="White" FontSize="18" VerticalAlignment="Center
"></TextBlock>
<!--
裁切框移动
-->
<TextBlock Text="
裁切框移动" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="0
"></TextBlock>
<Grid Grid.Row="1">
<Grid.RowDefinitions>
<RowDefinition Height="30"></RowDefinition>
<RowDefinition Height="*"></RowDefinition>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="80"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
<ColumnDefinition Width="80"></ColumnDefinition>
<ColumnDefinition Width="80"></ColumnDefinition>
</Grid.ColumnDefinitions>
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="0.001" Foreground="White" FontSize="16"></TextBlock>
<Slider Grid.Column="1" VerticalAlignment="Center" Margin="10,0,10,0"
Minimum="0.001" Maximum="0.05" IsSnapToTickEnabled="True" TickFrequency="0.001" Style="{StaticResource Slider_Setting}"
<TextBlock Text="非常平滑,移动速度慢" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" VerticalAlignment="Center"></TextBlock>
<TextBlock Text="一般平滑,移动速度快" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center"></TextBlock>
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="0.001" Foreground="White" FontSize="16" Grid.Row="1"></TextBlock>
<Slider Grid.Column="1" VerticalAlignment="Center" Margin="10,0,10,0" Style="{StaticResource Slider_Setting}" Grid.Row="1"
Minimum="0.001" Maximum="0.05" IsSnapToTickEnabled="True" TickFrequency="0.001"
Value="{Binding Path=SmoothCoeff,Mode=TwoWay}"></Slider>
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="0.05" Foreground="White" FontSize="16" Grid.Column="2"></TextBlock>
<fcommon:NumberBox Grid.Column="3" Height="40" IsShowUpAndDownButton="False"
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="0.05" Foreground="White" FontSize="16" Grid.Column="2"
Grid.Row="1"
></TextBlock>
<fcommon:NumberBox Grid.Column="3" Height="40" IsShowUpAndDownButton="False"
Grid.Row="1"
MinValue="0.001" MaxValue="0.05" Interval="0.001"
Value="{Binding Path=SmoothCoeff,Mode=TwoWay}"></fcommon:NumberBox>
</Grid>
...
...
VIZ.H2V.Module/NDISettingView/View/Algorithm/AlgorithmSixteenPanelView.xaml
View file @
0856c806
...
...
@@ -34,7 +34,7 @@
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="240"></RowDefinition>
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="
6
0"></RowDefinition>
<RowDefinition Height="
7
0"></RowDefinition>
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="60"></RowDefinition>
...
...
@@ -77,21 +77,27 @@
<TextBlock Text="距离画面中心的位置" Margin="10,0,0,0" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="3" Grid.Column="1"></TextBlock>
</Grid>
<!--
平滑系数
-->
<TextBlock Text="
平滑系数
" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="2"></TextBlock>
<!--
裁切框移动
-->
<TextBlock Text="
裁切框移动
" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="2"></TextBlock>
<Grid Grid.Row="3">
<Grid.RowDefinitions>
<RowDefinition Height="30"></RowDefinition>
<RowDefinition Height="*"></RowDefinition>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="80"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
<ColumnDefinition Width="80"></ColumnDefinition>
<ColumnDefinition Width="80"></ColumnDefinition>
</Grid.ColumnDefinitions>
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="0.001" Foreground="White" FontSize="16"></TextBlock>
<Slider Grid.Column="1" VerticalAlignment="Center" Margin="10,0,10,0" Style="{StaticResource Slider_Setting}"
<TextBlock Text="非常平滑,移动速度慢" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" VerticalAlignment="Center"></TextBlock>
<TextBlock Text="一般平滑,移动速度快" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center"></TextBlock>
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="0.001" Foreground="White" FontSize="16" Grid.Row="1"></TextBlock>
<Slider Grid.Column="1" VerticalAlignment="Center" Margin="10,0,10,0" Style="{StaticResource Slider_Setting}" Grid.Row="1"
Minimum="0.001" Maximum="0.05" IsSnapToTickEnabled="True" TickFrequency="0.001"
Value="{Binding Path=SmoothCoeff,Mode=TwoWay}"></Slider>
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="0.05" Foreground="White" FontSize="16" Grid.Column="2"></TextBlock>
<fcommon:NumberBox Grid.Column="3" Height="40" IsShowUpAndDownButton="False"
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="0.05" Foreground="White" FontSize="16" Grid.Column="2"
Grid.Row="1"
></TextBlock>
<fcommon:NumberBox Grid.Column="3" Height="40" IsShowUpAndDownButton="False"
Grid.Row="1"
MinValue="0.001" MaxValue="0.05" Interval="0.001"
Value="{Binding Path=SmoothCoeff,Mode=TwoWay}"></fcommon:NumberBox>
</Grid>
...
...
VIZ.H2V.Module/NDISettingView/View/Algorithm/AlgorithmTacticsPanelView.xaml
View file @
0856c806
...
...
@@ -34,7 +34,7 @@
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="240"></RowDefinition>
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="
6
0"></RowDefinition>
<RowDefinition Height="
7
0"></RowDefinition>
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="60"></RowDefinition>
...
...
@@ -77,21 +77,27 @@
<TextBlock Text="距离画面中心的位置" Margin="10,0,0,0" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="3" Grid.Column="1"></TextBlock>
</Grid>
<!--
平滑系数
-->
<TextBlock Text="
平滑系数
" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="2"></TextBlock>
<!--
裁切框移动
-->
<TextBlock Text="
裁切框移动
" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="2"></TextBlock>
<Grid Grid.Row="3">
<Grid.RowDefinitions>
<RowDefinition Height="30"></RowDefinition>
<RowDefinition Height="*"></RowDefinition>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="80"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
<ColumnDefinition Width="80"></ColumnDefinition>
<ColumnDefinition Width="80"></ColumnDefinition>
</Grid.ColumnDefinitions>
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="0.001" Foreground="White" FontSize="16"></TextBlock>
<Slider Grid.Column="1" VerticalAlignment="Center" Margin="10,0,10,0" Style="{StaticResource Slider_Setting}"
<TextBlock Text="非常平滑,移动速度慢" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" VerticalAlignment="Center"></TextBlock>
<TextBlock Text="一般平滑,移动速度快" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center"></TextBlock>
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="0.001" Foreground="White" FontSize="16" Grid.Row="1"></TextBlock>
<Slider Grid.Column="1" VerticalAlignment="Center" Margin="10,0,10,0" Style="{StaticResource Slider_Setting}" Grid.Row="1"
Minimum="0.001" Maximum="0.05" IsSnapToTickEnabled="True" TickFrequency="0.001"
Value="{Binding Path=SmoothCoeff,Mode=TwoWay}"></Slider>
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="0.05" Foreground="White" FontSize="16" Grid.Column="2"></TextBlock>
<fcommon:NumberBox Grid.Column="3" Height="40" IsShowUpAndDownButton="False"
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="0.05" Foreground="White" FontSize="16" Grid.Column="2"
Grid.Row="1"
></TextBlock>
<fcommon:NumberBox Grid.Column="3" Height="40" IsShowUpAndDownButton="False"
Grid.Row="1"
MinValue="0.001" MaxValue="0.05" Interval="0.001"
Value="{Binding Path=SmoothCoeff,Mode=TwoWay}"></fcommon:NumberBox>
</Grid>
...
...
VIZ.H2V.Module/NDIView/VieweModel/NDIViewModel.Message.cs
View file @
0856c806
...
...
@@ -286,7 +286,7 @@ namespace VIZ.H2V.Module
private
SideCheckPolygonInfo
BuildSideCheckPolygonInfo
(
List
<
List
<
int
>>
data
)
{
SideCheckPolygonInfo
info
=
new
SideCheckPolygonInfo
();
info
.
FillColor
=
SharpDxColorHelper
.
FromString
(
"#44FF000000"
)
;
info
.
FillColor
=
this
.
BorderSceneColor
;
foreach
(
List
<
int
>
item
in
data
)
{
if
(
item
==
null
||
item
.
Count
!=
2
)
...
...
VIZ.H2V.Module/NDIView/VieweModel/NDIViewModel.Property.cs
View file @
0856c806
...
...
@@ -74,6 +74,11 @@ namespace VIZ.H2V.Module
private
RawColor4
ClipBoxStrokeColor_Manual
;
/// <summary>
/// 边线检测填充颜色
/// </summary>
private
RawColor4
BorderSceneColor
;
// ======================================================================================
// === Controller ===
// ======================================================================================
...
...
VIZ.H2V.Module/NDIView/VieweModel/NDIViewModel.cs
View file @
0856c806
...
...
@@ -4,6 +4,7 @@ using System.Linq;
using
System.Text
;
using
System.Threading.Tasks
;
using
log4net
;
using
SharpDX.Mathematics.Interop
;
using
VIZ.Framework.Common
;
using
VIZ.Framework.Core
;
using
VIZ.H2V.Domain
;
...
...
@@ -260,6 +261,10 @@ namespace VIZ.H2V.Module
this
.
ClipBoxStrokeColor_Normal
=
SharpDxColorHelper
.
FromString
(
config
.
ClipNormalColor
);
this
.
ClipBoxStrokeColor_Exception
=
SharpDxColorHelper
.
FromString
(
config
.
ClipExceptionColor
);
this
.
ClipBoxStrokeColor_Manual
=
SharpDxColorHelper
.
FromString
(
config
.
ClipManualColor
);
RawColor4
borderSceneColor
=
SharpDxColorHelper
.
FromString
(
config
.
BorderSceneColor
);
borderSceneColor
.
A
=
0.4f
;
this
.
BorderSceneColor
=
borderSceneColor
;
}
/// <summary>
...
...
VIZ.H2V.Module/SystemSetting/View/StyleSettingPanelView.xaml
View file @
0856c806
...
...
@@ -35,6 +35,7 @@
<RowDefinition Height="180"></RowDefinition>
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="*"></RowDefinition>
</Grid.RowDefinitions>
<!-- 剪切框颜色 -->
...
...
@@ -47,7 +48,7 @@
<RowDefinition Height="60"></RowDefinition>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="
12
0"></ColumnDefinition>
<ColumnDefinition Width="
20
0"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<!-- 正常 -->
...
...
@@ -61,9 +62,18 @@
<fcommon:ColorPickButton Grid.Column="1" Color="{Binding Path=ClipManualColor,Mode=TwoWay}" Height="30" Grid.Row="2"></fcommon:ColorPickButton>
</Grid>
<Rectangle Grid.Row="1" VerticalAlignment="Bottom" Height="2" Fill="#ff364051"></Rectangle>
<!--
是否使用平滑
-->
<!--
边线检测框颜色
-->
<Grid Grid.Row="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="200"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<TextBlock Text="边线检测区域颜色" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="2"></TextBlock>
<fcommon:ColorPickButton Grid.Column="1" Color="{Binding Path=BorderSceneColor,Mode=TwoWay}" Height="30" Grid.Row="2"></fcommon:ColorPickButton>
</Grid>
<!-- 是否使用平滑 -->
<Grid Grid.Row="3">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="300"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions>
...
...
VIZ.H2V.Module/SystemSetting/ViewModel/StyleSettingPanelViewModel.cs
View file @
0856c806
...
...
@@ -76,6 +76,20 @@ namespace VIZ.H2V.Module
#
endregion
#
region
BorderSceneColor
--
边线检测区域颜色
private
Color
borderSceneColor
;
/// <summary>
/// 手动裁剪框颜色
/// </summary>
public
Color
BorderSceneColor
{
get
{
return
borderSceneColor
;
}
set
{
borderSceneColor
=
value
;
this
.
RaisePropertyChanged
(
nameof
(
BorderSceneColor
));
}
}
#
endregion
#
region
IsManualUseSmooth
--
手动裁切是否使用平滑
private
bool
isManualUseSmooth
;
...
...
@@ -114,6 +128,7 @@ namespace VIZ.H2V.Module
this
.
ClipNormalColor
=
(
Color
)
ColorConverter
.
ConvertFromString
(
this
.
SystemConfig
.
ClipNormalColor
);
this
.
ClipExceptionColor
=
(
Color
)
ColorConverter
.
ConvertFromString
(
this
.
SystemConfig
.
ClipExceptionColor
);
this
.
ClipManualColor
=
(
Color
)
ColorConverter
.
ConvertFromString
(
this
.
SystemConfig
.
ClipManualColor
);
this
.
BorderSceneColor
=
(
Color
)
ColorConverter
.
ConvertFromString
(
this
.
SystemConfig
.
BorderSceneColor
);
this
.
IsManualUseSmooth
=
this
.
SystemConfig
.
IsManualUseSmooth
;
}
...
...
@@ -139,6 +154,9 @@ namespace VIZ.H2V.Module
if
(
this
.
ClipManualColor
.
ToString
()
!=
this
.
SystemConfig
.
ClipManualColor
)
return
true
;
if
(
this
.
BorderSceneColor
.
ToString
()
!=
this
.
SystemConfig
.
BorderSceneColor
)
return
true
;
if
(
this
.
IsManualUseSmooth
!=
this
.
SystemConfig
.
IsManualUseSmooth
)
return
true
;
...
...
@@ -155,6 +173,7 @@ namespace VIZ.H2V.Module
this
.
SystemConfig
.
ClipNormalColor
=
this
.
ClipNormalColor
.
ToString
();
this
.
SystemConfig
.
ClipExceptionColor
=
this
.
ClipExceptionColor
.
ToString
();
this
.
SystemConfig
.
ClipManualColor
=
this
.
ClipManualColor
.
ToString
();
this
.
SystemConfig
.
BorderSceneColor
=
this
.
BorderSceneColor
.
ToString
();
this
.
SystemConfig
.
IsManualUseSmooth
=
this
.
IsManualUseSmooth
;
ApplicationDomainEx
.
LiteDbContext
.
SystemConfig
.
Update
(
this
.
SystemConfig
);
...
...
VIZ.H2V.Storage/LiteDB/System/SystemConfig.cs
View file @
0856c806
...
...
@@ -33,9 +33,9 @@ namespace VIZ.H2V.Storage
public
string
ClipManualColor
{
get
;
set
;
}
=
"#ffd9001b"
;
/// <summary>
/// 边线颜色
/// 边线
检测区域
颜色
/// </summary>
public
string
Border
LineColor
{
get
;
set
;
}
=
"#44
FF000000"
;
public
string
Border
SceneColor
{
get
;
set
;
}
=
"#FF
FF000000"
;
/// <summary>
/// 手动裁切是否使用平滑
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment