Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DikeImporter.cs =================================================================== diff -u -r6931 -r6932 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DikeImporter.cs (.../DikeImporter.cs) (revision 6931) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DikeImporter.cs (.../DikeImporter.cs) (revision 6932) @@ -77,7 +77,7 @@ /// The progress. /// The log messages. /// - public static Dike ImportDataForDikeRing(string damProjectFolder, string dataFolder, + public static Dike ImportDataForDike(string damProjectFolder, string dataFolder, DataSourceContainer dataSourceContainer, DamProjectType damProjectType, ProgressDelegate progress, out List logMessages) @@ -88,7 +88,7 @@ var dike = new Dike(); try { - dike = importer.ImportDataForDikeRing(damProjectFolder, progress); + dike = importer.ImportDataForDike(damProjectFolder, progress); if (string.IsNullOrEmpty(dike.MapForSoilGeometries2D) && !string.IsNullOrEmpty(dataSourceContainer.MapSoilProfile2D)) { @@ -119,7 +119,7 @@ /// The dam project folder. /// The progress. /// - private Dike ImportDataForDikeRing(string damProjectFolder, ProgressDelegate progress) + private Dike ImportDataForDike(string damProjectFolder, ProgressDelegate progress) { importer.DamProjectFolder = damProjectFolder; @@ -133,7 +133,7 @@ // Add dike other data List importedCsvSoils = importer.Dike.ImportedCsvSoils; - Dike importedDike = ImportDataForDikeRing(importedCsvSoils, "Dijkring"); + Dike importedDike = ImportDataForDike(importedCsvSoils, "Dijkring"); ImportBackground(); return importedDike; @@ -145,7 +145,7 @@ /// The soils as imported from the csv file /// The dike ring identifier. /// - private Dike ImportDataForDikeRing(List importedCsvSoils, string dikeRingId) + private Dike ImportDataForDike(List importedCsvSoils, string dikeRingId) { var importDike = new Dike { Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs =================================================================== diff -u -r6920 -r6932 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs (.../DamProject.cs) (revision 6920) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs (.../DamProject.cs) (revision 6932) @@ -146,7 +146,7 @@ List logMessages; // import - Dike dike = DikeImporter.ImportDataForDikeRing( + Dike dike = DikeImporter.ImportDataForDike( damProjectFolder, dataFolder, dataSourceContainer, damProjectType, progress, out logMessages); Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs =================================================================== diff -u -r6930 -r6932 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs (.../DataPluginImporter.cs) (revision 6930) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs (.../DataPluginImporter.cs) (revision 6932) @@ -1009,7 +1009,7 @@ SigmaTauCurveRecords = csvImporter.SigmaTauCurvesRecords, SuTableRecords = csvImporter.SuTablesRecords }; - combineImportedData.AddCsvDataToDikes(); + combineImportedData.AddCsvDataToDike(); ImportLogMessages.AddRange(combineImportedData.ErrorMessages); Debug.Assert(ReferenceEquals(Dike, combineImportedData.Dike)); Dike = combineImportedData.Dike; Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml =================================================================== diff -u -r6894 -r6932 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 6894) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 6932) @@ -164,7 +164,7 @@ - + Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeImporterTests.cs =================================================================== diff -u -r6892 -r6932 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeImporterTests.cs (.../DikeImporterTests.cs) (revision 6892) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeImporterTests.cs (.../DikeImporterTests.cs) (revision 6932) @@ -50,7 +50,7 @@ dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename); string damImportFolder = Path.GetDirectoryName(definitionFilename); - using Dike dike = DikeImporter.ImportDataForDikeRing("", damImportFolder, + using Dike dike = DikeImporter.ImportDataForDike("", damImportFolder, dataSourceContainer, damProjectType, null, out List _); @@ -159,7 +159,7 @@ dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename); string damImportFolder = Path.GetDirectoryName(definitionFilename); List logMessages; - using Dike dike = DikeImporter.ImportDataForDikeRing("", damImportFolder, + using Dike dike = DikeImporter.ImportDataForDike("", damImportFolder, dataSourceContainer, DamProjectType.Design, null, out logMessages); @@ -184,7 +184,7 @@ dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename); string damImportFolder = Path.GetDirectoryName(definitionFilename); List logMessages; - using Dike dike = DikeImporter.ImportDataForDikeRing("", damImportFolder, + using Dike dike = DikeImporter.ImportDataForDike("", damImportFolder, dataSourceContainer, DamProjectType.Design, null, out logMessages); @@ -210,7 +210,7 @@ dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename); string damImportFolder = Path.GetDirectoryName(definitionFilename); List logMessages; - using Dike dike = DikeImporter.ImportDataForDikeRing("", damImportFolder, + using Dike dike = DikeImporter.ImportDataForDike("", damImportFolder, dataSourceContainer, DamProjectType.Design, null, out logMessages); @@ -236,7 +236,7 @@ string damImportFolder = Path.GetDirectoryName(definitionFilename); List logMessages; - using Dike dike = DikeImporter.ImportDataForDikeRing("", damImportFolder, + using Dike dike = DikeImporter.ImportDataForDike("", damImportFolder, dataSourceContainer, DamProjectType.Design, null, out logMessages); @@ -266,7 +266,7 @@ dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename); string damImportFolder = Path.GetDirectoryName(definitionFilename); - damProject.DamProjectData.Dike = DikeImporter.ImportDataForDikeRing("", damImportFolder, + damProject.DamProjectData.Dike = DikeImporter.ImportDataForDike("", damImportFolder, dataSourceContainer, damProjectType, null, out List _); damProject.AssignGeometry2DMapnameIfNotAssigned(Path.Combine(damImportFolder, dataSourceContainer.MapSoilProfile2D)); @@ -297,7 +297,7 @@ dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename); string damImportFolder = Path.GetDirectoryName(definitionFilename); - using Dike dike = DikeImporter.ImportDataForDikeRing("", damImportFolder, + using Dike dike = DikeImporter.ImportDataForDike("", damImportFolder, dataSourceContainer, DamProjectType.Design, null, out List _); @@ -316,9 +316,9 @@ dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename); string damImportFolder = Path.GetDirectoryName(definitionFilename); - using (Dike dike = DikeImporter.ImportDataForDikeRing("", damImportFolder, dataSourceContainer, + using (Dike dike = DikeImporter.ImportDataForDike("", damImportFolder, dataSourceContainer, DamProjectType.Design, null, out List _)) - using (Dike referenceDike = DikeImporter.ImportDataForDikeRing("", damImportFolder, + using (Dike referenceDike = DikeImporter.ImportDataForDike("", damImportFolder, dataSourceContainer, DamProjectType.Design, null, out List _)) { @@ -403,7 +403,7 @@ dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename); string damImportFolder = Path.GetDirectoryName(definitionFilename); - using (Dike dike = DikeImporter.ImportDataForDikeRing("", damImportFolder, dataSourceContainer, + using (Dike dike = DikeImporter.ImportDataForDike("", damImportFolder, dataSourceContainer, DamProjectType.Design, null, out List _)) { // Check Dike Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Sensors/SensorImportFromExcelSheetTest.cs =================================================================== diff -u -r6873 -r6932 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Sensors/SensorImportFromExcelSheetTest.cs (.../SensorImportFromExcelSheetTest.cs) (revision 6873) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Sensors/SensorImportFromExcelSheetTest.cs (.../SensorImportFromExcelSheetTest.cs) (revision 6932) @@ -68,7 +68,7 @@ { DataSourceContainer dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename); string damImportFolder = Path.GetDirectoryName(definitionFilename); - damProject.DamProjectData.Dike = DikeImporter.ImportDataForDikeRing("", damImportFolder, dataSourceContainer, + damProject.DamProjectData.Dike = DikeImporter.ImportDataForDike("", damImportFolder, dataSourceContainer, DamProjectType.DamLiveConfiguration, null, out List _); damProject.AssignGeometry2DMapnameIfNotAssigned(Path.Combine(damImportFolder, dataSourceContainer.MapSoilProfile2D)); Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs =================================================================== diff -u -r6880 -r6932 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs (.../CombineImportedData.cs) (revision 6880) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs (.../CombineImportedData.cs) (revision 6932) @@ -109,9 +109,9 @@ public IList ErrorMessages { get; } = new List(); /// - /// Adds the imported CSV data to dikes. + /// Adds the imported CSV data to dike. /// - public void AddCsvDataToDikes() + public void AddCsvDataToDike() { if (Dike == null) { Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/CombineImportedDataTest.cs =================================================================== diff -u -r6920 -r6932 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/CombineImportedDataTest.cs (.../CombineImportedDataTest.cs) (revision 6920) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/CombineImportedDataTest.cs (.../CombineImportedDataTest.cs) (revision 6932) @@ -107,7 +107,7 @@ ScenarioRecords = csvImporter.ScenariosRecords, LocationRecords = csvImporter.LocationRecords }; - combineImportedData.AddCsvDataToDikes(); + combineImportedData.AddCsvDataToDike(); combineImportedData.AddScenarioDataToDike(); foreach (LogMessage errormessage in combineImportedData.ErrorMessages) { @@ -206,7 +206,7 @@ SigmaTauCurveRecords = csvImporter.SigmaTauCurvesRecords, SuTableRecords = csvImporter.SuTablesRecords }; - combineImportedData.AddCsvDataToDikes(); + combineImportedData.AddCsvDataToDike(); combineImportedData.AddScenarioDataToDike(); foreach (LogMessage errorMessage in combineImportedData.ErrorMessages) {