diff --git a/.vs/opdracht2/v16/.suo b/.vs/opdracht2/v16/.suo index 270b26e..a75f6fb 100644 Binary files a/.vs/opdracht2/v16/.suo and b/.vs/opdracht2/v16/.suo differ diff --git a/Logica/PolygonManipulatie.cs b/Logica/PolygonManipulatie.cs index 375d6a3..5b3c8c9 100644 --- a/Logica/PolygonManipulatie.cs +++ b/Logica/PolygonManipulatie.cs @@ -51,19 +51,19 @@ namespace Logica List returnWaarde = new List(); foreach (Punt punt in polygon.Punten) { - //Punt x = ScalePoint(scaleX, scaleY, punt, maxX, maxY, offsetX, offsetY); + Punt x = ScalePoint(scaleX, scaleY, punt, maxX, maxY, offsetX, offsetY); - double x = punt.X - minX; - x /= maxX; - x *= scaleX; - x += offsetX; - double y = punt.Y - minY; - y /= maxY; - y *= scaleY; - y += offsetY; - returnWaarde.Add(new Punt(x, y, punt.Naam)); - //x.Naam = punt.Naam; - //returnWaarde.Add(x); + //double x = punt.X - minX; + //x /= maxX; + //x *= scaleX; + //x += offsetX; + //double y = punt.Y - minY; + //y /= maxY; + //y *= scaleY; + //y += offsetY; + //returnWaarde.Add(new Punt(x, y, punt.Naam)); + x.Naam = punt.Naam; + returnWaarde.Add(x); } return new PolygonPunten(returnWaarde, polygon.Naam); } @@ -72,14 +72,14 @@ namespace Logica private static Punt ScalePoint(double scaleX, double scaleY, Punt punt, double maxX = 360, double maxY = 360, double offsetX = 180, double offsetY = 180) { - double x = punt.X; - x /= maxX; - x *= scaleX; - x += offsetX; + double x = punt.X + 1; + //x /= maxX; + x *= (scaleX / 2); + //x += offsetX; double y = punt.Y; - y /= maxY; - y *= scaleY; - y += offsetY; + //y /= maxY; + y *= (scaleY / 2); + //y += offsetY; return new Punt(x, y); } diff --git a/Logica/bin/Debug/Logica.dll b/Logica/bin/Debug/Logica.dll index 8eff22f..d87f1a2 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 a0e69d4..516d123 100644 Binary files a/Logica/bin/Debug/Logica.pdb and b/Logica/bin/Debug/Logica.pdb differ diff --git a/Logica/obj/Debug/Logica.dll b/Logica/obj/Debug/Logica.dll index 8eff22f..d87f1a2 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 a0e69d4..516d123 100644 Binary files a/Logica/obj/Debug/Logica.pdb and b/Logica/obj/Debug/Logica.pdb differ diff --git a/opdracht2/MainWindow.xaml.cs b/opdracht2/MainWindow.xaml.cs index 0db7a86..c5e6940 100644 --- a/opdracht2/MainWindow.xaml.cs +++ b/opdracht2/MainWindow.xaml.cs @@ -174,7 +174,7 @@ namespace opdracht2 } } //peuker implementatie moet ook nog gebeuren, code is er al, maar wanneer moet deze aangeroepen worden - if (scale.IsChecked == true) mpps = pm.ScaleMultiPolygons(mpps, c.Width/2, c.Height/2, c.Width/2, c.Height/2); + if (scale.IsChecked == true) mpps = pm.ScaleMultiPolygons(mpps, c.ActualWidth / 2, c.ActualHeight / 2, c.ActualWidth / 2, c.ActualHeight / 2); foreach(MultiPolygonPunten mp in mpps) { @@ -208,7 +208,7 @@ namespace opdracht2 Debug.WriteLine(lb.SelectedItem.GetType().Name); c.Children.Clear(); MultiPolygonPunten mp = (MultiPolygonPunten)lb.SelectedItem; - if (scale.IsChecked == true) mp = pm.ScaleMultiPolygon(mp, 100, 100, 0, 0); + if (scale.IsChecked == true) mp = pm.ScaleMultiPolygon(mp, c.ActualWidth / 2, c.ActualHeight / 2, c.ActualWidth / 2, c.Height / 2); if (peuker.IsChecked == true) mp = pm.Peuker(mp, peukerPercent.Value/1000); //hier ervoor zorgen dat scaling, triangulation etc gebeurt door gebruik van logica layer functies te callen foreach (PolygonPunten pp in mp.PolygonPunten) @@ -231,7 +231,7 @@ namespace opdracht2 Debug.WriteLine(lb.SelectedItem.GetType().Name); c.Children.Clear(); PolygonPunten p = (PolygonPunten)lb.SelectedItem; - if (scale.IsChecked == true) p = pm.ScalePolygon(p, 10000, 10000, 0, 0); + if (scale.IsChecked == true) p = pm.ScalePolygon(p, c.ActualWidth / 2 * 100, c.ActualHeight / 2 * 100, c.ActualWidth / 2 * 100, c.ActualHeight / 2 * 100); if (peuker.IsChecked == true) p = pm.Peuker(p, peukerPercent.Value / 1000); if (triangulate.IsChecked == true) { diff --git a/opdracht2/bin/Debug/netcoreapp3.1/Logica.dll b/opdracht2/bin/Debug/netcoreapp3.1/Logica.dll index 8eff22f..d87f1a2 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 a0e69d4..516d123 100644 Binary files a/opdracht2/bin/Debug/netcoreapp3.1/Logica.pdb and b/opdracht2/bin/Debug/netcoreapp3.1/Logica.pdb differ diff --git a/opdracht2/bin/Debug/netcoreapp3.1/opdracht2.dll b/opdracht2/bin/Debug/netcoreapp3.1/opdracht2.dll index 0315e2e..8ed8232 100644 Binary files a/opdracht2/bin/Debug/netcoreapp3.1/opdracht2.dll and b/opdracht2/bin/Debug/netcoreapp3.1/opdracht2.dll differ diff --git a/opdracht2/bin/Debug/netcoreapp3.1/opdracht2.pdb b/opdracht2/bin/Debug/netcoreapp3.1/opdracht2.pdb index f231b15..918502b 100644 Binary files a/opdracht2/bin/Debug/netcoreapp3.1/opdracht2.pdb and b/opdracht2/bin/Debug/netcoreapp3.1/opdracht2.pdb differ diff --git a/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.csprojAssemblyReference.cache b/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.csprojAssemblyReference.cache index 464e66f..7997fbb 100644 Binary files a/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.csprojAssemblyReference.cache and b/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.csprojAssemblyReference.cache differ diff --git a/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.dll b/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.dll index 0315e2e..8ed8232 100644 Binary files a/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.dll and b/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.dll differ diff --git a/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.pdb b/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.pdb index f231b15..918502b 100644 Binary files a/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.pdb and b/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.pdb differ