Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Segment.cs =================================================================== diff -u -r1545 -r1996 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Segment.cs (.../Segment.cs) (revision 1545) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Segment.cs (.../Segment.cs) (revision 1996) @@ -25,6 +25,7 @@ using System.Linq; using System.Text; using Deltares.Geotechnics.Soils; +using Deltares.Standard.Attributes; namespace Deltares.Dam.Data { @@ -53,22 +54,24 @@ SoilGeometry2DName = soilGeometryProbability.SoilGeometry2DName; } - public SoilGeometryType SoilGeometryType + [XmlOldName("SoilGeometryType")] + public SoilProfileType SoilProfileType { get { if (SoilProfile != null) { - return SoilGeometryType.SoilGeometry1D; + return SoilProfileType.SoilProfile1D; } - else + if (SoilProfile2D != null) { - if (SoilGeometry2DName == null) - { - throw new Exception("No soilprofile assigned"); - } - return SoilGeometryType.SoilGeometry2D; + return SoilProfileType.SoilProfile2D; } + if (SoilGeometry2DName == null) + { + throw new Exception("No soilprofile assigned"); + } + return SoilProfileType.SoilGeometryStiFile; } } @@ -79,15 +82,15 @@ { get { - string soilGeometryName = ""; if (this.SoilProfile != null) { - soilGeometryName = this.SoilProfile.Name; + return SoilProfile.Name; } - else + if (this.SoilProfile2D != null) { - soilGeometryName = this.SoilGeometry2DName; - } return soilGeometryName; + return SoilProfile2D.Name; + } + return SoilGeometry2DName; } } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs =================================================================== diff -u -r1690 -r1996 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 1690) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 1996) @@ -707,15 +707,15 @@ { inputSoilGeometryProbability.FailureMechanismSystemTypeSpecified = false; } - if (soilGeometryProbability.SoilGeometryType == SoilGeometryType.SoilGeometry1D) + if (soilGeometryProbability.SoilProfileType == SoilProfileType.SoilProfile1D) { inputSoilGeometryProbability.SoilProfileName = soilGeometryProbability.SoilGeometryName; } else { inputSoilGeometryProbability.SoilProfileName = soilGeometryProbability.SoilGeometry2DName; } - inputSoilGeometryProbability.SoilProfileType = ConversionHelper.ConvertToInputSoilGeometryType(soilGeometryProbability.SoilGeometryType); + inputSoilGeometryProbability.SoilProfileType = ConversionHelper.ConvertToInputSoilProfileType(soilGeometryProbability.SoilProfileType); inputSegment.SoilGeometryProbability[i] = inputSoilGeometryProbability; } } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/DamMStabInputDefinition.xsd =================================================================== diff -u -r1545 -r1996 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/DamMStabInputDefinition.xsd (.../DamMStabInputDefinition.xsd) (revision 1545) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/DamMStabInputDefinition.xsd (.../DamMStabInputDefinition.xsd) (revision 1996) @@ -151,11 +151,11 @@ - + - - + + Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs =================================================================== diff -u -r1900 -r1996 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs (.../DamProject.cs) (revision 1900) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs (.../DamProject.cs) (revision 1996) @@ -353,7 +353,7 @@ { foreach (SoilGeometryProbability soilGeometryProbability in location.Segment.SoilProfileProbabilities) { - if (soilGeometryProbability.SoilGeometryType == SoilGeometryType.SoilGeometry1D) + if (soilGeometryProbability.SoilProfileType == SoilProfileType.SoilProfile1D) { foreach (SoilLayer1D layer in soilGeometryProbability.SoilProfile.Layers) { Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoardPostProcessRelativeProfiles.cs =================================================================== diff -u -r1545 -r1996 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoardPostProcessRelativeProfiles.cs (.../WaterBoardPostProcessRelativeProfiles.cs) (revision 1545) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoardPostProcessRelativeProfiles.cs (.../WaterBoardPostProcessRelativeProfiles.cs) (revision 1996) @@ -64,7 +64,7 @@ { throw new WaterBoardPostProcessRelativeProfilesException(String.Format("Characteristic point {0} is not defined", characteristicPointType)); } - if (orgSoilGeometryProbability.SoilGeometryType.Equals(SoilGeometryType.SoilGeometry2D)) + if (orgSoilGeometryProbability.SoilProfileType.Equals(SoilProfileType.SoilGeometryStiFile)) { throw new WaterBoardPostProcessRelativeProfilesException("Cannnot apply releative profiles for 2d soilprofiles"); } Index: DamClients/DamUI/trunk/src/Dam/Tests/SoilGeometryTests.cs =================================================================== diff -u -r1498 -r1996 --- DamClients/DamUI/trunk/src/Dam/Tests/SoilGeometryTests.cs (.../SoilGeometryTests.cs) (revision 1498) +++ DamClients/DamUI/trunk/src/Dam/Tests/SoilGeometryTests.cs (.../SoilGeometryTests.cs) (revision 1996) @@ -39,24 +39,24 @@ public void ThrowsExceptionWhenTypeIsAskedAndNoGeometryDefined() { var soilGeometry = new SoilGeometry(null, null); - var soilGeometryType = soilGeometry.SoilGeometryType; + var soilGeometryType = soilGeometry.SoilProfileType; } [Test] public void CanEvaluateToSoilGeometry1D() { var soilGeometry = new SoilGeometry(new SoilProfile1D(), null); - Assert.AreEqual(SoilGeometryType.SoilGeometry1D, soilGeometry.SoilGeometryType); + Assert.AreEqual(SoilProfileType.SoilProfile1D, soilGeometry.SoilProfileType); soilGeometry = new SoilGeometry(new SoilProfile1D(), "Geometry2dName"); - Assert.AreEqual(SoilGeometryType.SoilGeometry1D, soilGeometry.SoilGeometryType); + Assert.AreEqual(SoilProfileType.SoilProfile1D, soilGeometry.SoilProfileType); } [Test] public void CanEvaluateToSoilGeometry2D() { var soilGeometry = new SoilGeometry(null, "Geometry2dName"); - Assert.AreEqual(SoilGeometryType.SoilGeometry2D, soilGeometry.SoilGeometryType); + Assert.AreEqual(SoilProfileType.SoilGeometryStiFile, soilGeometry.SoilProfileType); } } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/SoilGeometry.cs =================================================================== diff -u -r1545 -r1996 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/SoilGeometry.cs (.../SoilGeometry.cs) (revision 1545) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/SoilGeometry.cs (.../SoilGeometry.cs) (revision 1996) @@ -21,6 +21,7 @@ using System; using Deltares.Geotechnics.Soils; +using Deltares.Standard.Attributes; namespace Deltares.Dam.Data { @@ -37,7 +38,8 @@ public class SoilGeometryBase { - public virtual SoilGeometryType SoilGeometryType { get; set; } + [XmlOldName("SoilGeometryType")] + public virtual SoilProfileType SoilProfileType { get; set; } public virtual string SoilGeometryName { get; set; } } @@ -59,20 +61,22 @@ } #region PublicPropteries - public override SoilGeometryType SoilGeometryType + + [XmlOldName("SoilGeometryType")] + public override SoilProfileType SoilProfileType { get { - SoilGeometryType soilGeometryType = SoilGeometryType.SoilGeometry2D; + SoilProfileType soilProfileType = SoilProfileType.SoilGeometryStiFile; if (soilProfile != null) { - soilGeometryType = SoilGeometryType.SoilGeometry1D; + soilProfileType = SoilProfileType.SoilProfile1D; } if ((SoilProfile == null) && ((SoilGeometry2DName == null) || SoilGeometry2DName == "")) { throw new SoilGeometryException("No geometry assigned"); } - return soilGeometryType; + return soilProfileType; } } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs =================================================================== diff -u -r1982 -r1996 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 1982) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 1996) @@ -136,10 +136,13 @@ OrginalPLLines } - public enum SoilGeometryType + public enum SoilProfileType { - SoilGeometry1D, - SoilGeometry2D + [XmlOldName("SoilGeometry1D")] + SoilProfile1D, + SoilProfile2D, + [XmlOldName("SoilGeometry2D")] + SoilGeometryStiFile } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs =================================================================== diff -u -r1966 -r1996 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 1966) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 1996) @@ -314,31 +314,33 @@ /// /// Converts the Dam profile type to the input profile type /// - /// Type of the soil geometry. + /// Type of the soil geometry. /// - public static int ConvertToInputSoilGeometryType(SoilGeometryType soilGeometryType) + public static int ConvertToInputSoilProfileType(SoilProfileType soilProfileType) { - var translationTable = new Dictionary() + var translationTable = new Dictionary() { - {SoilGeometryType.SoilGeometry1D, 0}, - {SoilGeometryType.SoilGeometry2D, 2} + {SoilProfileType.SoilProfile1D, 0}, + {SoilProfileType.SoilProfile2D, 1}, + {SoilProfileType.SoilGeometryStiFile, 2} }; - return translationTable[soilGeometryType]; + return translationTable[soilProfileType]; } /// /// Converts the input profile type to the Dam profile type /// - /// Type of the soil geometry. + /// Type of the soil geometry. /// - public static SoilGeometryType ConvertToSoilGeometryType(int soilGeometryType) + public static SoilProfileType ConvertToSoilProfileType(int soilProfileType) { - var translationTable = new Dictionary() + var translationTable = new Dictionary() { - {0, SoilGeometryType.SoilGeometry1D}, - {2, SoilGeometryType.SoilGeometry2D} + {0, SoilProfileType.SoilProfile1D}, + {1, SoilProfileType.SoilProfile2D}, + {2, SoilProfileType.SoilGeometryStiFile} }; - return translationTable[soilGeometryType]; + return translationTable[soilProfileType]; } public const int InputFailureMechanismStabilityInside = 0; Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs =================================================================== diff -u -r1646 -r1996 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 1646) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 1996) @@ -623,9 +623,9 @@ { soilGeometryProbability.SoilGeometry2DName = inputSoilGeometryProbability.SoilProfileName; } - if (soilGeometryProbability.SoilGeometryType != ConversionHelper.ConvertToSoilGeometryType(inputSoilGeometryProbability.SoilProfileType)) + if (soilGeometryProbability.SoilProfileType != ConversionHelper.ConvertToSoilProfileType(inputSoilGeometryProbability.SoilProfileType)) { - throw new ConversionException(typeof(SegmentSoilGeometryProbability), soilGeometryProbability.SoilGeometryType); + throw new ConversionException(typeof(SegmentSoilGeometryProbability), soilGeometryProbability.SoilProfileType); } segment.SoilProfileProbabilities.Add(soilGeometryProbability); } Index: DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/ConversionHelperTests.cs =================================================================== diff -u -r1721 -r1996 --- DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 1721) +++ DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 1996) @@ -184,19 +184,19 @@ } [Test] - [TestCase(SoilGeometryType.SoilGeometry1D, 0)] - [TestCase(SoilGeometryType.SoilGeometry2D, 2)] - public void CanConvertToInputSoilGeometryType(SoilGeometryType soilGeometryType, int inputSoilGeometryType) + [TestCase(SoilProfileType.SoilProfile1D, 0)] + [TestCase(SoilProfileType.SoilGeometryStiFile, 2)] + public void CanConvertToInputSoilGeometryType(SoilProfileType soilProfileType, int inputSoilGeometryType) { - Assert.AreEqual(inputSoilGeometryType, ConversionHelper.ConvertToInputSoilGeometryType(soilGeometryType)); + Assert.AreEqual(inputSoilGeometryType, ConversionHelper.ConvertToInputSoilProfileType(soilProfileType)); } [Test] - [TestCase(0, SoilGeometryType.SoilGeometry1D)] - [TestCase(2, SoilGeometryType.SoilGeometry2D)] - public void CanConvertToSoilGeometryType(int inputSoilGeometryType, SoilGeometryType soilGeometryType) + [TestCase(0, SoilProfileType.SoilProfile1D)] + [TestCase(2, SoilProfileType.SoilGeometryStiFile)] + public void CanConvertToSoilGeometryType(int inputSoilGeometryType, SoilProfileType soilProfileType) { - Assert.AreEqual(soilGeometryType, ConversionHelper.ConvertToSoilGeometryType(inputSoilGeometryType)); + Assert.AreEqual(soilProfileType, ConversionHelper.ConvertToSoilProfileType(inputSoilGeometryType)); } [Test] Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs =================================================================== diff -u -r1545 -r1996 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs (.../MStabParameters.cs) (revision 1545) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs (.../MStabParameters.cs) (revision 1996) @@ -560,7 +560,7 @@ { public MStabGeometryCreationOptions() { - SoilGeometryType = SoilGeometryType.SoilGeometry1D; + SoilProfileType = SoilProfileType.SoilProfile1D; SoilGeometry2DFilename = ""; XOffsetSoilGeometry2DOrigin = 0.0; MaterialForDike = ""; @@ -573,7 +573,8 @@ PenetrationLength = 0.0; IsDesign = false; } - public SoilGeometryType SoilGeometryType { get; set; } + [XmlOldName("SoilGeometryType")] + public SoilProfileType SoilProfileType { get; set; } public string SoilGeometry2DFilename { get; set; } public double XOffsetSoilGeometry2DOrigin { get; set; } public string MaterialForDike { get; set; } @@ -588,7 +589,7 @@ public void Assign(MStabGeometryCreationOptions mstabGeometryCreationOptions) { - this.SoilGeometryType = mstabGeometryCreationOptions.SoilGeometryType; + this.SoilProfileType = mstabGeometryCreationOptions.SoilProfileType; this.SoilGeometry2DFilename = mstabGeometryCreationOptions.SoilGeometry2DFilename; this.XOffsetSoilGeometry2DOrigin = mstabGeometryCreationOptions.XOffsetSoilGeometry2DOrigin; this.MaterialForDike = mstabGeometryCreationOptions.MaterialForDike;