Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs =================================================================== diff -u -r93278dca1c6c5d43bb95e2a53c16daedda0bd162 -r3b838833901be7e334c406b2214e00341878f9c7 --- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 93278dca1c6c5d43bb95e2a53c16daedda0bd162) +++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 3b838833901be7e334c406b2214e00341878f9c7) @@ -43,6 +43,7 @@ using Riskeer.Common.Forms.PresentationObjects; using Riskeer.Common.Forms.TreeNodeInfos; using Riskeer.Common.Forms.UpdateInfos; +using Riskeer.Common.Forms.Views; using Riskeer.Common.Plugin; using Riskeer.Common.Service; using Riskeer.Common.Util.Helpers; @@ -104,16 +105,20 @@ CloseForData = CloseFailurePathViewForData }; - yield return new RiskeerViewInfo, - IObservableEnumerable, - WaveImpactAsphaltCoverFailureMechanismResultViewOld>(() => Gui) + yield return new RiskeerViewInfo< + WaveImpactAsphaltCoverFailureMechanismSectionResultContext, + IObservableEnumerable, + NonAdoptableWithProfileProbabilityFailureMechanismResultView>(() => Gui) { GetViewName = (view, context) => RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, CloseForData = CloseFailureMechanismResultViewForData, GetViewData = context => context.WrappedData, - CreateInstance = context => new WaveImpactAsphaltCoverFailureMechanismResultViewOld( + CreateInstance = context => new NonAdoptableWithProfileProbabilityFailureMechanismResultView( context.WrappedData, - (WaveImpactAsphaltCoverFailureMechanism) context.FailureMechanism) + (WaveImpactAsphaltCoverFailureMechanism) context.FailureMechanism, + context.AssessmentSection, + fm => fm.GeneralWaveImpactAsphaltCoverInput.GetN(context.AssessmentSection.ReferenceLine.Length), + fm => fm.GeneralWaveImpactAsphaltCoverInput.ApplyLengthEffectInSection) }; yield return new RiskeerViewInfo> + yield return new TreeNodeInfo { Text = context => RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, Image = context => RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, @@ -280,7 +285,8 @@ : ReferenceEquals(view.FailureMechanism, failureMechanism); } - private static bool CloseFailureMechanismResultViewForData(WaveImpactAsphaltCoverFailureMechanismResultViewOld view, object dataToCloseFor) + private static bool CloseFailureMechanismResultViewForData( + NonAdoptableWithProfileProbabilityFailureMechanismResultView view, object dataToCloseFor) { var failureMechanism = dataToCloseFor as WaveImpactAsphaltCoverFailureMechanism; @@ -403,8 +409,8 @@ new FailureMechanismAssemblyCategoriesContext( failureMechanism, assessmentSection, () => failureMechanism.GeneralWaveImpactAsphaltCoverInput.GetN( assessmentSection.ReferenceLine.Length)), - new FailureMechanismSectionResultContext( - failureMechanism.SectionResultsOld, failureMechanism), + new WaveImpactAsphaltCoverFailureMechanismSectionResultContext( + failureMechanism.SectionResults, failureMechanism, assessmentSection), failureMechanism.InAssemblyOutputComments }; }