Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs =================================================================== diff -u -r6793 -r6795 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 6793) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 6795) @@ -118,7 +118,6 @@ private double forbiddenZoneFactor = 1.0; // Start of parameters that are also defined in modelparameters - private PL1Line localXZPL1Line; private SurfaceLine2 localXzSurfaceLine; private double minimalCircleDepth; private string name = ""; @@ -359,21 +358,6 @@ } } - [Browsable(false)] - public virtual PL1Line LocalXZPL1Line - { - get - { - return localXZPL1Line; - } - set - { - DataEventPublisher.BeforeChange(this, "LocalXZPL1Line"); - localXZPL1Line = value; - DataEventPublisher.AfterChange(this, "LocalXZPL1Line"); - } - } - /// /// TODO /// Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeCoordinateSystemConverterTest.cs =================================================================== diff -u -r6793 -r6795 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeCoordinateSystemConverterTest.cs (.../DikeCoordinateSystemConverterTest.cs) (revision 6793) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeCoordinateSystemConverterTest.cs (.../DikeCoordinateSystemConverterTest.cs) (revision 6795) @@ -56,17 +56,14 @@ dikeCoordinateSystemConverter.CreateLocalXZObjects(dike); foreach (Location location in dike.Locations) { - // Check surfacelines + // Check surface lines CheckResultingLocalSurfaceLine(location.LocalXZSurfaceLine2); - - // Check PL1-Lines - CheckResultingLocalPL1Line(location.LocalXZPL1Line); } } } /// - /// Create result surfaceline + /// Create result surface line /// /// private SurfaceLine2 CreateResultingLocalSurfaceLine() @@ -89,9 +86,9 @@ } /// - /// Create test surfaceline + /// Create test surface line /// - /// a surfaceline with angle in XY plane between 0 and 90 degrees + /// a surface line with angle in XY plane between 0 and 90 degrees private SurfaceLine2 CreateGlobalSurfaceLineWithAlphaBetween0and90Degrees() { var surfaceline = new SurfaceLine2 @@ -112,9 +109,9 @@ } /// - /// Create test surfaceline + /// Create test surface line /// - /// a surfaceline with angle in XY plane between 0 and 90 degrees + /// a surface line with angle in XY plane between 0 and 90 degrees private SurfaceLine2 CreateGlobalSurfaceLineSteepWithAlphaBetween0and90Degrees() { var surfaceline = new SurfaceLine2 @@ -133,55 +130,11 @@ surfaceline.AddCharacteristicPoint(new GeometryPoint(10100.00, 20050.00, 10.0)); return surfaceline; } + /// - /// Create result PL1-line + /// Checks converted local surface line with reference surface line /// - /// - private PL1Line CreateResultingLocalPL1Line() - { - var pl1line = new PL1Line(); - pl1line.Points.Add(new GeometryPoint(0.0000, 0.0000, -1.0000)); - pl1line.Points.Add(new GeometryPoint(27.9508, 0.0000, 1.50000)); - pl1line.Points.Add(new GeometryPoint(55.9017, 0.0000, 4.00000)); - pl1line.Points.Add(new GeometryPoint(83.8525, 0.0000, 6.50000)); - pl1line.Points.Add(new GeometryPoint(111.8034, 0.0000, 9.0000)); - return pl1line; - } - - /// - /// Create test PL1-line - /// - /// a Pl1-line with angle in XY plane between 0 and 90 degrees - private PL1Line CreateGlobalPL1LineWithAlphaBetween0and90Degrees() - { - var pl1line = new PL1Line(); - pl1line.Points.Add(new GeometryPoint(10000.0, 20000.0, -1.0)); - pl1line.Points.Add(new GeometryPoint(10012.5, 20025.0, 1.5)); - pl1line.Points.Add(new GeometryPoint(10025.0, 20050.0, 4.0)); - pl1line.Points.Add(new GeometryPoint(10037.5, 20075.0, 6.5)); - pl1line.Points.Add(new GeometryPoint(10050.0, 20100.0, 9.0)); - return pl1line; - } - - /// - /// Create test PL1-line - /// - /// a surfaceline with angle in XY plane between 0 and 90 degrees - private PL1Line CreateGlobalPL1LineSteepWithAlphaBetween0and90Degrees() - { - var pl1line = new PL1Line(); - pl1line.Points.Add(new GeometryPoint(10000.00, 20000.00, -1.0)); - pl1line.Points.Add(new GeometryPoint(10025.00, 20012.50, 1.5)); - pl1line.Points.Add(new GeometryPoint(10050.00, 20025.00, 4.0)); - pl1line.Points.Add(new GeometryPoint(10075.00, 20037.50, 6.5)); - pl1line.Points.Add(new GeometryPoint(10100.00, 20050.00, 9.0)); - return pl1line; - } - - /// - /// Checks converted local surfaceline with reference surfaceline - /// /// private void CheckResultingLocalSurfaceLine(SurfaceLine2 localSurfaceLine) { @@ -197,21 +150,6 @@ } /// - /// Checks converted local PL1-line with reference PL1-line - /// - /// - private void CheckResultingLocalPL1Line(PL1Line localPL1Line) - { - PL1Line expectedLocalPL1Line = CreateResultingLocalPL1Line(); - Assert.That(localPL1Line.Points.Count, Is.EqualTo(expectedLocalPL1Line.Points.Count), String.Format("PL1 line {0}", localPL1Line.Name)); - for (var pointIndex = 0; pointIndex < localPL1Line.Points.Count; pointIndex++) - { - Assert.That(localPL1Line.Points[pointIndex].LocationEquals(expectedLocalPL1Line.Points[pointIndex]), - Is.True, String.Format("PL1 line {0} GeometryPoint {1} converted incorrectly", localPL1Line.Name, pointIndex)); - } - } - - /// /// Create test dike /// /// @@ -239,7 +177,7 @@ location.SurfaceLine2 = surfaceLine; dike.Locations.Add(location); - // Location 3: a location which has the same surfaceline and pl1-line as Location 2 + // Location 3: a location which has the same surface line and pl1-line as Location 2 location = new Location(); location.Name = "Loc3"; location.SurfaceLine2 = surfaceLine;