Index: Riskeer/Common/src/Riskeer.Common.Forms/Helpers/FailureMechanismSectionResultRowHelper.cs =================================================================== diff -u -rb70c5fe23fc35933af143bba669d3e2239377307 -r938ec5a0df29d420cc61321aff9bf288bba57971 --- Riskeer/Common/src/Riskeer.Common.Forms/Helpers/FailureMechanismSectionResultRowHelper.cs (.../FailureMechanismSectionResultRowHelper.cs) (revision b70c5fe23fc35933af143bba669d3e2239377307) +++ Riskeer/Common/src/Riskeer.Common.Forms/Helpers/FailureMechanismSectionResultRowHelper.cs (.../FailureMechanismSectionResultRowHelper.cs) (revision 938ec5a0df29d420cc61321aff9bf288bba57971) @@ -43,6 +43,7 @@ /// The value representing the probability of the detailed assessment. /// The set for the /// section result. May be null if the section result does not have a calculation set. + /// The error message when an error is present; otherwise. public static string GetDetailedAssessmentError(double detailedAssessmentProbability, ICalculation normativeCalculation) { @@ -51,14 +52,12 @@ return Resources.FailureMechanismResultView_DataGridViewCellFormatting_Calculation_not_set; } - CalculationScenarioStatus calculationScenarioStatus = GetCalculationStatus(normativeCalculation, - detailedAssessmentProbability); - if (calculationScenarioStatus == CalculationScenarioStatus.NotCalculated) + if (!normativeCalculation.HasOutput) { return Resources.FailureMechanismResultView_DataGridViewCellFormatting_Calculation_not_calculated; } - if (calculationScenarioStatus == CalculationScenarioStatus.Failed) + if (double.IsNaN(detailedAssessmentProbability)) { return Resources.FailureMechanismResultView_DataGridViewCellFormatting_Calculation_must_have_valid_output; } @@ -209,21 +208,5 @@ columnStateDefinition.ReadOnly = true; columnStateDefinition.Style = CellStyle.Disabled; } - - private static CalculationScenarioStatus GetCalculationStatus(ICalculation calculation, - double detailedAssessmentProbability) - { - if (!calculation.HasOutput) - { - return CalculationScenarioStatus.NotCalculated; - } - - if (double.IsNaN(detailedAssessmentProbability)) - { - return CalculationScenarioStatus.Failed; - } - - return CalculationScenarioStatus.Done; - } } } \ No newline at end of file