更新20260622
This commit is contained in:
@@ -410,6 +410,7 @@ namespace Footwear_Test_methodsfor_wholeshoe_Slipresistanceperformance.ViewModel
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var actualLoadForReport = FormatActualLoad(points);
|
||||||
var report = new SlipReportExport(
|
var report = new SlipReportExport(
|
||||||
TestNumber,
|
TestNumber,
|
||||||
OperatorName,
|
OperatorName,
|
||||||
@@ -421,7 +422,7 @@ namespace Footwear_Test_methodsfor_wholeshoe_Slipresistanceperformance.ViewModel
|
|||||||
CurrentMode(),
|
CurrentMode(),
|
||||||
CurrentSurface(),
|
CurrentSurface(),
|
||||||
TargetLoadText,
|
TargetLoadText,
|
||||||
ActualLoadText,
|
actualLoadForReport,
|
||||||
TestSpeedText,
|
TestSpeedText,
|
||||||
StandardReference,
|
StandardReference,
|
||||||
Samples.ToList(),
|
Samples.ToList(),
|
||||||
@@ -1199,6 +1200,12 @@ namespace Footwear_Test_methodsfor_wholeshoe_Slipresistanceperformance.ViewModel
|
|||||||
? Math.Max(1, targetLoad * MinimumAnalysisLoadRatio)
|
? Math.Max(1, targetLoad * MinimumAnalysisLoadRatio)
|
||||||
: 1;
|
: 1;
|
||||||
|
|
||||||
|
private static string FormatActualLoad(IReadOnlyList<SlipDataPoint> points)
|
||||||
|
{
|
||||||
|
var actualLoad = points.Average(point => point.VerticalLoadN);
|
||||||
|
return $"{actualLoad.ToString("F1", CultureInfo.InvariantCulture)} N";
|
||||||
|
}
|
||||||
|
|
||||||
private static bool TryParseLoadValue(string value, out double load)
|
private static bool TryParseLoadValue(string value, out double load)
|
||||||
{
|
{
|
||||||
var numeric = new string(value
|
var numeric = new string(value
|
||||||
|
|||||||
Reference in New Issue
Block a user