From 9073d73f7f4a1ea2651a88ce892060f699b09885 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Tue, 21 Jul 2020 01:51:04 +0200 Subject: [PATCH] ok, refactor gedaan, fout wss gevonden --- opdracht2/GeoJsonParser.cs | 16 ++++++++-------- opdracht2/MainWindow.xaml | 2 +- opdracht2/MainWindow.xaml.cs | 14 +++++++------- .../bin/Debug/netcoreapp3.1/opdracht2.dll | Bin 16384 -> 16384 bytes .../bin/Debug/netcoreapp3.1/opdracht2.pdb | Bin 6048 -> 6000 bytes .../obj/Debug/netcoreapp3.1/MainWindow.g.cs | 2 +- .../obj/Debug/netcoreapp3.1/opdracht2.dll | Bin 16384 -> 16384 bytes .../Debug/netcoreapp3.1/opdracht2.g.resources | Bin 1597 -> 1604 bytes .../obj/Debug/netcoreapp3.1/opdracht2.pdb | Bin 6048 -> 6000 bytes .../opdracht2_MarkupCompile.cache | 8 ++++---- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/opdracht2/GeoJsonParser.cs b/opdracht2/GeoJsonParser.cs index bc5bf03..de86386 100644 --- a/opdracht2/GeoJsonParser.cs +++ b/opdracht2/GeoJsonParser.cs @@ -100,6 +100,7 @@ namespace opdracht2 polygonLijst[punt3Index])); break; } + // TODO HIER MOET DE FOUT ZITTEN, KAN NIE ANDERS!!!! double hoek = GetAngle(polygonLijst[punt1Index], polygonLijst[punt2Index], polygonLijst[punt3Index]); if (hoek < 180) { @@ -192,8 +193,6 @@ namespace opdracht2 }*/ } - maximumXWaarde -= minimumXWaarde; - maximumYWaarde -= minimumYWaarde; return polygonAlsPuntenLijst; } @@ -253,8 +252,9 @@ namespace opdracht2 { if (i >= normalizedPoly.Count) i -= normalizedPoly.Count; returnWaarde.Add(normalizedPoly[i]); + i++; - } while (i != check); + } while (normalizedPoly.Count != returnWaarde.Count); return returnWaarde; } @@ -262,6 +262,8 @@ namespace opdracht2 //TODO refactor dit zodat het alle polygons normalized aan het einde van de formule. private static List NormalizePolygon(List polygons) { + maximumXWaarde -= minimumXWaarde; + maximumYWaarde -= minimumYWaarde; //mss deze fn hermaken zodat deze ook ramer douglas peucker List returnWaarde = new List(); foreach (System.Windows.Shapes.Polygon p in polygons) @@ -271,15 +273,13 @@ namespace opdracht2 { double x = (punt.X - minimumXWaarde); x = (x / maximumXWaarde); - x = (x * 200); + x = (x * schaalXWaarde); double y = (punt.Y - minimumYWaarde); y = (y / maximumYWaarde); - y = (y * 200); + y = (y * schaalYWaarde); puntCollectie.Add(new Point(x, y)); } - Polygon pol = new Polygon(); - pol.Points = puntCollectie; - returnWaarde.Add(pol); + returnWaarde.Add(CreateNewPolygon(puntCollectie[0], puntCollectie[1], puntCollectie[2])); } //List iets = DP(returnWaarde); return returnWaarde; diff --git a/opdracht2/MainWindow.xaml b/opdracht2/MainWindow.xaml index eb255e6..7d0905b 100644 --- a/opdracht2/MainWindow.xaml +++ b/opdracht2/MainWindow.xaml @@ -9,7 +9,7 @@ - + diff --git a/opdracht2/MainWindow.xaml.cs b/opdracht2/MainWindow.xaml.cs index 87680a5..d9ce228 100644 --- a/opdracht2/MainWindow.xaml.cs +++ b/opdracht2/MainWindow.xaml.cs @@ -43,7 +43,7 @@ namespace opdracht2 { //TODO remove //Tuple, List> t = GeoJsonParser.TriangulateJsonData(File.ReadAllText(openFileDialog.FileName), c.Width, c.Height); - f = GeoJsonParser.TriangulateJsonData(File.ReadAllText(openFileDialog.FileName), c.Width, c.Height); + f = GeoJsonParser.TriangulateJsonData(File.ReadAllText(openFileDialog.FileName), 800, 800); el = new List(); } var st = new ScaleTransform(); @@ -54,11 +54,7 @@ namespace opdracht2 } c.MouseWheel += (sender, e) => { - if (f.Count > 0) - { - buffer.Add(f[0]); - f.RemoveAt(0); - } + if (e.Delta > 0) { st.ScaleX *= 2; @@ -78,9 +74,13 @@ namespace opdracht2 { if (f.Count > 0) { + Debug.WriteLine("--- ADDING NEW POLYGON FROM LIST (COUNT: " + f.Count + ")"); + Debug.WriteLine(f[0].ToString()); c.Children.Add(f[0]); + Debug.WriteLine(("ADDED POLYGON")); f.RemoveAt(0); - Thread.Sleep(50); + Debug.WriteLine(("REMOVED POLYGON")); + Thread.Sleep(80); } } diff --git a/opdracht2/bin/Debug/netcoreapp3.1/opdracht2.dll b/opdracht2/bin/Debug/netcoreapp3.1/opdracht2.dll index ae5fed2b5f4267d86cfe2358e06814bb4419aa07..94a565861680dd077043d0edc5c7566493f69e81 100644 GIT binary patch delta 4114 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 VESfm&dyVg$9CclLmURb>{{oGu)@=X) delta 4021 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 diff --git a/opdracht2/bin/Debug/netcoreapp3.1/opdracht2.pdb b/opdracht2/bin/Debug/netcoreapp3.1/opdracht2.pdb index 3b4ccba75a89168d5f75c9e9351ff10d15d15d0a..4234adcab8351e0b7ca50d976e127ba0562a0725 100644 GIT binary patch delta 1527 zcmYjReN2^Q6hG&AKknE2a$n%y3zFakB0h$IAAk-MG?su?O#DFc64o3!3Wt)4nQ%cJ zND=I5bD23-nq_Ov(Q+&k*J@VgwA!l8R<}QjrMTf*wX9LU_x0+0_MYE4zw@4Rp68x> z-e zDd=;P=_<65z?6|7s2%zs^cm>O&|W`NmW*)z+>l$LN{>RXKvsGc(tRq$AcqWD30u$yPE5H|q7Al-HUQm}3J=jv2s=d;`V_WG!|=Q48f-Vs0KHD6LHV%BIULh* zl1nrz=Mo&48ldI`VPhxxHK%kVkm-=zrB%$jZ0CZxgmAR3+QZMZSzgp~>!w^)tWuJv z1vud80hV}2fs@|zzz#iTqY-0`dJPgPT{ObLzl^MBma>G`Gk%$D)%509NQB7)s-%=WXAUY{cKtunqa z)?(!{|0(+u3rrQgV9~|2fYf9;k(iz6@-Srzw*|nYL{yT$C00I}im!=s1ZHcNZ8?x_ z2RO-MTb|FJyA6R2nQ_mS)d{vI5H8kiPa5}J)uUN#KmB_2JmcxLxc99P_Z&ekN5k@P z($Wy$PFFh0bn;M}$NsP8hUBfJnvCcKKgT`eBAO(&i|91>mT>QZ5GUjQ;b^sNNnW3p z#>{=I*v*3l+}Fx|9o#p?gNu2vPJWeKRdghLVx#5#%sTdAZO75aAFKc5T-pu)?2~)0 zb&Xy>@n-XdeYHI=85s9W4?Z1TRtCz{Cf%JUy8;h(o2q+#Dg`pgXP?lT!yL^MQGC;S z-x}^)fB3y?STEdOXO-C>W;1S`@v-_DsK|$$+#`y^MlWBLg? zqzvX56?Tb5xF0RmEn~qFRT2A>WJ)NVKa!=PW#Ywu6 zwA6xuvPjx;`C_g!gRJ2*mP4o-wM$@iouB%2{rV~Bs z1F!1Yyb*jy^RJ_Qvk%mrD6H8u-a9>AS#e`>_h^KDyT>rl?oYDB6Q)&!fG8w$R5^E!%iOQHHKiolBv8s4YnfWx7?GMt#ep(pMgh z78@GH49o)49gvg!B_ES<@kxIZJRZ_0hp;k~TQ<)H55hiS^E~i0*zemsAAAw)E}IvC zFNfWZYCx|D+$?|D{9bTVuhZuDfzKl9r!}@?5ga41OHsWLSYitdf&0k$A8&x}U5*W> z8k^sb_?zJAsD8wk+2d=$lmEw;fd@#j`}>LV;Yfj_+#XN~o{9l?`B`wYRGRmcy~NuWXygN9)f zWy2QqAuNTKSrXl_ofHG=lm-vcbEs^IDs&pQN@MUl=_+iU1neX$(nAa2A!~9>`$;a> z`~_#=P-qoUr6WLx73!pyF-)g7tOTt5WV8eOjJ?3GaW`eD<2_}|=AOyRj>B3; z_kooa7sAzf>-MN0f3WJ{Sme_BBYz*>J{04|=Nx63@4qI7vKP@6tj z&wV^_T*L!ns~GI#!H+oM4{-{9QXH?7y0p}6t($&1k+gMBr9&9SvTpIx4M<@4uhP1WnMs(}#?-bAJg@5_*pV5$1J zLobwTgAc@#RlOxb!5ng%)AY|}j^~MZEAC99jT3E7%}jk;6yh|w0W0+j-Dh4d7Fb=X z(C3)THn0J>Sk@8&LilqHc_)}7b5b)ScY;f+D|Vj0)qibU?zhMO7`yg+!TCqONcYOe zQs=Wz?n=$hYw<(948KOGVX+yKX&$L>O!|e>~e`+d)$> // This code was generated by a tool. diff --git a/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.dll b/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.dll index ae5fed2b5f4267d86cfe2358e06814bb4419aa07..94a565861680dd077043d0edc5c7566493f69e81 100644 GIT binary patch delta 4114 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 VESfm&dyVg$9CclLmURb>{{oGu)@=X) delta 4021 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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 fb94220fc9e3af16b8afed0d051d8253e26996a0..4bdd5c0020b7d8cdbc2bb1c86c0a996e8bd96eb5 100644 GIT binary patch delta 144 zcmdnXbA)HY1IC1j4-Ye?GEQE{l*}v>&NO)$W7yo|~aX$0aM1Nkg0 SrhGt(9mF){2a?P{%me_Wb{|#% delta 115 zcmX@YvzKSW1IEaS4-YeiGfw7V3S)|4n!KGUYH}h|2vaJ{lLeWtu`@C-F)%Z* zPJYMi3};)g_`=yeEIKgu=KU-IjH1Hl|MMD}nd+Ds>KGbY>X;c6{xwsbtj#6~0LA$m AF#rGn diff --git a/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.pdb b/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.pdb index 3b4ccba75a89168d5f75c9e9351ff10d15d15d0a..4234adcab8351e0b7ca50d976e127ba0562a0725 100644 GIT binary patch delta 1527 zcmYjReN2^Q6hG&AKknE2a$n%y3zFakB0h$IAAk-MG?su?O#DFc64o3!3Wt)4nQ%cJ zND=I5bD23-nq_Ov(Q+&k*J@VgwA!l8R<}QjrMTf*wX9LU_x0+0_MYE4zw@4Rp68x> z-e zDd=;P=_<65z?6|7s2%zs^cm>O&|W`NmW*)z+>l$LN{>RXKvsGc(tRq$AcqWD30u$yPE5H|q7Al-HUQm}3J=jv2s=d;`V_WG!|=Q48f-Vs0KHD6LHV%BIULh* zl1nrz=Mo&48ldI`VPhxxHK%kVkm-=zrB%$jZ0CZxgmAR3+QZMZSzgp~>!w^)tWuJv z1vud80hV}2fs@|zzz#iTqY-0`dJPgPT{ObLzl^MBma>G`Gk%$D)%509NQB7)s-%=WXAUY{cKtunqa z)?(!{|0(+u3rrQgV9~|2fYf9;k(iz6@-Srzw*|nYL{yT$C00I}im!=s1ZHcNZ8?x_ z2RO-MTb|FJyA6R2nQ_mS)d{vI5H8kiPa5}J)uUN#KmB_2JmcxLxc99P_Z&ekN5k@P z($Wy$PFFh0bn;M}$NsP8hUBfJnvCcKKgT`eBAO(&i|91>mT>QZ5GUjQ;b^sNNnW3p z#>{=I*v*3l+}Fx|9o#p?gNu2vPJWeKRdghLVx#5#%sTdAZO75aAFKc5T-pu)?2~)0 zb&Xy>@n-XdeYHI=85s9W4?Z1TRtCz{Cf%JUy8;h(o2q+#Dg`pgXP?lT!yL^MQGC;S z-x}^)fB3y?STEdOXO-C>W;1S`@v-_DsK|$$+#`y^MlWBLg? zqzvX56?Tb5xF0RmEn~qFRT2A>WJ)NVKa!=PW#Ywu6 zwA6xuvPjx;`C_g!gRJ2*mP4o-wM$@iouB%2{rV~Bs z1F!1Yyb*jy^RJ_Qvk%mrD6H8u-a9>AS#e`>_h^KDyT>rl?oYDB6Q)&!fG8w$R5^E!%iOQHHKiolBv8s4YnfWx7?GMt#ep(pMgh z78@GH49o)49gvg!B_ES<@kxIZJRZ_0hp;k~TQ<)H55hiS^E~i0*zemsAAAw)E}IvC zFNfWZYCx|D+$?|D{9bTVuhZuDfzKl9r!}@?5ga41OHsWLSYitdf&0k$A8&x}U5*W> z8k^sb_?zJAsD8wk+2d=$lmEw;fd@#j`}>LV;Yfj_+#XN~o{9l?`B`wYRGRmcy~NuWXygN9)f zWy2QqAuNTKSrXl_ofHG=lm-vcbEs^IDs&pQN@MUl=_+iU1neX$(nAa2A!~9>`$;a> z`~_#=P-qoUr6WLx73!pyF-)g7tOTt5WV8eOjJ?3GaW`eD<2_}|=AOyRj>B3; z_kooa7sAzf>-MN0f3WJ{Sme_BBYz*>J{04|=Nx63@4qI7vKP@6tj z&wV^_T*L!ns~GI#!H+oM4{-{9QXH?7y0p}6t($&1k+gMBr9&9SvTpIx4M<@4uhP1WnMs(}#?-bAJg@5_*pV5$1J zLobwTgAc@#RlOxb!5ng%)AY|}j^~MZEAC99jT3E7%}jk;6yh|w0W0+j-Dh4d7Fb=X z(C3)THn0J>Sk@8&LilqHc_)}7b5b)ScY;f+D|Vj0)qibU?zhMO7`yg+!TCqONcYOe zQs=Wz?n=$hYw<(948KOGVX+yKX&$L>O!|e>~e`+d)$>