From 940ae180615860b2587b2726fbf9f00eb50e1f5b Mon Sep 17 00:00:00 2001 From: wo80 Date: Mon, 14 Feb 2022 21:46:02 +0100 Subject: [PATCH] Remove obsolete methods from IPolygon interface. --- src/MeshExplorer/Generators/BoxWithHole.cs | 4 ++-- src/MeshExplorer/Generators/CircleWithHole.cs | 6 +++--- src/MeshExplorer/Generators/RingPolygon.cs | 4 ++-- src/Triangle/Geometry/IPolygon.cs | 7 ------- src/Triangle/Geometry/Polygon.cs | 14 -------------- 5 files changed, 7 insertions(+), 28 deletions(-) diff --git a/src/MeshExplorer/Generators/BoxWithHole.cs b/src/MeshExplorer/Generators/BoxWithHole.cs index 6df17d4..dedc425 100644 --- a/src/MeshExplorer/Generators/BoxWithHole.cs +++ b/src/MeshExplorer/Generators/BoxWithHole.cs @@ -38,12 +38,12 @@ namespace MeshExplorer.Generators double r = GetParamValueInt(2, param2); // Generate circle (hole) - input.AddContour(CreateCircle(r, n, 1), 1, new Point(0, 0)); + input.Add(new Contour(CreateCircle(r, n, 1), 1), new Point(0, 0)); n = GetParamValueInt(0, param0); // Generate box - input.AddContour(CreateRectangle(new Rectangle(-50, -50, 100, 100), n, 2), 2); + input.Add(new Contour(CreateRectangle(new Rectangle(-50, -50, 100, 100), n, 2), 2)); return input; } diff --git a/src/MeshExplorer/Generators/CircleWithHole.cs b/src/MeshExplorer/Generators/CircleWithHole.cs index 44564a3..22dad3d 100644 --- a/src/MeshExplorer/Generators/CircleWithHole.cs +++ b/src/MeshExplorer/Generators/CircleWithHole.cs @@ -40,17 +40,17 @@ namespace MeshExplorer.Generators // Inner cirlce (radius = 1) (hole) r = 1; - input.AddContour(CreateCircle(r, (int)(r / h), 1), 1, new Point(0, 0)); + input.Add(new Contour(CreateCircle(r, (int)(r / h), 1), 1), new Point(0, 0)); // Center cirlce r = (radius + 1.0) / 2.0; - input.AddContour(CreateCircle(r, (int)(r / h), 2), 2); + input.Add(new Contour(CreateCircle(r, (int)(r / h), 2), 2)); //count = input.Count; // Outer cirlce r = radius; - input.AddContour(CreateCircle(r, (int)(r / h), 3), 3); + input.Add(new Contour(CreateCircle(r, (int)(r / h), 3), 3)); // Regions: |++++++|++++++|---| // r 1 0 diff --git a/src/MeshExplorer/Generators/RingPolygon.cs b/src/MeshExplorer/Generators/RingPolygon.cs index 6f0ce31..658f89a 100644 --- a/src/MeshExplorer/Generators/RingPolygon.cs +++ b/src/MeshExplorer/Generators/RingPolygon.cs @@ -63,7 +63,7 @@ namespace MeshExplorer.Generators inner.Add(new Vertex(r * Math.Cos(i * step), r * Math.Sin(i * step))); } - input.AddContour(inner, 1); + input.Add(new Contour(inner, 1)); r = 1.5 * r; @@ -85,7 +85,7 @@ namespace MeshExplorer.Generators outer.Add(new Vertex(ro * Math.Cos(i * step + offset), ro * Math.Sin(i * step + offset))); } - input.AddContour(outer, 2); + input.Add(new Contour(outer, 2)); input.Holes.Add(new Point(0, 0)); diff --git a/src/Triangle/Geometry/IPolygon.cs b/src/Triangle/Geometry/IPolygon.cs index 8977c94..686b9c4 100644 --- a/src/Triangle/Geometry/IPolygon.cs +++ b/src/Triangle/Geometry/IPolygon.cs @@ -6,7 +6,6 @@ namespace TriangleNet.Geometry { - using System; using System.Collections.Generic; /// @@ -44,12 +43,6 @@ namespace TriangleNet.Geometry /// bool HasSegmentMarkers { get; set; } - [Obsolete("Use polygon.Add(contour) method instead.")] - void AddContour(IEnumerable points, int marker, bool hole, bool convex); - - [Obsolete("Use polygon.Add(contour) method instead.")] - void AddContour(IEnumerable points, int marker, Point hole); - /// /// Compute the bounds of the polygon. /// diff --git a/src/Triangle/Geometry/Polygon.cs b/src/Triangle/Geometry/Polygon.cs index ebe65ef..6e7fb22 100644 --- a/src/Triangle/Geometry/Polygon.cs +++ b/src/Triangle/Geometry/Polygon.cs @@ -6,7 +6,6 @@ namespace TriangleNet.Geometry { - using System; using System.Collections.Generic; /// @@ -78,19 +77,6 @@ namespace TriangleNet.Geometry HasSegmentMarkers = markers; } - [Obsolete("Use polygon.Add(contour) method instead.")] - public void AddContour(IEnumerable points, int marker = 0, - bool hole = false, bool convex = false) - { - this.Add(new Contour(points, marker, convex), hole); - } - - [Obsolete("Use polygon.Add(contour) method instead.")] - public void AddContour(IEnumerable points, int marker, Point hole) - { - this.Add(new Contour(points, marker), hole); - } - /// public Rectangle Bounds() {