Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs =================================================================== diff -u -r3806 -r3818 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 3806) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 3818) @@ -246,7 +246,7 @@ { desResult.BaseFileName = "Loc(" + designResult.LocationName + ")_Prof(" + designResult.ProfileName + ")_Scen(" + designResult.ScenarioName + ")"; } - desResult.CreatePipingResultsFileForSurfaceLineAndProfile(); + desResult.CreateResultsFileForSurfaceLineAndProfile(desResult.PipingResultFile); } private static Scenario GetScenarioByName(DamProjectData damProjectData, string locationName, string scenarioName) @@ -408,7 +408,7 @@ { throw new NullReferenceException(nameof(desResult.BaseFileName) + "is null"); } - desResult.CreateDesignResultsFileForSurfaceLineAndProfile(); + desResult.CreateResultsFileForSurfaceLineAndProfile(desResult.DesignResultFile); } private static void ResetUpliftValues(CsvExportData desResult) Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs =================================================================== diff -u -r3814 -r3818 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs (.../CsvExportData.cs) (revision 3814) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs (.../CsvExportData.cs) (revision 3818) @@ -299,7 +299,7 @@ /// Gets the resulting surface line file. /// /// - /// The piping result file. + /// The design result file. /// [Browsable(false)] public string DesignResultFile @@ -1703,11 +1703,11 @@ fileName = DesignResultFile; } - if (!string.IsNullOrEmpty(fileName)) + if (fileName != string.Empty) { if (soilProfileWithSurfaceLine == null) { - soilProfileWithSurfaceLine = ReadSoilProfileWithSurfaceLineFromFile(PipingResultFile); + soilProfileWithSurfaceLine = ReadSoilProfileWithSurfaceLineFromFile(fileName); } soilProfile = soilProfileWithSurfaceLine.SoilProfile; } @@ -1789,7 +1789,7 @@ fileName = DesignResultFile; } - if (!string.IsNullOrEmpty(fileName)) + if (fileName != string.Empty) { if (soilProfileWithSurfaceLine == null) { @@ -2295,9 +2295,9 @@ } /// - /// Creates the piping results file for surface line and profile. + /// Creates the results file for surface line and profile. /// - public void CreatePipingResultsFileForSurfaceLineAndProfile() + public void CreateResultsFileForSurfaceLineAndProfile(string fileName) { var fullPath = Path.Combine(DamProject.ProjectMapWorkingPath, CalculationSubDir); if (!Directory.Exists(fullPath)) @@ -2311,29 +2311,9 @@ SurfaceLine = redesignedSurfaceLine }; var xmlSerializer = new Deltares.Standard.IO.Xml.XmlSerializer(); - xmlSerializer.Serialize(csvExportSoilProfileWithSurfaceLine, PipingResultFile); + xmlSerializer.Serialize(csvExportSoilProfileWithSurfaceLine, fileName); } - - /// - /// Creates the stability results file for surface line and profile. - /// - public void CreateDesignResultsFileForSurfaceLineAndProfile() - { - var fullPath = Path.Combine(DamProject.ProjectMapWorkingPath, CalculationSubDir); - if (!Directory.Exists(fullPath)) - { - Directory.CreateDirectory(fullPath); - } - var csvExportSoilProfileWithSurfaceLine = new CsvExportSoilProfileWithSurfaceLine - { - SoilProfile = soilProfile, - SurfaceLine = redesignedSurfaceLine - }; - var xmlSerializer = new Deltares.Standard.IO.Xml.XmlSerializer(); - xmlSerializer.Serialize(csvExportSoilProfileWithSurfaceLine, DesignResultFile); - } - /// /// Opens the calculation file. ///