Index: DamClients/DamUI/trunk/src/Dam/Data/DamProject.cs =================================================================== diff -u -r1195 -r1467 --- DamClients/DamUI/trunk/src/Dam/Data/DamProject.cs (.../DamProject.cs) (revision 1195) +++ DamClients/DamUI/trunk/src/Dam/Data/DamProject.cs (.../DamProject.cs) (revision 1467) @@ -120,7 +120,7 @@ set { this.damProjectSettings = value; } } - public object ImportWithDefinitionFile(string fileName, DamType damType, DamProjectType damProjectType, ProgressDelegate progress) + public object ImportWithDefinitionFile(string fileName, DamType damType, DamProjectType damProjectType, DamEngine.Data.Standard.Calculation.ProgressDelegate progress) { var dataSourceContainer = DataSourceContainer.Deserialize(fileName); ProjectFileName = fileName; @@ -166,7 +166,7 @@ /// The progress. /// public object Import(string dataFolder, DataSourceContainer dataSourceContainer, - IEnumerable dikeRingIds, DamType damType, DamProjectType damProjectType, ProgressDelegate progress) + IEnumerable dikeRingIds, DamType damType, DamProjectType damProjectType, DamEngine.Data.Standard.Calculation.ProgressDelegate progress) { var damProjectFolder = Path.GetDirectoryName(projectFileName); Index: DamClients/DamUI/trunk/src/Dam/Data/Importers/LocationPropertyImporter.cs =================================================================== diff -u -r875 -r1467 --- DamClients/DamUI/trunk/src/Dam/Data/Importers/LocationPropertyImporter.cs (.../LocationPropertyImporter.cs) (revision 875) +++ DamClients/DamUI/trunk/src/Dam/Data/Importers/LocationPropertyImporter.cs (.../LocationPropertyImporter.cs) (revision 1467) @@ -229,7 +229,18 @@ return FeatureRepository.CreateFromShapeFile(new ShapeFileLocation(fileName)); } - public void Import(ProgressDelegate progress) + /// + /// Imports the specified progress. + /// + /// The progress. + /// No target locations set + /// + /// + /// The file " + fileName + " does not exist so can not be imported. + /// or + /// Had problems reading attribute values from file: " + fileName + /// + public void Import(DamEngine.Data.Standard.Calculation.ProgressDelegate progress) { if (this.targets == null) throw new InvalidOperationException("No target locations set"); Index: DamClients/DamUI/trunk/src/Dam/Data/WaterBoardImporter.cs =================================================================== diff -u -r875 -r1467 --- DamClients/DamUI/trunk/src/Dam/Data/WaterBoardImporter.cs (.../WaterBoardImporter.cs) (revision 875) +++ DamClients/DamUI/trunk/src/Dam/Data/WaterBoardImporter.cs (.../WaterBoardImporter.cs) (revision 1467) @@ -180,7 +180,7 @@ /// The log messages. /// public static WaterBoard ImportAllData(string dataFolder, - DataSourceContainer dataSourceContainer, DamType damType, DamProjectType damProjectType, ProgressDelegate progress, + DataSourceContainer dataSourceContainer, DamType damType, DamProjectType damProjectType, DamEngine.Data.Standard.Calculation.ProgressDelegate progress, out List logMessages) { var importer = CreateDataPlugin(dataFolder, dataSourceContainer); @@ -200,7 +200,7 @@ /// The progress. /// public static WaterBoard ImportAllData(string dataFolder, - DataSourceContainer dataSourceContainer, DamType damType, DamProjectType damProjectType, ProgressDelegate progress) + DataSourceContainer dataSourceContainer, DamType damType, DamProjectType damProjectType, DamEngine.Data.Standard.Calculation.ProgressDelegate progress) { List dummy; return ImportAllData(dataFolder, dataSourceContainer, damType, damProjectType, progress, out dummy); @@ -219,7 +219,7 @@ /// public static WaterBoard ImportDataForDikeRings(string damProjectFolder, string dataFolder, DataSourceContainer dataSourceContainer, IEnumerable dikeRingIds, - DamType damType, DamProjectType damProjectType, ProgressDelegate progress) + DamType damType, DamProjectType damProjectType, DamEngine.Data.Standard.Calculation.ProgressDelegate progress) { List dummy; return ImportDataForDikeRings(damProjectFolder, dataFolder, dataSourceContainer, @@ -240,7 +240,7 @@ /// public static WaterBoard ImportDataForDikeRings(string damProjectFolder, string dataFolder, DataSourceContainer dataSourceContainer, IEnumerable dikeRingIds, - DamType damType, DamProjectType damProjectType, ProgressDelegate progress, out List logMessages) + DamType damType, DamProjectType damProjectType, DamEngine.Data.Standard.Calculation.ProgressDelegate progress, out List logMessages) { var importer = new WaterBoardImporter(dataFolder, dataSourceContainer, damType, damProjectType); @@ -281,7 +281,7 @@ /// The dike ring ids. /// The progress. /// - private WaterBoard ImportDataForDikeRings(string damProjectFolder, IEnumerable dikeRingIds, ProgressDelegate progress) + private WaterBoard ImportDataForDikeRings(string damProjectFolder, IEnumerable dikeRingIds, DamEngine.Data.Standard.Calculation.ProgressDelegate progress) { var dikeRingList = ValidateDikeRingIDs(dikeRingIds); @@ -468,7 +468,7 @@ /// The dike ring ids. /// The progress. /// - private bool ImportDikes(IEnumerable dikeRingIds, ProgressDelegate progress) + private bool ImportDikes(IEnumerable dikeRingIds, DamEngine.Data.Standard.Calculation.ProgressDelegate progress) { // Import dikes importer.ImportDataForDikeRings(dikeRingIds, damType, progress); Index: DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/CsvToDamxConverter.csproj =================================================================== diff -u -r875 -r1467 --- DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/CsvToDamxConverter.csproj (.../CsvToDamxConverter.csproj) (revision 875) +++ DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/CsvToDamxConverter.csproj (.../CsvToDamxConverter.csproj) (revision 1467) @@ -44,6 +44,10 @@ False ..\..\..\..\lib\CommandLineParser\CommandLine.dll + + False + ..\..\..\..\lib\DamEngine\Deltares.DamEngine.Data.dll + ..\..\..\..\lib\DSL-Geographic\Deltares.Geographic.dll Index: DamClients/DamUI/trunk/src/Dam/Data/ImportDirector.cs =================================================================== diff -u -r875 -r1467 --- DamClients/DamUI/trunk/src/Dam/Data/ImportDirector.cs (.../branches/CalcualtionIncluded/src/Dam/Data/ImportDirector.cs) (revision 875) +++ DamClients/DamUI/trunk/src/Dam/Data/ImportDirector.cs (.../trunk/src/Dam/Data/ImportDirector.cs) (revision 1467) @@ -1,12 +1,23 @@ -//----------------------------------------------------------------------- -// -// Copyright (c) 2009 Deltares. All rights reserved. -// -// B. Faassen -// barry.faassen@deltares.nl -// 26-5-2010 -// n.a. -//----------------------------------------------------------------------- +// Copyright (C) Stichting Deltares 2018. All rights reserved. +// +// This file is part of the application DAM - UI. +// +// DAM - UI is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. using Deltares.Dam.Data.DataPlugins.Configuration; using Deltares.Standard; @@ -15,7 +26,7 @@ { public static class ImportDirector { - public static WaterBoard Construct(string importFolder, ProgressDelegate progress) + public static WaterBoard Construct(string importFolder, DamEngine.Data.Standard.Calculation.ProgressDelegate progress) { var damProject = new DamProject { DamProjectData = new DamProjectData() }; Index: DamClients/DamUI/trunk/src/Dam/Tests/TestHelper/Deltares.Dam.TestHelper.csproj =================================================================== diff -u -r875 -r1467 --- DamClients/DamUI/trunk/src/Dam/Tests/TestHelper/Deltares.Dam.TestHelper.csproj (.../branches/CalcualtionIncluded/src/Dam/Tests/TestHelper/Deltares.Dam.TestHelper.csproj) (revision 875) +++ DamClients/DamUI/trunk/src/Dam/Tests/TestHelper/Deltares.Dam.TestHelper.csproj (.../trunk/src/Dam/Tests/TestHelper/Deltares.Dam.TestHelper.csproj) (revision 1467) @@ -10,10 +10,11 @@ Properties Deltares.Dam.TestHelper Deltares.Dam.TestHelper - v4.0 + v4.5 512 ..\..\..\ true + true @@ -25,6 +26,7 @@ true true true + false ..\..\..\bin\Release\ @@ -35,8 +37,13 @@ prompt true true + false + + False + ..\..\..\..\lib\DamEngine\Deltares.DamEngine.Data.dll + False ..\..\..\..\lib\DSL-Geographic\Deltares.Geographic.dll @@ -56,9 +63,9 @@ ..\..\..\..\lib\DSL-Geo\Deltares.Geotechnics.TestUtils.dll - + False - ..\..\..\..\lib\Soilbase\Deltares.Soilbase.dll + ..\..\..\..\lib\DSL-GeoIO\Deltares.Soilbase.dll False @@ -71,7 +78,6 @@ - @@ -83,6 +89,9 @@ + + Copying.GPL.licenseheader + Index: DamClients/DamUI/trunk/src/Dam/Data/DataPlugins/IDataPlugin.cs =================================================================== diff -u -r875 -r1467 --- DamClients/DamUI/trunk/src/Dam/Data/DataPlugins/IDataPlugin.cs (.../branches/CalcualtionIncluded/src/Dam/Data/DataPlugins/IDataPlugin.cs) (revision 875) +++ DamClients/DamUI/trunk/src/Dam/Data/DataPlugins/IDataPlugin.cs (.../trunk/src/Dam/Data/DataPlugins/IDataPlugin.cs) (revision 1467) @@ -1,14 +1,24 @@ -//----------------------------------------------------------------------- -// -// Copyright (c) 2011 Deltares. All rights reserved. -// -// Tom The -// tom.the@deltares.nl -// 23-03-2011 -// Interface for plugin to import data from external sources -//----------------------------------------------------------------------- +// Copyright (C) Stichting Deltares 2018. All rights reserved. +// +// This file is part of the application DAM - UI. +// +// DAM - UI is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. -using System.Collections; using Deltares.Dam.Data.DataPlugins.Configuration; using Deltares.Geometry; using Deltares.Standard; @@ -68,7 +78,8 @@ IEnumerable GetDikeRingIdList(DamType damType); - void ImportDataForDikeRings(IEnumerable dikeRingIds, DamType damType, ProgressDelegate progress); + void ImportDataForDikeRings(IEnumerable dikeRingIds, DamType damType, + DamEngine.Data.Standard.Calculation.ProgressDelegate progress); Info GetDikeRingInfo(string dikeRingId); Index: DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs =================================================================== diff -u -r1434 -r1467 --- DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs (.../DamPlugin.cs) (revision 1434) +++ DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs (.../DamPlugin.cs) (revision 1467) @@ -1230,7 +1230,7 @@ DataSourceManager.StartListening(); this.damProject.Import(damProjectFolder, dataSourceContainer, this.damNewProjectData.SelectedDikeRingIds, this.damNewProjectData.DamType, - this.damNewProjectData.DamProjectType, null);//this.progressDelegate); + this.damNewProjectData.DamProjectType, this.progressDelegate); // Importing data creates a new DamProjectData object so the values set in the dialog have to be reset. damProject.DamProjectData.DamProjectType = projectType; Index: DamClients/DamUI/trunk/src/Dam/Data/DataPlugins/DataPluginImporter.cs =================================================================== diff -u -r875 -r1467 --- DamClients/DamUI/trunk/src/Dam/Data/DataPlugins/DataPluginImporter.cs (.../branches/CalcualtionIncluded/src/Dam/Data/DataPlugins/DataPluginImporter.cs) (revision 875) +++ DamClients/DamUI/trunk/src/Dam/Data/DataPlugins/DataPluginImporter.cs (.../trunk/src/Dam/Data/DataPlugins/DataPluginImporter.cs) (revision 1467) @@ -1,12 +1,23 @@ -//----------------------------------------------------------------------- -// -// Copyright (c) 2011 Deltares. All rights reserved. -// -// Tom The -// tom.the@deltares.nl -// 23-03-2011 -// Data plugin for Waterschap Groot Salland -//----------------------------------------------------------------------- +// Copyright (C) Stichting Deltares 2018. All rights reserved. +// +// This file is part of the application DAM - UI. +// +// DAM - UI is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. using System; using System.Collections.Generic; @@ -16,7 +27,6 @@ using Deltares.Dam.Data.CsvImporters; using Deltares.Dam.Data.IO; using Deltares.Geometry; -using Deltares.Geotechnics; using Deltares.Geotechnics.IO; using Deltares.Geotechnics.Soils; using Deltares.Geotechnics.SurfaceLines; @@ -390,7 +400,8 @@ /// The dike ring ids. /// Type of the dam. /// The progress. - public void ImportDataForDikeRings(IEnumerable dikeRingIds, DamType damType, ProgressDelegate progress) + public void ImportDataForDikeRings(IEnumerable dikeRingIds, DamType damType, + DamEngine.Data.Standard.Calculation.ProgressDelegate progress) { ImportAllData(dikeRingIds, damType, progress); } @@ -564,17 +575,6 @@ } /// - /// Gets the non water retaining object list. - /// - /// The dike ring identifier. - /// - public IEnumerable GetNonWaterRetainingObjectList(string dikeRingId) - { - var dike = GetDike(dikeRingId); - return new List(dike.NonWaterRetainingObjects); - } - - /// /// Gets the profile1 d identifier list for segment. /// /// The dike ring identifier. @@ -802,7 +802,8 @@ /// /// /// - private CsvImporter ImportCsvFiles(string importFolder, DamType damType, ImportMode importMode, ProgressDelegate progress) + private CsvImporter ImportCsvFiles(string importFolder, DamType damType, + ImportMode importMode, DamEngine.Data.Standard.Calculation.ProgressDelegate progress) { DataSourceManager.CurrentSource = DataSourceSystemType.Csv; var csvImporter = new CsvImporter(); @@ -955,8 +956,10 @@ /// /// /// - private void ImportDataShapeFiles(string importFolder, IEnumerable dataAttributes, - ImportMode importMode, IEnumerable dikeRingIds, DamType damType, ProgressDelegate progress) + /// + private void ImportDataShapeFiles(string importFolder, IEnumerable dataAttributes, + ImportMode importMode, IEnumerable dikeRingIds, DamType damType, + DamEngine.Data.Standard.Calculation.ProgressDelegate progress) { DataSourceManager.CurrentSource = DataSourceSystemType.Gis; @@ -1175,7 +1178,7 @@ /// private void ImportData2(DataSource dataSource, DamType damType, IEnumerable dikeRingIdList, ImportMode importMode, - ProgressDelegate progress, ref CsvImporter csvImporter) + DamEngine.Data.Standard.Calculation.ProgressDelegate progress, ref CsvImporter csvImporter) { var dataLocation = GetDataLocation(dataSource); @@ -1257,7 +1260,7 @@ /// The dike ring ids. /// Type of the dam. /// The progress. - private void ImportAllData(IEnumerable dikeRingIds, DamType damType, ProgressDelegate progress) + private void ImportAllData(IEnumerable dikeRingIds, DamType damType, DamEngine.Data.Standard.Calculation.ProgressDelegate progress) { // do nothing if all data is already imported if (isAllDataImported) return; @@ -1270,7 +1273,7 @@ /// /// Import all data /// - private void ImportData(ImportMode importMode, IEnumerable dikeRingIds, DamType damType, ProgressDelegate progress) + private void ImportData(ImportMode importMode, IEnumerable dikeRingIds, DamType damType, DamEngine.Data.Standard.Calculation.ProgressDelegate progress) { ThrowIfNoDataDefinitions(); if (!isDikeRingAndLocationDataImported) Index: DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs =================================================================== diff -u -r875 -r1467 --- DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs (.../CsvImporterTestsNew.cs) (revision 875) +++ DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs (.../CsvImporterTestsNew.cs) (revision 1467) @@ -1003,7 +1003,7 @@ } if (locations.Count > 0) { - ProgressDelegate progress = null; + DamEngine.Data.Standard.Calculation.ProgressDelegate progress = null; var csvImporter = new CsvImporter(); csvImporter.ImportCsvDataFromDirectory(testDataFolder, false, progress, DamType.Regional, DamProjectType.Assessment); foreach (var errormessage in csvImporter.ErrorMessages) @@ -1085,7 +1085,7 @@ using (var damProjectData = new DamProjectData()) { const string testDataFolder = @"TestData\CsvData\Full1DProject\csvfiles"; - ProgressDelegate progress = null; + DamEngine.Data.Standard.Calculation.ProgressDelegate progress = null; var csvImporter = new CsvImporter(); csvImporter.ImportCsvDataFromDirectory(testDataFolder, false, progress, DamType.Regional, DamProjectType.Assessment); foreach (var errormessage in csvImporter.ErrorMessages) Index: DamClients/DamUI/trunk/src/Dam/Data/CsvImporters/CsvImporter.cs =================================================================== diff -u -r875 -r1467 --- DamClients/DamUI/trunk/src/Dam/Data/CsvImporters/CsvImporter.cs (.../branches/CalcualtionIncluded/src/Dam/Data/CsvImporters/CsvImporter.cs) (revision 875) +++ DamClients/DamUI/trunk/src/Dam/Data/CsvImporters/CsvImporter.cs (.../trunk/src/Dam/Data/CsvImporters/CsvImporter.cs) (revision 1467) @@ -1,8 +1,27 @@ -using System; +// Copyright (C) Stichting Deltares 2018. All rights reserved. +// +// This file is part of the application DAM - UI. +// +// DAM - UI is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Text; using Deltares.Standard; using Deltares.Standard.Logging; @@ -269,7 +288,8 @@ /// The progress. /// The DamType is not (yet) read from the csv file; we assign the specified DamType to all locations that are read /// Type of the dam project. - public void ImportCsvDataFromDirectory(string csvDir, bool isImportOnlyLocations, ProgressDelegate progress, DamType damType, DamProjectType damProjectType) + public void ImportCsvDataFromDirectory(string csvDir, bool isImportOnlyLocations, + DamEngine.Data.Standard.Calculation.ProgressDelegate progress, DamType damType, DamProjectType damProjectType) { folderName = csvDir; if (progress != null) progress(0.03); Index: DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj =================================================================== diff -u -r875 -r1467 --- DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj (.../Deltares.Dam.Tests.csproj) (revision 875) +++ DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj (.../Deltares.Dam.Tests.csproj) (revision 1467) @@ -43,6 +43,10 @@ False ..\..\..\lib\Authorization\x86\Deltares.Authorization.dll + + False + ..\..\..\lib\DamEngine\Deltares.DamEngine.Data.dll + False ..\..\..\lib\DamEngine\Deltares.DamEngine.Interface.dll Index: DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.IntegrationTests.csproj =================================================================== diff -u -r1016 -r1467 --- DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.IntegrationTests.csproj (.../Deltares.Dam.IntegrationTests.csproj) (revision 1016) +++ DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.IntegrationTests.csproj (.../Deltares.Dam.IntegrationTests.csproj) (revision 1467) @@ -42,6 +42,10 @@ false + + False + ..\..\..\lib\DamEngine\Deltares.DamEngine.Data.dll + False ..\..\..\lib\DamEngine\Deltares.DamEngine.Interface.dll