diff --git a/ViewModel/Grading/GradingResultVM.cs b/ViewModel/Grading/GradingResultVM.cs index 4820137..be223c2 100644 --- a/ViewModel/Grading/GradingResultVM.cs +++ b/ViewModel/Grading/GradingResultVM.cs @@ -406,11 +406,11 @@ public class GradingResultVM : BaseViewModel DataInfo info = new DataInfo(); info.TestItemId = "GIRDLE"; info.TestItemName = GetName("GIRDLE"); - info.Avg = FormatDouble_P(result.measurements.GIRDLE); - info.Dev = FormatDouble_P(result.measurements.GIRDLE_DEV); - info.Min = FormatDouble_P(result.measurements.GIRDLE_MIN); - info.Max = FormatDouble_P(result.measurements.GIRDLE_MAX); - info.CutLevel = calGrade_GIRDLE(result.measurements.GIRDLE_MIN, result.measurements.GIRDLE_MAX); + info.Avg = FormatDouble_P(result.measurements.GIRDLE_VALLEY); + 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); return info; } @@ -732,9 +732,9 @@ public class GradingResultVM : BaseViewModel stream.WriteLine($"PAV ANGLE={info.PAV_ANGLE}"); stream.WriteLine($"PAV ANGLE MIN={info.PAV_ANGLE_MIN}"); stream.WriteLine($"PAV ANGLE MAX={info.PAV_ANGLE_MAX}"); - stream.WriteLine($"GIRDLE={info.GIRDLE * 100}"); - stream.WriteLine($"GIRDLE MIN={info.GIRDLE_MIN * 100}"); - stream.WriteLine($"GIRDLE MAX={info.GIRDLE_MAX * 100}"); + stream.WriteLine($"GIRDLE={info.GIRDLE_VALLEY * 100}"); + stream.WriteLine($"GIRDLE MIN={info.GIRDLE_VALLEY_MIN * 100}"); + stream.WriteLine($"GIRDLE MAX={info.GIRDLE_VALLEY_MAX * 100}"); stream.WriteLine($"TOTAL DEPTH={info.TOTAL_DEPTH * 100}"); stream.WriteLine($"CULET={info.CULET*100}"); stream.WriteLine($"MACHINE={machine}"); @@ -797,9 +797,8 @@ public class GradingResultVM : BaseViewModel dataRow.CreateCell(col++).SetCellValue($"{FormatDouble_P(info.TOTAL_DEPTH)}%"); dataRow.CreateCell(col++).SetCellValue($"{FormatDouble_A(info.CROWN_ANGLE)}°"); dataRow.CreateCell(col++).SetCellValue($"{FormatDouble_A(info.PAV_ANGLE)}°"); - // TODO 底尖直径 - dataRow.CreateCell(col++).SetCellValue($"{FormatDouble_A(info.CULET)}(mm)"); - dataRow.CreateCell(col++).SetCellValue($"{FormatDouble_P(info.GIRDLE)}%"); + dataRow.CreateCell(col++).SetCellValue($"{FormatDouble_A(info.CULET_SIZE)}(mm)"); + dataRow.CreateCell(col++).SetCellValue($"{FormatDouble_P(info.GIRDLE_VALLEY)}%"); // TODO 腰部厚度英文 dataRow.CreateCell(col++).SetCellValue($"{calGirdleName(info)}"); dataRow.CreateCell(col++).SetCellValue($""); @@ -823,10 +822,10 @@ public class GradingResultVM : BaseViewModel string girdleName = ""; // 有问题 问题1 1.6时为thin to slight thick,那么 thin为什么时刻出现 // 问题2 假如最小值为very thin,最大值为thick时用哪个 - decimal min = Convert.ToDecimal(info.GIRDLE_MIN * 100); + decimal min = Convert.ToDecimal(info.GIRDLE_VALLEY_MIN * 100); girdleName += calGirdleName(min,true); girdleName += " to "; - decimal max = Convert.ToDecimal(info.GIRDLE_MAX * 100); + decimal max = Convert.ToDecimal(info.GIRDLE_VALLEY_MAX * 100); girdleName += calGirdleName(max,false); return girdleName; }