Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismResultView.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rb0dc46315e824778c8f43d8956f958376a3b802f --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismResultView.cs (.../ClosingStructuresFailureMechanismResultView.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismResultView.cs (.../ClosingStructuresFailureMechanismResultView.cs) (revision b0dc46315e824778c8f43d8956f958376a3b802f) @@ -74,11 +74,6 @@ this.assessmentSection = assessmentSection; - var assemblyResultControl = new FailureMechanismAssemblyControl(); - SetAssemblyResultControl( - assemblyResultControl, - () => assemblyResultControl.SetAssemblyResult(ClosingStructuresFailureMechanismAssemblyFactory.AssembleFailureMechanism(FailureMechanism, assessmentSection))); - // The concat is needed to observe the input of calculations in child groups. calculationInputObserver = new RecursiveObserver( UpdateView, @@ -178,5 +173,10 @@ DataGridViewControl, nameof(ClosingStructuresFailureMechanismSectionResultRow.ManualAssemblyProbability)); } + + protected override void UpdateAssemblyResultControl() + { + FailureMechanismAssemblyResultControl.SetAssemblyResult(ClosingStructuresFailureMechanismAssemblyFactory.AssembleFailureMechanism(FailureMechanism, assessmentSection)); + } } } \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/AssemblyResultControl.Designer.cs =================================================================== diff -u -r96e729865d3978156ee7d869c1f45f51dae51bcd -rb0dc46315e824778c8f43d8956f958376a3b802f --- Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/AssemblyResultControl.Designer.cs (.../AssemblyResultControl.Designer.cs) (revision 96e729865d3978156ee7d869c1f45f51dae51bcd) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/AssemblyResultControl.Designer.cs (.../AssemblyResultControl.Designer.cs) (revision b0dc46315e824778c8f43d8956f958376a3b802f) @@ -105,7 +105,6 @@ this.AutoSize = true; this.Controls.Add(this.GroupPanel); this.Name = "AssemblyResultControl"; - this.Size = new System.Drawing.Size(274, 150); this.GroupPanel.ResumeLayout(false); this.GroupPanel.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.ErrorProvider)).EndInit(); Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/AssemblyResultWithProbabilityControl.Designer.cs =================================================================== diff -u -rce7c1e5c5a8aec0020b1ef5cf50bf3c20d3d4c2f -rb0dc46315e824778c8f43d8956f958376a3b802f --- Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/AssemblyResultWithProbabilityControl.Designer.cs (.../AssemblyResultWithProbabilityControl.Designer.cs) (revision ce7c1e5c5a8aec0020b1ef5cf50bf3c20d3d4c2f) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/AssemblyResultWithProbabilityControl.Designer.cs (.../AssemblyResultWithProbabilityControl.Designer.cs) (revision b0dc46315e824778c8f43d8956f958376a3b802f) @@ -63,9 +63,9 @@ this.probabilityPanel.Dock = System.Windows.Forms.DockStyle.Left; this.probabilityPanel.Location = new System.Drawing.Point(56, 0); this.probabilityPanel.Name = "probabilityPanel"; + this.probabilityPanel.AutoSize = true; this.probabilityPanel.RowCount = 1; this.probabilityPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.probabilityPanel.Size = new System.Drawing.Size(200, 796); this.probabilityPanel.TabIndex = 1; // // ProbabilityLabel @@ -88,7 +88,6 @@ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.probabilityPanel); this.Name = "FailureMechanismAssemblyControl"; - this.Size = new System.Drawing.Size(256, 796); this.Controls.SetChildIndex(this.probabilityPanel, 0); ((System.ComponentModel.ISupportInitialize)(this.ErrorProvider)).EndInit(); this.probabilityPanel.ResumeLayout(false); Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.Designer.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rb0dc46315e824778c8f43d8956f958376a3b802f --- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.Designer.cs (.../FailureMechanismResultView.Designer.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.Designer.cs (.../FailureMechanismResultView.Designer.cs) (revision b0dc46315e824778c8f43d8956f958376a3b802f) @@ -74,9 +74,9 @@ this.failureMechanismAssemblyLabel.Dock = System.Windows.Forms.DockStyle.Fill; this.failureMechanismAssemblyLabel.Location = new System.Drawing.Point(3, 0); this.failureMechanismAssemblyLabel.Name = "failureMechanismAssemblyLabel"; - this.failureMechanismAssemblyLabel.Size = new System.Drawing.Size(57, 30); + this.failureMechanismAssemblyLabel.Size = new System.Drawing.Size(197, 30); this.failureMechanismAssemblyLabel.TabIndex = 2; - this.failureMechanismAssemblyLabel.Text = global::Ringtoets.Common.Forms.Properties.Resources.FailureMechanismResultView_FailureMechanismAssemblyLabel;; + this.failureMechanismAssemblyLabel.Text = global::Ringtoets.Common.Forms.Properties.Resources.FailureMechanismResultView_FailureMechanismAssemblyLabel; this.failureMechanismAssemblyLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // infoIcon Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rb0dc46315e824778c8f43d8956f958376a3b802f --- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs (.../FailureMechanismResultView.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs (.../FailureMechanismResultView.cs) (revision b0dc46315e824778c8f43d8956f958376a3b802f) @@ -27,6 +27,7 @@ using Core.Common.Controls.DataGrid; using Core.Common.Controls.Views; using Core.Common.Util.Extensions; +using Ringtoets.Common.Data.Exceptions; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Forms.Controls; using Ringtoets.Common.Forms.Properties; @@ -52,8 +53,7 @@ private readonly Observer failureMechanismObserver; private readonly Observer failureMechanismSectionResultObserver; private readonly RecursiveObserver, TSectionResult> failureMechanismSectionResultsObserver; - private TAssemblyResultControl failureMechanismAssemblyResultControl; - private Action setFailureMechanismAssemblyResultAction; + protected TAssemblyResultControl FailureMechanismAssemblyResultControl; private IEnumerable sectionResultRows; private bool rowUpdating; @@ -78,7 +78,7 @@ } InitializeComponent(); - InitializeInfoIcon(); + InitializeFailureMechanismAssemblyResultPanel(); FailureMechanism = failureMechanism; this.failureMechanismSectionResults = failureMechanismSectionResults; @@ -151,18 +151,10 @@ protected abstract void AddDataGridColumns(); /// - /// Sets the correct failure mechanism assembly result control on the view. + /// Updates the content of the . /// - /// The control to set on the view. - /// The action to perform to update the data of the control. - protected void SetAssemblyResultControl(TAssemblyResultControl control, - Action setResultAction) - { - failureMechanismAssemblyResultControl = new TAssemblyResultControl(); - setFailureMechanismAssemblyResultAction = setResultAction; - TableLayoutPanel.Controls.Add(failureMechanismAssemblyResultControl, 1, 0); - } - + /// Thrown when the assembly result + /// could not be created. protected abstract void UpdateAssemblyResultControl(); /// @@ -198,24 +190,24 @@ private void UpdateFailureMechanismAssemblyResultControl() { - if (failureMechanismAssemblyResultControl != null && setFailureMechanismAssemblyResultAction != null) + try { - try - { - setFailureMechanismAssemblyResultAction(); - failureMechanismAssemblyResultControl.ClearError(); - } - catch (Exception e) - { - failureMechanismAssemblyResultControl.SetError(e.Message); - } + UpdateAssemblyResultControl(); + FailureMechanismAssemblyResultControl.ClearError(); } + catch (AssemblyException e) + { + FailureMechanismAssemblyResultControl.SetError(e.Message); + } } - private void InitializeInfoIcon() + private void InitializeFailureMechanismAssemblyResultPanel() { infoIcon.BackgroundImage = CoreCommonGuiResources.information; toolTip.SetToolTip(infoIcon, Resources.FailureMechanismResultView_InfoToolTip); + + FailureMechanismAssemblyResultControl = new TAssemblyResultControl(); + TableLayoutPanel.Controls.Add(FailureMechanismAssemblyResultControl, 1, 0); } private void RemoveSectionResultRowEvents() Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rb0dc46315e824778c8f43d8956f958376a3b802f --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs (.../FailureMechanismResultViewTest.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs (.../FailureMechanismResultViewTest.cs) (revision b0dc46315e824778c8f43d8956f958376a3b802f) @@ -32,6 +32,7 @@ using NUnit.Framework; using Ringtoets.AssemblyTool.Data; using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators; +using Ringtoets.Common.Data.Exceptions; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.Controls; @@ -489,23 +490,8 @@ private class TestFailureMechanismResultView : FailureMechanismResultView, TestFailureMechanism, FailureMechanismAssemblyCategoryGroupControl> { public TestFailureMechanismResultView(IObservableEnumerable failureMechanismSectionResults, TestFailureMechanism failureMechanism) - : base(failureMechanismSectionResults, failureMechanism) - { - var assemblyResultControl = new FailureMechanismAssemblyCategoryGroupControl(); - SetAssemblyResultControl( - assemblyResultControl, - () => - { - if (ThrowExceptionOnCalculate) - { - throw new Exception("Message"); - } + : base(failureMechanismSectionResults, failureMechanism) {} - assemblyResultControl.SetAssemblyResult(FailureMechanismAssemblyCategoryGroup.IIIt); - AssemblyResultUpdated = true; - }); - } - public bool ThrowExceptionOnCalculate { private get; set; } public bool AssemblyResultUpdated { get; set; } @@ -519,6 +505,17 @@ { DataGridViewControl.AddTextBoxColumn("Name", "Test", true); } + + protected override void UpdateAssemblyResultControl() + { + if (ThrowExceptionOnCalculate) + { + throw new AssemblyException("Message"); + } + + FailureMechanismAssemblyResultControl.SetAssemblyResult(FailureMechanismAssemblyCategoryGroup.IIIt); + AssemblyResultUpdated = true; + } } private class TestRow : FailureMechanismSectionResultRow Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionFailureMechanismResultView.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rb0dc46315e824778c8f43d8956f958376a3b802f --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionFailureMechanismResultView.cs (.../DuneErosionFailureMechanismResultView.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionFailureMechanismResultView.cs (.../DuneErosionFailureMechanismResultView.cs) (revision b0dc46315e824778c8f43d8956f958376a3b802f) @@ -56,13 +56,7 @@ public DuneErosionFailureMechanismResultView( IObservableEnumerable failureMechanismSectionResults, DuneErosionFailureMechanism failureMechanism) - : base(failureMechanismSectionResults, failureMechanism) - { - var assemblyResultControl = new FailureMechanismAssemblyCategoryGroupControl(); - SetAssemblyResultControl( - assemblyResultControl, - () => assemblyResultControl.SetAssemblyResult(DuneErosionFailureMechanismAssemblyFactory.AssembleFailureMechanism(FailureMechanism))); - } + : base(failureMechanismSectionResults, failureMechanism) {} protected override DuneErosionSectionResultRow CreateFailureMechanismSectionResultRow(DuneErosionFailureMechanismSectionResult sectionResult) { @@ -143,5 +137,10 @@ DataGridViewControl, nameof(DuneErosionSectionResultRow.ManualAssemblyCategoryGroup)); } + + protected override void UpdateAssemblyResultControl() + { + FailureMechanismAssemblyResultControl.SetAssemblyResult(DuneErosionFailureMechanismAssemblyFactory.AssembleFailureMechanism(FailureMechanism)); + } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rb0dc46315e824778c8f43d8956f958376a3b802f --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs (.../GrassCoverErosionInwardsFailureMechanismResultView.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs (.../GrassCoverErosionInwardsFailureMechanismResultView.cs) (revision b0dc46315e824778c8f43d8956f958376a3b802f) @@ -74,11 +74,6 @@ this.assessmentSection = assessmentSection; - var assemblyResultControl = new FailureMechanismAssemblyControl(); - SetAssemblyResultControl( - assemblyResultControl, - () => assemblyResultControl.SetAssemblyResult(GrassCoverErosionInwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(FailureMechanism, assessmentSection))); - // The concat is needed to observe the input of calculations in child groups. calculationInputObserver = new RecursiveObserver( UpdateView, @@ -178,5 +173,10 @@ DataGridViewControl, nameof(GrassCoverErosionInwardsFailureMechanismSectionResultRow.ManualAssemblyProbability)); } + + protected override void UpdateAssemblyResultControl() + { + FailureMechanismAssemblyResultControl.SetAssemblyResult(GrassCoverErosionInwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(FailureMechanism, assessmentSection)); + } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismResultView.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rb0dc46315e824778c8f43d8956f958376a3b802f --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismResultView.cs (.../GrassCoverErosionOutwardsFailureMechanismResultView.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismResultView.cs (.../GrassCoverErosionOutwardsFailureMechanismResultView.cs) (revision b0dc46315e824778c8f43d8956f958376a3b802f) @@ -55,13 +55,7 @@ public GrassCoverErosionOutwardsFailureMechanismResultView( IObservableEnumerable failureMechanismSectionResults, GrassCoverErosionOutwardsFailureMechanism failureMechanism) - : base(failureMechanismSectionResults, failureMechanism) - { - var assemblyResultControl = new FailureMechanismAssemblyCategoryGroupControl(); - SetAssemblyResultControl( - assemblyResultControl, - () => assemblyResultControl.SetAssemblyResult(GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(FailureMechanism))); - } + : base(failureMechanismSectionResults, failureMechanism) {} protected override GrassCoverErosionOutwardsFailureMechanismSectionResultRow CreateFailureMechanismSectionResultRow(GrassCoverErosionOutwardsFailureMechanismSectionResult sectionResult) { @@ -142,5 +136,10 @@ DataGridViewControl, nameof(GrassCoverErosionOutwardsFailureMechanismSectionResultRow.ManualAssemblyCategoryGroup)); } + + protected override void UpdateAssemblyResultControl() + { + FailureMechanismAssemblyResultControl.SetAssemblyResult(GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(FailureMechanism)); + } } } \ No newline at end of file Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismResultView.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rb0dc46315e824778c8f43d8956f958376a3b802f --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismResultView.cs (.../HeightStructuresFailureMechanismResultView.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismResultView.cs (.../HeightStructuresFailureMechanismResultView.cs) (revision b0dc46315e824778c8f43d8956f958376a3b802f) @@ -75,11 +75,6 @@ this.assessmentSection = assessmentSection; - var assemblyResultControl = new FailureMechanismAssemblyControl(); - SetAssemblyResultControl( - assemblyResultControl, - () => assemblyResultControl.SetAssemblyResult(HeightStructuresFailureMechanismAssemblyFactory.AssembleFailureMechanism(FailureMechanism, assessmentSection))); - // The concat is needed to observe the input of calculations in child groups. calculationInputObserver = new RecursiveObserver( UpdateView, @@ -180,5 +175,10 @@ DataGridViewControl, nameof(HeightStructuresFailureMechanismSectionResultRow.ManualAssemblyProbability)); } + + protected override void UpdateAssemblyResultControl() + { + FailureMechanismAssemblyResultControl.SetAssemblyResult(HeightStructuresFailureMechanismAssemblyFactory.AssembleFailureMechanism(FailureMechanism, assessmentSection)); + } } } \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffInwardsResultView.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rb0dc46315e824778c8f43d8956f958376a3b802f --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffInwardsResultView.cs (.../GrassCoverSlipOffInwardsResultView.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffInwardsResultView.cs (.../GrassCoverSlipOffInwardsResultView.cs) (revision b0dc46315e824778c8f43d8956f958376a3b802f) @@ -53,13 +53,7 @@ /// public GrassCoverSlipOffInwardsResultView(IObservableEnumerable failureMechanismSectionResults, GrassCoverSlipOffInwardsFailureMechanism failureMechanism) - : base(failureMechanismSectionResults, failureMechanism) - { - var assemblyResultControl = new FailureMechanismAssemblyCategoryGroupControl(); - SetAssemblyResultControl( - assemblyResultControl, - () => assemblyResultControl.SetAssemblyResult(GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(FailureMechanism))); - } + : base(failureMechanismSectionResults, failureMechanism) {} protected override GrassCoverSlipOffInwardsSectionResultRow CreateFailureMechanismSectionResultRow( GrassCoverSlipOffInwardsFailureMechanismSectionResult sectionResult) @@ -121,5 +115,10 @@ DataGridViewControl, nameof(GrassCoverSlipOffInwardsSectionResultRow.ManualAssemblyCategoryGroup)); } + + protected override void UpdateAssemblyResultControl() + { + FailureMechanismAssemblyResultControl.SetAssemblyResult(GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(FailureMechanism)); + } } } \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultView.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rb0dc46315e824778c8f43d8956f958376a3b802f --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultView.cs (.../GrassCoverSlipOffOutwardsResultView.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultView.cs (.../GrassCoverSlipOffOutwardsResultView.cs) (revision b0dc46315e824778c8f43d8956f958376a3b802f) @@ -54,13 +54,7 @@ public GrassCoverSlipOffOutwardsResultView( IObservableEnumerable failureMechanismSectionResults, GrassCoverSlipOffOutwardsFailureMechanism failureMechanism) - : base(failureMechanismSectionResults, failureMechanism) - { - var assemblyResultControl = new FailureMechanismAssemblyCategoryGroupControl(); - SetAssemblyResultControl( - assemblyResultControl, - () => assemblyResultControl.SetAssemblyResult(GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(FailureMechanism))); - } + : base(failureMechanismSectionResults, failureMechanism) {} protected override GrassCoverSlipOffOutwardsSectionResultRow CreateFailureMechanismSectionResultRow(GrassCoverSlipOffOutwardsFailureMechanismSectionResult sectionResult) { @@ -121,5 +115,10 @@ DataGridViewControl, nameof(GrassCoverSlipOffOutwardsSectionResultRow.ManualAssemblyCategoryGroup)); } + + protected override void UpdateAssemblyResultControl() + { + FailureMechanismAssemblyResultControl.SetAssemblyResult(GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(FailureMechanism)); + } } } \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MacroStabilityOutwardsResultView.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rb0dc46315e824778c8f43d8956f958376a3b802f --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MacroStabilityOutwardsResultView.cs (.../MacroStabilityOutwardsResultView.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MacroStabilityOutwardsResultView.cs (.../MacroStabilityOutwardsResultView.cs) (revision b0dc46315e824778c8f43d8956f958376a3b802f) @@ -69,11 +69,6 @@ } this.assessmentSection = assessmentSection; - - var assemblyResultControl = new FailureMechanismAssemblyCategoryGroupControl(); - SetAssemblyResultControl( - assemblyResultControl, - () => assemblyResultControl.SetAssemblyResult(MacroStabilityOutwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(FailureMechanism, assessmentSection))); } protected override MacroStabilityOutwardsSectionResultRow CreateFailureMechanismSectionResultRow(MacroStabilityOutwardsFailureMechanismSectionResult sectionResult) @@ -145,5 +140,10 @@ DataGridViewControl, nameof(MacroStabilityOutwardsSectionResultRow.ManualAssemblyCategoryGroup)); } + + protected override void UpdateAssemblyResultControl() + { + FailureMechanismAssemblyResultControl.SetAssemblyResult(MacroStabilityOutwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(FailureMechanism, assessmentSection)); + } } } \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MicrostabilityResultView.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rb0dc46315e824778c8f43d8956f958376a3b802f --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MicrostabilityResultView.cs (.../MicrostabilityResultView.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MicrostabilityResultView.cs (.../MicrostabilityResultView.cs) (revision b0dc46315e824778c8f43d8956f958376a3b802f) @@ -53,13 +53,7 @@ /// public MicrostabilityResultView(IObservableEnumerable failureMechanismSectionResults, MicrostabilityFailureMechanism failureMechanism) - : base(failureMechanismSectionResults, failureMechanism) - { - var assemblyResultControl = new FailureMechanismAssemblyCategoryGroupControl(); - SetAssemblyResultControl( - assemblyResultControl, - () => assemblyResultControl.SetAssemblyResult(MicrostabilityFailureMechanismAssemblyFactory.AssembleFailureMechanism(FailureMechanism))); - } + : base(failureMechanismSectionResults, failureMechanism) {} protected override MicrostabilitySectionResultRow CreateFailureMechanismSectionResultRow(MicrostabilityFailureMechanismSectionResult sectionResult) { @@ -120,5 +114,10 @@ DataGridViewControl, nameof(MicrostabilitySectionResultRow.ManualAssemblyCategoryGroup)); } + + protected override void UpdateAssemblyResultControl() + { + FailureMechanismAssemblyResultControl.SetAssemblyResult(MicrostabilityFailureMechanismAssemblyFactory.AssembleFailureMechanism(FailureMechanism)); + } } } \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/PipingStructureResultView.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rb0dc46315e824778c8f43d8956f958376a3b802f --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/PipingStructureResultView.cs (.../PipingStructureResultView.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/PipingStructureResultView.cs (.../PipingStructureResultView.cs) (revision b0dc46315e824778c8f43d8956f958376a3b802f) @@ -53,13 +53,7 @@ /// public PipingStructureResultView(IObservableEnumerable failureMechanismSectionResults, PipingStructureFailureMechanism failureMechanism) - : base(failureMechanismSectionResults, failureMechanism) - { - var assemblyResultControl = new FailureMechanismAssemblyCategoryGroupControl(); - SetAssemblyResultControl( - assemblyResultControl, - () => assemblyResultControl.SetAssemblyResult(PipingStructureFailureMechanismAssemblyFactory.AssembleFailureMechanism(FailureMechanism))); - } + : base(failureMechanismSectionResults, failureMechanism) {} protected override PipingStructureSectionResultRow CreateFailureMechanismSectionResultRow(PipingStructureFailureMechanismSectionResult sectionResult) { @@ -120,5 +114,10 @@ DataGridViewControl, nameof(PipingStructureSectionResultRow.ManualAssemblyCategoryGroup)); } + + protected override void UpdateAssemblyResultControl() + { + FailureMechanismAssemblyResultControl.SetAssemblyResult(PipingStructureFailureMechanismAssemblyFactory.AssembleFailureMechanism(FailureMechanism)); + } } } \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultView.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rb0dc46315e824778c8f43d8956f958376a3b802f --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultView.cs (.../StrengthStabilityLengthwiseConstructionResultView.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultView.cs (.../StrengthStabilityLengthwiseConstructionResultView.cs) (revision b0dc46315e824778c8f43d8956f958376a3b802f) @@ -53,13 +53,7 @@ public StrengthStabilityLengthwiseConstructionResultView( IObservableEnumerable failureMechanismSectionResults, StrengthStabilityLengthwiseConstructionFailureMechanism failureMechanism) - : base(failureMechanismSectionResults, failureMechanism) - { - var assemblyResultControl = new FailureMechanismAssemblyCategoryGroupControl(); - SetAssemblyResultControl( - assemblyResultControl, - () => assemblyResultControl.SetAssemblyResult(StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactory.AssembleFailureMechanism(FailureMechanism))); - } + : base(failureMechanismSectionResults, failureMechanism) {} protected override StrengthStabilityLengthwiseConstructionSectionResultRow CreateFailureMechanismSectionResultRow( StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult sectionResult) @@ -111,5 +105,10 @@ DataGridViewControl, nameof(StrengthStabilityLengthwiseConstructionSectionResultRow.ManualAssemblyCategoryGroup)); } + + protected override void UpdateAssemblyResultControl() + { + FailureMechanismAssemblyResultControl.SetAssemblyResult(StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactory.AssembleFailureMechanism(FailureMechanism)); + } } } \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/TechnicalInnovationResultView.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rb0dc46315e824778c8f43d8956f958376a3b802f --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/TechnicalInnovationResultView.cs (.../TechnicalInnovationResultView.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/TechnicalInnovationResultView.cs (.../TechnicalInnovationResultView.cs) (revision b0dc46315e824778c8f43d8956f958376a3b802f) @@ -52,13 +52,7 @@ public TechnicalInnovationResultView( IObservableEnumerable failureMechanismSectionResults, TechnicalInnovationFailureMechanism failureMechanism) - : base(failureMechanismSectionResults, failureMechanism) - { - var assemblyResultControl = new FailureMechanismAssemblyCategoryGroupControl(); - SetAssemblyResultControl( - assemblyResultControl, - () => assemblyResultControl.SetAssemblyResult(TechnicalInnovationFailureMechanismAssemblyFactory.AssembleFailureMechanism(FailureMechanism))); - } + : base(failureMechanismSectionResults, failureMechanism) {} protected override TechnicalInnovationSectionResultRow CreateFailureMechanismSectionResultRow(TechnicalInnovationFailureMechanismSectionResult sectionResult) { @@ -109,5 +103,10 @@ DataGridViewControl, nameof(TechnicalInnovationSectionResultRow.ManualAssemblyCategoryGroup)); } + + protected override void UpdateAssemblyResultControl() + { + FailureMechanismAssemblyResultControl.SetAssemblyResult(TechnicalInnovationFailureMechanismAssemblyFactory.AssembleFailureMechanism(FailureMechanism)); + } } } \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/WaterPressureAsphaltCoverResultView.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rb0dc46315e824778c8f43d8956f958376a3b802f --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/WaterPressureAsphaltCoverResultView.cs (.../WaterPressureAsphaltCoverResultView.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/WaterPressureAsphaltCoverResultView.cs (.../WaterPressureAsphaltCoverResultView.cs) (revision b0dc46315e824778c8f43d8956f958376a3b802f) @@ -52,13 +52,7 @@ public WaterPressureAsphaltCoverResultView( IObservableEnumerable failureMechanismSectionResults, WaterPressureAsphaltCoverFailureMechanism failureMechanism) - : base(failureMechanismSectionResults, failureMechanism) - { - var assemblyResultControl = new FailureMechanismAssemblyCategoryGroupControl(); - SetAssemblyResultControl( - assemblyResultControl, - () => assemblyResultControl.SetAssemblyResult(WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.AssembleFailureMechanism(FailureMechanism))); - } + : base(failureMechanismSectionResults, failureMechanism) {} protected override WaterPressureAsphaltCoverSectionResultRow CreateFailureMechanismSectionResultRow(WaterPressureAsphaltCoverFailureMechanismSectionResult sectionResult) { @@ -109,5 +103,10 @@ DataGridViewControl, nameof(WaterPressureAsphaltCoverSectionResultRow.ManualAssemblyCategoryGroup)); } + + protected override void UpdateAssemblyResultControl() + { + FailureMechanismAssemblyResultControl.SetAssemblyResult(WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.AssembleFailureMechanism(FailureMechanism)); + } } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismResultView.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rb0dc46315e824778c8f43d8956f958376a3b802f --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismResultView.cs (.../MacroStabilityInwardsFailureMechanismResultView.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismResultView.cs (.../MacroStabilityInwardsFailureMechanismResultView.cs) (revision b0dc46315e824778c8f43d8956f958376a3b802f) @@ -72,11 +72,6 @@ this.assessmentSection = assessmentSection; - var assemblyResultControl = new FailureMechanismAssemblyControl(); - SetAssemblyResultControl( - assemblyResultControl, - () => assemblyResultControl.SetAssemblyResult(MacroStabilityInwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(FailureMechanism, assessmentSection))); - // The concat is needed to observe the input of calculations in child groups. calculationInputObserver = new RecursiveObserver( UpdateView, @@ -178,5 +173,10 @@ DataGridViewControl, nameof(MacroStabilityInwardsFailureMechanismSectionResultRow.ManualAssemblyProbability)); } + + protected override void UpdateAssemblyResultControl() + { + FailureMechanismAssemblyResultControl.SetAssemblyResult(MacroStabilityInwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(FailureMechanism, assessmentSection)); + } } } \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismResultView.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rb0dc46315e824778c8f43d8956f958376a3b802f --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismResultView.cs (.../PipingFailureMechanismResultView.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismResultView.cs (.../PipingFailureMechanismResultView.cs) (revision b0dc46315e824778c8f43d8956f958376a3b802f) @@ -72,11 +72,6 @@ this.assessmentSection = assessmentSection; - var assemblyResultControl = new FailureMechanismAssemblyControl(); - SetAssemblyResultControl( - assemblyResultControl, - () => assemblyResultControl.SetAssemblyResult(PipingFailureMechanismAssemblyFactory.AssembleFailureMechanism(FailureMechanism, assessmentSection))); - // The concat is needed to observe the input of calculations in child groups. calculationInputObserver = new RecursiveObserver( UpdateView, @@ -177,5 +172,10 @@ DataGridViewControl, nameof(PipingFailureMechanismSectionResultRow.ManualAssemblyProbability)); } + + protected override void UpdateAssemblyResultControl() + { + FailureMechanismAssemblyResultControl.SetAssemblyResult(PipingFailureMechanismAssemblyFactory.AssembleFailureMechanism(FailureMechanism, assessmentSection)); + } } } \ No newline at end of file Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rb0dc46315e824778c8f43d8956f958376a3b802f --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs (.../StabilityPointStructuresFailureMechanismResultView.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs (.../StabilityPointStructuresFailureMechanismResultView.cs) (revision b0dc46315e824778c8f43d8956f958376a3b802f) @@ -75,11 +75,6 @@ this.assessmentSection = assessmentSection; - var assemblyResultControl = new FailureMechanismAssemblyControl(); - SetAssemblyResultControl( - assemblyResultControl, - () => assemblyResultControl.SetAssemblyResult(StabilityPointStructuresFailureMechanismAssemblyFactory.AssembleFailureMechanism(FailureMechanism, assessmentSection))); - // The concat is needed to observe the input of calculations in child groups. calculationInputObserver = new RecursiveObserver( UpdateView, @@ -180,5 +175,10 @@ DataGridViewControl, nameof(StabilityPointStructuresFailureMechanismSectionResultRow.ManualAssemblyProbability)); } + + protected override void UpdateAssemblyResultControl() + { + FailureMechanismAssemblyResultControl.SetAssemblyResult(StabilityPointStructuresFailureMechanismAssemblyFactory.AssembleFailureMechanism(FailureMechanism, assessmentSection)); + } } } \ No newline at end of file Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverResultView.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rb0dc46315e824778c8f43d8956f958376a3b802f --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverResultView.cs (.../StabilityStoneCoverResultView.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverResultView.cs (.../StabilityStoneCoverResultView.cs) (revision b0dc46315e824778c8f43d8956f958376a3b802f) @@ -54,13 +54,7 @@ /// public StabilityStoneCoverResultView(IObservableEnumerable failureMechanismSectionResults, StabilityStoneCoverFailureMechanism failureMechanism) - : base(failureMechanismSectionResults, failureMechanism) - { - var assemblyResultControl = new FailureMechanismAssemblyCategoryGroupControl(); - SetAssemblyResultControl( - assemblyResultControl, - () => assemblyResultControl.SetAssemblyResult(StabilityStoneCoverFailureMechanismAssemblyFactory.AssembleFailureMechanism(FailureMechanism))); - } + : base(failureMechanismSectionResults, failureMechanism) {} protected override StabilityStoneCoverSectionResultRow CreateFailureMechanismSectionResultRow(StabilityStoneCoverFailureMechanismSectionResult sectionResult) { @@ -141,5 +135,10 @@ DataGridViewControl, nameof(StabilityStoneCoverSectionResultRow.ManualAssemblyCategoryGroup)); } + + protected override void UpdateAssemblyResultControl() + { + FailureMechanismAssemblyResultControl.SetAssemblyResult(StabilityStoneCoverFailureMechanismAssemblyFactory.AssembleFailureMechanism(FailureMechanism)); + } } } \ No newline at end of file Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismResultView.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rb0dc46315e824778c8f43d8956f958376a3b802f --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismResultView.cs (.../WaveImpactAsphaltCoverFailureMechanismResultView.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismResultView.cs (.../WaveImpactAsphaltCoverFailureMechanismResultView.cs) (revision b0dc46315e824778c8f43d8956f958376a3b802f) @@ -54,13 +54,7 @@ /// public WaveImpactAsphaltCoverFailureMechanismResultView(IObservableEnumerable failureMechanismSectionResults, WaveImpactAsphaltCoverFailureMechanism failureMechanism) - : base(failureMechanismSectionResults, failureMechanism) - { - var failureMechanismAssemblyResultWithProbabilityControl = new FailureMechanismAssemblyCategoryGroupControl(); - SetAssemblyResultControl( - failureMechanismAssemblyResultWithProbabilityControl, - () => failureMechanismAssemblyResultWithProbabilityControl.SetAssemblyResult(WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.AssembleFailureMechanism(FailureMechanism))); - } + : base(failureMechanismSectionResults, failureMechanism) {} protected override WaveImpactAsphaltCoverFailureMechanismSectionResultRow CreateFailureMechanismSectionResultRow( WaveImpactAsphaltCoverFailureMechanismSectionResult sectionResult) @@ -142,5 +136,10 @@ DataGridViewControl, nameof(WaveImpactAsphaltCoverFailureMechanismSectionResultRow.ManualAssemblyCategoryGroup)); } + + protected override void UpdateAssemblyResultControl() + { + FailureMechanismAssemblyResultControl.SetAssemblyResult(WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.AssembleFailureMechanism(FailureMechanism)); + } } } \ No newline at end of file