|
|
@ -510,6 +510,15 @@ public class GradingResultVM : BaseViewModel |
|
|
|
} |
|
|
|
} |
|
|
|
#endregion |
|
|
|
#endregion |
|
|
|
#region 参数列表行编辑 |
|
|
|
#region 参数列表行编辑 |
|
|
|
|
|
|
|
private string calDev(string max,string min) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
decimal Max = 0; |
|
|
|
|
|
|
|
decimal Min = 0; |
|
|
|
|
|
|
|
decimal.TryParse(max, out Max); |
|
|
|
|
|
|
|
decimal.TryParse(min, out Min); |
|
|
|
|
|
|
|
return (Max-Min).ToString(); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private DataInfo getDIAMETER(AlgorithmResultEntity result) |
|
|
|
private DataInfo getDIAMETER(AlgorithmResultEntity result) |
|
|
|
{ |
|
|
|
{ |
|
|
|
DataInfo info = new DataInfo(); |
|
|
|
DataInfo info = new DataInfo(); |
|
|
@ -519,6 +528,7 @@ public class GradingResultVM : BaseViewModel |
|
|
|
info.Dev = result.measurements.DIAMETER_DEV.ToString(digitsFormat); |
|
|
|
info.Dev = result.measurements.DIAMETER_DEV.ToString(digitsFormat); |
|
|
|
info.Min = FormatDouble_D(result.measurements.M1); |
|
|
|
info.Min = FormatDouble_D(result.measurements.M1); |
|
|
|
info.Max = FormatDouble_D(result.measurements.M2); |
|
|
|
info.Max = FormatDouble_D(result.measurements.M2); |
|
|
|
|
|
|
|
info.Dev = calDev(info.Max, info.Min); |
|
|
|
return info; |
|
|
|
return info; |
|
|
|
} |
|
|
|
} |
|
|
|
private DataInfo getTOTAL_DEPTH(AlgorithmResultEntity result) |
|
|
|
private DataInfo getTOTAL_DEPTH(AlgorithmResultEntity result) |
|
|
@ -555,6 +565,7 @@ public class GradingResultVM : BaseViewModel |
|
|
|
info.Min = FormatDouble_A(result.measurements.CROWN_ANGLE_MIN); |
|
|
|
info.Min = FormatDouble_A(result.measurements.CROWN_ANGLE_MIN); |
|
|
|
info.Max = FormatDouble_A(result.measurements.CROWN_ANGLE_MAX); |
|
|
|
info.Max = FormatDouble_A(result.measurements.CROWN_ANGLE_MAX); |
|
|
|
info.CutLevel = calGrade_CROWN_ANGLE(result.measurements.CROWN_ANGLE_MIN, result.measurements.CROWN_ANGLE_MAX); |
|
|
|
info.CutLevel = calGrade_CROWN_ANGLE(result.measurements.CROWN_ANGLE_MIN, result.measurements.CROWN_ANGLE_MAX); |
|
|
|
|
|
|
|
info.Dev = calDev(info.Max, info.Min); |
|
|
|
return info; |
|
|
|
return info; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -568,6 +579,7 @@ public class GradingResultVM : BaseViewModel |
|
|
|
info.Min = FormatDouble_P(result.measurements.CROWN_H_MIN); |
|
|
|
info.Min = FormatDouble_P(result.measurements.CROWN_H_MIN); |
|
|
|
info.Max = FormatDouble_P(result.measurements.CROWN_H_MAX); |
|
|
|
info.Max = FormatDouble_P(result.measurements.CROWN_H_MAX); |
|
|
|
info.CutLevel = calGrade_CROWN_HEIGHT(result.measurements.CROWN_H_MIN, result.measurements.CROWN_H_MAX); |
|
|
|
info.CutLevel = calGrade_CROWN_HEIGHT(result.measurements.CROWN_H_MIN, result.measurements.CROWN_H_MAX); |
|
|
|
|
|
|
|
info.Dev = calDev(info.Max, info.Min); |
|
|
|
return info; |
|
|
|
return info; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -580,6 +592,7 @@ public class GradingResultVM : BaseViewModel |
|
|
|
info.Dev = FormatDouble_P(result.measurements.GIRDLE_BEZEL_DEV); |
|
|
|
info.Dev = FormatDouble_P(result.measurements.GIRDLE_BEZEL_DEV); |
|
|
|
info.Min = FormatDouble_P(result.measurements.GIRDLE_BEZEL_MIN); |
|
|
|
info.Min = FormatDouble_P(result.measurements.GIRDLE_BEZEL_MIN); |
|
|
|
info.Max = FormatDouble_P(result.measurements.GIRDLE_BEZEL_MAX); |
|
|
|
info.Max = FormatDouble_P(result.measurements.GIRDLE_BEZEL_MAX); |
|
|
|
|
|
|
|
info.Dev = calDev(info.Max, info.Min); |
|
|
|
return info; |
|
|
|
return info; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -605,6 +618,7 @@ public class GradingResultVM : BaseViewModel |
|
|
|
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.CutLevel = calGrade_GIRDLE(result.measurements.GIRDLE_VALLEY_MIN, result.measurements.GIRDLE_VALLEY_MAX); |
|
|
|
|
|
|
|
info.Dev = calDev(info.Max, info.Min); |
|
|
|
return info; |
|
|
|
return info; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -618,6 +632,7 @@ public class GradingResultVM : BaseViewModel |
|
|
|
info.Min = FormatDouble_A(result.measurements.PAV_ANGLE_MIN); |
|
|
|
info.Min = FormatDouble_A(result.measurements.PAV_ANGLE_MIN); |
|
|
|
info.Max = FormatDouble_A(result.measurements.PAV_ANGLE_MAX); |
|
|
|
info.Max = FormatDouble_A(result.measurements.PAV_ANGLE_MAX); |
|
|
|
info.CutLevel = calGrade_PAV_ANGLE(result.measurements.PAV_ANGLE_MIN, result.measurements.PAV_ANGLE_MAX); |
|
|
|
info.CutLevel = calGrade_PAV_ANGLE(result.measurements.PAV_ANGLE_MIN, result.measurements.PAV_ANGLE_MAX); |
|
|
|
|
|
|
|
info.Dev = calDev(info.Max, info.Min); |
|
|
|
return info; |
|
|
|
return info; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -631,6 +646,7 @@ public class GradingResultVM : BaseViewModel |
|
|
|
info.Min = FormatDouble_P(result.measurements.PAV_DEPTH_MIN); |
|
|
|
info.Min = FormatDouble_P(result.measurements.PAV_DEPTH_MIN); |
|
|
|
info.Max = FormatDouble_P(result.measurements.PAV_DEPTH_MAX); |
|
|
|
info.Max = FormatDouble_P(result.measurements.PAV_DEPTH_MAX); |
|
|
|
info.CutLevel = calGrade_PAV_DEPTH(result.measurements.PAV_DEPTH_MIN, result.measurements.PAV_DEPTH_MAX); |
|
|
|
info.CutLevel = calGrade_PAV_DEPTH(result.measurements.PAV_DEPTH_MIN, result.measurements.PAV_DEPTH_MAX); |
|
|
|
|
|
|
|
info.Dev = calDev(info.Max, info.Min); |
|
|
|
return info; |
|
|
|
return info; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -698,6 +714,7 @@ public class GradingResultVM : BaseViewModel |
|
|
|
info.Dev = FormatDouble_A(result.measurements.TWIST_DEV); |
|
|
|
info.Dev = FormatDouble_A(result.measurements.TWIST_DEV); |
|
|
|
info.Min = FormatDouble_A(result.measurements.TWIST_MIN); |
|
|
|
info.Min = FormatDouble_A(result.measurements.TWIST_MIN); |
|
|
|
info.Max = FormatDouble_A(result.measurements.TWIST_MAX); |
|
|
|
info.Max = FormatDouble_A(result.measurements.TWIST_MAX); |
|
|
|
|
|
|
|
info.Dev = calDev(info.Max, info.Min); |
|
|
|
return info; |
|
|
|
return info; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|