Index: DamClients/DamUI/trunk/src/Dam/Tests/StiImporter/StiFileReaderTest.cs
===================================================================
diff -u -r3096 -r3098
--- DamClients/DamUI/trunk/src/Dam/Tests/StiImporter/StiFileReaderTest.cs (.../StiFileReaderTest.cs) (revision 3096)
+++ DamClients/DamUI/trunk/src/Dam/Tests/StiImporter/StiFileReaderTest.cs (.../StiFileReaderTest.cs) (revision 3098)
@@ -93,8 +93,7 @@
public void ReadSoilProfile_WithValidFile_ReturnsExpectedSoilProfile()
{
// Setup
- const string soilProfileName = "SimpleProfile";
- string filePath = Path.Combine(TestDataFolder, $"{soilProfileName}.sti");
+ string filePath = Path.Combine(TestDataFolder, "SimpleProfile.sti");
var reader = new StiFileReader();
@@ -103,7 +102,6 @@
// Assert
Assert.That(soilProfile, Is.Not.Null);
- Assert.That(soilProfile.Name, Is.EqualTo(soilProfileName));
Assert.That(soilProfile.Surfaces.Count, Is.EqualTo(2));
var topLeftPoint = new GeometryPoint(0, 0, -4);
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/StiImporter/SoilProfile2DImporter.cs
===================================================================
diff -u -r3096 -r3098
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/StiImporter/SoilProfile2DImporter.cs (.../SoilProfile2DImporter.cs) (revision 3096)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/StiImporter/SoilProfile2DImporter.cs (.../SoilProfile2DImporter.cs) (revision 3098)
@@ -71,12 +71,11 @@
foreach (SoilGeometryProbability profile in soilProfiles)
{
string profileName = profile.SoilGeometry2DName;
- string soilProfileFileName = HasStiFileExtension(profileName) ? profileName : $"{profileName}.sti";
- SoilProfile2D readSoilProfile = ReadSoilProfile(soilProfileDirectory, soilProfileFileName);
+ SoilProfile2D readSoilProfile = ReadSoilProfile(soilProfileDirectory, profileName);
if (!IsValidSoilProfile(availableSoils, readSoilProfile))
{
string messageFormat = LocalizationManager.GetTranslatedText(typeof(SoilProfile2DImporter), "ImportSoilProfileErrorUndefinedMaterials");
- throw new SoilProfileImporterException(string.Format(messageFormat, soilProfileFileName));
+ throw new SoilProfileImporterException(string.Format(messageFormat, profileName));
}
importedSoilProfiles.Add(readSoilProfile);
@@ -89,22 +88,23 @@
/// Reads a soil profile.
///
/// The directory to read the from.
- /// The file to read the from.
+ /// The name of the soil profile.
/// A .
/// Thrown when the soil profile could not be read.
- private static SoilProfile2D ReadSoilProfile(string soilProfileDirectory, string soilProfileFile)
+ private static SoilProfile2D ReadSoilProfile(string soilProfileDirectory, string soilProfileName)
{
- string filePath = Path.Combine(soilProfileDirectory, soilProfileFile);
-
+ string soilProfileFileName = HasStiFileExtension(soilProfileName) ? soilProfileName : $"{soilProfileName}.sti";
+ string filePath = Path.Combine(soilProfileDirectory, soilProfileFileName);
try
{
var reader = new StiFileReader();
SoilProfile2D readSoilProfile = reader.ReadSoilProfile(filePath);
+ readSoilProfile.Name = soilProfileName;
+
return readSoilProfile;
}
catch (StiFileReadException e)
{
- string soilProfileName = Path.GetFileNameWithoutExtension(soilProfileFile);
string messageFormat = LocalizationManager.GetTranslatedText(typeof(SoilProfile2DImporter), "ImportSoilProfileErrorReadFailed");
throw new SoilProfileImporterException(string.Format(messageFormat, soilProfileName, e.Message), e);
}
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/StiImporter/StiFileReader.cs
===================================================================
diff -u -r3096 -r3098
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/StiImporter/StiFileReader.cs (.../StiFileReader.cs) (revision 3096)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/StiImporter/StiFileReader.cs (.../StiFileReader.cs) (revision 3098)
@@ -62,8 +62,6 @@
{
var soilProfileImporter = new SoilProfile2DFromDSerieFileImporter();
SoilProfile2D soilProfile = soilProfileImporter.ConvertToSoilProfile2D(filePath);
- soilProfile.Name = Path.GetFileNameWithoutExtension(filePath);
-
return soilProfile;
}
catch (Exception e)
Index: DamClients/DamUI/trunk/src/Dam/Tests/StiImporter/SoilProfile2DImporterTest.cs
===================================================================
diff -u -r3096 -r3098
--- DamClients/DamUI/trunk/src/Dam/Tests/StiImporter/SoilProfile2DImporterTest.cs (.../SoilProfile2DImporterTest.cs) (revision 3096)
+++ DamClients/DamUI/trunk/src/Dam/Tests/StiImporter/SoilProfile2DImporterTest.cs (.../SoilProfile2DImporterTest.cs) (revision 3098)
@@ -78,12 +78,12 @@
public void Import_WithValidArguments_ReturnsExpectedSoilProfiles()
{
// Setup
- const string profileOneName = "SimpleProfile";
- const string profileTwoName = "Tutorial-1a 10.1.4.3";
+ const string profileOneName = "SimpleProfile.sti";
+ const string profileTwoName = "Tutorial-1a 10.1.4.3.sti";
Segment segment = CreateSegmentWithProfiles(new[]
{
- $"{profileOneName}.sti",
- $"{profileTwoName}.sti"
+ profileOneName,
+ profileTwoName
});
SoilList availableSoils = CreateSoilList(new[]
{