diamond-cut
/
SparkClient
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: GIRDLE level

Browse Source
master
tongg 8 months ago
parent 1cafae3de8
commit 3e8ebfc59b
1 changed files with 43 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 46
      ViewModel/Grading/GradingResultVM.cs

46
ViewModel/Grading/GradingResultVM.cs
Unescape View File

@ -890,11 +890,51 @@ public class GradingResultVM : BaseViewModel
info.Dev = FormatDouble_P(result.Measurements.GIRDLE_VALLEY_DEV); info.Dev = FormatDouble_P(result.Measurements.GIRDLE_VALLEY_DEV);
info.Min = FormatDouble_P(result.Measurements.GIRDLE_VALLEY_MIN); info.Min = FormatDouble_P(result.Measurements.GIRDLE_VALLEY_MIN);
info.Max = FormatDouble_P(result.Measurements.GIRDLE_VALLEY_MAX); 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 data = result.Measurements;
var girdleValleyDetail = data.GIRDLE_VALLEY_DETAIL; 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) if (girdleValleyDetail != null)
{ {
List<double> doubles = new List<double>(); List<double> doubles = new List<double>();

Write Preview
Loading…
Cancel
Save