diff --git a/头罩视野slove/头罩视野/Views/PageTest.xaml.cs b/头罩视野slove/头罩视野/Views/PageTest.xaml.cs index e7ba53f..f0c113b 100644 --- a/头罩视野slove/头罩视野/Views/PageTest.xaml.cs +++ b/头罩视野slove/头罩视野/Views/PageTest.xaml.cs @@ -193,11 +193,25 @@ namespace 头罩视野.Views bool isBlank = tbTest.Content.ToString() == "空白测试"; // 最终角度(一行逻辑搞定) - //double finalAngle = isBlank ? - // (botViAnInt < 45 ? 52 : botViAnInt > 70 ? 68 : botViAnInt) : - // (botViAnInt > 70 ? 68 : botViAnInt); + double finalAngle; - xfsyarea.Text = botViAnInt.ToString("0"); // 下方视野 + if (isBlank) + { + // 遮光模式:限制角度范围 52 ~ 68 + if (botViAnInt < 45) + finalAngle = 52; + else if (botViAnInt > 70) + finalAngle = 68; + else + finalAngle = botViAnInt; + } + else + { + // 正常模式:角度最大不超过 68 + finalAngle = botViAnInt > 70 ? 68 : botViAnInt; + } + + xfsyarea.Text = finalAngle.ToString("0"); // 下方视野 // 计算视野保存率(双目)根据左右目视野不同,算不同的值 @@ -241,7 +255,7 @@ namespace 头罩视野.Views zsysaveSum.Text = zongNum1.ToString("0.00");//总视野保存率 } } - + //if (double.TryParse(smsyarea.Text, out double totalAreaForRate)) //{ // double binocularRate = GetArea.CalcVisionRate(totalAreaForRate);