Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
H
hemei
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
潘栩锋
hemei
Commits
686fbcf7
Commit
686fbcf7
authored
Oct 16, 2020
by
潘栩锋
🚴
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复 对位相关性,写错成立条件了
parent
bc243ebd
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
4 deletions
+9
-4
PgSetup.xaml
...dbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/PgSetup.xaml
+2
-2
HeatBuf.cs
...Y.FeedbackRenZiJia/FLY.FeedbackRenZiJia/Server/HeatBuf.cs
+4
-1
HeatCell.cs
....FeedbackRenZiJia/FLY.FeedbackRenZiJia/Server/HeatCell.cs
+3
-1
No files found.
Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/PgSetup.xaml
View file @
686fbcf7
...
@@ -407,7 +407,7 @@
...
@@ -407,7 +407,7 @@
<StackPanel Margin="{StaticResource ControlMargin}">
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Text.FieldHeader2}" Text="对位结果" />
<TextBlock Style="{StaticResource Text.FieldHeader2}" Text="对位结果" />
<StackPanel Orientation="Horizontal">
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource Text.FieldContent
2
}" Text="{Binding AutoONoMsg}" />
<TextBlock Style="{StaticResource Text.FieldContent}" Text="{Binding AutoONoMsg}" />
</StackPanel>
</StackPanel>
</StackPanel>
</StackPanel>
<StackPanel Orientation="Horizontal" Visibility="{Binding AutoONoId0,Converter={StaticResource id2VisConv}}">
<StackPanel Orientation="Horizontal" Visibility="{Binding AutoONoId0,Converter={StaticResource id2VisConv}}">
...
@@ -561,7 +561,7 @@
...
@@ -561,7 +561,7 @@
<StackPanel Margin="{StaticResource ControlMargin}">
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Text.FieldHeader2}" Text="稳定状态" />
<TextBlock Style="{StaticResource Text.FieldHeader2}" Text="稳定状态" />
<StackPanel Orientation="Horizontal">
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource Text.FieldContent
2
}" Text="{Binding Stability, Converter={StaticResource stableconv}}" />
<TextBlock Style="{StaticResource Text.FieldContent}" Text="{Binding Stability, Converter={StaticResource stableconv}}" />
</StackPanel>
</StackPanel>
</StackPanel>
</StackPanel>
</StackPanel>
</StackPanel>
...
...
Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia/Server/HeatBuf.cs
View file @
686fbcf7
...
@@ -113,6 +113,9 @@ namespace FLY.FeedbackRenZiJia.Server
...
@@ -113,6 +113,9 @@ namespace FLY.FeedbackRenZiJia.Server
/// </summary>
/// </summary>
public
long
MaxR_Id1
{
get
;
private
set
;
}
=
-
1
;
public
long
MaxR_Id1
{
get
;
private
set
;
}
=
-
1
;
/// <summary>
/// MaxR 对应的 时间
/// </summary>
public
DateTime
MaxR_Time
{
get
;
private
set
;
}
public
DateTime
MaxR_Time
{
get
;
private
set
;
}
#
endregion
#
endregion
...
@@ -489,7 +492,7 @@ namespace FLY.FeedbackRenZiJia.Server
...
@@ -489,7 +492,7 @@ namespace FLY.FeedbackRenZiJia.Server
if
(
maxOffsetHeatThickR
!=
-
1
)
if
(
maxOffsetHeatThickR
!=
-
1
)
{
{
if
(
maxOffsetHeatThickR
>=
Max
R
)
if
(
maxOffsetHeatThickR
>=
Threshold
R
)
{
{
BestOrgBoltNo
=
maxOffsetHeatThickR_orgBoltNo
;
BestOrgBoltNo
=
maxOffsetHeatThickR_orgBoltNo
;
BestKp
=
Math
.
Round
(
maxOffsetHeatThickR_kp
,
1
);
BestKp
=
Math
.
Round
(
maxOffsetHeatThickR_kp
,
1
);
...
...
Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia/Server/HeatCell.cs
View file @
686fbcf7
...
@@ -290,6 +290,8 @@ namespace FLY.FeedbackRenZiJia.Server
...
@@ -290,6 +290,8 @@ namespace FLY.FeedbackRenZiJia.Server
if
(
mHeatBuf
.
MaxR_Id1
==
mHeatBuf
.
mData
.
Last
().
thickHeat
.
ID
)
//算出结果
if
(
mHeatBuf
.
MaxR_Id1
==
mHeatBuf
.
mData
.
Last
().
thickHeat
.
ID
)
//算出结果
{
{
string
msg
=
"对位完成"
;
string
msg
=
"对位完成"
;
msg
+=
$",[相关性]
{
mHeatBuf
.
MaxR
:
F2
}
"
;
msg
+=
$",[极差]
{
mHeatBuf
.
MaxMin
}
%"
;
if
(
blowingService
.
OrgBoltNo
!=
mHeatBuf
.
BestOrgBoltNo
)
if
(
blowingService
.
OrgBoltNo
!=
mHeatBuf
.
BestOrgBoltNo
)
{
{
//调节 mHeatBuf.ThickPercents 移动到 mHeatBuf.BestOrgBoltNo
//调节 mHeatBuf.ThickPercents 移动到 mHeatBuf.BestOrgBoltNo
...
@@ -309,7 +311,7 @@ namespace FLY.FeedbackRenZiJia.Server
...
@@ -309,7 +311,7 @@ namespace FLY.FeedbackRenZiJia.Server
if
(
Math
.
Abs
(
Kp
-
mHeatBuf
.
BestKp
)
>
0.2
)
if
(
Math
.
Abs
(
Kp
-
mHeatBuf
.
BestKp
)
>
0.2
)
{
{
msg
+=
$",
Kp
{
Kp
:
F1
}
->
{
mHeatBuf
.
BestKp
:
F1
}
"
;
msg
+=
$",
[Kp]
{
Kp
:
F1
}
->
{
mHeatBuf
.
BestKp
:
F1
}
"
;
Kp
=
mHeatBuf
.
BestKp
;
Kp
=
mHeatBuf
.
BestKp
;
Apply
();
Apply
();
}
}
...
...
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