Commit 8febf980 authored by 潘栩锋's avatar 潘栩锋 🚴

优化 扫描解方程数小于4才不显示。

parent c4888cdd
......@@ -51,6 +51,6 @@ using System.Windows;
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
//通过使用 "*",如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.8.2.0")]
[assembly: AssemblyFileVersion("7.8.2.0")]
[assembly: AssemblyVersion("7.8.3.0")]
[assembly: AssemblyFileVersion("7.8.3.0")]
[assembly: Guid("38E0D8EC-4D1C-49FF-AB08-6289294C5BD4")]
......@@ -1562,15 +1562,19 @@ namespace FLY.Thick.BlowingScan.Server
continue;
cnt++;
double a = mScanInfoList[i].GetAvg();
double p = (a - avg) / avg;
if (Math.Abs(p) > 0.05)
return false;
if (Math.Abs(a - avg) > 5)
{
double p = (a - avg) / avg;
if (Math.Abs(p) > 0.05)
continue; //return false;
}
equationlist.AddRange(mScanInfoList[i].equationList);
if (cnt >= SolveCnt)
break;
}
if (cnt < SolveCnt)//方程不够!!!!
if (cnt < 4) // SolveCnt)//方程不够!!!!
return false;
if (equationlist.Count < 100)//方程数太少
......
{
"InstallZipVersion":"7.8.2.1",
"InstallZipUrl":"http://server.flyautomation.net:8889/download/和美安装包_v7.8.2.1_20230620.7z"
"InstallZipVersion":"7.8.3.0",
"InstallZipUrl":"http://server.flyautomation.net:8889/download/和美安装包_v7.8.3.0_20230719.7z"
}
\ No newline at end of file
{
"Version": "v0.7和美立式",
"Devices": [
{
"PlcName": null,
"EP": "192.168.50.40:502"
}
],
"Variables": [
{
"DeviceIndex": 0,
"Mode": "4",
"Addr": 980,
"Type": "float",
"Scale": 1.0,
"OwnerName": "Accessory",
"PropertyName": "VelocitySet",
"RegAddr": "汇川H3U 监控协议.D(980)"
},
{
"DeviceIndex": 0,
"Mode": "4",
"Addr": 180,
"Type": "float",
"Scale": 1.0,
"OwnerName": "Accessory",
"PropertyName": "Velocity",
"RegAddr": "汇川H3U 监控协议.D(180)"
},
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 1301,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Accessory",
"PropertyName": "IsRotaryForw",
"RegAddr": "汇川H3U 监控协议.M(1301)"
},
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 1300,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Accessory",
"PropertyName": "IsRotaryBackw",
"RegAddr": "汇川H3U 监控协议.M(1300)"
},
{
"DeviceIndex": 0,
"Mode": "1",
"Addr": 63512,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Accessory",
"PropertyName": "IsRotaryForwTurn",
"RegAddr": "汇川H3U 监控协议.X(30)"
},
{
"DeviceIndex": 0,
"Mode": "1",
"Addr": 63513,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Accessory",
"PropertyName": "IsRotaryBackwTurn",
"RegAddr": "汇川H3U 监控协议.X(31)"
},
{
"DeviceIndex": 0,
"Mode": "4",
"Addr": 1380,
"Type": "uint16",
"Scale": 0.01,
"OwnerName": "Accessory",
"PropertyName": "RotaryFreqSet",
"RegAddr": "汇川H3U 监控协议.D(1380)"
},
{
"DeviceIndex": 0,
"Mode": "4",
"Addr": 1381,
"Type": "uint16",
"Scale": 0.01,
"OwnerName": "Accessory",
"PropertyName": "RotaryFreq",
"RegAddr": "汇川H3U 监控协议.D(1381)"
},
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 411,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Accessory",
"PropertyName": "IsRotaryOn",
"RegAddr": "汇川H3U 监控协议.M(411)"
}
]
}
\ No newline at end of file
# 和美安装包_v7.8.3-20230719
## 测厚仪服务器 v7.8.0
## 测厚仪客户端 v7.7.4
## 扫描测厚仪服务器 v7.6.1
## 扫描测厚仪客户端 v7.8.3
1. 修复 收卷V4 控制开关 无法动作,内外收卷模式无法显示
## 自动风环 v7.6.1
## 称重 v7.7.1
## 称重单组 v7.6.0
## 收卷 v7.8.0
## IBC v7.6.0
## 下吹 v7.6.1
## 吹膜数据库浏览器 v7.0.0
<br/>
<br/>
<br/>
# 和美安装包_v7.8.2-202306
## 测厚仪服务器 v7.8.0
......
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