From 3e8ebfc59b25ddbb31ec817914d97b76ebabaf62 Mon Sep 17 00:00:00 2001
From: tongg <tongguibina@163.com>
Date: Tue, 22 Apr 2025 21:13:12 +0800
Subject: [PATCH] feat: GIRDLE level

---
 ViewModel/Grading/GradingResultVM.cs | 46 ++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 3 deletions(-)

diff --git a/ViewModel/Grading/GradingResultVM.cs b/ViewModel/Grading/GradingResultVM.cs
index cac8c44..966b977 100644
--- a/ViewModel/Grading/GradingResultVM.cs
+++ b/ViewModel/Grading/GradingResultVM.cs
@@ -890,11 +890,51 @@ public class GradingResultVM : BaseViewModel
         info.Dev = FormatDouble_P(result.Measurements.GIRDLE_VALLEY_DEV);
         info.Min = FormatDouble_P(result.Measurements.GIRDLE_VALLEY_MIN);
         info.Max = FormatDouble_P(result.Measurements.GIRDLE_VALLEY_MAX);
-        info.CutLevel = calGrade_GIRDLE(result.Measurements.GIRDLE_VALLEY_MIN, result.Measurements.GIRDLE_VALLEY_MAX);
-        info.Dev = calDev(info.Max, info.Min);
+        
         var data = result.Measurements;
-       
         var girdleValleyDetail = data.GIRDLE_VALLEY_DETAIL;
+        // 变更 波谷评级计算方式
+        // List<double> gradeValues = new List<double>();
+        // gradeValues.Add(data.GIRDLE_VALLEY_DETAIL.GIRDLE_VALLEY_1);
+        // gradeValues.Add(data.GIRDLE_VALLEY_DETAIL.GIRDLE_VALLEY_2);
+        // gradeValues.Add(data.GIRDLE_VALLEY_DETAIL.GIRDLE_VALLEY_3);
+        // gradeValues.Add(data.GIRDLE_VALLEY_DETAIL.GIRDLE_VALLEY_4);
+        // gradeValues.Add(data.GIRDLE_VALLEY_DETAIL.GIRDLE_VALLEY_5);
+        // gradeValues.Add(data.GIRDLE_VALLEY_DETAIL.GIRDLE_VALLEY_6);
+        // gradeValues.Add(data.GIRDLE_VALLEY_DETAIL.GIRDLE_VALLEY_7);
+        // gradeValues.Add(data.GIRDLE_VALLEY_DETAIL.GIRDLE_VALLEY_8);
+        // gradeValues.Add(data.GIRDLE_VALLEY_DETAIL.GIRDLE_VALLEY_9);
+        // gradeValues.Add(data.GIRDLE_VALLEY_DETAIL.GIRDLE_VALLEY_10);
+        // gradeValues.Add(data.GIRDLE_VALLEY_DETAIL.GIRDLE_VALLEY_11);
+        // gradeValues.Add(data.GIRDLE_VALLEY_DETAIL.GIRDLE_VALLEY_12);
+        // gradeValues.Add(data.GIRDLE_VALLEY_DETAIL.GIRDLE_VALLEY_13);
+        // gradeValues.Add(data.GIRDLE_VALLEY_DETAIL.GIRDLE_VALLEY_14);
+        // gradeValues.Add(data.GIRDLE_VALLEY_DETAIL.GIRDLE_VALLEY_15);
+        // gradeValues.Add(data.GIRDLE_VALLEY_DETAIL.GIRDLE_VALLEY_16);
+        // gradeValues.Add(data.GIRDLE_BONE_DETAIL.GIRDLE_BONE_1);
+        // gradeValues.Add(data.GIRDLE_BONE_DETAIL.GIRDLE_BONE_2);
+        // gradeValues.Add(data.GIRDLE_BONE_DETAIL.GIRDLE_BONE_3);
+        // gradeValues.Add(data.GIRDLE_BONE_DETAIL.GIRDLE_BONE_4);
+        // gradeValues.Add(data.GIRDLE_BONE_DETAIL.GIRDLE_BONE_5);
+        // gradeValues.Add(data.GIRDLE_BONE_DETAIL.GIRDLE_BONE_6);
+        // gradeValues.Add(data.GIRDLE_BONE_DETAIL.GIRDLE_BONE_7);
+        // gradeValues.Add(data.GIRDLE_BONE_DETAIL.GIRDLE_BONE_8);
+        // gradeValues.Add(data.GIRDLE_BEZEL_DETAIL.GIRDLE_BEZEL_1);
+        // gradeValues.Add(data.GIRDLE_BEZEL_DETAIL.GIRDLE_BEZEL_2);
+        // gradeValues.Add(data.GIRDLE_BEZEL_DETAIL.GIRDLE_BEZEL_3);
+        // gradeValues.Add(data.GIRDLE_BEZEL_DETAIL.GIRDLE_BEZEL_4);
+        // gradeValues.Add(data.GIRDLE_BEZEL_DETAIL.GIRDLE_BEZEL_5);
+        // gradeValues.Add(data.GIRDLE_BEZEL_DETAIL.GIRDLE_BEZEL_6);
+        // gradeValues.Add(data.GIRDLE_BEZEL_DETAIL.GIRDLE_BEZEL_7);
+        // gradeValues.Add(data.GIRDLE_BEZEL_DETAIL.GIRDLE_BEZEL_8);
+        // double averageGrade = gradeValues.Average();
+        info.CutLevel = calGrade_GIRDLE(data.GIRDLE, data.GIRDLE);
+        
+        // info.CutLevel = calGrade_GIRDLE(result.Measurements.GIRDLE_VALLEY_MIN, result.Measurements.GIRDLE_VALLEY_MAX);
+        info.Dev = calDev(info.Max, info.Min);
+        
+       
+        
         if (girdleValleyDetail != null)
         {
             List<double> doubles = new List<double>();