Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/CombinedFailureMechanismSectionAssemblyResultRow.cs =================================================================== diff -u -rae7cafd5af974ddf36d9db5b2687e86c022e8fb4 -r8cfd4ab61e7539fdd3b33bc23dd338bcbce57d59 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/CombinedFailureMechanismSectionAssemblyResultRow.cs (.../CombinedFailureMechanismSectionAssemblyResultRow.cs) (revision ae7cafd5af974ddf36d9db5b2687e86c022e8fb4) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/CombinedFailureMechanismSectionAssemblyResultRow.cs (.../CombinedFailureMechanismSectionAssemblyResultRow.cs) (revision 8cfd4ab61e7539fdd3b33bc23dd338bcbce57d59) @@ -102,77 +102,77 @@ /// /// Gets the assembly result for piping. /// - public string Piping => GetFailureMechanismSectionAssemblyGroupDisplayName(combinedFailureMechanismSectionAssemblyResult.Piping); + public string Piping => GetDisplayNameForFailureMechanism(combinedFailureMechanismSectionAssemblyResult.Piping); /// /// Gets the assembly result for grass cover erosion inwards. /// - public string GrassCoverErosionInwards => GetFailureMechanismSectionAssemblyGroupDisplayName(combinedFailureMechanismSectionAssemblyResult.GrassCoverErosionInwards); + public string GrassCoverErosionInwards => GetDisplayNameForFailureMechanism(combinedFailureMechanismSectionAssemblyResult.GrassCoverErosionInwards); /// /// Gets the assembly result for macro stability inwards. /// - public string MacroStabilityInwards => GetFailureMechanismSectionAssemblyGroupDisplayName(combinedFailureMechanismSectionAssemblyResult.MacroStabilityInwards); + public string MacroStabilityInwards => GetDisplayNameForFailureMechanism(combinedFailureMechanismSectionAssemblyResult.MacroStabilityInwards); /// /// Gets the assembly result for microstability. /// - public string Microstability => GetFailureMechanismSectionAssemblyGroupDisplayName(combinedFailureMechanismSectionAssemblyResult.Microstability); + public string Microstability => GetDisplayNameForFailureMechanism(combinedFailureMechanismSectionAssemblyResult.Microstability); /// /// Gets the assembly result for stability stone cover. /// - public string StabilityStoneCover => GetFailureMechanismSectionAssemblyGroupDisplayName(combinedFailureMechanismSectionAssemblyResult.StabilityStoneCover); + public string StabilityStoneCover => GetDisplayNameForFailureMechanism(combinedFailureMechanismSectionAssemblyResult.StabilityStoneCover); /// /// Gets the assembly result for wave impact asphalt cover. /// - public string WaveImpactAsphaltCover => GetFailureMechanismSectionAssemblyGroupDisplayName(combinedFailureMechanismSectionAssemblyResult.WaveImpactAsphaltCover); + public string WaveImpactAsphaltCover => GetDisplayNameForFailureMechanism(combinedFailureMechanismSectionAssemblyResult.WaveImpactAsphaltCover); /// /// Gets the assembly result for water pressure asphalt cover. /// - public string WaterPressureAsphaltCover => GetFailureMechanismSectionAssemblyGroupDisplayName(combinedFailureMechanismSectionAssemblyResult.WaterPressureAsphaltCover); + public string WaterPressureAsphaltCover => GetDisplayNameForFailureMechanism(combinedFailureMechanismSectionAssemblyResult.WaterPressureAsphaltCover); /// /// Gets the assembly result for grass cover erosion outwards. /// - public string GrassCoverErosionOutwards => GetFailureMechanismSectionAssemblyGroupDisplayName(combinedFailureMechanismSectionAssemblyResult.GrassCoverErosionOutwards); + public string GrassCoverErosionOutwards => GetDisplayNameForFailureMechanism(combinedFailureMechanismSectionAssemblyResult.GrassCoverErosionOutwards); /// /// Gets the assembly result for grass cover slip off outwards. /// - public string GrassCoverSlipOffOutwards => GetFailureMechanismSectionAssemblyGroupDisplayName(combinedFailureMechanismSectionAssemblyResult.GrassCoverSlipOffOutwards); + public string GrassCoverSlipOffOutwards => GetDisplayNameForFailureMechanism(combinedFailureMechanismSectionAssemblyResult.GrassCoverSlipOffOutwards); /// /// Gets the assembly result for grass cover slip off inwards. /// - public string GrassCoverSlipOffInwards => GetFailureMechanismSectionAssemblyGroupDisplayName(combinedFailureMechanismSectionAssemblyResult.GrassCoverSlipOffInwards); + public string GrassCoverSlipOffInwards => GetDisplayNameForFailureMechanism(combinedFailureMechanismSectionAssemblyResult.GrassCoverSlipOffInwards); /// /// Gets the assembly result for height structures. /// - public string HeightStructures => GetFailureMechanismSectionAssemblyGroupDisplayName(combinedFailureMechanismSectionAssemblyResult.HeightStructures); + public string HeightStructures => GetDisplayNameForFailureMechanism(combinedFailureMechanismSectionAssemblyResult.HeightStructures); /// /// Gets the assembly result for closing structures. /// - public string ClosingStructures => GetFailureMechanismSectionAssemblyGroupDisplayName(combinedFailureMechanismSectionAssemblyResult.ClosingStructures); + public string ClosingStructures => GetDisplayNameForFailureMechanism(combinedFailureMechanismSectionAssemblyResult.ClosingStructures); /// /// Gets the assembly result for piping structure. /// - public string PipingStructure => GetFailureMechanismSectionAssemblyGroupDisplayName(combinedFailureMechanismSectionAssemblyResult.PipingStructure); + public string PipingStructure => GetDisplayNameForFailureMechanism(combinedFailureMechanismSectionAssemblyResult.PipingStructure); /// /// Gets the assembly result for stability point structures. /// - public string StabilityPointStructures => GetFailureMechanismSectionAssemblyGroupDisplayName(combinedFailureMechanismSectionAssemblyResult.StabilityPointStructures); + public string StabilityPointStructures => GetDisplayNameForFailureMechanism(combinedFailureMechanismSectionAssemblyResult.StabilityPointStructures); /// /// Gets the assembly result for dune erosion. /// - public string DuneErosion => GetFailureMechanismSectionAssemblyGroupDisplayName(combinedFailureMechanismSectionAssemblyResult.DuneErosion); + public string DuneErosion => GetDisplayNameForFailureMechanism(combinedFailureMechanismSectionAssemblyResult.DuneErosion); public IDictionary ColumnStateDefinitions { get; } @@ -199,24 +199,24 @@ private void SetColumnStateDefinitionColors() { ColumnStateDefinitions[totalResultIndex].Style = CreateCellStyle(combinedFailureMechanismSectionAssemblyResult.TotalResult); - ColumnStateDefinitions[pipingIndex].Style = CreateGetFailureMechanismSectionAssemblyGroupCellStyle(combinedFailureMechanismSectionAssemblyResult.Piping); - ColumnStateDefinitions[grassCoverErosionInwardsIndex].Style = CreateGetFailureMechanismSectionAssemblyGroupCellStyle(combinedFailureMechanismSectionAssemblyResult.GrassCoverErosionInwards); - ColumnStateDefinitions[macroStabilityInwardsIndex].Style = CreateGetFailureMechanismSectionAssemblyGroupCellStyle(combinedFailureMechanismSectionAssemblyResult.MacroStabilityInwards); - ColumnStateDefinitions[microstabililityIndex].Style = CreateGetFailureMechanismSectionAssemblyGroupCellStyle(combinedFailureMechanismSectionAssemblyResult.Microstability); - ColumnStateDefinitions[stabilityStoneCoverIndex].Style = CreateGetFailureMechanismSectionAssemblyGroupCellStyle(combinedFailureMechanismSectionAssemblyResult.StabilityStoneCover); - ColumnStateDefinitions[waveImpactAsphaltCoverIndex].Style = CreateGetFailureMechanismSectionAssemblyGroupCellStyle(combinedFailureMechanismSectionAssemblyResult.WaveImpactAsphaltCover); - ColumnStateDefinitions[waterPressureAsphaltCoverIndex].Style = CreateGetFailureMechanismSectionAssemblyGroupCellStyle(combinedFailureMechanismSectionAssemblyResult.WaterPressureAsphaltCover); - ColumnStateDefinitions[grassCoverErosionOutwardsIndex].Style = CreateGetFailureMechanismSectionAssemblyGroupCellStyle(combinedFailureMechanismSectionAssemblyResult.GrassCoverErosionOutwards); - ColumnStateDefinitions[grassCoverSlipOffOutwardsIndex].Style = CreateGetFailureMechanismSectionAssemblyGroupCellStyle(combinedFailureMechanismSectionAssemblyResult.GrassCoverSlipOffOutwards); - ColumnStateDefinitions[grassCoverSlipOffInwardsIndex].Style = CreateGetFailureMechanismSectionAssemblyGroupCellStyle(combinedFailureMechanismSectionAssemblyResult.GrassCoverSlipOffInwards); - ColumnStateDefinitions[heightStructuresIndex].Style = CreateGetFailureMechanismSectionAssemblyGroupCellStyle(combinedFailureMechanismSectionAssemblyResult.HeightStructures); - ColumnStateDefinitions[closingStructuresIndex].Style = CreateGetFailureMechanismSectionAssemblyGroupCellStyle(combinedFailureMechanismSectionAssemblyResult.ClosingStructures); - ColumnStateDefinitions[pipingStructureIndex].Style = CreateGetFailureMechanismSectionAssemblyGroupCellStyle(combinedFailureMechanismSectionAssemblyResult.PipingStructure); - ColumnStateDefinitions[stabilityPointStructuresIndex].Style = CreateGetFailureMechanismSectionAssemblyGroupCellStyle(combinedFailureMechanismSectionAssemblyResult.StabilityPointStructures); - ColumnStateDefinitions[duneErosionIndex].Style = CreateGetFailureMechanismSectionAssemblyGroupCellStyle(combinedFailureMechanismSectionAssemblyResult.DuneErosion); + ColumnStateDefinitions[pipingIndex].Style = CreateCellStyleForFailureMechanism(combinedFailureMechanismSectionAssemblyResult.Piping); + ColumnStateDefinitions[grassCoverErosionInwardsIndex].Style = CreateCellStyleForFailureMechanism(combinedFailureMechanismSectionAssemblyResult.GrassCoverErosionInwards); + ColumnStateDefinitions[macroStabilityInwardsIndex].Style = CreateCellStyleForFailureMechanism(combinedFailureMechanismSectionAssemblyResult.MacroStabilityInwards); + ColumnStateDefinitions[microstabililityIndex].Style = CreateCellStyleForFailureMechanism(combinedFailureMechanismSectionAssemblyResult.Microstability); + ColumnStateDefinitions[stabilityStoneCoverIndex].Style = CreateCellStyleForFailureMechanism(combinedFailureMechanismSectionAssemblyResult.StabilityStoneCover); + ColumnStateDefinitions[waveImpactAsphaltCoverIndex].Style = CreateCellStyleForFailureMechanism(combinedFailureMechanismSectionAssemblyResult.WaveImpactAsphaltCover); + ColumnStateDefinitions[waterPressureAsphaltCoverIndex].Style = CreateCellStyleForFailureMechanism(combinedFailureMechanismSectionAssemblyResult.WaterPressureAsphaltCover); + ColumnStateDefinitions[grassCoverErosionOutwardsIndex].Style = CreateCellStyleForFailureMechanism(combinedFailureMechanismSectionAssemblyResult.GrassCoverErosionOutwards); + ColumnStateDefinitions[grassCoverSlipOffOutwardsIndex].Style = CreateCellStyleForFailureMechanism(combinedFailureMechanismSectionAssemblyResult.GrassCoverSlipOffOutwards); + ColumnStateDefinitions[grassCoverSlipOffInwardsIndex].Style = CreateCellStyleForFailureMechanism(combinedFailureMechanismSectionAssemblyResult.GrassCoverSlipOffInwards); + ColumnStateDefinitions[heightStructuresIndex].Style = CreateCellStyleForFailureMechanism(combinedFailureMechanismSectionAssemblyResult.HeightStructures); + ColumnStateDefinitions[closingStructuresIndex].Style = CreateCellStyleForFailureMechanism(combinedFailureMechanismSectionAssemblyResult.ClosingStructures); + ColumnStateDefinitions[pipingStructureIndex].Style = CreateCellStyleForFailureMechanism(combinedFailureMechanismSectionAssemblyResult.PipingStructure); + ColumnStateDefinitions[stabilityPointStructuresIndex].Style = CreateCellStyleForFailureMechanism(combinedFailureMechanismSectionAssemblyResult.StabilityPointStructures); + ColumnStateDefinitions[duneErosionIndex].Style = CreateCellStyleForFailureMechanism(combinedFailureMechanismSectionAssemblyResult.DuneErosion); } - private static string GetFailureMechanismSectionAssemblyGroupDisplayName(FailureMechanismSectionAssemblyGroup? failureMechanismSectionAssemblyGroup) + private static string GetDisplayNameForFailureMechanism(FailureMechanismSectionAssemblyGroup? failureMechanismSectionAssemblyGroup) { return failureMechanismSectionAssemblyGroup.HasValue ? EnumDisplayNameHelper.GetDisplayName(failureMechanismSectionAssemblyGroup.Value) @@ -229,7 +229,7 @@ AssemblyGroupColorHelper.GetFailureMechanismSectionAssemblyGroupColor(failureMechanismSectionAssemblyGroup)); } - private static CellStyle CreateGetFailureMechanismSectionAssemblyGroupCellStyle(FailureMechanismSectionAssemblyGroup? failureMechanismSectionAssemblyGroup) + private static CellStyle CreateCellStyleForFailureMechanism(FailureMechanismSectionAssemblyGroup? failureMechanismSectionAssemblyGroup) { return failureMechanismSectionAssemblyGroup.HasValue ? CreateCellStyle(failureMechanismSectionAssemblyGroup.Value)