Index: dam clients/DamUI/trunk/src/Dam/Tests/DamEngineIo/ConversionHelperTests.cs =================================================================== diff -u -r483 -r505 --- dam clients/DamUI/trunk/src/Dam/Tests/DamEngineIo/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 483) +++ dam clients/DamUI/trunk/src/Dam/Tests/DamEngineIo/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 505) @@ -7,6 +7,7 @@ using Deltares.Dam.Data.DamEngineIo; using Deltares.DamEngine.Io.XmlInput; using Deltares.Geotechnics.SurfaceLines; +using Deltares.Standard; using NUnit.Framework; namespace Deltares.Dam.Tests.DamEngineIo @@ -126,5 +127,35 @@ { Assert.AreEqual(inputPointType, ConversionHelper.ConvertToInputPointType(characteristicPointType)); } + + [Test] + [TestCase(0, CalculationResult.NoRun)] + [TestCase(1, CalculationResult.Succeeded)] + [TestCase(2, CalculationResult.NoInput)] + [TestCase(3, CalculationResult.NoLicense)] + [TestCase(4, CalculationResult.UserAbort)] + [TestCase(5, CalculationResult.InvalidInputStructure)] + [TestCase(6, CalculationResult.InvalidInputData)] + [TestCase(7, CalculationResult.RunFailed)] + [TestCase(8, CalculationResult.UnexpectedError)] + public void CanConvertToOutputCalculationResult(int result, CalculationResult calculationResult) + { + Assert.AreEqual(result, ConversionHelper.ConvertToOutputCalculationResult(calculationResult)); + } + + [Test] + [TestCase(CalculationResult.NoRun, 0)] + [TestCase(CalculationResult.Succeeded, 1)] + [TestCase(CalculationResult.NoInput, 2)] + [TestCase(CalculationResult.NoLicense, 3)] + [TestCase(CalculationResult.UserAbort, 4)] + [TestCase(CalculationResult.InvalidInputStructure, 5)] + [TestCase(CalculationResult.InvalidInputData, 6)] + [TestCase(CalculationResult.RunFailed, 7)] + [TestCase(CalculationResult.UnexpectedError, 8)] + public void CanConvertToCalculationResult(CalculationResult result, int calculationResult) + { + Assert.AreEqual(result, ConversionHelper.ConvertToCalculationResult(calculationResult)); + } } } Index: dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/ConversionHelper.cs =================================================================== diff -u -r483 -r505 --- dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 483) +++ dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 505) @@ -1,6 +1,7 @@ using System.Collections.Generic; using Deltares.DamEngine.Io.XmlInput; using Deltares.Geotechnics.SurfaceLines; +using Deltares.Standard; namespace Deltares.Dam.Data.DamEngineIo { @@ -161,6 +162,7 @@ }; return translationTable[inputPointType]; } + public static int ConvertToInputPointType(CharacteristicPointType characteristicPointType) { var translationTable = new Dictionary() @@ -186,5 +188,49 @@ }; return translationTable[characteristicPointType]; } + + /// + /// Converts to calculation result. + /// + /// The calculation result. + /// + public static CalculationResult ConvertToCalculationResult(int calculationResult) + { + var translationTable = new Dictionary() + { + {0, CalculationResult.NoRun}, + {1, CalculationResult.Succeeded}, + {2, CalculationResult.NoInput}, + {3, CalculationResult.NoLicense}, + {4, CalculationResult.UserAbort}, + {5, CalculationResult.InvalidInputStructure}, + {6, CalculationResult.InvalidInputData}, + {7, CalculationResult.RunFailed}, + {8, CalculationResult.UnexpectedError} + }; + return translationTable[calculationResult]; + } + + /// + /// Converts to output calculation result. + /// + /// Type of the dam project. + /// + public static int ConvertToOutputCalculationResult(CalculationResult calculationResult) + { + var translationTable = new Dictionary() + { + {CalculationResult.NoRun, 0}, + {CalculationResult.Succeeded, 1}, + {CalculationResult.NoInput, 2}, + {CalculationResult.NoLicense, 3}, + {CalculationResult.UserAbort, 4}, + {CalculationResult.InvalidInputStructure, 5}, + {CalculationResult.InvalidInputData, 6}, + {CalculationResult.RunFailed, 7}, + {CalculationResult.UnexpectedError, 8} + }; + return translationTable[calculationResult]; + } } }