Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/Probabilistic/ProbabilisticPipingInputContextProperties.cs =================================================================== diff -u -r9734b80112af7f1053a232a6a43d515cc1878766 -r239ce4a30ac83b5d891ec54f32fdba549c73e21d --- Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/Probabilistic/ProbabilisticPipingInputContextProperties.cs (.../ProbabilisticPipingInputContextProperties.cs) (revision 9734b80112af7f1053a232a6a43d515cc1878766) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/Probabilistic/ProbabilisticPipingInputContextProperties.cs (.../ProbabilisticPipingInputContextProperties.cs) (revision 239ce4a30ac83b5d891ec54f32fdba549c73e21d) @@ -52,7 +52,9 @@ /// public class ProbabilisticPipingInputContextProperties : ObjectProperties, IHasHydraulicBoundaryLocationProperty, - IHasSurfaceLineProperty + IHasSurfaceLineProperty, + IHasStochasticSoilModel, + IHasStochasticSoilProfile { private const int selectedHydraulicBoundaryLocationPropertyIndex = 1; private const int dampingFactorExitPropertyIndex = 2; @@ -266,7 +268,7 @@ } [PropertyOrder(stochasticSoilModelPropertyIndex)] - [Editor(typeof(PipingInputContextStochasticSoilModelSelectionEditor), typeof(UITypeEditor))] + [Editor(typeof(PipingInputContextStochasticSoilModelSelectionEditor), typeof(UITypeEditor))] [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_Schematization))] [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingInput_StochasticSoilModel_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.PipingInput_StochasticSoilModel_Description))] @@ -290,7 +292,7 @@ } [PropertyOrder(stochasticSoilProfilePropertyIndex)] - [Editor(typeof(PipingInputContextStochasticSoilProfileSelectionEditor), typeof(UITypeEditor))] + [Editor(typeof(PipingInputContextStochasticSoilProfileSelectionEditor), typeof(UITypeEditor))] [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_Schematization))] [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingInput_StochasticSoilProfile_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.PipingInput_StochasticSoilProfile_Description))] Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/SemiProbabilistic/SemiProbabilisticPipingInputContextProperties.cs =================================================================== diff -u -r9734b80112af7f1053a232a6a43d515cc1878766 -r239ce4a30ac83b5d891ec54f32fdba549c73e21d --- Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/SemiProbabilistic/SemiProbabilisticPipingInputContextProperties.cs (.../SemiProbabilisticPipingInputContextProperties.cs) (revision 9734b80112af7f1053a232a6a43d515cc1878766) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/SemiProbabilistic/SemiProbabilisticPipingInputContextProperties.cs (.../SemiProbabilisticPipingInputContextProperties.cs) (revision 239ce4a30ac83b5d891ec54f32fdba549c73e21d) @@ -50,7 +50,9 @@ /// public class SemiProbabilisticPipingInputContextProperties : ObjectProperties, IHasHydraulicBoundaryLocationProperty, - IHasSurfaceLineProperty + IHasSurfaceLineProperty, + IHasStochasticSoilModel, + IHasStochasticSoilProfile { private const int selectedHydraulicBoundaryLocationPropertyIndex = 1; private const int assessmentLevelPropertyIndex = 2; @@ -311,7 +313,7 @@ } [PropertyOrder(stochasticSoilModelPropertyIndex)] - [Editor(typeof(PipingInputContextStochasticSoilModelSelectionEditor), typeof(UITypeEditor))] + [Editor(typeof(PipingInputContextStochasticSoilModelSelectionEditor), typeof(UITypeEditor))] [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_Schematization))] [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingInput_StochasticSoilModel_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.PipingInput_StochasticSoilModel_Description))] @@ -335,7 +337,7 @@ } [PropertyOrder(stochasticSoilProfilePropertyIndex)] - [Editor(typeof(PipingInputContextStochasticSoilProfileSelectionEditor), typeof(UITypeEditor))] + [Editor(typeof(PipingInputContextStochasticSoilProfileSelectionEditor), typeof(UITypeEditor))] [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_Schematization))] [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingInput_StochasticSoilProfile_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.PipingInput_StochasticSoilProfile_Description))] Index: Riskeer/Piping/src/Riskeer.Piping.Forms/UITypeEditors/IHasStochasticSoilModel.cs =================================================================== diff -u --- Riskeer/Piping/src/Riskeer.Piping.Forms/UITypeEditors/IHasStochasticSoilModel.cs (revision 0) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/UITypeEditors/IHasStochasticSoilModel.cs (revision 239ce4a30ac83b5d891ec54f32fdba549c73e21d) @@ -0,0 +1,42 @@ +// Copyright (C) Stichting Deltares 2019. 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.Collections.Generic; +using Core.Common.Gui.PropertyBag; +using Riskeer.Piping.Data.SoilProfile; + +namespace Riskeer.Piping.Forms.UITypeEditors +{ + public interface IHasStochasticSoilModel : IObjectProperties + { + /// + /// Returns the collection of surface lines. + /// + /// A collection of surface lines. + IEnumerable GetAvailableStochasticSoilModels(); + + /// + /// Gets the piping surface line. + /// + PipingStochasticSoilModel StochasticSoilModel { get; } + + } +} Index: Riskeer/Piping/src/Riskeer.Piping.Forms/UITypeEditors/IHasStochasticSoilProfile.cs =================================================================== diff -u --- Riskeer/Piping/src/Riskeer.Piping.Forms/UITypeEditors/IHasStochasticSoilProfile.cs (revision 0) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/UITypeEditors/IHasStochasticSoilProfile.cs (revision 239ce4a30ac83b5d891ec54f32fdba549c73e21d) @@ -0,0 +1,41 @@ +// Copyright (C) Stichting Deltares 2019. 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.Collections.Generic; +using Core.Common.Gui.PropertyBag; +using Riskeer.Piping.Data.SoilProfile; + +namespace Riskeer.Piping.Forms.UITypeEditors +{ + public interface IHasStochasticSoilProfile : IObjectProperties + { + /// + /// Returns the collection of surface lines. + /// + /// A collection of surface lines. + IEnumerable GetAvailableStochasticSoilProfiles(); + + /// + /// Gets the piping surface line. + /// + PipingStochasticSoilProfile StochasticSoilProfile { get; } + } +} Index: Riskeer/Piping/src/Riskeer.Piping.Forms/UITypeEditors/PipingInputContextStochasticSoilModelSelectionEditor.cs =================================================================== diff -u -rdf1942940ece42a98d022f8c4a8bd873274462fc -r239ce4a30ac83b5d891ec54f32fdba549c73e21d --- Riskeer/Piping/src/Riskeer.Piping.Forms/UITypeEditors/PipingInputContextStochasticSoilModelSelectionEditor.cs (.../PipingInputContextStochasticSoilModelSelectionEditor.cs) (revision df1942940ece42a98d022f8c4a8bd873274462fc) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/UITypeEditors/PipingInputContextStochasticSoilModelSelectionEditor.cs (.../PipingInputContextStochasticSoilModelSelectionEditor.cs) (revision 239ce4a30ac83b5d891ec54f32fdba549c73e21d) @@ -23,18 +23,17 @@ using System.ComponentModel; using Core.Common.Gui.UITypeEditors; using Riskeer.Piping.Data.SoilProfile; -using Riskeer.Piping.Forms.PropertyClasses.SemiProbabilistic; namespace Riskeer.Piping.Forms.UITypeEditors { /// /// This class defines a drop down list edit-control from which the user can select a /// from a collection. /// - public class PipingInputContextStochasticSoilModelSelectionEditor : SelectionEditor + public class PipingInputContextStochasticSoilModelSelectionEditor : SelectionEditor where T: IHasStochasticSoilModel { /// - /// Creates a new instance of . + /// Creates a new instance of . /// public PipingInputContextStochasticSoilModelSelectionEditor() { Index: Riskeer/Piping/src/Riskeer.Piping.Forms/UITypeEditors/PipingInputContextStochasticSoilProfileSelectionEditor.cs =================================================================== diff -u -rdf1942940ece42a98d022f8c4a8bd873274462fc -r239ce4a30ac83b5d891ec54f32fdba549c73e21d --- Riskeer/Piping/src/Riskeer.Piping.Forms/UITypeEditors/PipingInputContextStochasticSoilProfileSelectionEditor.cs (.../PipingInputContextStochasticSoilProfileSelectionEditor.cs) (revision df1942940ece42a98d022f8c4a8bd873274462fc) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/UITypeEditors/PipingInputContextStochasticSoilProfileSelectionEditor.cs (.../PipingInputContextStochasticSoilProfileSelectionEditor.cs) (revision 239ce4a30ac83b5d891ec54f32fdba549c73e21d) @@ -23,7 +23,6 @@ using System.ComponentModel; using Core.Common.Gui.UITypeEditors; using Riskeer.Piping.Data.SoilProfile; -using Riskeer.Piping.Forms.PropertyClasses.SemiProbabilistic; using Riskeer.Piping.Primitives; namespace Riskeer.Piping.Forms.UITypeEditors @@ -32,10 +31,10 @@ /// This class defines a drop down list edit-control from which the user can select a /// from a collection. /// - public class PipingInputContextStochasticSoilProfileSelectionEditor : SelectionEditor + public class PipingInputContextStochasticSoilProfileSelectionEditor : SelectionEditor where T: IHasStochasticSoilProfile { /// - /// Creates a new instance of . + /// Creates a new instance of . /// public PipingInputContextStochasticSoilProfileSelectionEditor() { Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilModelSelectionEditorTest.cs =================================================================== diff -u -r9d81fce2b4838979d13c48cf0adc054fb240625a -r239ce4a30ac83b5d891ec54f32fdba549c73e21d --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilModelSelectionEditorTest.cs (.../PipingInputContextStochasticSoilModelSelectionEditorTest.cs) (revision 9d81fce2b4838979d13c48cf0adc054fb240625a) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilModelSelectionEditorTest.cs (.../PipingInputContextStochasticSoilModelSelectionEditorTest.cs) (revision 239ce4a30ac83b5d891ec54f32fdba549c73e21d) @@ -77,7 +77,7 @@ AssessmentSectionTestHelper.GetTestAssessmentLevel, handler); - var editor = new PipingInputContextStochasticSoilModelSelectionEditor(); + var editor = new PipingInputContextStochasticSoilModelSelectionEditor(); var someValue = new object(); var propertyBag = new DynamicPropertyBag(properties); @@ -147,7 +147,7 @@ AssessmentSectionTestHelper.GetTestAssessmentLevel, handler); - var editor = new PipingInputContextStochasticSoilModelSelectionEditor(); + var editor = new PipingInputContextStochasticSoilModelSelectionEditor(); var someValue = new object(); var propertyBag = new DynamicPropertyBag(properties); Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilProfileSelectionEditorTest.cs =================================================================== diff -u -r9d81fce2b4838979d13c48cf0adc054fb240625a -r239ce4a30ac83b5d891ec54f32fdba549c73e21d --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilProfileSelectionEditorTest.cs (.../PipingInputContextStochasticSoilProfileSelectionEditorTest.cs) (revision 9d81fce2b4838979d13c48cf0adc054fb240625a) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilProfileSelectionEditorTest.cs (.../PipingInputContextStochasticSoilProfileSelectionEditorTest.cs) (revision 239ce4a30ac83b5d891ec54f32fdba549c73e21d) @@ -77,7 +77,7 @@ AssessmentSectionTestHelper.GetTestAssessmentLevel, handler); - var editor = new PipingInputContextStochasticSoilProfileSelectionEditor(); + var editor = new PipingInputContextStochasticSoilProfileSelectionEditor(); var someValue = new object(); var propertyBag = new DynamicPropertyBag(properties); @@ -147,7 +147,7 @@ AssessmentSectionTestHelper.GetTestAssessmentLevel, handler); - var editor = new PipingInputContextStochasticSoilProfileSelectionEditor(); + var editor = new PipingInputContextStochasticSoilProfileSelectionEditor(); var someValue = new object(); var propertyBag = new DynamicPropertyBag(properties);