Commit 686fbcf7 authored by 潘栩锋's avatar 潘栩锋 🚴

修复 对位相关性,写错成立条件了

parent bc243ebd
...@@ -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.FieldContent2}" 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.FieldContent2}" Text="{Binding Stability, Converter={StaticResource stableconv}}" /> <TextBlock Style="{StaticResource Text.FieldContent}" Text="{Binding Stability, Converter={StaticResource stableconv}}" />
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
......
...@@ -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 >= MaxR) if (maxOffsetHeatThickR >= ThresholdR)
{ {
BestOrgBoltNo = maxOffsetHeatThickR_orgBoltNo; BestOrgBoltNo = maxOffsetHeatThickR_orgBoltNo;
BestKp = Math.Round(maxOffsetHeatThickR_kp, 1); BestKp = Math.Round(maxOffsetHeatThickR_kp, 1);
......
...@@ -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();
} }
......
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