Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismSectionResultRowOld.cs =================================================================== diff -u -r26259e86f36858575c3307e3a97602a899026bbf -r16350bb8bad254e52da022cc575250b2be1d0d5f --- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismSectionResultRowOld.cs (.../ClosingStructuresFailureMechanismSectionResultRowOld.cs) (revision 26259e86f36858575c3307e3a97602a899026bbf) +++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismSectionResultRowOld.cs (.../ClosingStructuresFailureMechanismSectionResultRowOld.cs) (revision 16350bb8bad254e52da022cc575250b2be1d0d5f) @@ -261,15 +261,15 @@ private void UpdateDetailedAssessmentProbabilityError() { - if (FailureMechanismSectionResultRowHelper.SimpleAssessmentIsSufficient(SimpleAssessmentResult) - || !FailureMechanismSectionResultRowHelper.DetailedAssessmentResultIsProbability(DetailedAssessmentResult) + if (FailureMechanismSectionResultRowHelperOld.SimpleAssessmentIsSufficient(SimpleAssessmentResult) + || !FailureMechanismSectionResultRowHelperOld.DetailedAssessmentResultIsProbability(DetailedAssessmentResult) || UseManualAssembly) { ColumnStateDefinitions[detailedAssessmentProbabilityIndex].ErrorText = string.Empty; } else { - ColumnStateDefinitions[detailedAssessmentProbabilityIndex].ErrorText = FailureMechanismSectionResultRowHelper.GetDetailedAssessmentProbabilityError( + ColumnStateDefinitions[detailedAssessmentProbabilityIndex].ErrorText = FailureMechanismSectionResultRowHelperOld.GetDetailedAssessmentProbabilityError( SectionResult.GetCalculationScenarios(calculationScenarios).ToArray(), scenarios => SectionResult.GetTotalContribution(scenarios), scenarios => SectionResult.GetDetailedAssessmentProbability(scenarios)); @@ -385,13 +385,13 @@ /// is a valid value, but unsupported. private void UpdateColumnStateDefinitions() { - bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelper.SimpleAssessmentIsSufficient(SimpleAssessmentResult); + bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelperOld.SimpleAssessmentIsSufficient(SimpleAssessmentResult); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[simpleAssessmentResultIndex], UseManualAssembly); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[detailedAssessmentResultIndex], simpleAssessmentSufficient || UseManualAssembly); if (simpleAssessmentSufficient - || !FailureMechanismSectionResultRowHelper.DetailedAssessmentResultIsProbability(DetailedAssessmentResult) + || !FailureMechanismSectionResultRowHelperOld.DetailedAssessmentResultIsProbability(DetailedAssessmentResult) || UseManualAssembly) { ColumnStateHelper.DisableColumn(ColumnStateDefinitions[detailedAssessmentProbabilityIndex]); @@ -406,7 +406,7 @@ || UseManualAssembly); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[tailorMadeAssessmentProbabilityIndex], simpleAssessmentSufficient - || !FailureMechanismSectionResultRowHelper.TailorMadeAssessmentResultIsProbability(TailorMadeAssessmentResult) + || !FailureMechanismSectionResultRowHelperOld.TailorMadeAssessmentResultIsProbability(TailorMadeAssessmentResult) || UseManualAssembly); if (UseManualAssembly) @@ -419,13 +419,13 @@ } else { - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex], simpleAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[detailedAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[detailedAssemblyCategoryGroupIndex], detailedAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[tailorMadeAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[tailorMadeAssemblyCategoryGroupIndex], tailorMadeAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[combinedAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[combinedAssemblyCategoryGroupIndex], combinedAssemblyCategoryGroup); ColumnStateHelper.EnableColumn(ColumnStateDefinitions[combinedAssemblyProbabilityIndex], true); } Fisheye: Tag 16350bb8bad254e52da022cc575250b2be1d0d5f refers to a dead (removed) revision in file `Riskeer/Common/src/Riskeer.Common.Forms/Helpers/FailureMechanismSectionResultRowHelper.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Common/src/Riskeer.Common.Forms/Helpers/FailureMechanismSectionResultRowHelperOld.cs =================================================================== diff -u --- Riskeer/Common/src/Riskeer.Common.Forms/Helpers/FailureMechanismSectionResultRowHelperOld.cs (revision 0) +++ Riskeer/Common/src/Riskeer.Common.Forms/Helpers/FailureMechanismSectionResultRowHelperOld.cs (revision 16350bb8bad254e52da022cc575250b2be1d0d5f) @@ -0,0 +1,180 @@ +// Copyright (C) Stichting Deltares 2021. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Linq; +using Core.Common.Controls.DataGrid; +using Riskeer.AssemblyTool.Data; +using Riskeer.Common.Data.Calculation; +using Riskeer.Common.Forms.Properties; +using Riskeer.Common.Forms.Views; +using Riskeer.Common.Primitives; + +namespace Riskeer.Common.Forms.Helpers +{ + /// + /// Helper class for updating states of a + /// in a . + /// + public static class FailureMechanismSectionResultRowHelperOld + { + /// + /// Gets the error text to display when the detailed assessment probability fails. + /// + /// The type of . + /// All relevant scenarios to use. + /// The to get + /// the total contribution. + /// The + /// to get the detailed assessment probability. + /// The error message when an error is present; otherwise. + /// Thrown when any parameter is null. + public static string GetDetailedAssessmentProbabilityError( + TCalculationScenario[] relevantScenarios, Func, double> getTotalContributionFunc, + Func, double> getDetailedAssessmentProbabilityFunc) + where TCalculationScenario : ICalculationScenario + { + if (relevantScenarios == null) + { + throw new ArgumentNullException(nameof(relevantScenarios)); + } + + if (getTotalContributionFunc == null) + { + throw new ArgumentNullException(nameof(getTotalContributionFunc)); + } + + if (getDetailedAssessmentProbabilityFunc == null) + { + throw new ArgumentNullException(nameof(getDetailedAssessmentProbabilityFunc)); + } + + if (relevantScenarios.Length == 0) + { + return Resources.FailureMechanismResultView_DataGridViewCellFormatting_No_relevant_calculation_scenarios_present; + } + + if (Math.Abs(getTotalContributionFunc(relevantScenarios) - 1.0) > 1e-6) + { + return Resources.FailureMechanismResultView_DataGridViewCellFormatting_Scenario_contribution_for_this_section_not_100; + } + + if (!relevantScenarios.All(s => s.HasOutput)) + { + return Resources.FailureMechanismResultView_DataGridViewCellFormatting_Not_all_relevant_calculation_scenarios_have_been_executed; + } + + if (double.IsNaN(getDetailedAssessmentProbabilityFunc(relevantScenarios))) + { + return Resources.FailureMechanismResultView_DataGridViewCellFormatting_All_relevant_calculation_scenarios_must_have_valid_output; + } + + return string.Empty; + } + + /// + /// Helper method that determines whether the simple assessment is sufficient. + /// + /// The simple assessment result to check. + /// true when the simple assessment is + /// or , false otherwise. + public static bool SimpleAssessmentIsSufficient(SimpleAssessmentResultType simpleAssessmentResult) + { + return simpleAssessmentResult == SimpleAssessmentResultType.ProbabilityNegligible + || simpleAssessmentResult == SimpleAssessmentResultType.NotApplicable; + } + + /// + /// Helper method that determines whether the simple assessment is sufficient. + /// + /// The simple assessment result to check. + /// true when the simple assessment is , + /// false otherwise. + public static bool SimpleAssessmentIsSufficient(SimpleAssessmentValidityOnlyResultType simpleAssessmentResult) + { + return simpleAssessmentResult == SimpleAssessmentValidityOnlyResultType.NotApplicable; + } + + /// + /// Helper method that determines whether the detailed assessment + /// is . + /// + /// The detailed assessment result to check. + /// true when the detailed assessment is + /// , false otherwise. + public static bool DetailedAssessmentResultIsProbability(DetailedAssessmentProbabilityOnlyResultType detailedAssessmentResult) + { + return detailedAssessmentResult == DetailedAssessmentProbabilityOnlyResultType.Probability; + } + + /// + /// Helper method that determines whether the tailor made assessment + /// is . + /// + /// The tailor made assessment result to check. + /// true when the tailor made assessment + /// is , false otherwise. + public static bool TailorMadeAssessmentResultIsProbability(TailorMadeAssessmentProbabilityCalculationResultType tailorMadeAssessmentResult) + { + return tailorMadeAssessmentResult == TailorMadeAssessmentProbabilityCalculationResultType.Probability; + } + + /// + /// Helper method that determines whether the tailor made assessment + /// is . + /// + /// The tailor made assessment result to check. + /// true when the tailor made assessment + /// is , false otherwise. + public static bool TailorMadeAssessmentResultIsProbability(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType tailorMadeAssessmentResult) + { + return tailorMadeAssessmentResult == TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.Probability; + } + + /// + /// Helper method that sets the style of a based on a + /// . + /// + /// The column state definition to set the style for. + /// The assembly category group to base the style on. + /// Thrown when + /// has an invalid value for . + /// Thrown when + /// is not supported. + /// Thrown when + /// is null. + public static void SetAssemblyCategoryGroupStyle(DataGridViewColumnStateDefinition columnStateDefinition, + FailureMechanismSectionAssemblyCategoryGroup assemblyCategoryGroup) + { + if (columnStateDefinition == null) + { + throw new ArgumentNullException(nameof(columnStateDefinition)); + } + + columnStateDefinition.Style = new CellStyle( + Color.FromKnownColor(KnownColor.ControlText), + AssemblyCategoryGroupColorHelper.GetFailureMechanismSectionAssemblyCategoryGroupColor(assemblyCategoryGroup)); + } + } +} \ No newline at end of file Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Helpers/FailureMechanismSectionResultRowHelperOldTest.cs =================================================================== diff -u --- Riskeer/Common/test/Riskeer.Common.Forms.Test/Helpers/FailureMechanismSectionResultRowHelperOldTest.cs (revision 0) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Helpers/FailureMechanismSectionResultRowHelperOldTest.cs (revision 16350bb8bad254e52da022cc575250b2be1d0d5f) @@ -0,0 +1,302 @@ +// Copyright (C) Stichting Deltares 2021. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using System.ComponentModel; +using System.Drawing; +using Core.Common.Controls.DataGrid; +using Core.Common.TestUtil; +using NUnit.Framework; +using Rhino.Mocks; +using Riskeer.AssemblyTool.Data; +using Riskeer.Common.Data.Calculation; +using Riskeer.Common.Forms.Helpers; +using Riskeer.Common.Forms.TestUtil; +using Riskeer.Common.Primitives; + +namespace Riskeer.Common.Forms.Test.Helpers +{ + [TestFixture] + public class FailureMechanismSectionResultRowHelperOldTest + { + [Test] + public void GetDetailedAssessmentProbabilityError_RelevantScenariosNull_ThrowsArgumentNullException() + { + // Call + void Call() => FailureMechanismSectionResultRowHelperOld.GetDetailedAssessmentProbabilityError( + null, scenarios => double.NaN, scenarios => double.NaN); + + // Assert + var exception = Assert.Throws(Call); + Assert.AreEqual("relevantScenarios", exception.ParamName); + } + + [Test] + public void GetDetailedAssessmentProbabilityError_GetTotalContributionFuncNull_ThrowsArgumentNullException() + { + // Call + void Call() => FailureMechanismSectionResultRowHelperOld.GetDetailedAssessmentProbabilityError( + new ICalculationScenario[0], null, scenarios => double.NaN); + + // Assert + var exception = Assert.Throws(Call); + Assert.AreEqual("getTotalContributionFunc", exception.ParamName); + } + + [Test] + public void GetDetailedAssessmentProbabilityError_GetDetailedAssessmentProbabilityFuncNull_ThrowsArgumentNullException() + { + // Call + void Call() => FailureMechanismSectionResultRowHelperOld.GetDetailedAssessmentProbabilityError( + new ICalculationScenario[0], scenarios => double.NaN, null); + + // Assert + var exception = Assert.Throws(Call); + Assert.AreEqual("getDetailedAssessmentProbabilityFunc", exception.ParamName); + } + + [Test] + public void GetDetailedAssessmentProbabilityError_RelevantScenariosEmpty_ReturnsErrorMessage() + { + // Setup + var random = new Random(21); + + // Call + string errorMessage = FailureMechanismSectionResultRowHelperOld.GetDetailedAssessmentProbabilityError( + new ICalculationScenario[0], scenarios => random.NextDouble(), scenarios => random.NextDouble()); + + // Assert + Assert.AreEqual("Er moet minimaal één maatgevende berekening voor dit vak worden gedefinieerd.", errorMessage); + } + + [Test] + public void GetDetailedAssessmentProbabilityError_TotalContributionNotOne_ReturnsErrorMessage() + { + // Setup + var mocks = new MockRepository(); + var calculationScenario = mocks.Stub(); + mocks.ReplayAll(); + + var random = new Random(21); + ICalculationScenario[] calculationScenarios = + { + calculationScenario + }; + + // Call + string errorMessage = FailureMechanismSectionResultRowHelperOld.GetDetailedAssessmentProbabilityError( + calculationScenarios, scenarios => random.NextDouble(0, 0.99), scenarios => random.NextDouble()); + + // Assert + Assert.AreEqual("De bijdragen van de maatgevende scenario's voor dit vak moeten opgeteld gelijk zijn aan 100%.", errorMessage); + } + + [Test] + public void GetDetailedAssessmentProbabilityError_CalculationScenariosWithoutOutput_ReturnsErrorMessage() + { + // Setup + var mocks = new MockRepository(); + var calculationScenario1 = mocks.Stub(); + calculationScenario1.Stub(cs => cs.HasOutput).Return(true); + var calculationScenario2 = mocks.Stub(); + mocks.ReplayAll(); + + var random = new Random(21); + ICalculationScenario[] calculationScenarios = + { + calculationScenario1, + calculationScenario2 + }; + + // Call + string errorMessage = FailureMechanismSectionResultRowHelperOld.GetDetailedAssessmentProbabilityError( + calculationScenarios, scenarios => 1, scenarios => random.NextDouble()); + + // Assert + Assert.AreEqual("Alle maatgevende berekeningen voor dit vak moeten uitgevoerd zijn.", errorMessage); + } + + [Test] + public void GetDetailedAssessmentProbabilityError_DetailedAssessmentProbabilityNaN_ReturnsErrorMessage() + { + // Setup + var mocks = new MockRepository(); + var calculationScenario = mocks.Stub(); + calculationScenario.Stub(cs => cs.HasOutput).Return(true); + mocks.ReplayAll(); + + ICalculationScenario[] calculationScenarios = + { + calculationScenario + }; + + // Call + string errorMessage = FailureMechanismSectionResultRowHelperOld.GetDetailedAssessmentProbabilityError( + calculationScenarios, scenarios => 1, scenarios => double.NaN); + + // Assert + Assert.AreEqual("Alle maatgevende berekeningen voor dit vak moeten een geldige uitkomst hebben.", errorMessage); + } + + [Test] + public void GetDetailedAssessmentProbabilityError_ValidData_ReturnsEmptyMessage() + { + // Setup + var mocks = new MockRepository(); + var calculationScenario = mocks.Stub(); + calculationScenario.Stub(cs => cs.HasOutput).Return(true); + mocks.ReplayAll(); + + var random = new Random(21); + ICalculationScenario[] calculationScenarios = + { + calculationScenario + }; + + // Call + string errorMessage = FailureMechanismSectionResultRowHelperOld.GetDetailedAssessmentProbabilityError( + calculationScenarios, scenarios => 1, scenarios => random.NextDouble()); + + // Assert + Assert.IsEmpty(errorMessage); + } + + [Test] + [TestCase(SimpleAssessmentResultType.None, false)] + [TestCase(SimpleAssessmentResultType.NotApplicable, true)] + [TestCase(SimpleAssessmentResultType.ProbabilityNegligible, true)] + [TestCase(SimpleAssessmentResultType.AssessFurther, false)] + public void SimpleAssessmentIsSufficient_WithSimpleAssessmentResultType_ReturnsExpectedResult( + SimpleAssessmentResultType simpleAssessmentResult, bool expectedSufficiency) + { + // Call + bool isSufficient = FailureMechanismSectionResultRowHelperOld.SimpleAssessmentIsSufficient(simpleAssessmentResult); + + // Assert + Assert.AreEqual(expectedSufficiency, isSufficient); + } + + [Test] + [TestCase(SimpleAssessmentValidityOnlyResultType.None, false)] + [TestCase(SimpleAssessmentValidityOnlyResultType.Applicable, false)] + [TestCase(SimpleAssessmentValidityOnlyResultType.NotApplicable, true)] + public void SimpleAssessmentIsSufficient_WithSimpleAssessmentValidityOnlyResultType_ReturnsExpectedResult( + SimpleAssessmentValidityOnlyResultType simpleAssessmentResult, bool expectedSufficiency) + { + // Call + bool isSufficient = FailureMechanismSectionResultRowHelperOld.SimpleAssessmentIsSufficient(simpleAssessmentResult); + + // Assert + Assert.AreEqual(expectedSufficiency, isSufficient); + } + + [Test] + [TestCase(DetailedAssessmentProbabilityOnlyResultType.NotAssessed, false)] + [TestCase(DetailedAssessmentProbabilityOnlyResultType.Probability, true)] + public void DetailedAssessmentResultIsProbability_WithDetailedAssessmentProbabilityOnlyResultType_ReturnsExpectedResult( + DetailedAssessmentProbabilityOnlyResultType detailedAssessmentResult, bool expectedIsProbability) + { + // Call + bool isProbability = FailureMechanismSectionResultRowHelperOld.DetailedAssessmentResultIsProbability(detailedAssessmentResult); + + // Assert + Assert.AreEqual(expectedIsProbability, isProbability); + } + + [Test] + [TestCase(TailorMadeAssessmentProbabilityCalculationResultType.NotAssessed, false)] + [TestCase(TailorMadeAssessmentProbabilityCalculationResultType.ProbabilityNegligible, false)] + [TestCase(TailorMadeAssessmentProbabilityCalculationResultType.Probability, true)] + [TestCase(TailorMadeAssessmentProbabilityCalculationResultType.NotAssessed, false)] + public void TailorMadeAssessmentResultIsProbability_WithTailorMadeAssessmentProbabilityCalculationResultType_ReturnsExpectedResult( + TailorMadeAssessmentProbabilityCalculationResultType tailorMadeAssessmentResult, bool expectedIsProbability) + { + // Call + bool isProbability = FailureMechanismSectionResultRowHelperOld.TailorMadeAssessmentResultIsProbability(tailorMadeAssessmentResult); + + // Assert + Assert.AreEqual(expectedIsProbability, isProbability); + } + + [Test] + [TestCase(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.None, false)] + [TestCase(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.NotAssessed, false)] + [TestCase(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.ProbabilityNegligible, false)] + [TestCase(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.Probability, true)] + [TestCase(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.Sufficient, false)] + [TestCase(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.Insufficient, false)] + public void TailorMadeAssessmentResultIsProbability_WithTailorMadeAssessmentProbabilityAndDetailedCalculationResultType_ReturnsExpectedResult( + TailorMadeAssessmentProbabilityAndDetailedCalculationResultType tailorMadeAssessmentResult, bool expectedIsProbability) + { + // Call + bool isProbability = FailureMechanismSectionResultRowHelperOld.TailorMadeAssessmentResultIsProbability(tailorMadeAssessmentResult); + + // Assert + Assert.AreEqual(expectedIsProbability, isProbability); + } + + [Test] + public void SetAssemblyCategoryGroupStyle_DataGridViewColumnStateDefinitionNull_ThrowsArgumentNullException() + { + // Call + void Call() => FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle( + null, new Random(39).NextEnumValue()); + + // Assert + var exception = Assert.Throws(Call); + Assert.AreEqual("columnStateDefinition", exception.ParamName); + } + + [Test] + public void SetAssemblyCategoryGroupStyle_WithInvalidFailureMechanismSectionAssemblyCategoryGroup_ThrowsInvalidEnumArgumentException() + { + // Setup + var columnStateDefinition = new DataGridViewColumnStateDefinition + { + Style = new CellStyle(Color.FromKnownColor(KnownColor.Transparent), Color.FromKnownColor(KnownColor.Transparent)) + }; + + // Call + void Call() => FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle( + columnStateDefinition, (FailureMechanismSectionAssemblyCategoryGroup) 99); + + // Assert + const string expectedMessage = "The value of argument 'assemblyCategoryGroup' (99) is invalid for Enum type 'FailureMechanismSectionAssemblyCategoryGroup'."; + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, expectedMessage); + } + + [Test] + [TestCaseSource(typeof(AssemblyCategoryColorTestHelper), nameof(AssemblyCategoryColorTestHelper.FailureMechanismSectionAssemblyCategoryGroupColorCases))] + public void SetAssemblyCategoryGroupStyle_WithFailureMechanismSectionAssemblyCategoryGroup_UpdatesColumnStyle( + FailureMechanismSectionAssemblyCategoryGroup assemblyCategoryGroup, Color expectedColor) + { + // Setup + var columnStateDefinition = new DataGridViewColumnStateDefinition(); + + // Call + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(columnStateDefinition, assemblyCategoryGroup); + + // Assert + Assert.AreEqual(expectedColor, columnStateDefinition.Style.BackgroundColor); + Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), columnStateDefinition.Style.TextColor); + } + } +} \ No newline at end of file Fisheye: Tag 16350bb8bad254e52da022cc575250b2be1d0d5f refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Forms.Test/Helpers/FailureMechanismSectionResultRowHelperTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneErosionSectionResultRowOld.cs =================================================================== diff -u -rca05b1d7e9fa4460c5bb6bcdb1e360f2bebfa08b -r16350bb8bad254e52da022cc575250b2be1d0d5f --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneErosionSectionResultRowOld.cs (.../DuneErosionSectionResultRowOld.cs) (revision ca05b1d7e9fa4460c5bb6bcdb1e360f2bebfa08b) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneErosionSectionResultRowOld.cs (.../DuneErosionSectionResultRowOld.cs) (revision 16350bb8bad254e52da022cc575250b2be1d0d5f) @@ -401,7 +401,7 @@ /// is a valid value, but unsupported. private void UpdateColumnStateDefinitionStates() { - bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelper.SimpleAssessmentIsSufficient(SimpleAssessmentResult); + bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelperOld.SimpleAssessmentIsSufficient(SimpleAssessmentResult); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[simpleAssessmentResultIndex], UseManualAssembly); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[detailedAssessmentResultForFactorizedSignalingNormIndex], @@ -426,13 +426,13 @@ } else { - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex], simpleAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[detailedAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[detailedAssemblyCategoryGroupIndex], detailedAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[tailorMadeAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[tailorMadeAssemblyCategoryGroupIndex], tailorMadeAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[combinedAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[combinedAssemblyCategoryGroupIndex], combinedAssemblyCategoryGroup); } Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowOld.cs =================================================================== diff -u -r26259e86f36858575c3307e3a97602a899026bbf -r16350bb8bad254e52da022cc575250b2be1d0d5f --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowOld.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRowOld.cs) (revision 26259e86f36858575c3307e3a97602a899026bbf) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowOld.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRowOld.cs) (revision 16350bb8bad254e52da022cc575250b2be1d0d5f) @@ -260,15 +260,15 @@ private void UpdateDetailedAssessmentProbabilityError() { - if (FailureMechanismSectionResultRowHelper.SimpleAssessmentIsSufficient(SimpleAssessmentResult) - || !FailureMechanismSectionResultRowHelper.DetailedAssessmentResultIsProbability(DetailedAssessmentResult) + if (FailureMechanismSectionResultRowHelperOld.SimpleAssessmentIsSufficient(SimpleAssessmentResult) + || !FailureMechanismSectionResultRowHelperOld.DetailedAssessmentResultIsProbability(DetailedAssessmentResult) || UseManualAssembly) { ColumnStateDefinitions[detailedAssessmentProbabilityIndex].ErrorText = string.Empty; } else { - ColumnStateDefinitions[detailedAssessmentProbabilityIndex].ErrorText = FailureMechanismSectionResultRowHelper.GetDetailedAssessmentProbabilityError( + ColumnStateDefinitions[detailedAssessmentProbabilityIndex].ErrorText = FailureMechanismSectionResultRowHelperOld.GetDetailedAssessmentProbabilityError( SectionResult.GetCalculationScenarios(calculationScenarios).ToArray(), scenarios => SectionResult.GetTotalContribution(scenarios), scenarios => SectionResult.GetDetailedAssessmentProbability(scenarios)); @@ -384,13 +384,13 @@ /// is a valid value, but unsupported. private void UpdateColumnDefinitionStates() { - bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelper.SimpleAssessmentIsSufficient(SimpleAssessmentResult); + bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelperOld.SimpleAssessmentIsSufficient(SimpleAssessmentResult); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[simpleAssessmentResultIndex], UseManualAssembly); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[detailedAssessmentResultIndex], simpleAssessmentSufficient || UseManualAssembly); if (simpleAssessmentSufficient - || !FailureMechanismSectionResultRowHelper.DetailedAssessmentResultIsProbability(DetailedAssessmentResult) + || !FailureMechanismSectionResultRowHelperOld.DetailedAssessmentResultIsProbability(DetailedAssessmentResult) || UseManualAssembly) { ColumnStateHelper.DisableColumn(ColumnStateDefinitions[detailedAssessmentProbabilityIndex]); @@ -404,7 +404,7 @@ simpleAssessmentSufficient || UseManualAssembly); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[tailorMadeAssessmentProbabilityIndex], simpleAssessmentSufficient - || !FailureMechanismSectionResultRowHelper.TailorMadeAssessmentResultIsProbability(TailorMadeAssessmentResult) + || !FailureMechanismSectionResultRowHelperOld.TailorMadeAssessmentResultIsProbability(TailorMadeAssessmentResult) || UseManualAssembly); if (UseManualAssembly) @@ -417,13 +417,13 @@ } else { - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex], simpleAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[detailedAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[detailedAssemblyCategoryGroupIndex], detailedAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[tailorMadeAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[tailorMadeAssemblyCategoryGroupIndex], tailorMadeAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[combinedAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[combinedAssemblyCategoryGroupIndex], combinedAssemblyCategoryGroup); ColumnStateHelper.EnableColumn(ColumnStateDefinitions[combinedAssemblyProbabilityIndex], true); } Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismSectionResultRowOld.cs =================================================================== diff -u -rca05b1d7e9fa4460c5bb6bcdb1e360f2bebfa08b -r16350bb8bad254e52da022cc575250b2be1d0d5f --- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismSectionResultRowOld.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResultRowOld.cs) (revision ca05b1d7e9fa4460c5bb6bcdb1e360f2bebfa08b) +++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismSectionResultRowOld.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResultRowOld.cs) (revision 16350bb8bad254e52da022cc575250b2be1d0d5f) @@ -401,7 +401,7 @@ /// is a valid value, but unsupported. private void UpdateColumnStateDefinitionStates() { - bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelper.SimpleAssessmentIsSufficient(SimpleAssessmentResult); + bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelperOld.SimpleAssessmentIsSufficient(SimpleAssessmentResult); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[simpleAssessmentResultIndex], UseManualAssembly); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[detailedAssessmentResultForFactorizedSignalingNormIndex], @@ -426,13 +426,13 @@ } else { - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex], simpleAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[detailedAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[detailedAssemblyCategoryGroupIndex], detailedAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[tailorMadeAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[tailorMadeAssemblyCategoryGroupIndex], tailorMadeAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[combinedAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[combinedAssemblyCategoryGroupIndex], combinedAssemblyCategoryGroup); } Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresFailureMechanismSectionResultRowOld.cs =================================================================== diff -u -r26259e86f36858575c3307e3a97602a899026bbf -r16350bb8bad254e52da022cc575250b2be1d0d5f --- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresFailureMechanismSectionResultRowOld.cs (.../HeightStructuresFailureMechanismSectionResultRowOld.cs) (revision 26259e86f36858575c3307e3a97602a899026bbf) +++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresFailureMechanismSectionResultRowOld.cs (.../HeightStructuresFailureMechanismSectionResultRowOld.cs) (revision 16350bb8bad254e52da022cc575250b2be1d0d5f) @@ -259,15 +259,15 @@ private void UpdateDetailedAssessmentProbabilityError() { - if (FailureMechanismSectionResultRowHelper.SimpleAssessmentIsSufficient(SimpleAssessmentResult) - || !FailureMechanismSectionResultRowHelper.DetailedAssessmentResultIsProbability(DetailedAssessmentResult) + if (FailureMechanismSectionResultRowHelperOld.SimpleAssessmentIsSufficient(SimpleAssessmentResult) + || !FailureMechanismSectionResultRowHelperOld.DetailedAssessmentResultIsProbability(DetailedAssessmentResult) || UseManualAssembly) { ColumnStateDefinitions[detailedAssessmentProbabilityIndex].ErrorText = string.Empty; } else { - ColumnStateDefinitions[detailedAssessmentProbabilityIndex].ErrorText = FailureMechanismSectionResultRowHelper.GetDetailedAssessmentProbabilityError( + ColumnStateDefinitions[detailedAssessmentProbabilityIndex].ErrorText = FailureMechanismSectionResultRowHelperOld.GetDetailedAssessmentProbabilityError( SectionResult.GetCalculationScenarios(calculationScenarios).ToArray(), scenarios => SectionResult.GetTotalContribution(scenarios), scenarios => SectionResult.GetDetailedAssessmentProbability(scenarios)); @@ -375,13 +375,13 @@ /// is a valid value, but unsupported. private void UpdateColumnDefinitionStates() { - bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelper.SimpleAssessmentIsSufficient(SimpleAssessmentResult); + bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelperOld.SimpleAssessmentIsSufficient(SimpleAssessmentResult); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[simpleAssessmentResultIndex], UseManualAssembly); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[detailedAssessmentResultIndex], simpleAssessmentSufficient || UseManualAssembly); if (simpleAssessmentSufficient - || !FailureMechanismSectionResultRowHelper.DetailedAssessmentResultIsProbability(DetailedAssessmentResult) + || !FailureMechanismSectionResultRowHelperOld.DetailedAssessmentResultIsProbability(DetailedAssessmentResult) || UseManualAssembly) { ColumnStateHelper.DisableColumn(ColumnStateDefinitions[detailedAssessmentProbabilityIndex]); @@ -395,7 +395,7 @@ simpleAssessmentSufficient || UseManualAssembly); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[tailorMadeAssessmentProbabilityIndex], simpleAssessmentSufficient - || !FailureMechanismSectionResultRowHelper.TailorMadeAssessmentResultIsProbability(TailorMadeAssessmentResult) + || !FailureMechanismSectionResultRowHelperOld.TailorMadeAssessmentResultIsProbability(TailorMadeAssessmentResult) || UseManualAssembly); if (UseManualAssembly) @@ -408,13 +408,13 @@ } else { - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex], simpleAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[detailedAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[detailedAssemblyCategoryGroupIndex], detailedAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[tailorMadeAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[tailorMadeAssemblyCategoryGroupIndex], tailorMadeAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[combinedAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[combinedAssemblyCategoryGroupIndex], combinedAssemblyCategoryGroup); ColumnStateHelper.EnableColumn(ColumnStateDefinitions[combinedAssemblyProbabilityIndex], true); } Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultRows/GrassCoverSlipOffInwardsSectionResultRowOld.cs =================================================================== diff -u -rca05b1d7e9fa4460c5bb6bcdb1e360f2bebfa08b -r16350bb8bad254e52da022cc575250b2be1d0d5f --- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultRows/GrassCoverSlipOffInwardsSectionResultRowOld.cs (.../GrassCoverSlipOffInwardsSectionResultRowOld.cs) (revision ca05b1d7e9fa4460c5bb6bcdb1e360f2bebfa08b) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultRows/GrassCoverSlipOffInwardsSectionResultRowOld.cs (.../GrassCoverSlipOffInwardsSectionResultRowOld.cs) (revision 16350bb8bad254e52da022cc575250b2be1d0d5f) @@ -311,7 +311,7 @@ /// is a valid value, but unsupported. private void UpdateColumnStateDefinitionStates() { - bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelper.SimpleAssessmentIsSufficient(SimpleAssessmentResult); + bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelperOld.SimpleAssessmentIsSufficient(SimpleAssessmentResult); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[simpleAssessmentResultIndex], UseManualAssembly); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[detailedAssessmentResultIndex], @@ -328,13 +328,13 @@ } else { - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex], simpleAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[detailedAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[detailedAssemblyCategoryGroupIndex], detailedAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[tailorMadeAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[tailorMadeAssemblyCategoryGroupIndex], tailorMadeAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[combinedAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[combinedAssemblyCategoryGroupIndex], combinedAssemblyCategoryGroup); } Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultRows/GrassCoverSlipOffOutwardsSectionResultRowOld.cs =================================================================== diff -u -rca05b1d7e9fa4460c5bb6bcdb1e360f2bebfa08b -r16350bb8bad254e52da022cc575250b2be1d0d5f --- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultRows/GrassCoverSlipOffOutwardsSectionResultRowOld.cs (.../GrassCoverSlipOffOutwardsSectionResultRowOld.cs) (revision ca05b1d7e9fa4460c5bb6bcdb1e360f2bebfa08b) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultRows/GrassCoverSlipOffOutwardsSectionResultRowOld.cs (.../GrassCoverSlipOffOutwardsSectionResultRowOld.cs) (revision 16350bb8bad254e52da022cc575250b2be1d0d5f) @@ -311,7 +311,7 @@ /// is a valid value, but unsupported. private void UpdateColumnStateDefinitionStates() { - bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelper.SimpleAssessmentIsSufficient(SimpleAssessmentResult); + bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelperOld.SimpleAssessmentIsSufficient(SimpleAssessmentResult); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[simpleAssessmentResultIndex], UseManualAssembly); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[detailedAssessmentResultIndex], @@ -328,13 +328,13 @@ } else { - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex], simpleAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[detailedAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[detailedAssemblyCategoryGroupIndex], detailedAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[tailorMadeAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[tailorMadeAssemblyCategoryGroupIndex], tailorMadeAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[combinedAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[combinedAssemblyCategoryGroupIndex], combinedAssemblyCategoryGroup); } Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRowOld.cs =================================================================== diff -u -rca05b1d7e9fa4460c5bb6bcdb1e360f2bebfa08b -r16350bb8bad254e52da022cc575250b2be1d0d5f --- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRowOld.cs (.../MacroStabilityOutwardsSectionResultRowOld.cs) (revision ca05b1d7e9fa4460c5bb6bcdb1e360f2bebfa08b) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRowOld.cs (.../MacroStabilityOutwardsSectionResultRowOld.cs) (revision 16350bb8bad254e52da022cc575250b2be1d0d5f) @@ -391,20 +391,20 @@ /// is a valid value, but unsupported. private void UpdateColumnStateDefinitionStates() { - bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelper.SimpleAssessmentIsSufficient(SimpleAssessmentResult); + bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelperOld.SimpleAssessmentIsSufficient(SimpleAssessmentResult); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[simpleAssessmentResultIndex], UseManualAssembly); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[detailedAssessmentResultIndex], simpleAssessmentSufficient || UseManualAssembly); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[detailedAssessmentProbabilityIndex], simpleAssessmentSufficient - || !FailureMechanismSectionResultRowHelper.DetailedAssessmentResultIsProbability(DetailedAssessmentResult) + || !FailureMechanismSectionResultRowHelperOld.DetailedAssessmentResultIsProbability(DetailedAssessmentResult) || UseManualAssembly); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[tailorMadeAssessmentResultIndex], simpleAssessmentSufficient || UseManualAssembly); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[tailorMadeAssessmentProbabilityIndex], simpleAssessmentSufficient - || !FailureMechanismSectionResultRowHelper.TailorMadeAssessmentResultIsProbability(TailorMadeAssessmentResult) + || !FailureMechanismSectionResultRowHelperOld.TailorMadeAssessmentResultIsProbability(TailorMadeAssessmentResult) || UseManualAssembly); if (UseManualAssembly) @@ -416,13 +416,13 @@ } else { - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex], simpleAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[detailedAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[detailedAssemblyCategoryGroupIndex], detailedAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[tailorMadeAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[tailorMadeAssemblyCategoryGroupIndex], tailorMadeAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[combinedAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[combinedAssemblyCategoryGroupIndex], combinedAssemblyCategoryGroup); } Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultRows/MicrostabilitySectionResultRowOld.cs =================================================================== diff -u -rca05b1d7e9fa4460c5bb6bcdb1e360f2bebfa08b -r16350bb8bad254e52da022cc575250b2be1d0d5f --- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultRows/MicrostabilitySectionResultRowOld.cs (.../MicrostabilitySectionResultRowOld.cs) (revision ca05b1d7e9fa4460c5bb6bcdb1e360f2bebfa08b) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultRows/MicrostabilitySectionResultRowOld.cs (.../MicrostabilitySectionResultRowOld.cs) (revision 16350bb8bad254e52da022cc575250b2be1d0d5f) @@ -312,7 +312,7 @@ /// is a valid value, but unsupported. private void UpdateColumnStateDefinitionStates() { - bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelper.SimpleAssessmentIsSufficient(SimpleAssessmentResult); + bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelperOld.SimpleAssessmentIsSufficient(SimpleAssessmentResult); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[simpleAssessmentResultIndex], UseManualAssembly); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[detailedAssessmentResultIndex], @@ -329,13 +329,13 @@ } else { - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex], simpleAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[detailedAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[detailedAssemblyCategoryGroupIndex], detailedAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[tailorMadeAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[tailorMadeAssemblyCategoryGroupIndex], tailorMadeAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[combinedAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[combinedAssemblyCategoryGroupIndex], combinedAssemblyCategoryGroup); } Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultRows/PipingStructureSectionResultRowOld.cs =================================================================== diff -u -rca05b1d7e9fa4460c5bb6bcdb1e360f2bebfa08b -r16350bb8bad254e52da022cc575250b2be1d0d5f --- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultRows/PipingStructureSectionResultRowOld.cs (.../PipingStructureSectionResultRowOld.cs) (revision ca05b1d7e9fa4460c5bb6bcdb1e360f2bebfa08b) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultRows/PipingStructureSectionResultRowOld.cs (.../PipingStructureSectionResultRowOld.cs) (revision 16350bb8bad254e52da022cc575250b2be1d0d5f) @@ -311,7 +311,7 @@ /// is a valid value, but unsupported. private void UpdateColumnStateDefinitionStates() { - bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelper.SimpleAssessmentIsSufficient(SimpleAssessmentResult); + bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelperOld.SimpleAssessmentIsSufficient(SimpleAssessmentResult); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[simpleAssessmentResultIndex], UseManualAssembly); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[detailedAssessmentResultIndex], @@ -328,13 +328,13 @@ } else { - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex], simpleAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[detailedAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[detailedAssemblyCategoryGroupIndex], detailedAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[tailorMadeAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[tailorMadeAssemblyCategoryGroupIndex], tailorMadeAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[combinedAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[combinedAssemblyCategoryGroupIndex], combinedAssemblyCategoryGroup); } Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultRows/StrengthStabilityLengthwiseConstructionSectionResultRowOld.cs =================================================================== diff -u -rca05b1d7e9fa4460c5bb6bcdb1e360f2bebfa08b -r16350bb8bad254e52da022cc575250b2be1d0d5f --- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultRows/StrengthStabilityLengthwiseConstructionSectionResultRowOld.cs (.../StrengthStabilityLengthwiseConstructionSectionResultRowOld.cs) (revision ca05b1d7e9fa4460c5bb6bcdb1e360f2bebfa08b) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultRows/StrengthStabilityLengthwiseConstructionSectionResultRowOld.cs (.../StrengthStabilityLengthwiseConstructionSectionResultRowOld.cs) (revision 16350bb8bad254e52da022cc575250b2be1d0d5f) @@ -261,7 +261,7 @@ /// is a valid value, but unsupported. private void UpdateColumnStateDefinitionStates() { - bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelper.SimpleAssessmentIsSufficient(SimpleAssessmentResult); + bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelperOld.SimpleAssessmentIsSufficient(SimpleAssessmentResult); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[simpleAssessmentResultIndex], UseManualAssembly); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[tailorMadeAssessmentResultIndex], @@ -275,11 +275,11 @@ } else { - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex], simpleAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[tailorMadeAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[tailorMadeAssemblyCategoryGroupIndex], tailorMadeAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[combinedAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[combinedAssemblyCategoryGroupIndex], combinedAssemblyCategoryGroup); } Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultRows/TechnicalInnovationSectionResultRowOld.cs =================================================================== diff -u -rca05b1d7e9fa4460c5bb6bcdb1e360f2bebfa08b -r16350bb8bad254e52da022cc575250b2be1d0d5f --- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultRows/TechnicalInnovationSectionResultRowOld.cs (.../TechnicalInnovationSectionResultRowOld.cs) (revision ca05b1d7e9fa4460c5bb6bcdb1e360f2bebfa08b) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultRows/TechnicalInnovationSectionResultRowOld.cs (.../TechnicalInnovationSectionResultRowOld.cs) (revision 16350bb8bad254e52da022cc575250b2be1d0d5f) @@ -260,7 +260,7 @@ /// is a valid value, but unsupported. private void UpdateColumnStateDefinitionStates() { - bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelper.SimpleAssessmentIsSufficient(SimpleAssessmentResult); + bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelperOld.SimpleAssessmentIsSufficient(SimpleAssessmentResult); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[simpleAssessmentResultIndex], UseManualAssembly); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[tailorMadeAssessmentResultIndex], @@ -274,11 +274,11 @@ } else { - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex], simpleAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[tailorMadeAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[tailorMadeAssemblyCategoryGroupIndex], tailorMadeAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[combinedAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[combinedAssemblyCategoryGroupIndex], combinedAssemblyCategoryGroup); } Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultRows/WaterPressureAsphaltCoverSectionResultRowOld.cs =================================================================== diff -u -rca05b1d7e9fa4460c5bb6bcdb1e360f2bebfa08b -r16350bb8bad254e52da022cc575250b2be1d0d5f --- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultRows/WaterPressureAsphaltCoverSectionResultRowOld.cs (.../WaterPressureAsphaltCoverSectionResultRowOld.cs) (revision ca05b1d7e9fa4460c5bb6bcdb1e360f2bebfa08b) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultRows/WaterPressureAsphaltCoverSectionResultRowOld.cs (.../WaterPressureAsphaltCoverSectionResultRowOld.cs) (revision 16350bb8bad254e52da022cc575250b2be1d0d5f) @@ -260,7 +260,7 @@ /// is a valid value, but unsupported. private void UpdateColumnStateDefinitionStates() { - bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelper.SimpleAssessmentIsSufficient(SimpleAssessmentResult); + bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelperOld.SimpleAssessmentIsSufficient(SimpleAssessmentResult); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[simpleAssessmentResultIndex], UseManualAssembly); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[tailorMadeAssessmentResultIndex], @@ -274,11 +274,11 @@ } else { - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex], simpleAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[tailorMadeAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[tailorMadeAssemblyCategoryGroupIndex], tailorMadeAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[combinedAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[combinedAssemblyCategoryGroupIndex], combinedAssemblyCategoryGroup); } Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismSectionResultRowOld.cs =================================================================== diff -u -r26259e86f36858575c3307e3a97602a899026bbf -r16350bb8bad254e52da022cc575250b2be1d0d5f --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismSectionResultRowOld.cs (.../MacroStabilityInwardsFailureMechanismSectionResultRowOld.cs) (revision 26259e86f36858575c3307e3a97602a899026bbf) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismSectionResultRowOld.cs (.../MacroStabilityInwardsFailureMechanismSectionResultRowOld.cs) (revision 16350bb8bad254e52da022cc575250b2be1d0d5f) @@ -260,15 +260,15 @@ private void UpdateDetailedAssessmentProbabilityError() { - if (FailureMechanismSectionResultRowHelper.SimpleAssessmentIsSufficient(SimpleAssessmentResult) - || !FailureMechanismSectionResultRowHelper.DetailedAssessmentResultIsProbability(DetailedAssessmentResult) + if (FailureMechanismSectionResultRowHelperOld.SimpleAssessmentIsSufficient(SimpleAssessmentResult) + || !FailureMechanismSectionResultRowHelperOld.DetailedAssessmentResultIsProbability(DetailedAssessmentResult) || UseManualAssembly) { ColumnStateDefinitions[detailedAssessmentProbabilityIndex].ErrorText = string.Empty; } else { - ColumnStateDefinitions[detailedAssessmentProbabilityIndex].ErrorText = FailureMechanismSectionResultRowHelper.GetDetailedAssessmentProbabilityError( + ColumnStateDefinitions[detailedAssessmentProbabilityIndex].ErrorText = FailureMechanismSectionResultRowHelperOld.GetDetailedAssessmentProbabilityError( SectionResult.GetCalculationScenarios(calculations).ToArray(), scenarios => SectionResult.GetTotalContribution(scenarios), scenarios => SectionResult.GetDetailedAssessmentProbability(scenarios, failureMechanism.GeneralInput.ModelFactor)); @@ -384,13 +384,13 @@ /// is a valid value, but unsupported. private void UpdateColumnStateDefinitions() { - bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelper.SimpleAssessmentIsSufficient(SimpleAssessmentResult); + bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelperOld.SimpleAssessmentIsSufficient(SimpleAssessmentResult); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[simpleAssessmentResultIndex], UseManualAssembly); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[detailedAssessmentResultIndex], simpleAssessmentSufficient || UseManualAssembly); if (simpleAssessmentSufficient - || !FailureMechanismSectionResultRowHelper.DetailedAssessmentResultIsProbability(DetailedAssessmentResult) + || !FailureMechanismSectionResultRowHelperOld.DetailedAssessmentResultIsProbability(DetailedAssessmentResult) || UseManualAssembly) { ColumnStateHelper.DisableColumn(ColumnStateDefinitions[detailedAssessmentProbabilityIndex]); @@ -405,7 +405,7 @@ || UseManualAssembly); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[tailorMadeAssessmentProbabilityIndex], simpleAssessmentSufficient - || !FailureMechanismSectionResultRowHelper.TailorMadeAssessmentResultIsProbability(TailorMadeAssessmentResult) + || !FailureMechanismSectionResultRowHelperOld.TailorMadeAssessmentResultIsProbability(TailorMadeAssessmentResult) || UseManualAssembly); if (UseManualAssembly) @@ -418,13 +418,13 @@ } else { - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex], simpleAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[detailedAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[detailedAssemblyCategoryGroupIndex], detailedAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[tailorMadeAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[tailorMadeAssemblyCategoryGroupIndex], tailorMadeAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[combinedAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[combinedAssemblyCategoryGroupIndex], combinedAssemblyCategoryGroup); ColumnStateHelper.EnableColumn(ColumnStateDefinitions[combinedAssemblyProbabilityIndex], true); } Index: Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingFailureMechanismSectionResultRowOld.cs =================================================================== diff -u -r26259e86f36858575c3307e3a97602a899026bbf -r16350bb8bad254e52da022cc575250b2be1d0d5f --- Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingFailureMechanismSectionResultRowOld.cs (.../PipingFailureMechanismSectionResultRowOld.cs) (revision 26259e86f36858575c3307e3a97602a899026bbf) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingFailureMechanismSectionResultRowOld.cs (.../PipingFailureMechanismSectionResultRowOld.cs) (revision 16350bb8bad254e52da022cc575250b2be1d0d5f) @@ -260,15 +260,15 @@ private void UpdateDetailedAssessmentProbabilityError() { - if (FailureMechanismSectionResultRowHelper.SimpleAssessmentIsSufficient(SimpleAssessmentResult) - || !FailureMechanismSectionResultRowHelper.DetailedAssessmentResultIsProbability(DetailedAssessmentResult) + if (FailureMechanismSectionResultRowHelperOld.SimpleAssessmentIsSufficient(SimpleAssessmentResult) + || !FailureMechanismSectionResultRowHelperOld.DetailedAssessmentResultIsProbability(DetailedAssessmentResult) || UseManualAssembly) { ColumnStateDefinitions[detailedAssessmentProbabilityIndex].ErrorText = string.Empty; } else { - ColumnStateDefinitions[detailedAssessmentProbabilityIndex].ErrorText = FailureMechanismSectionResultRowHelper.GetDetailedAssessmentProbabilityError( + ColumnStateDefinitions[detailedAssessmentProbabilityIndex].ErrorText = FailureMechanismSectionResultRowHelperOld.GetDetailedAssessmentProbabilityError( SectionResult.GetCalculationScenarios(calculations).ToArray(), scenarios => SectionResult.GetTotalContribution(scenarios), scenarios => SectionResult.GetDetailedAssessmentProbability(scenarios, assessmentSection.FailureMechanismContribution.Norm)); @@ -384,13 +384,13 @@ /// is a valid value, but unsupported. private void UpdateColumnStateDefinitions() { - bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelper.SimpleAssessmentIsSufficient(SimpleAssessmentResult); + bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelperOld.SimpleAssessmentIsSufficient(SimpleAssessmentResult); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[simpleAssessmentResultIndex], UseManualAssembly); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[detailedAssessmentResultIndex], simpleAssessmentSufficient || UseManualAssembly); if (simpleAssessmentSufficient - || !FailureMechanismSectionResultRowHelper.DetailedAssessmentResultIsProbability(DetailedAssessmentResult) + || !FailureMechanismSectionResultRowHelperOld.DetailedAssessmentResultIsProbability(DetailedAssessmentResult) || UseManualAssembly) { ColumnStateHelper.DisableColumn(ColumnStateDefinitions[detailedAssessmentProbabilityIndex]); @@ -405,7 +405,7 @@ || UseManualAssembly); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[tailorMadeAssessmentProbabilityIndex], simpleAssessmentSufficient - || !FailureMechanismSectionResultRowHelper.TailorMadeAssessmentResultIsProbability(TailorMadeAssessmentResult) + || !FailureMechanismSectionResultRowHelperOld.TailorMadeAssessmentResultIsProbability(TailorMadeAssessmentResult) || UseManualAssembly); if (UseManualAssembly) @@ -418,13 +418,13 @@ } else { - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex], simpleAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[detailedAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[detailedAssemblyCategoryGroupIndex], detailedAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[tailorMadeAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[tailorMadeAssemblyCategoryGroupIndex], tailorMadeAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[combinedAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[combinedAssemblyCategoryGroupIndex], combinedAssemblyCategoryGroup); ColumnStateHelper.EnableColumn(ColumnStateDefinitions[combinedAssemblyProbabilityIndex], true); } Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismSectionResultRowOld.cs =================================================================== diff -u -r26259e86f36858575c3307e3a97602a899026bbf -r16350bb8bad254e52da022cc575250b2be1d0d5f --- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismSectionResultRowOld.cs (.../StabilityPointStructuresFailureMechanismSectionResultRowOld.cs) (revision 26259e86f36858575c3307e3a97602a899026bbf) +++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismSectionResultRowOld.cs (.../StabilityPointStructuresFailureMechanismSectionResultRowOld.cs) (revision 16350bb8bad254e52da022cc575250b2be1d0d5f) @@ -262,15 +262,15 @@ private void UpdateDetailedAssessmentProbabilityError() { - if (FailureMechanismSectionResultRowHelper.SimpleAssessmentIsSufficient(SimpleAssessmentResult) - || !FailureMechanismSectionResultRowHelper.DetailedAssessmentResultIsProbability(DetailedAssessmentResult) + if (FailureMechanismSectionResultRowHelperOld.SimpleAssessmentIsSufficient(SimpleAssessmentResult) + || !FailureMechanismSectionResultRowHelperOld.DetailedAssessmentResultIsProbability(DetailedAssessmentResult) || UseManualAssembly) { ColumnStateDefinitions[detailedAssessmentProbabilityIndex].ErrorText = string.Empty; } else { - ColumnStateDefinitions[detailedAssessmentProbabilityIndex].ErrorText = FailureMechanismSectionResultRowHelper.GetDetailedAssessmentProbabilityError( + ColumnStateDefinitions[detailedAssessmentProbabilityIndex].ErrorText = FailureMechanismSectionResultRowHelperOld.GetDetailedAssessmentProbabilityError( SectionResult.GetCalculationScenarios(calculationScenarios).ToArray(), scenarios => SectionResult.GetTotalContribution(scenarios), scenarios => SectionResult.GetDetailedAssessmentProbability(scenarios)); @@ -386,14 +386,14 @@ /// is a valid value, but unsupported. private void UpdateColumnStateDefinitions() { - bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelper.SimpleAssessmentIsSufficient(SimpleAssessmentResult); + bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelperOld.SimpleAssessmentIsSufficient(SimpleAssessmentResult); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[simpleAssessmentResultIndex], UseManualAssembly); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[detailedAssessmentResultIndex], simpleAssessmentSufficient || UseManualAssembly); if (simpleAssessmentSufficient - || !FailureMechanismSectionResultRowHelper.DetailedAssessmentResultIsProbability(DetailedAssessmentResult) + || !FailureMechanismSectionResultRowHelperOld.DetailedAssessmentResultIsProbability(DetailedAssessmentResult) || UseManualAssembly) { ColumnStateHelper.DisableColumn(ColumnStateDefinitions[detailedAssessmentProbabilityIndex]); @@ -408,7 +408,7 @@ || UseManualAssembly); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[tailorMadeAssessmentProbabilityIndex], simpleAssessmentSufficient - || !FailureMechanismSectionResultRowHelper.TailorMadeAssessmentResultIsProbability(TailorMadeAssessmentResult) + || !FailureMechanismSectionResultRowHelperOld.TailorMadeAssessmentResultIsProbability(TailorMadeAssessmentResult) || UseManualAssembly); if (UseManualAssembly) @@ -421,13 +421,13 @@ } else { - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex], simpleAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[detailedAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[detailedAssemblyCategoryGroupIndex], detailedAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[tailorMadeAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[tailorMadeAssemblyCategoryGroupIndex], tailorMadeAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[combinedAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[combinedAssemblyCategoryGroupIndex], combinedAssemblyCategoryGroup); ColumnStateHelper.EnableColumn(ColumnStateDefinitions[combinedAssemblyProbabilityIndex], true); } Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Forms/Views/StabilityStoneCoverSectionResultRowOld.cs =================================================================== diff -u -rca05b1d7e9fa4460c5bb6bcdb1e360f2bebfa08b -r16350bb8bad254e52da022cc575250b2be1d0d5f --- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Forms/Views/StabilityStoneCoverSectionResultRowOld.cs (.../StabilityStoneCoverSectionResultRowOld.cs) (revision ca05b1d7e9fa4460c5bb6bcdb1e360f2bebfa08b) +++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Forms/Views/StabilityStoneCoverSectionResultRowOld.cs (.../StabilityStoneCoverSectionResultRowOld.cs) (revision 16350bb8bad254e52da022cc575250b2be1d0d5f) @@ -402,7 +402,7 @@ /// is a valid value, but unsupported. private void UpdateColumnStateDefinitionStates() { - bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelper.SimpleAssessmentIsSufficient(SimpleAssessmentResult); + bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelperOld.SimpleAssessmentIsSufficient(SimpleAssessmentResult); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[simpleAssessmentResultIndex], UseManualAssembly); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[detailedAssessmentResultForFactorizedSignalingNormIndex], @@ -427,13 +427,13 @@ } else { - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex], simpleAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[detailedAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[detailedAssemblyCategoryGroupIndex], detailedAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[tailorMadeAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[tailorMadeAssemblyCategoryGroupIndex], tailorMadeAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[combinedAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[combinedAssemblyCategoryGroupIndex], combinedAssemblyCategoryGroup); } Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismSectionResultRowOld.cs =================================================================== diff -u -rca05b1d7e9fa4460c5bb6bcdb1e360f2bebfa08b -r16350bb8bad254e52da022cc575250b2be1d0d5f --- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismSectionResultRowOld.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultRowOld.cs) (revision ca05b1d7e9fa4460c5bb6bcdb1e360f2bebfa08b) +++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismSectionResultRowOld.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultRowOld.cs) (revision 16350bb8bad254e52da022cc575250b2be1d0d5f) @@ -401,7 +401,7 @@ /// is a valid value, but unsupported. private void UpdateColumnStateDefinitionStates() { - bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelper.SimpleAssessmentIsSufficient(SimpleAssessmentResult); + bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelperOld.SimpleAssessmentIsSufficient(SimpleAssessmentResult); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[simpleAssessmentResultIndex], UseManualAssembly); ColumnStateHelper.SetColumnState(ColumnStateDefinitions[detailedAssessmentResultForFactorizedSignalingNormIndex], @@ -426,13 +426,13 @@ } else { - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex], simpleAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[detailedAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[detailedAssemblyCategoryGroupIndex], detailedAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[tailorMadeAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[tailorMadeAssemblyCategoryGroupIndex], tailorMadeAssemblyCategoryGroup); - FailureMechanismSectionResultRowHelper.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[combinedAssemblyCategoryGroupIndex], + FailureMechanismSectionResultRowHelperOld.SetAssemblyCategoryGroupStyle(ColumnStateDefinitions[combinedAssemblyCategoryGroupIndex], combinedAssemblyCategoryGroup); }