diff --git a/头罩视野slove/头罩视野/Views/PageTest.xaml.cs b/头罩视野slove/头罩视野/Views/PageTest.xaml.cs index 5637b41..70f8c29 100644 --- a/头罩视野slove/头罩视野/Views/PageTest.xaml.cs +++ b/头罩视野slove/头罩视野/Views/PageTest.xaml.cs @@ -7,6 +7,7 @@ using System; using System.Collections.Generic; using System.Net; using System.Net.Sockets; +using System.Reflection.Metadata; using System.Text; using System.Windows; using System.Windows.Controls; @@ -193,33 +194,19 @@ namespace 头罩视野.Views // 计算下方视野° int botViAnInt = (int)Math.Round(BotViAn); - //botViAnInt = botViAnInt <= 45 ? 52: botViAnInt; - botViAnInt = botViAnInt switch - { - < 45 => 52, - > 70 => 68, - _ => botViAnInt - }; + + System.Diagnostics.Debug.WriteLine($"下方视野角度:{botViAnInt}"); + bool isBlank = tbTest.Content.ToString() == "空白测试"; + + // 最终角度(一行逻辑搞定) + double finalAngle = isBlank ? + (botViAnInt < 45 ? 52 : botViAnInt > 70 ? 68 : botViAnInt) : + (botViAnInt > 70 ? 68 : botViAnInt); + xfsyarea.Text = botViAnInt.ToString("0"); // 下方视野 // 计算视野保存率(双目)根据左右目视野不同,算不同的值 - if (isLeftOnly) - { - //double binocularRateL = GetArea.CalcVisionRate(_leftTotalArea); - //sybhl.Text = binocularRateL.ToString("0"); // 视野保存率 - - //double blankArea = GetArea.GetBlankViewArea(_leftTotalArea); - //kbsyarea.Text = blankArea.ToString("0"); // 空白视野面积 - } - - else if (isRightOnly) - { - //double binocularRateR = GetArea.CalcVisionRate(_rightTotalArea); - //sybhl.Text = binocularRateR.ToString("0"); // 视野保存率 - //double blankArea = GetArea.GetBlankViewArea(_rightTotalArea); - //kbsyarea.Text = blankArea.ToString("0"); // 空白视野面积 - } if (_leftFinalData != null && _leftFinalData.Count > 0 && _rightFinalData != null && _rightFinalData.Count > 0) {