Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryCurve.cs =================================================================== diff -u -r3893 -r4000 --- DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryCurve.cs (.../GeometryCurve.cs) (revision 3893) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryCurve.cs (.../GeometryCurve.cs) (revision 4000) @@ -30,10 +30,12 @@ /// Unknown as direction /// Unknown = -1, + /// /// Forward as direction /// Forward = 0, + /// /// Reverse as direction /// @@ -65,6 +67,38 @@ } /// + /// The unique name of the object. + /// + public override string Name + { + get + { + if (!string.IsNullOrEmpty(base.Name)) + { + return base.Name; + } + + var text = ""; + if (HeadPoint != null) + { + text += HeadPoint.ToString().Trim(); + } + + text += "-"; + if (EndPoint != null) + { + text += EndPoint.ToString().Trim(); + } + + return text; + } + set + { + base.Name = value; + } + } + + /// /// Gets or sets the head point of the curve. /// public virtual Point2D HeadPoint @@ -95,34 +129,14 @@ } /// - /// The unique name of the object. + /// Gets or sets the surface at the Left. /// - public override string Name - { - get - { - if (!string.IsNullOrEmpty(base.Name)) - { - return base.Name; - } + public virtual GeometrySurface SurfaceAtLeft { get; set; } - string text = ""; - if (HeadPoint != null) - { - text += HeadPoint.ToString().Trim(); - } - text += "-"; - if (EndPoint != null) - { - text += EndPoint.ToString().Trim(); - } - return text; - } - set - { - base.Name = value; - } - } + /// + /// Gets or sets the surface at the Right. + /// + public virtual GeometrySurface SurfaceAtRight { get; set; } /// /// Locations the equals. @@ -140,9 +154,9 @@ /// public void Reverse() { - var point = HeadPoint; + Point2D point = HeadPoint; HeadPoint = EndPoint; - EndPoint = point; + EndPoint = point; } /// @@ -174,8 +188,20 @@ return headPoint; } - + /// + /// Determines whether the curve contains the specified point within the given tolerance. + /// + /// The point. + /// The tolerance. + /// + public bool ContainsPoint(Point2D point, double tolerance = GeometryConstants.Accuracy * 0.5) + { + return HeadPoint != null && EndPoint != null && + Routines2D.DoesPointExistInLine(HeadPoint, EndPoint, point, tolerance); + } + + /// /// Gets the geometry bounds. /// /// @@ -192,39 +218,15 @@ } /// - /// Determines whether the curve contains the specified point within the given tolerance. - /// - /// The point. - /// The tolerance. - /// - public bool ContainsPoint(Point2D point, double tolerance = GeometryConstants.Accuracy * 0.5) - { - return HeadPoint != null && EndPoint != null && - Routines2D.DoesPointExistInLine(HeadPoint, EndPoint, point, tolerance); - } - - /// /// Returns a string that represents the current object. /// /// /// A string that represents the current object. /// /// 2 public override string ToString() - { + { return string.Empty; } - - /// - /// Gets or sets the surface at the Left. - /// - public virtual GeometrySurface SurfaceAtLeft { get; set; } - - - /// - /// Gets or sets the surface at the Right. - /// - public virtual GeometrySurface SurfaceAtRight { get; set; } - } } \ No newline at end of file