Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/CombineImportedDataTest.cs
===================================================================
diff -u -r6873 -r6920
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/CombineImportedDataTest.cs (.../CombineImportedDataTest.cs) (revision 6873)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/CombineImportedDataTest.cs (.../CombineImportedDataTest.cs) (revision 6920)
@@ -90,7 +90,7 @@
}
csvImporter.LocationRecords = locationRecords;
- csvImporter.ImportCsvDataFromDirectory(testDataFolder, false, progress, DamProjectType.Design);
+ csvImporter.ImportCsvDataFromDirectory(testDataFolder, progress, DamProjectType.Design);
foreach (LogMessage errormessage in csvImporter.ErrorMessages)
{
LogManager.Messages.Add(errormessage);
@@ -186,7 +186,7 @@
{
const string testDataFolder = @"TestData\CsvData\Full1DProject\csvfiles";
var csvImporter = new CsvImporter();
- csvImporter.ImportCsvDataFromDirectory(testDataFolder, false, null, DamProjectType.Design);
+ csvImporter.ImportCsvDataFromDirectory(testDataFolder, null, DamProjectType.Design);
foreach (LogMessage errorMessage in csvImporter.ErrorMessages)
{
LogManager.Messages.Add(errorMessage);
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporter.cs
===================================================================
diff -u -r6544 -r6920
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporter.cs (.../CsvImporter.cs) (revision 6544)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporter.cs (.../CsvImporter.cs) (revision 6920)
@@ -73,69 +73,65 @@
/// if set to true [is import only locations].
/// The progress.
/// Type of the dam project.
- public void ImportCsvDataFromDirectory(string csvDir, bool isImportOnlyLocations,
- ProgressDelegate progress, DamProjectType damProjectType)
+ public void ImportCsvDataFromDirectory(string csvDir, ProgressDelegate progress, DamProjectType damProjectType)
{
folderName = csvDir;
progress?.Invoke(0.03);
ThrowHelper.ThrowIfDirectoryNotExist(csvDir, StringResourceNames.ImportFolderNotExist);
ImportLocations(LocationsFileName);
- if (!isImportOnlyLocations)
- {
- progress?.Invoke(0.08);
+ progress?.Invoke(0.08);
- ImportSegments(SegmentsFileName);
- progress?.Invoke(0.12);
+ ImportSegments(SegmentsFileName);
+ progress?.Invoke(0.12);
- ImportCharacteristicPoints(CharacteristicPointsFileName);
- progress?.Invoke(0.16);
+ ImportCharacteristicPoints(CharacteristicPointsFileName);
+ progress?.Invoke(0.16);
- ImportSoilProfiles(SoilProfilesFileName);
- progress?.Invoke(0.2);
+ ImportSoilProfiles(SoilProfilesFileName);
+ progress?.Invoke(0.2);
- ImportAquifers(AquifersFileName);
- progress?.Invoke(0.2);
+ ImportAquifers(AquifersFileName);
+ progress?.Invoke(0.2);
- ImportSurfaceLines(SurfaceLinesFileName);
- // Scenario file is required for design projects and optional for the rest
- if (damProjectType == DamProjectType.Design)
+ ImportSurfaceLines(SurfaceLinesFileName);
+ // Scenario file is required for design projects and optional for the rest
+ if (damProjectType == DamProjectType.Design)
+ {
+ progress?.Invoke(0.25);
+
+ ImportScenarios(ScenariosFileName);
+ RemoveEveryLocationThatHasNoScenarios();
+ }
+ else
+ {
+ if (File.Exists(ScenariosFileName))
{
progress?.Invoke(0.25);
ImportScenarios(ScenariosFileName);
- RemoveEveryLocationThatHasNoScenarios();
}
- else
- {
- if (File.Exists(ScenariosFileName))
- {
- progress?.Invoke(0.25);
+ }
- ImportScenarios(ScenariosFileName);
- }
- }
+ if (File.Exists(SoilsFileName))
+ {
+ progress?.Invoke(0.27);
+ ImportSoils(SoilsFileName);
+ }
- if (File.Exists(SoilsFileName))
- {
- progress?.Invoke(0.27);
- ImportSoils(SoilsFileName);
- }
+ if (File.Exists(SigmaTauCurvesFileName))
+ {
+ progress?.Invoke(0.29);
+ ImportSigmaTauCurves(SigmaTauCurvesFileName);
+ }
- if (File.Exists(SigmaTauCurvesFileName))
- {
- progress?.Invoke(0.29);
- ImportSigmaTauCurves(SigmaTauCurvesFileName);
- }
-
- if (File.Exists(SuTablesFileName))
- {
- progress?.Invoke(0.29);
- ImportSuTables(SuTablesFileName);
- }
-
- progress?.Invoke(0.30);
+ if (File.Exists(SuTablesFileName))
+ {
+ progress?.Invoke(0.29);
+ ImportSuTables(SuTablesFileName);
}
+
+ progress?.Invoke(0.30);
}
public override string ToString()
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs
===================================================================
diff -u -r6918 -r6920
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs (.../DataPluginImporter.cs) (revision 6918)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs (.../DataPluginImporter.cs) (revision 6920)
@@ -41,15 +41,6 @@
// TODO: Import PL1-lines
///
-/// ImportMode
-///
-internal enum ImportMode
-{
- DikeRingAndLocationData,
- All
-}
-
-///
/// Exception for DataPluginImporter
///
public class DataPluginImporterException : Exception
@@ -236,16 +227,6 @@
}
///
- /// Imports the data for the dike.
- ///
- /// The progress.
- public void ImportDataForDike(ProgressDelegate progress)
- {
- isAllDataImported = false;
- ImportAllData(progress);
- }
-
- ///
/// Gets the scenario list.
///
/// The location identifier.
@@ -741,12 +722,10 @@
/// The progress.
/// The CSV importer.
///
- private void ImportCsvFiles(string importFolder,
- ImportMode importMode, ProgressDelegate progress, ref CsvImporter csvImporter)
+ private void ImportCsvFiles(string importFolder, ProgressDelegate progress, ref CsvImporter csvImporter)
{
DataSourceManager.CurrentSource = DataSourceSystemType.Csv;
- bool isImportOnlyLocations = importMode == ImportMode.DikeRingAndLocationData;
- csvImporter.ImportCsvDataFromDirectory(importFolder, isImportOnlyLocations, progress, damProjectType);
+ csvImporter.ImportCsvDataFromDirectory(importFolder, progress, damProjectType);
// add messages
List messages = csvImporter.ErrorMessages;
@@ -787,9 +766,7 @@
///
///
private void ImportDataShapeFiles(string importFolder, IEnumerable dataAttributes,
- ImportMode importMode,
- ProgressDelegate progress,
- ref List locationRecords)
+ ProgressDelegate progress, ref List locationRecords)
{
DataSourceManager.CurrentSource = DataSourceSystemType.Gis;
@@ -815,25 +792,21 @@
locationRecords = locationImporter.ImportedItems.ToList();
}
- // Skip reading properties when only dikering and locationdata is required
- if (importMode == ImportMode.All)
+ //
+ // Location Property Importer
+ // This is where all the attribute values are read from the shapefiles
+ //
+ var importer = new LocationPropertyImporter(importFolder, dataAttributesList)
{
- //
- // Location Property Importer
- // This is where all the attribute values are read from the shapefiles
- //
- var importer = new LocationPropertyImporter(importFolder, dataAttributesList)
- {
- Targets = locationRecords
- };
+ Targets = locationRecords
+ };
- importer.Import(progress);
- exceptions.AddRange(importer.ImportErrors);
- foreach (string importerMessage in importer.ImproperAttributeMessages)
- {
- var lm = new LogMessage(LogMessageType.Error, this, importerMessage);
- ImportLogMessages.Add(lm);
- }
+ importer.Import(progress);
+ exceptions.AddRange(importer.ImportErrors);
+ foreach (string importerMessage in importer.ImproperAttributeMessages)
+ {
+ var lm = new LogMessage(LogMessageType.Error, this, importerMessage);
+ ImportLogMessages.Add(lm);
}
using (var sw = new StreamWriter(importErrorLogFile, false))
@@ -910,27 +883,22 @@
/// The progress.
/// The CSV importer.
///
- private void ImportData2(DataSource dataSource, ImportMode importMode,
- ProgressDelegate progress, ref CsvImporter csvImporter)
+ private void ImportData2(DataSource dataSource, ProgressDelegate progress, ref CsvImporter csvImporter)
{
string dataLocation = GetDataLocation(dataSource);
switch (dataSource.DataSourceType)
{
case DataSourceType.CsvFiles:
// New importer
- ImportCsvFiles(dataLocation, importMode, progress, ref csvImporter);
+ ImportCsvFiles(dataLocation, progress, ref csvImporter);
break;
case DataSourceType.DataShapeFiles:
List locationRecords = csvImporter.LocationRecords;
- ImportDataShapeFiles(dataLocation, attributes, importMode, progress, ref locationRecords);
+ ImportDataShapeFiles(dataLocation, attributes, progress, ref locationRecords);
csvImporter.LocationRecords = locationRecords;
break;
case DataSourceType.BackgroundShapeFiles:
- if (importMode == ImportMode.All)
- {
- ImportBackgroundShapeFiles(dataLocation);
- }
-
+ ImportBackgroundShapeFiles(dataLocation);
break;
default:
throw new ArgumentOutOfRangeException();
@@ -964,27 +932,12 @@
}
///
- /// Imports all data.
+ /// Imports the data for the dike.
///
/// The progress.
- private void ImportAllData(ProgressDelegate progress)
+ public void ImportDataForDike(ProgressDelegate progress)
{
- // do nothing if all data is already imported
- if (isAllDataImported)
- {
- return;
- }
-
- ImportData(ImportMode.All, progress);
-
- isAllDataImported = true;
- }
-
- ///
- /// Import all data
- ///
- private void ImportData(ImportMode importMode, ProgressDelegate progress)
- {
+ isAllDataImported = false;
ThrowIfNoDataDefinitions();
InitializeDike();
@@ -993,21 +946,19 @@
foreach (DataSource dataSource in DataSources)
{
- ImportData2(dataSource, importMode, progress, ref csvImporter);
+ ImportData2(dataSource, progress, ref csvImporter);
}
// create and fill the locations, scenarios etc. with the data from csv and shapefiles
AddCsvDataToDikes(csvImporter);
AddScenarioDataToDikes(csvImporter);
- if (importMode == ImportMode.All)
- {
- CorrectSegmentAssignments();
- }
+ CorrectSegmentAssignments();
if (Dike.Locations.Count > 0)
{
Dike.Name = Dike.Locations[0].DikeRingId;
}
+ isAllDataImported = true;
}
///
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs
===================================================================
diff -u -r6892 -r6920
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs (.../DamProject.cs) (revision 6892)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs (.../DamProject.cs) (revision 6920)
@@ -137,8 +137,8 @@
/// Type of the dam project.
/// The progress.
///
- public object Import(string dataFolder, DataSourceContainer dataSourceContainer,
- DamProjectType damProjectType, ProgressDelegate progress)
+ public void Import(string dataFolder, DataSourceContainer dataSourceContainer,
+ DamProjectType damProjectType, ProgressDelegate progress)
{
string damProjectFolder = Path.GetDirectoryName(projectFileName);
@@ -169,8 +169,6 @@
{
damProjectData.DamProjectCalculationSpecification.DamCalculationSpecifications.Add(new DamFailureMechanismeCalculationSpecification());
}
-
- return DamProjectData;
}
///