Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs =================================================================== diff -u -r2153 -r2168 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs (.../DamProject.cs) (revision 2153) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs (.../DamProject.cs) (revision 2168) @@ -111,7 +111,7 @@ } } - public object ImportWithDefinitionFile(string fileName, DamType damType, DamProjectType damProjectType, DamEngine.Data.Standard.Calculation.ProgressDelegate progress) + public object ImportWithDefinitionFile(string fileName, DamProjectType damProjectType, DamEngine.Data.Standard.Calculation.ProgressDelegate progress) { var dataSourceContainer = DataSourceContainer.Deserialize(fileName); ProjectFileName = fileName; @@ -121,11 +121,11 @@ // import var waterBoard = WaterBoardImporter.ImportAllData( - definitionFileProjectFolder, dataSourceContainer, damType, damProjectType, + definitionFileProjectFolder, dataSourceContainer, damProjectType, progress, out logMessages); //var importer = new WaterBoardImporter(); //var waterBoard = importer.ImportAllData( - // definitionFileProjectFolder, dataSourceContainer, damType, progress); + // definitionFileProjectFolder, dataSourceContainer, progress); //logMessages = importer.importLogMessages.ToList(); // create data @@ -152,12 +152,11 @@ /// The data folder. /// The data source container. /// The dike ring ids. - /// Type of the dam. /// Type of the dam project. /// The progress. /// public object Import(string dataFolder, DataSourceContainer dataSourceContainer, - IEnumerable dikeRingIds, DamType damType, DamProjectType damProjectType, DamEngine.Data.Standard.Calculation.ProgressDelegate progress) + IEnumerable dikeRingIds, DamProjectType damProjectType, DamEngine.Data.Standard.Calculation.ProgressDelegate progress) { var damProjectFolder = Path.GetDirectoryName(projectFileName); @@ -167,7 +166,7 @@ // import var waterBoard = WaterBoardImporter.ImportDataForDikeRings( damProjectFolder, dataFolder, dataSourceContainer, - dikeRingIds, damType, damProjectType, progress, out logMessages); + dikeRingIds, damProjectType, progress, out logMessages); // create data DamProjectData = new DamProjectData { WaterBoard = waterBoard, DataSourceEsriProjection = dataSourceContainer.DataSourceEsriProjection };