Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoard.cs =================================================================== diff -u -r6793 -r6815 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoard.cs (.../WaterBoard.cs) (revision 6793) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoard.cs (.../WaterBoard.cs) (revision 6815) @@ -41,7 +41,7 @@ private IList featureList; private IList segments; private string waterLevelTimeSeriesFileName; - private Dike selectedDike; + private Dike dike; public WaterBoard() { @@ -64,29 +64,29 @@ } /// - /// Gets the selected dike. + /// Gets the dike. /// Is a helper property to be able to show the soil table. When more Dikes than one are allowed, /// this has to become a "real" property set by the onselectionchanged event. /// /// - /// The selected dike. + /// The dike. /// - public Dike SelectedDike + public Dike Dike { get { - if (selectedDike != null) + if (dike != null) { - return selectedDike; + return dike; } return dikes.Count > 0 ? dikes[0] : null; } set { - DataEventPublisher.BeforeChange(this, x => x.SelectedDike); - selectedDike = value; - DataEventPublisher.AfterChange(this, x => x.SelectedDike); + DataEventPublisher.BeforeChange(this, x => x.Dike); + dike = value; + DataEventPublisher.AfterChange(this, x => x.Dike); } } @@ -202,7 +202,7 @@ { switch (property) { - case "SelectedDike": return VisibleEnabledProvider != null && VisibleEnabledProvider.IsVisible(this, "SelectedDike"); + case "Dike": return VisibleEnabledProvider != null && VisibleEnabledProvider.IsVisible(this, "Dike"); case "WaterLevelTimeSeriesFileName": return Location.DamProjectType == DamProjectType.DamLiveConfiguration; default: return true; } Index: DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs =================================================================== diff -u -r6808 -r6815 --- DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs (.../DamPlugin.cs) (revision 6808) +++ DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs (.../DamPlugin.cs) (revision 6815) @@ -270,9 +270,9 @@ BindSupport.Assign(damNavigator, projectData); BindSupport.Assign(projectPanel, projectData); - Dike sd = projectData.WaterBoard.SelectedDike; - projectData.WaterBoard.SelectedDike = sd; - BindSupport.Assign(materialPanel, projectData.WaterBoard.SelectedDike); + Dike sd = projectData.WaterBoard.Dike; + projectData.WaterBoard.Dike = sd; + BindSupport.Assign(materialPanel, projectData.WaterBoard.Dike); BindSupport.Assign(sensorPanel, projectData); BindSupport.Assign(calculationSpecificationPanel, projectData.DamProjectCalculationSpecification); BindSupport.Assign(locationJobPanel, currentLocationJob); @@ -346,7 +346,7 @@ { switch (property) { - case "SelectedDike": + case "Dike": return StabilityKernelTypeSpecificationsVisible; default: return true; @@ -661,7 +661,7 @@ DataEventPublisher.InvokeWithoutPublishingEvents(() => { - mainForm.Invoke(new TaskDelegate(DataEventPublisher.SelectionChanged), damProject.DamProjectData.WaterBoard.SelectedDike); + mainForm.Invoke(new TaskDelegate(DataEventPublisher.SelectionChanged), damProject.DamProjectData.WaterBoard.Dike); LogManager.Clear(); damProject.DamProjectData.ClearResults(); }); @@ -1076,8 +1076,8 @@ { LogManager.Clear(); - damProject.DamProjectData.WaterBoard.SelectedDike = new Dike(); - mainForm.Invoke(new TaskDelegate(DataEventPublisher.SelectionChanged), damProject.DamProjectData.WaterBoard.SelectedDike); + damProject.DamProjectData.WaterBoard.Dike = new Dike(); + mainForm.Invoke(new TaskDelegate(DataEventPublisher.SelectionChanged), damProject.DamProjectData.WaterBoard.Dike); progressDelegate(0);