Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs =================================================================== diff -u -r2913 -r3129 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs (.../CsvExportData.cs) (revision 2913) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs (.../CsvExportData.cs) (revision 3129) @@ -100,7 +100,6 @@ private ResultEvaluation resultEvaluation = ResultEvaluation.NotEvaluated; private string notes = ""; - private StabilityKernelType selectedStabilityKernelType = StabilityKernelType.DamClassicStability; // redesigned LOCAL surfaceline (initialized with original local surfaceline) private SurfaceLine2 redesignedSurfaceLine; // redesigned Global surfaceline in use for this result (either piping or stability) @@ -137,13 +136,6 @@ return localPoint; } - [Browsable(false)] - public StabilityKernelType SelectedStabilityKernelType - { - get { return selectedStabilityKernelType; } - set { selectedStabilityKernelType = value; } - } - /// /// Gets or sets the number of iterations (as used in the design calculation). /// @@ -208,11 +200,8 @@ { if (!String.IsNullOrEmpty(BaseFileName)) { - string fileExtension = ".sti"; - if (selectedStabilityKernelType != StabilityKernelType.DamClassicStability) - { - fileExtension = ".dsx"; - } + const string fileExtension = ".sti"; + string fullBaseFilename = DamProject.ProjectWorkingPath; if (CalculationSubDir != "") { @@ -1992,12 +1981,7 @@ private string GetCurrentExeForOpenCalculationFile() { - var exeName = DamHelperFunctions.MStabExePath; - if (SelectedStabilityKernelType != StabilityKernelType.DamClassicStability) - { - exeName = Path.GetDirectoryName(exeName) + "\\MStab.exe"; - } - return exeName; + return DamHelperFunctions.MStabExePath; } /// @@ -2011,14 +1995,13 @@ Path.GetFileNameWithoutExtension(InputFile) + " (copy)" + Path.GetExtension(InputFile); File.Copy(InputFile, copyFile, true); var exeName = GetCurrentExeForOpenCalculationFile(); - if (SelectedStabilityKernelType == StabilityKernelType.DamClassicStability) - { - const string stdExtension = ".std"; - CopyResultFile(stdExtension); - const string stoExtension = ".sto"; - CopyResultFile(stoExtension); - } + const string stdExtension = ".std"; + CopyResultFile(stdExtension); + + const string stoExtension = ".sto"; + CopyResultFile(stoExtension); + var process = new Process { StartInfo = @@ -2027,10 +2010,8 @@ FileName = exeName } }; - if (SelectedStabilityKernelType == StabilityKernelType.DamClassicStability) - { - process.StartInfo.Arguments = " \"" + copyFile + "\""; - } + + process.StartInfo.Arguments = " \"" + copyFile + "\""; process.StartInfo.UseShellExecute = false; process.StartInfo.WindowStyle = ProcessWindowStyle.Normal; process.Start();