From dce5a885c36c7a637cdb310399ab25fe6473a277 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Mon, 20 Jul 2020 15:12:37 +0200 Subject: [PATCH] verkleining, maar nog altijd geen id waarom geen poly's gedisplayed worden :/ --- opdracht2/GeoJsonParser.cs | 81 +++--------------- opdracht2/MainWindow.xaml.cs | 26 +----- .../bin/Debug/netcoreapp3.1/opdracht2.dll | Bin 16384 -> 16384 bytes .../bin/Debug/netcoreapp3.1/opdracht2.pdb | Bin 6152 -> 6048 bytes .../obj/Debug/netcoreapp3.1/MainWindow.baml | Bin 1369 -> 0 bytes .../obj/Debug/netcoreapp3.1/opdracht2.dll | Bin 16384 -> 16384 bytes .../Debug/netcoreapp3.1/opdracht2.g.resources | Bin 1597 -> 1597 bytes .../obj/Debug/netcoreapp3.1/opdracht2.pdb | Bin 6152 -> 6048 bytes .../opdracht2_MarkupCompile.cache | 8 +- 9 files changed, 19 insertions(+), 96 deletions(-) delete mode 100644 opdracht2/obj/Debug/netcoreapp3.1/MainWindow.baml diff --git a/opdracht2/GeoJsonParser.cs b/opdracht2/GeoJsonParser.cs index be782d6..bc5bf03 100644 --- a/opdracht2/GeoJsonParser.cs +++ b/opdracht2/GeoJsonParser.cs @@ -47,7 +47,7 @@ namespace opdracht2 { try { - List EnkelePolygonLijst = maakPolygonLijn(maakPolygonLijst(JsonConvert.DeserializeObject(v["geometry"].ToString()))); + List EnkelePolygonLijst = MaakPolygonLijn(MaakPolygonLijst(JsonConvert.DeserializeObject(v["geometry"].ToString()))); returnWaarde.AddRange(maakDriehoeken(EnkelePolygonLijst)); } catch (Exception e) @@ -96,14 +96,14 @@ namespace opdracht2 if (polygonLijst.Count == 3) { - returnWaarde.Add(createNewPolygon(polygonLijst[punt1Index], polygonLijst[punt2Index], + returnWaarde.Add(CreateNewPolygon(polygonLijst[punt1Index], polygonLijst[punt2Index], polygonLijst[punt3Index])); break; } - double hoek = getAngle(polygonLijst[punt1Index], polygonLijst[punt2Index], polygonLijst[punt3Index]); + double hoek = GetAngle(polygonLijst[punt1Index], polygonLijst[punt2Index], polygonLijst[punt3Index]); if (hoek < 180) { - returnWaarde.Add(createNewPolygon(polygonLijst[punt1Index], polygonLijst[punt2Index], + returnWaarde.Add(CreateNewPolygon(polygonLijst[punt1Index], polygonLijst[punt2Index], polygonLijst[punt3Index])); polygonLijst.RemoveAt(punt2Index); @@ -119,14 +119,14 @@ namespace opdracht2 } //https://stackoverflow.com/a/31334882 - private static double getAngle(Point p1, Point p2, Point p3) + private static double GetAngle(Point p1, Point p2, Point p3) { return Math.Atan2(p3.Y - p1.Y, p3.X - p1.X) - Math.Atan2(p2.Y - p1.Y, p2.X - p1.X); } - private static System.Windows.Shapes.Polygon createNewPolygon(Point punt1, Point punt2, Point punt3) + private static System.Windows.Shapes.Polygon CreateNewPolygon(Point punt1, Point punt2, Point punt3) { System.Windows.Shapes.Polygon returnWaarde = new System.Windows.Shapes.Polygon(); PointCollection puntCollectie = new PointCollection(); @@ -149,7 +149,7 @@ namespace opdracht2 return returnWaarde; } - private static List> maakPolygonLijst(MultiPolygon multiPolygon) + private static List> MaakPolygonLijst(MultiPolygon multiPolygon) { List> polygonAlsPuntenLijst = new List>(); foreach (GeoJSON.Net.Geometry.Polygon geojsonPolygon in multiPolygon.Coordinates) @@ -197,7 +197,7 @@ namespace opdracht2 return polygonAlsPuntenLijst; } - private static List maakPolygonLijn(List> multiPolygon) + private static List MaakPolygonLijn(List> multiPolygon) { //zoek dichtsbijzijnde punt wanneer toevoegen volgende vector en voeg pas vanaf dat punt toe. bool richting = true; //richting van inlezen polygon (met klok mee, tegen in klok) @@ -214,6 +214,7 @@ namespace opdracht2 { Point dichtsbijzijndePunt = returnWaarde[0]; Point dichtsbijzijndeNieuwePunt = normalizedPoly[0]; + foreach (Point punt in returnWaarde) { //ik dacht dat dit beter ging zijn, maar blijkbaar geen echt effect, behalve shit vertragen. @@ -227,14 +228,9 @@ namespace opdracht2 dichtsbijzijndeNieuwePunt = punt2; } } - - /*if (Vector2.Distance(punt, normalizedPoly[0]) < Vector2.Distance(dichtsbijzijndePunt, normalizedPoly[0])) - { - dichtsbijzijndePunt = punt; - }*/ } - //normalizedPoly = orderList(normalizedPoly, dichtsbijzijndeNieuwePunt); + normalizedPoly = orderList(normalizedPoly, dichtsbijzijndeNieuwePunt); returnWaarde.InsertRange(returnWaarde.IndexOf(dichtsbijzijndePunt), normalizedPoly); } else @@ -247,12 +243,12 @@ namespace opdracht2 return returnWaarde; } - - private static List orderList(List normalizedPoly, Vector2 dichtsbijzijndeNieuwePunt) + + private static List orderList(List normalizedPoly, Point dichtsbijzijndeNieuwePunt) { int i = normalizedPoly.IndexOf(dichtsbijzijndeNieuwePunt); int check = i; - List returnWaarde = new List(); + List returnWaarde = new List(); do { if (i >= normalizedPoly.Count) i -= normalizedPoly.Count; @@ -303,10 +299,6 @@ namespace opdracht2 index = i; dmax = distance; } - else - { - Debug.WriteLine("distance between points = " + distance); - } } @@ -336,52 +328,5 @@ namespace opdracht2 } - public static Double PerpendicularDistance - (Vector2 Point1, Vector2 Point2, Vector2 Point) - { - //Area = |(1/2)(x1y2 + x2y3 + x3y1 - x2y1 - x3y2 - x1y3)| *Area of triangle - //Base = v((x1-x2)²+(x1-x2)²) *Base of Triangle* - //Area = .5*Base*H *Solve for height - //Height = Area/.5/Base - - Double area = Math.Abs(.5 * (Point1.X * Point2.Y + Point2.X * - Point.Y + Point.X * Point1.Y - Point2.X * Point1.Y - Point.X * - Point2.Y - Point1.X * Point.Y)); - Double bottom = Math.Sqrt(Math.Pow(Point1.X - Point2.X, 2) + - Math.Pow(Point1.Y - Point2.Y, 2)); - Double height = area / bottom * 2; - - return height; - - //Another option - //Double A = Point.X - Point1.X; - //Double B = Point.Y - Point1.Y; - //Double C = Point2.X - Point1.X; - //Double D = Point2.Y - Point1.Y; - - //Double dot = A * C + B * D; - //Double len_sq = C * C + D * D; - //Double param = dot / len_sq; - - //Double xx, yy; - - //if (param < 0) - //{ - // xx = Point1.X; - // yy = Point1.Y; - //} - //else if (param > 1) - //{ - // xx = Point2.X; - // yy = Point2.Y; - //} - //else - //{ - // xx = Point1.X + param * C; - // yy = Point1.Y + param * D; - //} - - //Double d = DistanceBetweenOn2DPlane(Point, new Point(xx, yy)); - } } } \ No newline at end of file diff --git a/opdracht2/MainWindow.xaml.cs b/opdracht2/MainWindow.xaml.cs index ffea5da..87680a5 100644 --- a/opdracht2/MainWindow.xaml.cs +++ b/opdracht2/MainWindow.xaml.cs @@ -93,30 +93,8 @@ namespace opdracht2 buffer.Add(f[0]); f.RemoveAt(0); } - //List f = GeoJsonParser.TriangulateJsonData(File.ReadAllText(openFileDialog.FileName), c.Width, c.Height); - - /* - foreach (Polygon p in f) - { - foreach(Point po in p.Points) - { - //fuck c# https://stackoverflow.com/a/36482552 - Ellipse dot = new Ellipse(); - dot.Stroke = Brushes.Black; - dot.StrokeThickness = 1; - Canvas.SetZIndex(dot, 3); - dot.Height = 5; - dot.Width = 5; - dot.Fill = new SolidColorBrush(Colors.Black); - dot.Margin = new Thickness(po.X, po.Y, 0, 0); - c.Children.Add(dot); - } - c.Children.Add(p); - } - */ - - - } + } } +} diff --git a/opdracht2/bin/Debug/netcoreapp3.1/opdracht2.dll b/opdracht2/bin/Debug/netcoreapp3.1/opdracht2.dll index a7797702d1203f798498af2e7b2c4eb2e43b2aac..ae5fed2b5f4267d86cfe2358e06814bb4419aa07 100644 GIT binary patch delta 4379 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 diff --git a/opdracht2/bin/Debug/netcoreapp3.1/opdracht2.pdb b/opdracht2/bin/Debug/netcoreapp3.1/opdracht2.pdb index e221896887cfe5644e0947322fad7690c3c9e915..3b4ccba75a89168d5f75c9e9351ff10d15d15d0a 100644 GIT binary patch delta 1223 zcmYjQZETZO6n@Tq-+rxqySB8Q8Qa)kn4!#xY+($ulx1Tp5Fl&|R#7(-vJs|cYQ$y4 z6>B1@O@ChaV)HI6n=9AH|XyQ3sPZ)Df$`u@93B4*Ov=A^@Gy5E*-FN zhPJQFLS4|tGVSeBlnpPiu`+m2%?{n(c9wJvbq#fANw1=I z=ML(GwJ_mBi{toID)SFB7 zTd5PQzoqA?F+ppmDcsNFEOV%hgKnx6ZzALT%-)O$-Xc>NH1#7y8;6M=yyupfRe~L+ zrbx6fNVIX8=)rTW^kR}6SW7;kaDmjq7PG}6avw58KdKl3o~DV})WRIOjT4Of@H@F5 zioDEJhOmwinC1j$$&^`jYm7^bSf(u-v*cd0$~TNxxP>2Yn#1-J1(QUD4Q7FRH@4Z- z!w&-lc;)Vq)x?`mQOq5BQ81CO4e|pjW%6FzefEMQddbt+Srr%%8#<6Bwv`o#D);_c=P%mU$cJHccIweKX2C_I@i_y zLq%sp-%0zE^E+lv+;;iC*}vZ(%V%WIM?KpfxL*7x^oAvW>DMClzb%9N7CKlhNUyRn*S4ytZo4YExtLpi#q@)9!Ci_P~(5C!;@c*LF zs4qqDjb>GLUS(&Kl6|#|HAnrrCRUU>Js-OmP6tG?lgghx2Jw#Rg%#T?TSO$cQ~Z+e zlH8EwMkRMm@_mv&pf|@;Yd@&n9`3l7JnFpj#bWBG_;~kte`fE<=Rbe>+E>qDcgN{W zNA~5AJ{_MCM|UThh=&vPoa|(xP949YKTRYhtiNHXTrVeXmxx}S98)j-s81z3q((0$ Vhh$LqRP@N4p03y{F@2??{$Gx(%Ax=O delta 1342 zcmYjQZEO@(6utM&$9~Q3cDmhdP+AJzDn-{Vp$oWeYH6zlRIJcKMA`tcZi)R6sFvEM zyX_J!7E0>_Ni>=oONxonA4>vaf+T(`1|_KpA%sSM_{XGLtt1U3o*B1>m)vvDx$nF; z@4lIthz^&HmG3&L5fu**wd+LZ8GKv!fqk8cgM<-w5~;|=P1|TCc!S03n>N)UAA%n9 zL)Wx-?S*z1T)cdu;dlYj(@wxv3=ngSElZTpk9|8<~7 zA6piCH@06o?i*U6=YcBC0yRpWgjFXAL9`xR&{tpzS>0>&BDjNEfKG~{Lez&~dsBs` z!Bv_<-9Zd=QV{62od%U!cKdKlAAkva)na=$P*JEMiKNn5pl&a7&}n<4vp}LQAk%w5 zL2IEEdkZ`gT%$P9Wq*clymV_s5lo)}1ua+w`>L4^gXwhIuH3Yd$sq(7K2Tk?{tl)| z`Mnm|obTGrDvi2Qz?gdic*lJSxL=q-P_gOEpO@T^tRT0iMDPTaeSKj&2dgGnoHcS{phWiN>9yCJQ|%} zH~e)~^>j}4hpm0DUZDDeJu{h$#@h;fE8nTE1yknnNP>vq)t^oI2@- zXV8$pni(#Ur*glkc+$n38WqmeFtOfSWLWb}E*8~>^Es~5=@D9?l8<~UULaTXdU&vb zhk`tGJjAjiu=$>5W==oBP9Evtbb{0SIsH42^z+Cu`BR{}1J~x0 zvpx4;Klk^E*}opR*79AUUv|QiBW3VDHsyt2uNZa6Sg3{{lZQeHJ|bsA8~IOJn!lCf IvOhokFXIQ|IRF3v diff --git a/opdracht2/obj/Debug/netcoreapp3.1/MainWindow.baml b/opdracht2/obj/Debug/netcoreapp3.1/MainWindow.baml deleted file mode 100644 index f023a447d9bd4dfe0b6346cd54c81052ac599456..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1369 zcmb_bTTc@~6h3>Y(t?7q#zbr2p_mZ2ducmMi)ln^ctAt~jqu=u)9n;C?9QySTPeT7 zXXC5CgIDwk`76G|I#ZxDCK@%&=FH5Q%QxTo_M8a-cm*hDZBt! zWKoA>Z#O9$Gj9lweMTFOY0J-;Y4(Do$4P^dUczx;%&hm?f$zN}2Q9WoXoL2G;Nk3j zFW@DLLlQ^WBMU>o>~IEvZivUT!X7;k9pr~w<}2*eEuVJSz9u%1B071lu%W=(`FgyB zV{*l=`nT*VPP<#FAs2TlZk1F};jIeW>zu@dCO8p+E^|S8pYgrx04EyY&4V~0p?N{u zY%-c~7R2U;-)=MdAFs6M=P~k->(nb%V%O@0Egd#TLufL79n$2Np}w0W(Sl{g-YyAo zY=*waS9Nq-_i49pm2KO#`Zx@%XhcRG6i`6}9gsTwdl^`}P-9!1zlPBB3rgSk z7mnw&bjSdbnI)4dzo>M|f5aet8JVmCs~r&9ks;Sckn~HW6*csp{sP4!Li=IRWjw@5 zY%;!Mg_!U4qLPp>5-HdA13x(!$T)(Txx}2y1kA(1@9Jsf%4Ic8Pl$>-g-pv&0#cj; z$X%7wr&Ba`fn3aa znnc0|t(g0s>Z_!iG|o@m5v#??<1~xPMx|=lhW-B3HRNLUYpS(a)JWZD!ksQCuyP9b zHiW8#w>YM;6zVnicYIo$QXuD;Wd|9y=~f?~xmyxp>?BpoNYMN^@QzXyN$<1pbTlq{ zY1&~5Na!%&Tap<#nLT XaAgFuVpG@AZ86-GQ#2`hnMdkR4HkG7 diff --git a/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.dll b/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.dll index a7797702d1203f798498af2e7b2c4eb2e43b2aac..ae5fed2b5f4267d86cfe2358e06814bb4419aa07 100644 GIT binary patch delta 4379 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 diff --git a/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.g.resources b/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.g.resources index 99add43ec7dc45ac2281f6e4e608f1284015e747..fb94220fc9e3af16b8afed0d051d8253e26996a0 100644 GIT binary patch delta 61 zcmdnXvzKSX5=N$Q#>sn_LMMM?jAII7p1h1PkSUdAau`$cWI^UzjLehYFna(kO9LYSVE7U* delta 62 zcmdnXvzKSX5=N#V#>vr4fs_9*#xkWcPhQ8A%q$bmGI<$e=ww0WTZ}A|-!OXuNi&vU QAlb!Y#K^LFFG~X>0B2khOaK4? diff --git a/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.pdb b/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.pdb index e221896887cfe5644e0947322fad7690c3c9e915..3b4ccba75a89168d5f75c9e9351ff10d15d15d0a 100644 GIT binary patch delta 1223 zcmYjQZETZO6n@Tq-+rxqySB8Q8Qa)kn4!#xY+($ulx1Tp5Fl&|R#7(-vJs|cYQ$y4 z6>B1@O@ChaV)HI6n=9AH|XyQ3sPZ)Df$`u@93B4*Ov=A^@Gy5E*-FN zhPJQFLS4|tGVSeBlnpPiu`+m2%?{n(c9wJvbq#fANw1=I z=ML(GwJ_mBi{toID)SFB7 zTd5PQzoqA?F+ppmDcsNFEOV%hgKnx6ZzALT%-)O$-Xc>NH1#7y8;6M=yyupfRe~L+ zrbx6fNVIX8=)rTW^kR}6SW7;kaDmjq7PG}6avw58KdKl3o~DV})WRIOjT4Of@H@F5 zioDEJhOmwinC1j$$&^`jYm7^bSf(u-v*cd0$~TNxxP>2Yn#1-J1(QUD4Q7FRH@4Z- z!w&-lc;)Vq)x?`mQOq5BQ81CO4e|pjW%6FzefEMQddbt+Srr%%8#<6Bwv`o#D);_c=P%mU$cJHccIweKX2C_I@i_y zLq%sp-%0zE^E+lv+;;iC*}vZ(%V%WIM?KpfxL*7x^oAvW>DMClzb%9N7CKlhNUyRn*S4ytZo4YExtLpi#q@)9!Ci_P~(5C!;@c*LF zs4qqDjb>GLUS(&Kl6|#|HAnrrCRUU>Js-OmP6tG?lgghx2Jw#Rg%#T?TSO$cQ~Z+e zlH8EwMkRMm@_mv&pf|@;Yd@&n9`3l7JnFpj#bWBG_;~kte`fE<=Rbe>+E>qDcgN{W zNA~5AJ{_MCM|UThh=&vPoa|(xP949YKTRYhtiNHXTrVeXmxx}S98)j-s81z3q((0$ Vhh$LqRP@N4p03y{F@2??{$Gx(%Ax=O delta 1342 zcmYjQZEO@(6utM&$9~Q3cDmhdP+AJzDn-{Vp$oWeYH6zlRIJcKMA`tcZi)R6sFvEM zyX_J!7E0>_Ni>=oONxonA4>vaf+T(`1|_KpA%sSM_{XGLtt1U3o*B1>m)vvDx$nF; z@4lIthz^&HmG3&L5fu**wd+LZ8GKv!fqk8cgM<-w5~;|=P1|TCc!S03n>N)UAA%n9 zL)Wx-?S*z1T)cdu;dlYj(@wxv3=ngSElZTpk9|8<~7 zA6piCH@06o?i*U6=YcBC0yRpWgjFXAL9`xR&{tpzS>0>&BDjNEfKG~{Lez&~dsBs` z!Bv_<-9Zd=QV{62od%U!cKdKlAAkva)na=$P*JEMiKNn5pl&a7&}n<4vp}LQAk%w5 zL2IEEdkZ`gT%$P9Wq*clymV_s5lo)}1ua+w`>L4^gXwhIuH3Yd$sq(7K2Tk?{tl)| z`Mnm|obTGrDvi2Qz?gdic*lJSxL=q-P_gOEpO@T^tRT0iMDPTaeSKj&2dgGnoHcS{phWiN>9yCJQ|%} zH~e)~^>j}4hpm0DUZDDeJu{h$#@h;fE8nTE1yknnNP>vq)t^oI2@- zXV8$pni(#Ur*glkc+$n38WqmeFtOfSWLWb}E*8~>^Es~5=@D9?l8<~UULaTXdU&vb zhk`tGJjAjiu=$>5W==oBP9Evtbb{0SIsH42^z+Cu`BR{}1J~x0 zvpx4;Klk^E*}opR*79AUUv|QiBW3VDHsyt2uNZa6Sg3{{lZQeHJ|bsA8~IOJn!lCf IvOhokFXIQ|IRF3v diff --git a/opdracht2/obj/Debug/netcoreapp3.1/opdracht2_MarkupCompile.cache b/opdracht2/obj/Debug/netcoreapp3.1/opdracht2_MarkupCompile.cache index be05267..4e2a083 100644 --- a/opdracht2/obj/Debug/netcoreapp3.1/opdracht2_MarkupCompile.cache +++ b/opdracht2/obj/Debug/netcoreapp3.1/opdracht2_MarkupCompile.cache @@ -10,11 +10,11 @@ none false TRACE;DEBUG;NETCOREAPP;NETCOREAPP3_1 C:\Users\Beppe\source\repos\opdracht2\opdracht2\App.xaml -11316880640 +1-1315075995 -41434824894 -195-1386093099 +41252897694 +195-1941964533 MainWindow.xaml; -False +True