Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismResultView.cs =================================================================== diff -u -rfa2a0dff6598123689fc7a69745440215879a243 -r8bb257bcf65291ebc7fc3b913d73bb11f40124d4 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismResultView.cs (.../PipingFailureMechanismResultView.cs) (revision fa2a0dff6598123689fc7a69745440215879a243) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismResultView.cs (.../PipingFailureMechanismResultView.cs) (revision 8bb257bcf65291ebc7fc3b913d73bb11f40124d4) @@ -22,12 +22,15 @@ using System; using System.Linq; using System.Windows.Forms; + using Core.Common.Base; using Core.Common.Utils.Reflection; + using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Forms.Views; using Ringtoets.Piping.Data; + using CoreCommonResources = Core.Common.Base.Properties.Resources; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; @@ -88,37 +91,33 @@ base.Dispose(disposing); } + protected override object CreateFailureMechanismSectionResultRow(PipingFailureMechanismSectionResult sectionResult) + { + if (FailureMechanism == null) + { + return null; + } + return new PipingFailureMechanismSectionResultRow(sectionResult, FailureMechanism.Calculations.OfType()); + } + private void AddDataGridColumns() { DataGridViewControl.AddTextBoxColumn( TypeUtils.GetMemberName(sr => sr.Name), RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Section_name, - true - ); + true); DataGridViewControl.AddCheckBoxColumn( TypeUtils.GetMemberName(sr => sr.AssessmentLayerOne), - RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one - ); + RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one); DataGridViewControl.AddTextBoxColumn( TypeUtils.GetMemberName(sr => sr.AssessmentLayerTwoA), RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a, - true - ); + true); DataGridViewControl.AddTextBoxColumn( TypeUtils.GetMemberName(sr => sr.AssessmentLayerThree), - RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three - ); + RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three); } - protected override object CreateFailureMechanismSectionResultRow(PipingFailureMechanismSectionResult sectionResult) - { - if (FailureMechanism == null) - { - return null; - } - return new PipingFailureMechanismSectionResultRow(sectionResult, FailureMechanism.Calculations.OfType()); - } - #region Event handling private void DisableIrrelevantFieldsFormatting(object sender, DataGridViewCellFormattingEventArgs eventArgs) @@ -142,11 +141,11 @@ { return; } - + var currentDataGridViewCell = DataGridViewControl.GetCell(e.RowIndex, e.ColumnIndex); - - PipingFailureMechanismSectionResultRow resultRow = (PipingFailureMechanismSectionResultRow) GetDataAtRow(e.RowIndex); + PipingFailureMechanismSectionResultRow resultRow = (PipingFailureMechanismSectionResultRow)GetDataAtRow(e.RowIndex); + if (resultRow != null && e.ColumnIndex == assessmentLayerTwoAIndex) { PipingFailureMechanismSectionResult rowObject = resultRow.SectionResult; @@ -167,19 +166,16 @@ } var calculationScenarioStatus = rowObject.GetCalculationScenarioStatus(FailureMechanism.Calculations.OfType()); - if (calculationScenarioStatus == CalculationScenarioStatus.NotCalculated) { currentDataGridViewCell.ErrorText = RingtoetsCommonFormsResources.FailureMechanismResultView_DataGridViewCellFormatting_Not_all_calculations_are_executed; return; } - if (calculationScenarioStatus == CalculationScenarioStatus.Failed) { currentDataGridViewCell.ErrorText = RingtoetsCommonFormsResources.FailureMechanismResultView_DataGridViewCellFormatting_Not_all_calculations_have_valid_output; return; } - currentDataGridViewCell.ErrorText = string.Empty; } }