Index: Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingInputView.cs =================================================================== diff -u -r8da4704f43ae462b1eeae911f401e9b41cb3ce50 -rb4611cca8aeb98f81b6c8eebf125ad0f2a2c95d6 --- Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingInputView.cs (.../PipingInputView.cs) (revision 8da4704f43ae462b1eeae911f401e9b41cb3ce50) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingInputView.cs (.../PipingInputView.cs) (revision b4611cca8aeb98f81b6c8eebf125ad0f2a2c95d6) @@ -28,7 +28,6 @@ using Core.Components.Chart.Forms; using Riskeer.Common.Forms.Factories; using Riskeer.Piping.Data; -using Riskeer.Piping.Data.SemiProbabilistic; using Riskeer.Piping.Forms.Factories; using Riskeer.Piping.Primitives; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; @@ -57,7 +56,7 @@ private readonly List soilLayerChartDataLookup; - private SemiProbabilisticPipingCalculationScenario data; + private IPipingCalculation data; private PipingSoilProfile currentSoilProfile; @@ -105,7 +104,7 @@ } set { - data = value as SemiProbabilisticPipingCalculationScenario; + data = value as IPipingCalculation; calculationObserver.Observable = data; calculationInputObserver.Observable = data?.InputParameters; Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs =================================================================== diff -u -r64772edbdba3ee8ef1b86596b90e971435891467 -rb4611cca8aeb98f81b6c8eebf125ad0f2a2c95d6 --- Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision 64772edbdba3ee8ef1b86596b90e971435891467) +++ Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision b4611cca8aeb98f81b6c8eebf125ad0f2a2c95d6) @@ -266,6 +266,14 @@ CloseForData = ClosePipingInputViewForData }; + yield return new ViewInfo + { + GetViewData = context => context.PipingCalculation, + GetViewName = (view, context) => RiskeerCommonFormsResources.Calculation_Input, + Image = PipingFormsResources.PipingInputIcon, + CloseForData = ClosePipingInputViewForData + }; + yield return new ViewInfo { GetViewData = context => context.WrappedData, Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingInputViewTest.cs =================================================================== diff -u -r8da4704f43ae462b1eeae911f401e9b41cb3ce50 -rb4611cca8aeb98f81b6c8eebf125ad0f2a2c95d6 --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingInputViewTest.cs (.../PipingInputViewTest.cs) (revision 8da4704f43ae462b1eeae911f401e9b41cb3ce50) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingInputViewTest.cs (.../PipingInputViewTest.cs) (revision b4611cca8aeb98f81b6c8eebf125ad0f2a2c95d6) @@ -31,6 +31,7 @@ using Riskeer.Piping.Data; using Riskeer.Piping.Data.SemiProbabilistic; using Riskeer.Piping.Data.SoilProfile; +using Riskeer.Piping.Data.TestUtil; using Riskeer.Piping.Forms.Views; using Riskeer.Piping.Primitives; @@ -101,7 +102,7 @@ // Setup using (var view = new PipingInputView()) { - var calculation = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput()); + var calculation = new TestPipingCalculation(new TestPipingInput()); // Call view.Data = calculation;