Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/Line.cs
===================================================================
diff -u -r3893 -r4000
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/Line.cs (.../Line.cs) (revision 3893)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/Line.cs (.../Line.cs) (revision 4000)
@@ -90,7 +90,15 @@
/// The z.
public void CreateHorizontalZLine(double x1, double x2, double z)
{
- SetBeginAndEndPoints(new Point2D{ X = x1, Z = z}, new Point2D{ X = x2, Z = z});
+ SetBeginAndEndPoints(new Point2D
+ {
+ X = x1,
+ Z = z
+ }, new Point2D
+ {
+ X = x2,
+ Z = z
+ });
}
///
@@ -112,7 +120,7 @@
public Point2D GetIntersectPointXz(Line other)
{
Point2D intersectionPoint;
- var isIntersecting = line.IntersectsZ(other.line, out intersectionPoint);
+ bool isIntersecting = line.IntersectsZ(other.line, out intersectionPoint);
return isIntersecting ? intersectionPoint : null;
}
@@ -171,21 +179,21 @@
{
intersectionPoint = null;
- var dx1 = End.X - Start.X;
- var dx2 = line.End.X - line.Start.X;
+ double dx1 = End.X - Start.X;
+ double dx2 = line.End.X - line.Start.X;
- var dyz1 = End.Z - Start.Z;
- var dyz2 = line.End.Z - line.Start.Z;
- var yz = Start.Z;
- var yzLine = line.Start.Z;
-
- var noem = dx1*dyz2 - dyz1*dx2;
+ double dyz1 = End.Z - Start.Z;
+ double dyz2 = line.End.Z - line.Start.Z;
+ double yz = Start.Z;
+ double yzLine = line.Start.Z;
+
+ double noem = dx1 * dyz2 - dyz1 * dx2;
if (Math.Abs(noem) > 0.0)
{
- var u = (dx2*(yz - yzLine) - dyz2*(Start.X - line.Start.X))/noem;
+ double u = (dx2 * (yz - yzLine) - dyz2 * (Start.X - line.Start.X)) / noem;
if ((u >= 0.0) && (u <= 1.0))
{
- var v = (dx1*(yz - yzLine) - dyz1*(Start.X - line.Start.X))/noem;
+ double v = (dx1 * (yz - yzLine) - dyz1 * (Start.X - line.Start.X)) / noem;
if ((v >= 0.0) && (v <= 1.0))
{
@@ -198,6 +206,7 @@
}
}
}
+
return false;
}
}