Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs
===================================================================
diff -u -r3459 -r3525
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs (.../CsvExportData.cs) (revision 3459)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs (.../CsvExportData.cs) (revision 3525)
@@ -207,7 +207,7 @@
{
if (!String.IsNullOrEmpty(BaseFileName))
{
- const string fileExtension = ".sti";
+ const string fileExtension = ".stix";
string fullBaseFilename = DamProject.ProjectWorkingPath;
if (CalculationSubDir != "")
@@ -1688,7 +1688,7 @@
break;
case FailureMechanismSystemType.Piping:
res = PipingFactor;
- break;
+ break;
}
return res;
}
@@ -1717,7 +1717,7 @@
break;
}
return res;
- }
+ }
}
[Format("F3")]
@@ -1799,7 +1799,7 @@
{
if (damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping)
{
- return damFailureMechanismeCalculationSpecification.PipingModelType;
+ return damFailureMechanismeCalculationSpecification.PipingModelType;
}
return null;
}
@@ -2043,50 +2043,46 @@
/// The extension.
private void CopyResultFile(string extension)
{
- string copyResFile = Path.GetDirectoryName(InputFile) + Path.DirectorySeparatorChar + Path.GetFileNameWithoutExtension(InputFile) + " (copy)" + extension;
+ string copyResFile = Path.GetDirectoryName(InputFile) + Path.DirectorySeparatorChar +
+ Path.GetFileNameWithoutExtension(InputFile) + " (copy)" + extension;
var resFile = Path.ChangeExtension(InputFile, extension);
if (resFile != null)
{
File.Copy(resFile, copyResFile, true);
}
}
- private string GetCurrentExeForOpenCalculationFile()
- {
- return DamHelperFunctions.MStabExePath;
- }
-
///
/// Opens the calculation file.
///
public void OpenCalculationFile()
{
if (File.Exists(InputFile))
{
- string copyFile = Path.GetDirectoryName(InputFile) + Path.DirectorySeparatorChar +
- Path.GetFileNameWithoutExtension(InputFile) + " (copy)" + Path.GetExtension(InputFile);
+ string copyFile = Path.GetDirectoryName(InputFile) + Path.DirectorySeparatorChar +
+ Path.GetFileNameWithoutExtension(InputFile) + " (copy)" +
+ Path.GetExtension(InputFile);
File.Copy(InputFile, copyFile, true);
- var exeName = GetCurrentExeForOpenCalculationFile();
- const string stdExtension = ".std";
- CopyResultFile(stdExtension);
-
- const string stoExtension = ".sto";
- CopyResultFile(stoExtension);
-
var process = new Process
{
- StartInfo =
+ StartInfo = new ProcessStartInfo(copyFile)
{
- RedirectStandardOutput = false,
- FileName = exeName
+ UseShellExecute = true,
+ WindowStyle = ProcessWindowStyle.Normal
}
};
-
- process.StartInfo.Arguments = " \"" + copyFile + "\"";
- process.StartInfo.UseShellExecute = false;
- process.StartInfo.WindowStyle = ProcessWindowStyle.Normal;
- process.Start();
+ try
+ {
+ process.Start();
+ }
+ catch (Exception)
+ {
+ var exceptionMessage = string.Format(
+ "The file {0} could not be opened with D-Stability. Make sure files with the extension {1} are associated with D-Stability.",
+ InputFile, Path.GetExtension(InputFile));
+ throw new CsvExporterException(exceptionMessage);
+ }
}
else
{
@@ -2109,7 +2105,9 @@
public bool IsVisible(string property)
{
if (damFailureMechanismeCalculationSpecification == null)
+ {
return false;
+ }
switch (property)
{
case "StabilityModel":
@@ -2118,18 +2116,20 @@
damFailureMechanismeCalculationSpecification.FailureMechanismSystemType ==
FailureMechanismSystemType.StabilityOutside;
case "PipingModel":
- return damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping;
+ return damFailureMechanismeCalculationSpecification.FailureMechanismSystemType ==
+ FailureMechanismSystemType.Piping;
case "PipingFactor":
- return damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping;
+ return damFailureMechanismeCalculationSpecification.FailureMechanismSystemType ==
+ FailureMechanismSystemType.Piping;
case "HCritical":
- return damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping;
+ return damFailureMechanismeCalculationSpecification.FailureMechanismSystemType ==
+ FailureMechanismSystemType.Piping;
case "OpenCalculationFile":
- return damFailureMechanismeCalculationSpecification.FailureMechanismSystemType != FailureMechanismSystemType.Piping &&
- File.Exists(GetCurrentExeForOpenCalculationFile());
+ return damFailureMechanismeCalculationSpecification.FailureMechanismSystemType !=
+ FailureMechanismSystemType.Piping;
default:
return true;
}
-
- }
+ }
}
}
\ No newline at end of file