Index: DamClients/DamUI/branches/DamUI 19.1/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs
===================================================================
diff -u -r3586 -r3588
--- DamClients/DamUI/branches/DamUI 19.1/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs (.../CsvExportData.cs) (revision 3586)
+++ DamClients/DamUI/branches/DamUI 19.1/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs (.../CsvExportData.cs) (revision 3588)
@@ -349,12 +349,7 @@
[Browsable(false)]
public string Calculation
{
- get
- {
- return damFailureMechanismeCalculationSpecification != null
- ? damFailureMechanismeCalculationSpecification.ToString()
- : "";
- }
+ get { return damFailureMechanismeCalculationSpecification?.ToString() ?? ""; }
}
[CsvExportColumn("Scenario", 4)]
@@ -1854,7 +1849,7 @@
{
if (soilProfileWithSurfaceLine == null)
{
- soilProfileWithSurfaceLine = GetSoilProfileWithSurfaceLineFromFile();
+ soilProfileWithSurfaceLine = ReadSoilProfileWithSurfaceLineFromFile();
}
soilProfile = soilProfileWithSurfaceLine.SoilProfile;
}
@@ -1890,7 +1885,7 @@
return localRedesignedSurfaceLineGlobal;
}
- private CsvExportSoilProfileWithSurfaceLine GetSoilProfileWithSurfaceLineFromFile()
+ private CsvExportSoilProfileWithSurfaceLine ReadSoilProfileWithSurfaceLineFromFile()
{
CsvExportSoilProfileWithSurfaceLine localSoilProfileWithSurfaceLine = null;
DataEventPublisher. InvokeWithoutPublishingEvents(() =>
@@ -1921,7 +1916,7 @@
{
if (soilProfileWithSurfaceLine == null)
{
- soilProfileWithSurfaceLine = GetSoilProfileWithSurfaceLineFromFile();
+ soilProfileWithSurfaceLine = ReadSoilProfileWithSurfaceLineFromFile();
}
redesignedSurfaceLine = soilProfileWithSurfaceLine.SurfaceLine;
// Also determine and set the correct global version in order to retrieve dependend properties
Index: DamClients/DamUI/branches/DamUI 19.1/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportSoilProfileWithSurfaceLine.cs
===================================================================
diff -u -r3580 -r3588
--- DamClients/DamUI/branches/DamUI 19.1/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportSoilProfileWithSurfaceLine.cs (.../CsvExportSoilProfileWithSurfaceLine.cs) (revision 3580)
+++ DamClients/DamUI/branches/DamUI 19.1/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportSoilProfileWithSurfaceLine.cs (.../CsvExportSoilProfileWithSurfaceLine.cs) (revision 3588)
@@ -37,7 +37,11 @@
///
/// The soil profile.
///
- public SoilProfile1D SoilProfile { get; set; }
+ public SoilProfile1D SoilProfile
+ {
+ get;
+ set;
+ }
///
/// Gets or sets the surface line.