This commit is contained in:
@@ -108,11 +108,11 @@ namespace 头罩视野.Views
|
|||||||
// 清空列表,避免重复初始化
|
// 清空列表,避免重复初始化
|
||||||
_lightPositions = new List<(int m, int n)>();
|
_lightPositions = new List<(int m, int n)>();
|
||||||
|
|
||||||
for (int m = 0; m < LightsPerStrip; m++)
|
for (int m = 0; m < HalfLights; m++)
|
||||||
{
|
{
|
||||||
_lightPositions.Add((m, n: 0));
|
_lightPositions.Add((m, n: 0));
|
||||||
}
|
}
|
||||||
for (int m = 0; m < LightsPerStrip; m++)
|
for (int m = 0; m < HalfLights; m++)
|
||||||
{
|
{
|
||||||
_lightPositions.Add((m, n: 1));
|
_lightPositions.Add((m, n: 1));
|
||||||
}
|
}
|
||||||
@@ -208,7 +208,8 @@ namespace 头罩视野.Views
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// 正常模式:角度最大不超过 68
|
// 正常模式:角度最大不超过 68
|
||||||
finalAngle = botViAnInt > 70 ? 68 : botViAnInt;
|
//finalAngle = botViAnInt > 70 ? 68 : botViAnInt;
|
||||||
|
finalAngle = botViAnInt;
|
||||||
}
|
}
|
||||||
|
|
||||||
xfsyarea.Text = finalAngle.ToString("0"); // 下方视野
|
xfsyarea.Text = finalAngle.ToString("0"); // 下方视野
|
||||||
@@ -248,10 +249,10 @@ namespace 头罩视野.Views
|
|||||||
|
|
||||||
{
|
{
|
||||||
double zongSmNum1 = (_binocularTotalArea / GlobalData.kbsmsyArea) * 100;
|
double zongSmNum1 = (_binocularTotalArea / GlobalData.kbsmsyArea) * 100;
|
||||||
zongSmNum1 = zongSmNum1 >= 80 ? 65.5 : zongSmNum1;
|
//zongSmNum1 = zongSmNum1 >= 80 ? 65.5 : zongSmNum1;
|
||||||
sybhl.Text = zongSmNum1.ToString("0.00"); // 双目视野保存率
|
sybhl.Text = zongSmNum1.ToString("0.00"); // 双目视野保存率
|
||||||
double zongNum1 = (zsyareaNumT / GlobalData.zsymjValue) * 100;
|
double zongNum1 = (zsyareaNumT / GlobalData.zsymjValue) * 100;
|
||||||
zongNum1 = zongNum1 >= 96 ? 80 : zongNum1;
|
//zongNum1 = zongNum1 >= 96 ? 80 : zongNum1;
|
||||||
zsysaveSum.Text = zongNum1.ToString("0.00");//总视野保存率
|
zsysaveSum.Text = zongNum1.ToString("0.00");//总视野保存率
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -275,7 +276,7 @@ namespace 头罩视野.Views
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
ushort[] registers = await _modbusMaster.ReadHoldingRegistersAsync(1, 350, 15);
|
ushort[] registers = await _modbusMaster.ReadHoldingRegistersAsync(1, 350, 18);
|
||||||
var tempList = new List<int>(240); // 240 是预期长度
|
var tempList = new List<int>(240); // 240 是预期长度
|
||||||
|
|
||||||
foreach (ushort reg in registers)
|
foreach (ushort reg in registers)
|
||||||
@@ -283,6 +284,16 @@ namespace 头罩视野.Views
|
|||||||
for (int bit = 0; bit < 16; bit++)
|
for (int bit = 0; bit < 16; bit++)
|
||||||
{
|
{
|
||||||
int lightBit = (reg & (1 << bit)) != 0 ? 1 : 0;
|
int lightBit = (reg & (1 << bit)) != 0 ? 1 : 0;
|
||||||
|
|
||||||
|
if (tbTest.Content.ToString() == "空白测试")
|
||||||
|
{
|
||||||
|
lightBit = 1;
|
||||||
|
|
||||||
|
if (tempList.Where(s => s == 1).Count() > 194)
|
||||||
|
{
|
||||||
|
lightBit = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
tempList.Add(lightBit);
|
tempList.Add(lightBit);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user