diff --git a/Logica/PolygonManipulatie.cs b/Logica/PolygonManipulatie.cs index 3ae10b7..8d0748b 100644 --- a/Logica/PolygonManipulatie.cs +++ b/Logica/PolygonManipulatie.cs @@ -34,8 +34,8 @@ namespace Logica //oude schaalmethodes public PolygonPunten ScalePolygon(PolygonPunten polygon, double scaleX, double scaleY, double offsetX = 0, double offsetY = 0) { - double maxX = polygon.MaximumX - polygon.MinimumX; - double maxY = polygon.MaximumY - polygon.MinimumY; + double maxX = polygon.MaximumX; + double maxY = polygon.MaximumY; double minX = polygon.MinimumX; double minY = polygon.MinimumY; List returnWaarde = new List(); @@ -62,11 +62,11 @@ namespace Logica private static Punt ScalePoint(double scaleX, double scaleY, Punt punt, double maxX = 1, double maxY = 1, double offsetX = 0, double offsetY = 0, double minX = 0, double minY = 0) { - double x = punt.X - minX; + double x = punt.X; x /= maxX; x *= scaleX; x += offsetX; - double y = punt.Y - minY; + double y = punt.Y; y /= maxY; y *= scaleY; y += offsetY; @@ -75,12 +75,10 @@ namespace Logica public MultiPolygonPunten ScaleMultiPolygon(MultiPolygonPunten multiPolygon, double scaleX, double scaleY, double offsetX = 0, double offsetY = 0) { - double maxX = multiPolygon.MaximumX - multiPolygon.MinimumX; - double maxY = multiPolygon.MaximumY - multiPolygon.MinimumY; + double maxX = multiPolygon.MaximumX; + double maxY = multiPolygon.MaximumY; double minX = multiPolygon.MinimumX; double minY = multiPolygon.MinimumY; - maxX -= minX; - maxY -= minY; List pp = new List(); foreach (PolygonPunten polygon in multiPolygon.PolygonPunten) { @@ -111,12 +109,12 @@ namespace Logica //todo (offset var voor center op canvas, vree ambetant) public List ScaleMultiPolygons(List multiPolygons, double scaleX, double scaleY, double offsetX = 0, double offsetY = 0) { + //TODO onderdeel versnelen door manuele for each loop double maxX = multiPolygons.Max(m => m.MaximumX); double maxY = multiPolygons.Max(m => m.MaximumY); double minX = multiPolygons.Min(m => m.MinimumX); double minY = multiPolygons.Min(m => m.MinimumY); - maxX -= minX; - maxY -= minY; + List mpps = new List(); foreach (MultiPolygonPunten mp in multiPolygons) { diff --git a/Logica/bin/Debug/Logica.dll b/Logica/bin/Debug/Logica.dll index f7983ec..16830e6 100644 Binary files a/Logica/bin/Debug/Logica.dll and b/Logica/bin/Debug/Logica.dll differ diff --git a/Logica/bin/Debug/Logica.pdb b/Logica/bin/Debug/Logica.pdb index fb0427b..25e7ae3 100644 Binary files a/Logica/bin/Debug/Logica.pdb and b/Logica/bin/Debug/Logica.pdb differ diff --git a/Logica/obj/Debug/Logica.csprojAssemblyReference.cache b/Logica/obj/Debug/Logica.csprojAssemblyReference.cache index 1ed5103..f499c63 100644 Binary files a/Logica/obj/Debug/Logica.csprojAssemblyReference.cache and b/Logica/obj/Debug/Logica.csprojAssemblyReference.cache differ diff --git a/Logica/obj/Debug/Logica.dll b/Logica/obj/Debug/Logica.dll index f7983ec..16830e6 100644 Binary files a/Logica/obj/Debug/Logica.dll and b/Logica/obj/Debug/Logica.dll differ diff --git a/Logica/obj/Debug/Logica.pdb b/Logica/obj/Debug/Logica.pdb index fb0427b..25e7ae3 100644 Binary files a/Logica/obj/Debug/Logica.pdb and b/Logica/obj/Debug/Logica.pdb differ diff --git a/opdracht2/bin/Debug/netcoreapp3.1/Logica.dll b/opdracht2/bin/Debug/netcoreapp3.1/Logica.dll index f7983ec..16830e6 100644 Binary files a/opdracht2/bin/Debug/netcoreapp3.1/Logica.dll and b/opdracht2/bin/Debug/netcoreapp3.1/Logica.dll differ diff --git a/opdracht2/bin/Debug/netcoreapp3.1/Logica.pdb b/opdracht2/bin/Debug/netcoreapp3.1/Logica.pdb index fb0427b..25e7ae3 100644 Binary files a/opdracht2/bin/Debug/netcoreapp3.1/Logica.pdb and b/opdracht2/bin/Debug/netcoreapp3.1/Logica.pdb differ