Index: Riskeer/Common/src/Riskeer.Common.Forms/Helpers/CalculationsDisplayNameHelper.cs =================================================================== diff -u -rf46c8c7a6ec4924d8e1298fc06ca1d77bcb7e3bb -rd47871932be00b85193481e18b55d97f50824fed --- Riskeer/Common/src/Riskeer.Common.Forms/Helpers/CalculationsDisplayNameHelper.cs (.../CalculationsDisplayNameHelper.cs) (revision f46c8c7a6ec4924d8e1298fc06ca1d77bcb7e3bb) +++ Riskeer/Common/src/Riskeer.Common.Forms/Helpers/CalculationsDisplayNameHelper.cs (.../CalculationsDisplayNameHelper.cs) (revision d47871932be00b85193481e18b55d97f50824fed) @@ -84,37 +84,36 @@ } /// - /// Gets a unique wave height calculations display name for the provided . + /// Gets a unique display name for the provided . /// - /// The assessment section the belong to. - /// The wave height calculations to get the unique display name for. - /// A unique wave height calculations display name. + /// The enumeration of all calculations (containing ). + /// The calculations to get the unique display name for. + /// The function to obtain the target probability for elements within . + /// A unique calculations display name. /// Thrown when any input parameter is null. - /// Thrown when is not part of the wave height - /// calculations within . - public static string GetUniqueDisplayNameForWaveHeightCalculations(IAssessmentSection assessmentSection, IEnumerable calculations) + /// Thrown when is not part of . + public static string GetUniqueDisplayNameForCalculations(T calculations, IEnumerable allCalculations, Func getTargetProbabilityFunc) { - if (assessmentSection == null) + if (allCalculations == null) { - throw new ArgumentNullException(nameof(assessmentSection)); + throw new ArgumentNullException(nameof(allCalculations)); } if (calculations == null) { throw new ArgumentNullException(nameof(calculations)); } - Dictionary nonUniqueWaveHeightCalculationsDisplayNameLookup = - assessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities - .ToDictionary(whc => (object) whc.HydraulicBoundaryLocationCalculations, - whc => noProbabilityValueDoubleConverter.ConvertToString(whc.TargetProbability)); + Dictionary nonUniqueCalculationsDisplayNameLookup = + allCalculations.ToDictionary(c => (object) c, + c => noProbabilityValueDoubleConverter.ConvertToString(getTargetProbabilityFunc(c))); - if (!nonUniqueWaveHeightCalculationsDisplayNameLookup.ContainsKey(calculations)) + if (!nonUniqueCalculationsDisplayNameLookup.ContainsKey(calculations)) { - throw new InvalidOperationException("The provided calculations object is not part of the wave height calculations within the assessment section."); + throw new InvalidOperationException("The provided calculations object is not part of the enumeration."); } - return GetUniqueDisplayNameLookup(nonUniqueWaveHeightCalculationsDisplayNameLookup)[calculations]; + return GetUniqueDisplayNameLookup(nonUniqueCalculationsDisplayNameLookup)[calculations]; } private static Dictionary GetUniqueDisplayNameLookup(IDictionary nonUniqueDisplayNameLookup) @@ -130,7 +129,7 @@ uniqueDisplayNameLookup.Add(firstElement.Key, firstElement.Value); nonUniqueDisplayNameLookup.Remove(firstElement.Key); - + if (elementsWithSameDisplayNameAsFirstElement.Count > 1) { for (var i = 1; i < elementsWithSameDisplayNameAsFirstElement.Count; i++) Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs =================================================================== diff -u -r0e2fd798abfea9b41d73646072a38accfe36f318 -rd47871932be00b85193481e18b55d97f50824fed --- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision 0e2fd798abfea9b41d73646072a38accfe36f318) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision d47871932be00b85193481e18b55d97f50824fed) @@ -1063,8 +1063,9 @@ yield return new TreeNodeInfo { - Text = context => CalculationsDisplayNameHelper.GetUniqueDisplayNameForWaveHeightCalculations(context.AssessmentSection, - context.WrappedData.HydraulicBoundaryLocationCalculations), + Text = context => CalculationsDisplayNameHelper.GetUniqueDisplayNameForCalculations(context.WrappedData, + context.AssessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities, + probability => probability.TargetProbability), Image = context => RiskeerCommonFormsResources.GenericInputOutputIcon, EnsureVisibleOnCreate = (context, o) => true, OnRemoveConfirmationText = context => Resources.RiskeerPlugin_GetTreeNodeInfos_Confirm_remove_TargetProbability,