Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
T
Thick-Common
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
潘栩锋
Thick-Common
Commits
7b846bb6
Commit
7b846bb6
authored
Sep 09, 2021
by
潘栩锋
🚴
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化 限制 DynAreaIO 的高度,避免 errMsg 的长度导致 DynAreaIO尺寸一直在刷新
添加 GetSample 添加参数异常报警
parent
3a186c04
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
39 additions
and
5 deletions
+39
-5
DynAreaIO.xaml
....FLY.Thick.Base/FLY.Thick.Base.UI/UiModule/DynAreaIO.xaml
+3
-3
GetSample.cs
Project.FLY.Thick.Base/FLY.Thick.Base/Server/GetSample.cs
+36
-2
No files found.
Project.FLY.Thick.Base/FLY.Thick.Base.UI/UiModule/DynAreaIO.xaml
View file @
7b846bb6
...
...
@@ -26,10 +26,10 @@
</Style>
<local:DynAreaIOVmUt x:Key="ioVm" />
<local:DynAreaErrorVm x:Key="errorVm" IsError="
Fals
e" ErrMsg="枫莱尔控制器连接断开"/>
<local:DynAreaErrorVm x:Key="errorVm" IsError="
Tru
e" ErrMsg="枫莱尔控制器连接断开"/>
</ResourceDictionary>
</UserControl.Resources>
<Grid>
<Grid
Height="100"
>
<Button Style="{StaticResource Styles.Button.Empty}" d:DataContext="{StaticResource ioVm}" Command="{Binding OpenIoTipCmd}">
<Grid>
<Border Style="{StaticResource Styles.Module.Border}" >
...
...
@@ -115,7 +115,7 @@
</Button>
<Button x:Name="grid_error" Style="{StaticResource Styles.Button.Empty}" Command="{Binding OpenWarningCmd}"
Visibility="{Binding IsError,Converter={StaticResource visbilityconv}}"
d:DataContext="{StaticResource errorVm}"
d:DataContext="{StaticResource errorVm}"
>
<Border Style="{StaticResource Styles.Module.Border}" Background="Red" >
<Grid >
...
...
Project.FLY.Thick.Base/FLY.Thick.Base/Server/GetSample.cs
View file @
7b846bb6
...
...
@@ -566,7 +566,12 @@ namespace FLY.Thick.Base.Server
{
if
(
CheckParamIsValid
()
==
false
)
{
this
.
warningSystem
.
Update
(
ERRNOs
.
Instance
.
SAMPLE_ERRNO_Failure
.
Code
,
$"
{
ERRNOs
.
Instance
.
SAMPLE_ERRNO_Failure
.
Descrption
}
:参数异常"
);
return
;
}
int
grid_offset
=
0
;
//经过相识性计算后的偏移量
...
...
@@ -801,13 +806,42 @@ _end:
}
public
bool
Enable
{
get
;
set
;
}
=
true
;
public
int
Range
{
get
;
set
;
}
=
100
;
public
int
Window
{
get
;
set
;
}
public
bool
IsCheckByPercent
{
get
;
set
;
}
=
true
;
public
double
ErrPercent
{
get
;
set
;
}
=
2
;
public
int
ErrValue
{
get
;
set
;
}
=
200
;
public
SampleCellParam
[]
Samples
{
get
;
set
;
}
public
int
Search
{
get
;
set
;
}
=
100
;
public
SampleFeatureParam
[]
Features
{
get
;
set
;
}
#
region
IGetSampleService
接口
/// <summary>
/// 参数:样品点范围 单位:脉冲
/// 样品点直径为 Range*2
/// </summary>
public
int
SampleRange
{
get
;
set
;
}
=
50
;
/// <summary>
/// 当前 样品X_AD/样品0_AD 与 上一次比较 差异比例 单位不是%
/// </summary>
public
double
CrossErrPercent
{
get
;
set
;
}
=
0.02
;
/// <summary>
/// 异常比较 时间间隔范围;
/// 两次时间点比较, 时间点的间隔最大时长。 大于它无效,不能比较
/// </summary>
public
int
ErrIntervalMin
{
get
;
set
;
}
=
30
;
/// <summary>
/// 参数:特征查找范围 单位:脉冲
/// 取样范围 会扩大为 -SearchRange ~ +SearchRange
/// </summary>
public
int
SearchRange
{
get
;
set
;
}
=
100
;
#
endregion
}
}
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