diff --git a/头罩视野slove/头罩视野/Services/GetArea.cs b/头罩视野slove/头罩视野/Services/GetArea.cs index 6c00452..d8aaff3 100644 --- a/头罩视野slove/头罩视野/Services/GetArea.cs +++ b/头罩视野slove/头罩视野/Services/GetArea.cs @@ -16,6 +16,13 @@ namespace 头罩视野.Services public static double verticalAngleStep = 90.0 / (totalLights - 1); // 上下灯条用 public static double horizontalAngleStep = 180.0 / (totalLights - 1); // 左右灯条用 + //public const double BlankTotalBaseArea = 4610; + //public const double lysmcdSrea = 780; + + ///// 双目标准标定总面积:无面罩空标准头模的双目总实测面积国标总视野保存率计算的基准值,单位:cm² + //public const double StandardTotal = 10360; + + //空白视野面积计算 public static readonly double _standardTotalArea = (Math.PI * R * R) / 100; diff --git a/头罩视野slove/头罩视野/Views/PageTest.xaml.cs b/头罩视野slove/头罩视野/Views/PageTest.xaml.cs index 3c09a2c..f0c113b 100644 --- a/头罩视野slove/头罩视野/Views/PageTest.xaml.cs +++ b/头罩视野slove/头罩视野/Views/PageTest.xaml.cs @@ -510,6 +510,11 @@ namespace 头罩视野.Views tbTest.Background = System.Windows.Media.Brushes.LightGray; await _modbusMaster.WriteSingleCoilAsync(1, 41, false); } + private void Button_Click_home(object sender, RoutedEventArgs e) + { + NavigationService.Content = null; + } + //读取数据 private DispatcherTimer InitDispatcherTimer() @@ -810,6 +815,7 @@ namespace 头罩视野.Views _timer.Stop(); NavigationService.Content = new Views.PageTest(); } + private void GoRecord(object s, RoutedEventArgs e) => NavigationService.Content = new Views.RecordDate(); private void GoView(object s, RoutedEventArgs e) => NavigationService.Content = new Views.RecordPage(); //初始化数据 private void InitAllDataAsync() @@ -854,6 +860,7 @@ namespace 头罩视野.Views _modbusMaster.WriteSingleCoil(1, 0, false); } + } }