Index: DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationSpecificationPropertyControl.cs =================================================================== diff -u -r6977 -r6980 --- DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationSpecificationPropertyControl.cs (.../DamProjectCalculationSpecificationPropertyControl.cs) (revision 6977) +++ DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationSpecificationPropertyControl.cs (.../DamProjectCalculationSpecificationPropertyControl.cs) (revision 6980) @@ -19,15 +19,14 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; +using System.Windows.Forms; using Deltares.Dam.Data; using Deltares.Standard.EventPublisher; using Deltares.Standard.EventPublisher.Enum; using Deltares.Standard.Forms; using Deltares.Standard.Forms.DExpress; -using System; -using System.Windows.Forms; - namespace Deltares.Dam.Forms { public partial class DamProjectCalculationSpecificationPropertyControl : UserControl, IPropertyControl @@ -39,9 +38,9 @@ public DamProjectCalculationSpecificationPropertyControl() { InitializeComponent(); - + Name = "Calculation"; - + BindSupport.BindTextAndValue(CalculationDefinitionPanelControl, FailureMechanismLabel, FailureMechanismCombobox, p => p.FailureMechanismSystemType); BindSupport.BindTextAndValue(CalculationDefinitionPanelControl, CalculationModelLabel, CalculationModelComboBox, p => p.CalculationModel); DataEventPublisher.OnSelectionChanged += DataEventPublisher_OnSubSelectionChanged; @@ -61,6 +60,7 @@ damProjectCalculationSpecification = specification; SetSelectedDamCalculationSpecification(); } + if (sender is DamProject pd) { damProjectCalculationSpecification = pd.DamProjectData.DamProjectCalculationSpecification; @@ -102,16 +102,16 @@ private void DataEventPublisher_OnSubSelectionChanged(object sender, PublishEventArgs e) { - if (((SelectionEventArgs)e).PropertyEditorReactionType == PropertyEditorReactionType.Ignore && + if (((SelectionEventArgs) e).PropertyEditorReactionType == PropertyEditorReactionType.Ignore && sender is DamProjectCalculationSpecification item && damProjectData.DamProjectCalculationSpecifications.Contains(item)) { damProjectCalculationSpecification = item; SetSelectedDamCalculationSpecification(); } - DamProjectData data = sender as DamProjectData; - if (data != null && ((SelectionEventArgs)e).PropertyEditorReactionType == PropertyEditorReactionType.Update && + var data = sender as DamProjectData; + if (data != null && ((SelectionEventArgs) e).PropertyEditorReactionType == PropertyEditorReactionType.Update && data.DamProjectCalculationSpecifications.Contains(data.DamProjectCalculationSpecification)) { damProjectData = data; @@ -139,7 +139,7 @@ BindSupport.Assign(CalculationDefinitionPanelControl, data.DamProjectCalculationSpecifications); SetSelectedDamCalculationSpecification(); - CalculationSpecificationsGroupControl.Visible = true; + CalculationSpecificationsGroupControl.Visible = true; } } }