Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs =================================================================== diff -u -r6781 -r6793 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs (.../Dike.cs) (revision 6781) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs (.../Dike.cs) (revision 6793) @@ -23,6 +23,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Linq; +using System.Xml.Serialization; using Deltares.Dam.Data.CsvImporters; using Deltares.Geotechnics.Soils; using Deltares.Geotechnics.SurfaceLines; @@ -51,7 +52,6 @@ { private IList locations; - private IList pl1Lines; private SoilList soilList; private List damSoils; private IList soilProfiles; @@ -64,7 +64,6 @@ locations = new List(); soilProfiles = new List(); SurfaceLines2 = new List(); - pl1Lines = new List(); soilList = new SoilList(); damSoils = new List(); } @@ -87,12 +86,6 @@ public IList SurfaceLines2 { get; set; } - public virtual IList PL1Lines - { - get => pl1Lines; - set => pl1Lines = value; - } - public virtual IList SoilProfiles { get => soilProfiles; @@ -118,22 +111,6 @@ [Browsable(false)] public virtual IList GaugePLLines { get; set; } = new List(); - public bool UsesGauges => (GaugePLLines != null) && (GaugePLLines.Count > 0) && (Gauges != null); - - public virtual List Scenarios - { - get - { - var scenarios = new List(); - foreach (Location location in Locations) - { - scenarios.AddRange(location.Scenarios); - } - - return scenarios; - } - } - public string Description { get; set; } = ""; /// @@ -147,20 +124,6 @@ } /// - /// Updates the locations for scenarios. - /// - public void UpdateLocationsForScenarios() - { - foreach (Location location in Locations) - { - foreach (Scenario scenario in location.Scenarios) - { - scenario.Location = location; - } - } - } - - /// /// Sorts the locations. /// public void SortLocations() @@ -471,9 +434,7 @@ } } - internal List ImportedCsvSoils { get; } = new(); - internal List ImportedCsvStressCurves { get; } = new(); - internal List ImportedCsvSuTables { get; } = new(); + [XmlIgnore] internal List ImportedCsvSoils { get; } = new(); /// /// Remove the from both soil lists (SoilList and DamSoils). @@ -485,6 +446,9 @@ soilList.Remove(damSoil); } + [XmlIgnore] private List ImportedCsvStressCurves { get; } = new(); + [XmlIgnore] private List ImportedCsvSuTables { get; } = new(); + /// /// Tries to make the soil data as read for 1D profiles consistent with the data in the soil database. /// In the end we have a neat soil list with parameters for every soil as read from the database. @@ -594,7 +558,7 @@ } /// - /// Checks wether a location (or rather the soilprofiles in the segement of the location) contains invalid soils. + /// Checks whether a location (or rather the soil profiles in the segment of the location) contains invalid soils. /// A soil is hereby considered invalid if it is not found in the database. /// /// @@ -628,17 +592,17 @@ } /// - /// Delete all locations without surfacelines + /// Delete all locations without surface lines /// private List DeleteLocationsWithoutSurfaceLines() { var logMessages = new List(); - //Add all locations with valid surfaceline + //Add all locations with valid surface line var newLocations = new List(); newLocations.AddRange(Locations.Where(loc => loc.SurfaceLine2 != null)); - // Report which locations are not added because no valid surfaceline is found + // Report which locations are not added because no valid surface line is found var deletedLocations = new List(); deletedLocations.AddRange(Locations.Where(loc => loc.SurfaceLine2 == null)); foreach (Location deletedLocation in deletedLocations)