From 8ba52ae65c5e92e65a916cdcf10cf6ae4a5a91ed Mon Sep 17 00:00:00 2001 From: Sebastian Nadorp Date: Thu, 1 Sep 2022 22:23:46 +0200 Subject: [PATCH 01/10] Order list of vendors in ConfigWizard: @lukasmatena 's amendment: PR #8795. Thanks. --- src/slic3r/GUI/ConfigWizard_private.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/slic3r/GUI/ConfigWizard_private.hpp b/src/slic3r/GUI/ConfigWizard_private.hpp index aa074f9253..d757eed634 100644 --- a/src/slic3r/GUI/ConfigWizard_private.hpp +++ b/src/slic3r/GUI/ConfigWizard_private.hpp @@ -75,7 +75,7 @@ struct Bundle const std::string& vendor_id() const { return vendor_profile->id; } }; -struct BundleMap : std::unordered_map +struct BundleMap : std::map { static BundleMap load(); From 934d51d26f6a96d2a349b90b3a7e3c6ab0f69584 Mon Sep 17 00:00:00 2001 From: rtyr <36745189+rtyr@users.noreply.github.com> Date: Thu, 6 Oct 2022 22:00:48 +0200 Subject: [PATCH 02/10] Taz Workhorse thumbnail --- .../LulzBot/TAZ_WORKHORSE_thumbnail.png | Bin 0 -> 40220 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 resources/profiles/LulzBot/TAZ_WORKHORSE_thumbnail.png diff --git a/resources/profiles/LulzBot/TAZ_WORKHORSE_thumbnail.png b/resources/profiles/LulzBot/TAZ_WORKHORSE_thumbnail.png new file mode 100644 index 0000000000000000000000000000000000000000..133858a6f29734a951fac3da38caa97ca67d1f43 GIT binary patch literal 40220 zcmXtf1ymec)9nm8xVt;S-QC??hu{`GI1HZPkl;>mcXxsX4G`QtIKlnR{r>fk1>N-O zu0E$~SJmFdR}D3JG-P6A004lds34;S{n-Qn00AHb=x@Z^Ci~EXaC>QK4Mk~bN>_Im z8+#{f0Dv(mFiBKlP=a*G+_+hb3H^+6mP*>Ifl~LUW`zM9N^$i}Mc7!e`AiX&qMIA8 z2?}};iyoOtwwISH9$Y^LraS|KEWwAXV8sI2Sj3T6AMXpdd-Tf|2NljIdY~-ttqK>_ z9!h2CJ01{~G90u+&E2H)nGLuu>hsvDl4%$wJs`hS| zI;jnwCcPL#?#$oNp9v;uq(QqTEz9HFgMMt>>ZJ7ezeHJXIVz8kuXx;a^mKmRACRRA zy13~%pe?jB1Y6XV)mXKwafi~TCQ1>*(DG==qS1eBswg5Hoe3Hk5_fo>+e;qRg{K*T zIo6lR2_~@PXFYjdYFJ@_ToAQsb-wwbq`%U3FaIf& z@4Mu4bzA>aB)a8}Na#B&W72EVDcy9KKO7=NY{GadW_t-rJoNBi_TjBr$B{-LK|*97+F_- zf=OvD&6fq!^&$L}jq^7>P(|UWfHq{tn9>uKt!;JIK#%>$?|I{C!3zp+8y?GX*#^bX z!rcV1mRg(hiSB#<+~@2~ZMJ?MqAR@L9>6tNi6QYRADUTme+(Nrw;6kwYjN0zb#cN8 zcA(EY>cAZ8(L?l6G2jy-fm_6^j> z`wm|GYX&%!U9r4FZFnZ%Glk;F3AMbsR#GxkiaE2Z7xC`zu7ZO9Bf!X{i_slU<;atJX8~TI&$Yn9{QJ-gf zB|sEQQ;TnA=&v0L{-;^oc4{;z&=tFdeGr8-mIQ$N>2-qM#|k^CCbC<*f4(x34NUY0 z?5lI+89cU{NCb(`l6U$cjN4lkK<%LdBy54NaZh=Q7WNZK4tyxbk+t}Pum+ka`Q;?7 ziUVLqk-r~(JYp~hVLQN|Y``rAH;*;|E^na^9^qC{qxtWhQUJLC*M9{|6ep`luYm;d z(kGQN=Tqb0?iWM}Uz3OeN-cVz>(Oa}Fk%nq86ew)(5DSZRUhh3 zAI*%Op!_~$8=|-1hiGhwc(N}pVfD22DabDm3=3J~Kzw>;gL5`Q&Q+15{oI4Y5iB@M z{``mxYLOrdbx%K|5etafGd8=&j<3;7XGspbjbr6hX{C1B2NN z%y%louNNrp1M1Dpzh8c-f-q>~{PGM5Hbp9Se&S~XM&*6oYni= zUJBoYy`fo{fwp`Bzr!Mk09DP?H2&kZ^a0(s1J$z2=zsv*00;GS@n=UnWpyI{g0RlS zwqq+RiZ-B#AXh!C)4`TgfIFA@I?Ux)s8#($HzohGiVb+l0y*#|J_xNBk{5m0o%+0r%DQG-9wxWh%P9gV!!VpfpdoXbG<}8MF9Nsqnsm36NiyEap@_*=v<|Vqe!Dcr; z#e$-#{!44sK2d}D`_YbD*FWv(1F)tEb5DuH?ff4GV_QQkZeN2AhL*k$KkKTiM9hJ0Ndgoak)Wp5a1L{}k(I=>1Loc=NkA zH-fEe=Krv`b_kca50`6g?|_dHMLqm=;ai<~H!So8khl-;5P6gEpi8jEJ|AF*GH*Er zkEVya+1grE92m>%o4(7TZjoa}d^3uL^3^CNND zlzg;7^Hq_h+zFFl9#zPcH}{iZ$@V6S&45oRfL&q8QchXZd_6y;5 z`{^rc2)E73G8DG1(ZHX8mygo$*BjV3o0?_M&lX~0hZ*L7l8*ll!R)T+aV-+aMoiBK7XENv|4m*j~ zQMPcjLj+%nNhFyae}UCrFJ!mETqu%ZcchK`&@}Nk#K3ueo4ZLt&D$?WzizqDoJvuk z{-{aOg}_0P!!%L+Rq{eZ3lj?R=)CjyULP9S1db!q{xh85KfDF{5P8_X@>-w=+%4wg zH8QMMIJ#&w_AFW5drhDG?JM25ul#e4$~Fi0A27mqnH*@pt#CLht7mBGt;=Yrw@?E5 zDj1%xGCVGp`R1~GI{?t+Q60Hxv-QvmKQR=zuUt~H69fte*9HeQaJ(Pyo7@si_xjJN zxEy%@rhE=*NALTVE(M$Z6}+LZ9vj&IqV~A*O!$5;Lw&O!b8aO5-z^RPdo)hhuTwhh zl}1Zx)4PI?cI{h(vzflnDt}&tA&(5uI84Fl68)CR>HObPPetB~bir$HH0DG?{Y4`| z;0LNhy9GL&lxu76--UmOQATf-Q<8kBYT3iVptWht ze_$Cn*#0~jMAJ`?$?M5zv}wi*H7N7Hl0sC(CBv4iL465j9)3SG!SezOVbf(d9Xowc ze*^w3{Mw@Tc2B1OAJ7Ah!qV-K{`TRc-)M&9qP0WX>v}(Q zFu?TfL#>MAW>iU#yyjq!TAcd)i(@YGM?R_B`Nr7T4b^Qg!I|csA0wFUG-^S;BE-HR z=L~gXZtTCxK|S&w^yN~gs^%@ERzmpcrr~q*!ixCd!yv}}N<+(zaWEq+(Pal=agDgY z5{EjKwo6IQndfam?_+L-DnRO6&~Dcp=G!l(vM5&exy-Ls61lt-$5^&1r;9800;a-u zj5&oV&ChWNrR!tnf?JDw}nY_6;faju|O z1Gi|P%dpFx7MRJ7jNxfl8VHZ4U&G{oXMS+!nAmlvLx^D#QSZ`=IP9_S?QT8he}6uD zKB*PFbCP(F!zUK<`M#k=d~V>kW1e!@QZE=Y}#cr$b-9YPs0-^b4SI+ zLD00K2CefJCQS~AP(-cMffA-~S69L8A|+LhV%23K7fmP{kFN|dLI2(Yjz9E46H7Qz zx-CS^E?u$CexOw4>`G`o;WF)0Hs@ZC6J ziG5<5`GRS#)Yl!ZUEW0&x?yf9h{3`GVrhs^;JuTBFD?}7e zkeB6&v&FukvzG3GuHGua{VyI^Pg1@gS8*L)>4}A}Q+-Qdk76UlIQD^zi(kgKHqmT$ z+c#Cy?e@A}{rAYbo1L;mT$cOEM_MGqZNa%j&-#LQdL#yyr3_E6Z!Dk6kzq)EKF*pA zr%Hyao6q;u1Q(jGv`A9;Z1txaR9Tui9ZtzEI}QJP4$Gqc(;TRr%JR48VJF6R1?PnZ z*v($%k+25$zMPkbI}xGzdOa1`L60b~fKDB7Pb1&{%dn{BHG*>bi!<{jKJyK6l zJXikMvdf}K|4nk0&w8YO`yNpPt0uhgNF{YYyTqPz(aTcm%VcJamo(T|T6*v^1f!*? z$sotIfD(#wErTaimeeCkFz!X+?Ow0CmLEUcK zPd6uy;Vl8S@U5+E*w9c;gek$ytSqW=E)dmLwlsk9yTqL5Q3pbXlGI!i>ETOv>zez? zgynJx&CGL{AD2dC@0G$8QjLgUDAbv4waoqc(6{|NsR_M^oK_=u+rY8?UOCiF;h30G zl;IFe7&vT!Lk(Q`D6-E>51*yB+!2NeK~&(_5J6Okgt77JuLu+j|CU1PF3aTxYqA&u z3eLGAHz6Pz;MgsV(&x&1yhWA%+WG$1d3QOzKS`hT@gIbHFD@p_bmGRJuid~4`OX%La zAtYNO6q7Wlm*Te_?)O>hOF^0_9j3UJ7T?i*)V6r-rt_K;sW~1VKE99Z9bR?Lh|z@- zx_>woll`m=HzYrtp~AuB;Nfkbb<~WktgIlgcb@*6M>V^^&M$?zl@aAnUd;9D%Uc{I zuICaaF^uZxVYO-`ij9k-N>P$bE-Dl^f#`s?A4jD2UhSvJG;!g_)7aTNXlqWWlN7*K zR&d*{gefU0GhSp;Ac6R>?QM&uCMbO&BqW5HFaq6N9@VJA(fsdH&^xK;Mv3Bp;N+|f z|7z$KYcJl$|N8ZdjF;Cd$JyE0l!ivy(){h8zKv1rt0=IWzYH3aV-zXk4i8|G(Np*1 zOYt$oI>{KyiV9?1UC9ruFed`&4a+PhixISA9I>QK%*^#(Cwf0Wa!%xlQ?#3)#}Kfy z8F@|#s?5P1l6KTcr|wfvKu=p*T5_Pm#>K_ev5@@u@ndwq0eT2sKM+Jq3(i=VceDXc zSGRx>*~&1IRxyzl>ATkU^`n8c^?n)4cuvQ3>tN|gj;^k5j%plhPQM0tWIJYMINpDH zY#22&7&iYN!3$^r&^~Y1BqY-l{iML#k3|mo9xvVf%*cX3r^saFFy4?fX~Q8P08&g& zRI{zK`@Id{H=Ke_MX9(k@Y@*NAVo*ula zcf|{j!p4l7Ss|&{^@;~!_%4y8qoWfp%YjRX1{WF_WX^$)`Zq^Rw640mytuJL2-~<0 zEcu>Hr)-mZ@=py0iVr|i+zH`R`nB{=ky(g80P?`H^#ZmwQuudoQU{d3p2UNLgGUz^ zBOgk$VHUlxkR!l`dRNWxj^;kW7Vi;f-?d`nhb=M@2yGL~_&=2GsiMm2NtVN@&i%{B z;TXQgK~pIG_GM&ubl<(s38jz&XpIz2eaPC0p!*wol_7m1Em1`Y6(J}Zy7eZyx_`c~ zD6hf*gKa4Zmo!bu{-%@U^m3D;dtrv2er3p=uz`rdSyGoNk62l3oK6h0bECOlFEpMi zrvXeISW$x0dU7#g#v2lqilM&tdv!HtH(nUM=A^K_ohaL*XwF_kX}s#@94E}f%s}O> z^rS=g$|oS#B3)BfGmBTX_B(AwiI$>4>eu>u&ZQPKB~b%9rTz#=$?@f5z)&DTPvuDm zctVydMTRLwikcI7#Aax$s6vU{4?eR*N>hh18ddQheMrr-jHNUU23%N}*m~>SA&Msg z%v*d##jms5+uNMXk|BIH6M+_Rzr~!{=kFMQ;*p7Opd}#w0WXsHr?gBe5PMh!z@^_W z)nTkt*(<^sJ}uv~-Y%2=>G@gm%i*&_re3)1eIWON{d#qEbsfv9oxT0ChPL+H`pQbj z$prT_ao|D5;V2sannr1bLs4}hwW(q9eEt_Xy3=wV@D zuK$#j`bB3w@zBuFp!W)4Q3R{tUMR(%^l`XzxFbA0`6rE`;w8wZT9;KQeI6E~lhw`A zk#$a{eUwp5E@0$(c>_=dz3Rr|B;zY2daotJlSDfkZoC)@{1w123rM@7M`aGaS$3c`)9 zq===k=#?~Pm8d{FGdCAjteiH`z;e_P?<#<*WdHk}ZPXWjagay#=I(C5%|rn^qNEbK zQ6K~uy`qxg!f>bC$3W=@T9=yYN|LL;Z>$~%6GRAg%NO?~jtgB8+uK;Cb4`Pc#c>TR z6lPGrv&%fN$i6;s;uFsDs9A2I+jkd4MZ*{v&8TDP1c?;G=@ia*p^4?y9>L(P5iMek zT5%DQ6Uj00A`Fh=n-+;&!r#JIRQSDhu}Ew4h7YE6328ZpOBa|)?Ww71^Xu#Co*^TI z8Iuqb3&DB&|M*>YmAk9PqHR69+|=beC-*e}O}#R@(4@<142x`{IS&~@x+gR9i`UO2 z<>e+oht8jLmWf)rlbPHyIT7-aF5hc#CZC)fq9mnsDkH5d1e>U#C{&9mnneOMX>5s< zJrnwbIzU9(RvOgC<{lXVb!Sg6ukFAKVfgRK)O`^#y`3qo&Ygs&EC!#Z1X;$Jn3!u$ z`dUV4zDt4ZGUGEdK@}AhvlSKRvpmic0Ac8XUx3)=ROU)1VR4i9_Q0T=4evBxuJ1v{ z0@-TIpPZ}yx!S^H-zit~gX5nDv$ll8UC?D*Y?zQ+^m5QD|DHT~kf@XZ%^p%9O&xtt zQ+Y~EKryxea~mfq%mx{Kjv7sd%12r;c;A%rf$^i&H^@B>_q zQafqWD4XwPI{jQ{^t*z<%)G)A0NHJ;W5Iz!C)J`C0o1IermB148dxg005J-w0!$uN zW!>;Wd#2yjL8>Gst`FIK=7}WUHIJ_@&M|lB=;%Vs`Zc)vCXd!1zK!Xy8wOZa%QVAB zGqnoDcT=Wu8zqlf&AUz5v8AEda1n6{2z;^P68uzvm-#+LB}0wHV&e1g;C&#H$G1hD zqh`rNJ~BG$dX>!>4WpQBZJ3JBSkWP&nKFlhpX&y}j(%D(f@0SohptpzS!pQ=M8Fgj zBvb$=H}yaPF!$GoH9gj*81S}uxF?&_NiU6TLS%XZCtW`{j#r5W2vFqX0;)S zbCx4LWOMyK>P%*I;^ICoJLu`J>1xaQ5#qKm_usX;3WuCOe{@eOE0}|)1(n%MTYd(3 z+#1_CJEO(L)2Bj&Je$O^^7(S2xkPEsl6_!vLn=A!=yz=xT$(VIy>u>2AXf(veIhB9-lPX90~w zSZ28*qJe~wV37z#;z<=l#-+gy7-j6h!cVf!MaVLzd7RYqDlmGzk7BS0z03HtG7 z6d1VMOB9Kvp_{_b$0tUbF!FAHeK2YJ^Ydq>q~kAw!EXbO7j3&WX!mO#7|krq8s_E{ zpGj?7PC8U$>q|U^)-%WViCM-o9W!lm>@!*aswn-kZk(N&!NmS5mR@2SOWh*(L&Gcd zcN>t3Fd)d>tpN)&pEi5C9c8t}!Z3BGZ7icXcGCVBs; zp>IBtM&8Xsr}-z~rJi9)B3PXp2s9y(%%cFVBT@s{1ZZ{Tm{PhNjbK?NF1Kb_UO20P zw4iaVf^swZY)rT!T9hd~HqTaUCrdyyYY1bN0i2?QL>WW{pn?1q6M_w*$o~te;!IBl z$|?=YTeWGm^YWp>va+()Ig@;qDa;o(zn+l}HtKG@2)bYQzG&NtW>zzAJg7ELppzFr zzpgY#ygYj)yB-m{<3xwR5>C9Ia;ga5x(M_n=;$bC>KJUAfLIVW|Mlz;%uzyg zUv>&)OLOExrQs40v9fKTI8h7( zg@-3zmsN&5&jHOA=UzoTSr`HcCMDcftn}WsF|I7u9KIbJ=$zbPc-Ni`fJlc+NeoI6 zDTZ0o{*KbBN3|s(p{oMo2k0WoBtn+p1hXVQ!eGvifBp=riiH&6fYJu*0EXAV8ub2` z{080c2kwHfKYqBOqM`Nks2+7-d{<)ER0`_owQSptB;ne8yK5D@UOB1lp5~aq6Mr1@ zdVi*PznV-6TTtJg`X;HNi`C)3P=9^DqD^ayZi=5U;u5sm9M{3Z+(_hcxamG#L9$R| zI_D&u8_Wt|gr*-xIN2l%8xL0}l8zcGQq+$dYwi4U6lr zNwfO!{J_J=1_7!5p>QQ(Bz&K+{e=|HDv5TaK?^elQZeqEY|}8gXhz+rPGuxjszxb~ zmvkwZakSRR0C0i1J6S45(@|tKq5aKu5R)n*OuzC)_k9nnpTH|d(B+Sb;wZizhm&emy-s+tP~ z%aNHiG}vFkkDSW&U^Ntn0pPrzzEm=8(`203-HtMQjo)QKlpg$G3PwDg9L3`UgP5BV zv`tTA3}I15bkb#Ju6)ZIhd+GG$G1df+f^u@gMvSeR{8u5>T7P0G2Jg31!b&jCm|B zUhc54wUuDm2|v1aW!)d`FhPZoN$)ik= zvs+*LiaeRue5M5DW$A1m_91GjHO;p%N>X%n_Iy)GxA8uwF1xZvV@F>e^Z^f1nT_}4 zqN@Pp0iXkpt1-kK<`}Vw5?=Gmp{zDcRyzk8`nXqto~DbxT&NA^Q7D81fz6kdRWkMe z&jL_+0Lm&W!&t@%NlC*uFT(6I#ov~v^)|$pcaQ&`m*YxNW~h87yXlZJ2xjd{KfsT5S4GqPw~OYbw8PjJ1X5N=RP1D3!UuNY z9dVfMhro6QsdkDwalMY}mX^0i*RtdLhN2Ly=z?vk`T2QjA#ZY(5!pa(nt%!zB|05F zStT;zLPjPD0ZkAUQ;Mdxu4s8g_VmRGUNT&ihigCJ90Edsgep~}<4dg4LWKYN*RLdd zrwRV^3g&ZKh;pR^6E1(esQ|Y}U~XV*TIA!Q7Nz#-nl8mjRN!$qkS2mcWRX;&1|~*F z(P0i4fgVUEQx<}#*|D7*W&^W6sYXG`Nn_-zQ#q!#33S5;SW@Sm?{A3c{h^5yKuXT@ zPePR5QIYOaj6|!dxDZA$rFMFHETykc0PP0CF+ouS zvZE%8#by9S4JncC&WZ{LElhkX4Jh?G_WVeRSJ0I>_E3YcQlk5i^Ug!de8P};)+G)I zsQ^YF7Zy@~SC7B{m4W<5=xyp6)~7b=Drc$?518aQGDOJHTnY^-C%r^bu#iB9F*(4* zgOKV-;32EQk&2O56?%5vaRf7@&kH_`o4-**IWSY}^hgcd{de@CM{Jn5Y!4>QS>HZ_ z_%d&-U+gPqoz9h&m9M=6epcXoiq%#Zd2et2r>Ey=i|2|8rSAaMe{$jY=dno&R$3DN z=aCX@Y0MpD5hM*P;}@Tnr@lK}T8)c`C^OkS1}@cYI~(Yg`}AGo7{Jg;=<3oj4gAb9 z4#&F|fbzBBp*lB|`u_a0G#--0Ol2)FV|PF;KxR2?G%}UFYa75CGNCI#)K|==@P$f? z0FdNSe0fSvm5n>&xKQ;5mX{xKYbff%`YNMGfgKU{<d#6TSBD=k7Eq^~tUrFzM=Vzv(v*-FZZbwHUyf*3#!^ zmvd6l>j?}KZesNplXSz28hP5Xig<}W3@KW>l?SOw9#tt2R?Ue*xCR6eEhN~x=&=j3 zGK7Z(cc4<+<~!=A30(ce+02o!O^?iaa0e-lL=XgFhhv_u{E4&bu~)Xo8{J^l^~I{% zyckpn0A=@AZej8XSU!da!${I8Xraf_g0T=35lzx0ldS-JjGjl>^7KR!ed0k_$}x5f zyPvC#nvd&NgBp)LW%aNdZJO6my4=6;_}PAth_p7!$jP?1Jpq~w%lt$Cs)IXTiO(wZ zav<|@FUGj_lNt5+ql2exi28kU5sxZPF^*9(ZF-4p_cgm@4(-hD5SAIjN4_jswlwLF zJQf;CkDcg8O_kg7fsGpeRyamBlT1pyjkc|Ym6a&{V9aHwJAh3Gqp{s+Lu_WI14xY$ z4p@xZK^8BB4wq_2J@3F+Re*UYR5XFdYJ6UuTusO}Th@ zXl1FBR?oZdy~m_s8pq3-Bja~WRGzMgkmEpU38DiLul9gm;7EYV9^L`{J)d84Ao9@z)CqM-1_o(Ow0e7Mef2h}oyC;aTRC3fY*{cd?j8 zs%!gRaQ{+2sDjQ#WWIV5>}G5#@fe&QUM)|XJ=uwf{j09uJHqhy_bby^IYGR~&71wM zc1*{cp_9yLB^z0Fz8UqlLm(DxAe7Vd&wulE$`?vTQY|(^0?_QJ*aIdrTiFbug|KpN z@SE?1i=(uuDH-Z`pU1T5w`tyOpNc!8du;;qHeN05SMW)8iLQC)OK-=UjYNW=n8_SB z3Jq#HcPU<|e+c$sJ*Nmy`0%jYL%>s!O&6nivu}+oCu{=nQYki^GMB>a^6NFTV`d&^ z%b9EiR|YC$v4Sl(hbm5z0$f*moiva%JtD~CHnR}{@!3{aSMJ=X-Q9W`OP*A-+iiDP zgM+Y&l!z!}Qn1$3v~{W}*07-pE}+Bg5annx?|EmaXZT4dFJs>_@9AdQF)9kN!;xB5 zdaOR_dkI2ZX>MTGcQFU}@ZCtO{C4IpL^fEe$zus{F ze1Dl%e}86Yf7?Iq*)T&Z(x{OwV2tkUoV8wUDRRuz&sVI|&u8zt3~d(`?cNO9|D!Lq zFBEU|MG5(GT}ZFMV3dQ0=ZnloT(LY1uV$~Zs)|S!h9o5nOV=XpbE2h|bj$`Hz3Wq# zfP+Sg-sdK5_2<96K@LMDy-YK143J9ytfZSAin6Mzp9b!zHRDinz0P7#4oWk%#ZrA6 zD{N?JNdME~&*t9GmB!8`;#RAZnomb2i_)`tuGj4<^=*vS&)+}hL)w@payTX`Dyl?M z%FEcHE9oHwa(;gPCIVnF5qPhg4m@w{ZrKfY8vl2T@!f3n3cFS&R8lwK=wvl^h#)W4 zQz+ue&c~1qM~2IOH~fB5z9{lXbe+3Mx`^LfDDiSsr72IAHxLuv9%DIh3h ze1s=M&nV(7eit-F$h5o1Nry3CCrQP|q71sNHoXVQ@ z&Yh!%2$iTR7>6kFI2Es)BZj;SX4+={=z>C$d`Q2_5bGuZh)J>%$LO{$Q9;%UMW6px zE_w#jXGFh`2L~OFFXnje_`h#1Q#=)kW_WPYk@@{Z-+JzzRB*e%S7VekH8rg-DlI8N zV94<-OnZQ3&la_v${wrA8plr>=p=sJBk;Zt4{)7|W|(Pl-h*<`sHlA$s1L7iJBn;7 z#H%ez#^>kvq$ciTy>d8Te`8csJPGS+Q%oFic||7Oa-JVheeU<&NIOI)ybfZSgE%^T zIU@{{VbmFlv@X`fLU5Xs8ELU7N=DeBq2Kv27&NG`0ByDx)mG9{2VlUxSTF>qHDRu7 zYqOoXCqi4`e+Ne98f1SvG= zEYQR3a;Au$cSKMa{(~{P+Q#kh9>N0Y?7&ipprNUzB;ui~5*!@|DhJ+0hzA_1Cy3k} z8oM~w`pdI=_TmlPKM{ldGD!enJ!KTqbIOdVz9!QnF}zIks1t#szZbH)x_HQIxDF4W z^+lo|Npv6@5I4lw&PSH602^|jo}#=x6w~n&016rr8aLt~4?wApDv{US`n6EBy7M99 z8Q#yw=V-Id)jE&(DZ{#BL|Op?9$Iyh6lMs=4?~5(MG597M>e~lNkaxNuBGP!DSsk_ zpdEm!44>uKUSdi$bu~jGP|(9LKPnaQ!feKv7`*RYZu{dIWwknBhXa_aUSu{V3%@t4 z>&ANuv6fft$Z9K>b)9!mu=^iml#*|BI4g4lTr3pnY9FNjg&J>!A3T0HKi8dbg#jV= z!wYorp|at){u}BvaZOK+t65@<7ZHk~czM{Y|9pmD)$tdj&KZx*?eb}OMC}X1GkN!& z{HDN(@McHQO``Ep5Oeqi8c)AW`?!X_eoRsl*8IW(C4P)#5-$k7jZMC)5e3Sux;a75 zp6j-du(R)MJtFKC|0phokD>_jF)V9tB8pwq0>Au3_Cd2ojw3^11qs~K%YG$iJv&Kv z={##S63TgOqE%dt*sA3oo}AV2qbew+HXHyXS%;aQoby}D5 zp6B(87SY>z?F8r5p6X>`+aebIz`~uK^^4qMZ<8tCDTqaL)j!#jT0VMF=d z$UAn6?E$}~R3uQS!E}k`LQU|=HihYX^%fPpUz*|9_hZLUIt9bbQd-5!XIQAHi-(8j zvm3{Md0bg*F%qvP@^bm3th!pBFDt@XIGxu~&(QBkhBqkUYwGak$AGDcJ9dfdRmpafy+zKldy2o`AL|JOudrr-RZKO zqhn?Iafe)rgE_*{6(7Y7L8yMHhu(xZ#XZPitmp?IQLWTkbq;jJMKJ{J^#^B2T&jZX z=1Ssj!vP&N1ToGdb28n#tT*f*x=+;Rd#V#>HQLO~U^0PehHdXPi*D~ZE|x)_Y&Eaj zrEbUeF%~3TaFC6HNrq2LUFQqt>rXg;69L_GRRg?XXs*#U{XP@51qHwqJUoLoFx9bx zqucR^(tIe(8(p<^WIfK|@(CB3B%xotyuAJoy4Ep+0r5>+zQOvK5Cx4d;nl0cm-7@9 zuok$aP~pRa^ZrLsfh8lZjI}Ibjiq!d9o!4>!IR9x$W}UOf2UDjszBq!Yw>;WsPm%R zcH?}c+hPzw@SEZ*1Kk!LUWzwt-&yPC+okU2(?M6ZMUnT}N`%bEDn{+dFblXFKtM-y zW~Nfpq@%R5GAt9*fGcT;r_k5)b2eIR8h|&I2}-E2*%g!JOdxSM=Ez#Wbwx?o7ooRQ zi8pG1Yd`#M>^{oEKVOT1Igt@l^c_PbWqL|5TbKo5zqt7QO|x-}lMpEY4iS_@smvv? z3!XSRw8+FaN$Ynr{OW~o?LED-QhfP7K-Sb|I(^SMwzbGF8X+#u4Ovm(?s>ZPxZKb- zwlHRE10Nl4Tz)-UZ4Exj4?Kda^w~umL>pgk5OaqM_h}T%QQNJDPCt3+rW}r}phHDd zi&Z`c2Wo@og{<^Wu-KE|b2PqRp_%6fE|qL~o)$8CO5qnZmPK+s&|crI|pOFVgu7OK#O6EfwVhJ=KiKsjynY>z3yK<~Ay)!OXW0*qqk zw0(c=w(%*^`@HzKKEx?fL1-s%Xw8)o2~`jnzKvP+QS9MuGwsEq3JDA6S1=jb@`iPpMX!ZRZIr3k7Z?()(8D$rSwO7{9v&!V$Dw}u$`gmto_7AV<{F0naZ<+;nu zM)6um^JM$}uwvYqfpYNI6)x6yqy9`F;JKyR%8FJE+Cz&8ZqgXHkP-yG4jR1Q1&#{~ zwUD25Fy3u>kRdGIg1@Vh81hFs@u3)|7Muua=nxN)FQ#B;@@ttn!m%e{n+*~lNPy56 z=@ep1>W@=L>g|3L{1)oOGjHF4LA~1y&k>#lcYLj0<$qngOPI$`?sD}8^JDYtA?9HMrObfEG7Yhid62)EYO*x-)n2ofd)-eW7tJEOl0^Gl5PnV zLX{6GzF=WcX=58i=f`l9#7of6-LNG!QW0$efXB#s!uskdK2xFSW@;$6CTeZkadC-# zC{p}WM<)IFul2mK_z)#CaRF0pXk0ObpqLGs+#$jc&|FF0VBCDc2z)?IR-v~bB>K6F zDly|1os|~uQQq(e; zir~s5te)YSbaHTT>Uf{*=a#)|W`72@1-F{YoHm01Mr2GFA~*fV5lr7aNs&xOBbSv!_Gkvo4{|#@-PM8+f%1NGL7)V z|KT%y-P~WEn&+_u*C%@hORF}NY~!uiL2J}h`@t4d*W3#Nc@U2&Lq%bJ;cQg2l6XZ$ zWzx8zkK-i04u9vv418n#O%bJM9)iu-QWsU^Aq9CT^6UYR@5;*@kG+S=l(!H_T`^UP57Ea$?igKv^8*JikwqbISfD}YiNtH^5SRxYh zV_S_Q=WsSFiTt{R#wQd6rXbIM{_3b~W(}CwK=;THgDMoLI*Fn>2eCIKRHem4Mfgp$ z%9(}Y64>7c`0_oC(y%^{g7V*QW37b~bysvL<-PXg%YJe}k;fD6o+Ea|5J7r!pDn>` z&woh*cj?G1W+I3L=6*tYuRFdEv`9I^{DGI#?BQadt@<&*Ya?{J6dCX^-%C1O&S)qb z8}o<>b9B5Caa_UVw9)_%HN@_dgA`P6I^pVS{*315=l}apH%ee&;L+KcEd93)mjnE8 z03L)It`8o@2LDe-^j-^kco85}EFPI23`{JC!(^Xl{nuKr<%1GuB$IJ=Nh=RT2j(s& z(*2az3MN&y`J`n<&CSMoc6{8uQu^!%bp<`actvND`8t*IR&Rx=qPdXVja+tv5?R(& zNj68RIZw<7Do1ny{eChu82XL(q`}L>(x+`JXB~ar-A8$U&aOt}8fnab@>_dy+Z_-K zn|k~4leV+FJbu<#@`$}J5+hS=9O>W|$O)jvG3*zz=Xw;F1JpZ>k!K#IelMwsXIFus zdcWTp_iH5J<_AS2t#TsWMT@vgzlG0(I>zpAd2&hmEO<+(m@;a+mDDA?1s_G|P1)Dq z)|qwA{tw9v#)P95QU2|N<;F?)VJIfLVQQCRVj66@jPg9aQD$gj@Xy?^9@DUgTh{yS zy20s?>DuksMvTEhjPB^9ARto9(aFi<@g)EI%@wpSI@ytc^oT+Kxh5fy-UL^~42Jfb zB6J!L&tC#crTQDJnRa$njn=OR@pH~R;_+M;@v8wo8H4onC^>AX%&_`Q6bCgczS>qh zxdmNp{OO%%N(}fdv5jT8Yx>mv&785pm9!tPSSbnW6sxV1n{95wMn=Z1e--LaiEVAg*gJ7Rf(rWO38z}EQLRx z155~fJUkiV#hwUd4ksd5J`j?{Nzd`zoGNXn@r#AKm;?#v7{buNwmonY#CAUgj7+9V zG6@g>hcldvQjsMGO6(u!{yG)gXTGWMNjr}xJFjYa$f=E6arMYhvt0$8n2tAq4@nd= zQzJ~+5PLThROolTT$A?$_DF_)`K-2V7w3P!UpgQi((6sN#?QKoy4A%s1e5Faa+ zefI-4B*TkR?S7&x=E3L*i~bVh<>K=5-)<(>S4M%um))xvl3Z!&wyP1io2r_cTv-6$ zImXe2+=}I5D)X1nivqb*gsF{}sM&*UoXNO#;WK~r0M^r0*hw!^kbLBc!01E{>~;8$ zg6?)S)nU*P*s1FyY2gG{+ApPjcWm~j*@(Ascz%YgNvEEtoHmYD_x^L`6jf=bFw1cVoG0grQ|Pnqey4Vsmjp0oCmveREUK z!<^ngAu*96yUfU?shm1fg68Jt+?P}g_gMB{-s*_OjFV!F-FNVmXoC_QgllJGNJI48 z;8?1hG2iX0mlZqj$(~EY+#&|Rc79ENRGRr(0)9v0bg>x^&1wgF_SDd-Hi-x zE_1+TN+9s{42nomI0hdj8G%0SiGrFMR)vUK|@lc^`NU$9o z7YobPnAwdh%#c+f#erXc#JWD~1`->a3_MkM;C<(&uZsw|xt=!3U$Mu%Z*QJ&zIiMs z`Hz2U&90XFL;7hXHEtGBrZul%2(a6>Mr{PJzp|*%#O16K@>Q*dfXj%t!GIF$kK?J6 zWwo`^Jj6p&Ih;Ja{7@yGLg&C|e}5570#jRU7FAtOmYmd>i6`6MSlo=x-UUKMN42oB z`l$?peWmYX`(#)4Olz6lS)+{eRc4Ul{b44j#hyt_HEP^s!ofjmg(F%WRXRutXD0_y zF_l3eEui&8Il89_la!Y?sXa%?-RM)F)srwxRRC;% zp14XX&42A8H{S_Tsaf!JsXfg0&t(M?f*1)1clc&$ETO|87N1OEhe5d*%o3(vU*Y96 zPgrs|hH$d)QzX02GmA0c{=tyIg=joHF!z4m4|ZB_d34g%)xaq?Z~QzNc@OQ4QaDuS zlB}2U26TmlTHiUosrFyo(_~Fjrzq`r`bPpjhJn!7rm1oif3ylCdC-RN=W^g{xMQWSK!Y#3; z-oof>nZyp;N!|Qi0H~{X8wA))SO1(cKyPjq!W~PvClyCz7jJInOCiyKcTDQ+@SXx< zu8P*Vzioio{F-q@+H5gSF@9g-lSJ6?zzLd;Xj@R|{lfnQCH?f^gNXF5Oagg*6nTC( z5(f+*ach1y|JzHaIPmg_0^Vx~_MNUDfAhEUY3p}$(la*p_yZjWT(HY*5hG7)TanY>L=D{Ls(NhGbs$TL2?BY9Y(7 zn1(ImZMKZ@14=k{u_Dg_dBbm{0@`(6+N2e1b(Y5bGC|#Z!pFsGKX++tIc&t1=R`gC z$l2tJMDMnOOkgEJAN(gSLpsp4l?6^s=H%MO9+4}yaes2jzb#6nURNI)XeGeN5fDYOfvG>0G zt3^bNQbURwbmUPD<|C(g%uExw@B--SgxoNWcqE+nHGCtf_cCQq?qumA+ErL4b_ksf z53;1@j5c72jE+Vo_1#O_f-z{iF+jcZvOF2~0@oPNFY~H~SsOtsSA!-yEF)v%E2xC9 z&yeQ(LgxK)H`m;J>oz5bBUKf!^Hsh!bZe>07iZ@R>*n)4bcWPw)}AmmLcz<+utM@L zFY6vJfskoRdm7A8$x$-Td5qt)|lUBWJz4`=+W$DJ5$w zkCEPqD)m{z^oNu#oojsKhkfsxd$bl6A+1rtL)v%2!mbO=vCSxahpFp?sC-hq6bn}+ zKtF&@Lc&5@;=pMw8Kq(Iv>RrE=R)txM{!a1Mae?Aj)Tq51Bx3uaa;N^*=B6%N>hJCIHmKU?fRS%6A* z;ts#nIgzNX!11dZWWpF}>G7Gt40q8|09<<7h2E?12^g|{xH74E>n2G<`#EO+((>qD zliL>j1%F0RRgI&B^ZC1<))%q(;j5ee6jA#;qS$4KIIs^#UF2=8vbN{tw!U67!z1!f zL%BSeKJg%?zAImcSnM|Bt4# zjEb`Tx;V|yNOvPccXzkIkkTn7(%s!Xbf zbkNULb%PR>aKXX5k@$0mI7%N-NJ^sQc)ov^OUfF_6DJ@S-HaJ@6xj>XfiPBW>CS8i zr8lLMZU^TrbNRBK=nT?Jf`~xBtBn%>UGJMc-JKGVlA_5u_SvZPyYd$^HF6nXh#O3t z8w@x;G_k)K(|vJSbl;DUPcW%Bb*5D5S9sZ=eBMZdfMi(bmpZM_`Gq?4slqxs^wwnLj+iktMS`hF#VYD1Z9N?+n&EjOy`xWs!OsYyxD#8U1ZLo@mfI5>+ zMK`x4Bnv7-0}B_OTq2Jht8cu1v^%xtOx-H;D~3upSFY0VX2hrvd+wVpcUEQe){EF< ztVyfX7^Fc<2{1Ma)bejIhQXES4=w}+1!?G4=Jeyn^WwUt;U`JF+p|@}t-HC(9P-8Ky*RxZ3)0OuUJ5^Frm!gtpmhRjyh4LA%@de$I5)^NJO0I_# zCPgt256L5Z=EPWK^vrXSz?H(QM4va;@v8k;I5j|Cjn!2ZWnod1Gro86c0uc@`wJ~1vfBtgvS@EX+^9ItBBQ4hC|Cbo~b?g!64?KaX?qb~H#G$ni=->8W;` zW0lKrN^jaLdLQha&T7YdD?rCOx@J6OfJfeG>q1hdSOcpJ7CT<9$d-hy{Xvxf{(K{? zf!rWHhCbl;N729A(#)JrUNAL>c&LM1jcqJELxtQczwCs5HZJ%XzwU;4!LqjX42*!I ziX{0<(thDcxJDFZz)J9c&*6VjfOMxmu(Z|>hPFJ)OuhR@L9;OZlWZ0R?(tSf8 z6@~xeMF-W;MW6+q4IzxB$Z}s}Ou5yK1d8L-yX`_4cLc^aic@h>=f@m(dZ$K|Ii*&j zcLPFBw)uV~6s*lnji96iOrk6s%k(2_dLn1f8<$%!`ni(E|I92dB1?ht{hnvFCj!}X zT|s9w<_CJ;O~wA+--akh?+zn3*e}+`h{R^}3~YXk7!?+V@GJDv_FH7tp~>zXx;_50(dtlUgvCCW&SP7m zBqm%OS(j8x@x5$)v%j};%3Jg*FGObpBgn}4#?hv5R?Ra+G1{K zj1`?Zikq7|b?UgemnBiSIZAjR57}4rUO~e}B-r47hf;_?Abi0hC6M(ljS$Tp;_Y05 zf7glgcWnQ}*bIk4(Ii{P<9l(3zc{Vq@bY3nlq_9jPgXl9!)!R>Dl+1uk(At~iP6w; zaAHQrs`<w2BmqZR7l&iJU4inN!j}5V zI3Vkr7{XRm$4`uWn{N;P{I7M6Z|E>BBDZMAqpbGvqOJ^VjIRbVOEKX#{ypVHgp*5NsH&UY!klKtW zAD=8(st;daT&d7u-sgMEkD|cy{NeGzxr?F(bd^ve==dH%PC2GD|CUfGSIqM4#x`e_ z;PBWVChX#*@x2EBCl4LAwAahOIgXRQBNO7s_Z#;!8J_2UdHK9`SRoziO4on7RQ^sj zfv2UiY%e@t*ZAR5(vHW7LTgFYaq9h-FsV3L(AFAy-B|y`hbn#hsl{}iMq2cKL}llf>u`20_a@DCKP370sm&#`4Mqf(By={C|jL!fp+9KTIXC`yDprcocxwJ6-RYj~RhRAEU)6%!)W_xOhuO(v?nz z6N^5`d^U&HBQ4B~goshi;?2I!bT0(4tj_P>_}jcfi{azkc%7Tb-4d<6=h;!+uWbCO z;uHZ9C!+aqIB;1<)AC6_bPfnjQRYk$dVE=J@o)b$gNBELK0nCyddwh}(CO<@)U;o1 z@Vnqg`5%|nWxq`ewz8XIL$Sa&fKv8iPG;O(3Bpm8Qu;u=qShFZWVz&Q{|zL^PJLuKt8{J(;kp z^$G4L+A$45thWzYS7jLlHNs3nsg71aRMg0zJ&et~ko+APW#`?GUxeKcZ3Z9EDY{3U zei=2c2He!_}HP?FZbHbVom(cVI30{h_@;Xb&!U{loBZp$&-5$|U8s zQjF1uQm}dCc}t$A;*XDy7oF$+brA)67U4yf@WhMGYm{`FHNz#dOZxqK9&XEx^x|)Q zgs=5}b2%H%=Qt2nqwii>ISS?Db)9!Y(;uvIZ~79-^xJNPL*Ch>`~nx?>?~fPCS?b~ zqb%hjk}{P=eU*mHH`C6z!~f#=i9uY(xay%M#=eUp9}G7GnwjUu3g2-?gkg0UDnTQd z^0hP<>5k{(kmJ$&^ox)fN>xZ@TBvnxu!aML9n~UB#U)lK;tXLDZq+c z^!!yrqoxXnD?=}@l$=+vT0l{P8B;)%xztOti5;EPR$z%`{Dkuo& zal~5uW%&7*aJUi^&e1|aH7A#*(Rz^e6wIx+@E1rwAIj0r%hSEZVWZVjhbKFasx**w z*VX06BohcypbN<`_CeWmAqKQGa`ICm5|X~-x^9iEOPkU)-^A`T3aVsG55w z#PGnkI7Iru!LemfFouFnb|&rRHBluvIgnWN3FOrr$vj4T(Yi^34d#kC;gB#KSZm&# z_34(Y=yc281g%R;-WNv8hlu8(*FmKW449{cJv;d|ki(zOIw&i(*r!&VC_tbDa`6Pp z4HvZ9?pGf-504$%MZ?(b}FY*$U-;d0yRoU6sWW zzlycituefOqfZ@mtTFguTn=F*jvcfVd8ds=$Ob)iSZA_v(yklsFYWFw*t_;V?L%YN zYC>uf50Vu%>d@y_u}ayMk1VipJlDV7eskHgJ8%ApLyHsN(=rZHzC;)WQiR`|n~T+1 zeklYXDx_$^q2ragpzJ}2+s%5M#|yQB4>vw-;8VB}uCYM9&|Q`A!3!7p$~w|N@DeBy zDB1!Uz-}BchnC8Lj*ipwU-4%kNKIL#M~qR+2Fu*>QB(AVp(ZHz|5WFtn9^i;?95zT z080mGl4$J(2 zG?wVErQbCj4J6tD8ymaV1#i!PDiN*^&ECFqu^x7t;6I{+EL2daGaZ@&--p3sr&W_; z@(nvPeLm-4dKZ_IB4jSXQBVx+b2B4JRw!*$TEt2WZx#aa82TOhx!u|c{Ok^z^gIpO zuPB>Y^#}49Q>zcDSsTYE^vH!aMn#;9jYSmjwZo;>=r+F=HeTgQinIRK5#+iWIuGI} zL9_}B^jH$?#eGT;x7iPy1&n$IR=vrzSlLp8Vy8713>m_q0%G2o--?%{ zl!n2d%Y%epJ1N6+F(;kOvQU<1mtWh?{hpqo z#Ov*%+zM-MraLFYnqgfp=7uA?h4hZ6E_k5NEl-es=j`t}S{Pm?H73*0Kk-X>9Pi3^zu% zojGb?ZBapJ2zGd*5yF0Ph-9Qi9Ouz=#6j!bZqCeX&2CY_{q8?&wIDl$IK6}8k2kxM z;%|G>4DpN0@Y$7Z*yh&ujT67jav8tzjF;m7fFPh|;jwrBgijQGMUW8rH1yG$RieEN zanU4DRP1San(wFaQi@dNJagLX8#M1&oE;)BnGC^!iE*6*!RkVazkWUb7f;H+E(5ym zbb!Ih9ur>XMMKNyj}0|%(6UX?wibt>=jE_7-$lHxKP=V}`4^kl`ZDY*QHdl+?9)N; zv&&^L=GfYI*wwCDy*r{-;Aj30HpE}KV;Nyh<8BVM@+Whxe2KsfG&0%22#cQ|!iRrdsa})!o*r=t5)F+MO8xg4J;7D;x zdNDWtE5&Af!P*>_5{O4>c7B<^-EDMk^SO6YeEf9l8Jdhe_L*sKNId$6O}dbemVT?@V2Rn zm^04B3thN4^GDO}fOXH?VS%w@;OTMTCCX|`ftcGv4^z1QkzOW>u`KxS4T>}fQ`L6k zleSN|6ph(7JmpUqHIbD>1`2;ftzFZo;-*e}r-h?5-OamQU#y9}GIm1EI*hJJ zvy1pt7yn zpmNzlJo$F|;P{;1yRRKTOh11{5V{@%1Tuo|*~QKS+8-|u8~v`GT}?l_h*LMv>m#kJ zG=tjuD8Sq2*3yF6r$OP^L=+@&o`Ng-b4x!wu~6p`$%u(yJdMcKeqaFzlcmNz6s$gr zQaORnu3PdJg@A8~)t&K{F8$xg1pj4ywq3ODc@HV1$GV!s<1r$RDEC3Q0=s@=#!>9y z%Agh&MGvAjA2L0HOSxzc8{p%{U(VS3L0%X|rkxTXX8T;8Ey|9xzCnUV5QZ(qs11c6 zNqPAfzx?Iz_C5d#^POzE6<|ZSZoWRYHu+RlshH_4(`QA82*s=fmAW;UYVfoDbi&Q| zb73ADelG!%X372wRO^2mLl~s5S2=-C>uZ&U$8GBMrH)9a3ksHZ5)~;BwS?>6$nGx> z*8YkYSFx*|qD_ucln?93>l4w@voj2l?{AHplX1Rm{7f6RM}DLC_j6mtsu1%hZ)%jG zr9g~RN0Fj;V}&z{4N3-q%fM-53W|lAA?cPY$9W@UDnq8s7`2cjrtY<5+;LccEm~HS z%<&IKl9Eo_qstL&O#8VYYC38eG!ovbBG{X>UdoNf7v)x`*XN$#mp}*$LA+C*VWJWu z<%hx#+Aj@NBUG6LgY+53QQp^&7h8YjIfb}T`=eqItywqPO}G2%fD^v@L-g)o{;OZ- zKF*93?@9JTbxv=VK%na(mChLEN2^LNLR7Kv;UA%(R)(UKkO;5nN&O3o#%<&V8duim z564UHHw?-Sob}5^CEwiQL$PrqdV9dImmg__VncB@2{16jSc2yS@bIEyUJFZ5a9;C%^0#r! z6L0YQcz=2+^CunoEO5tt>)(9W-zH?9vN>VJ@FVqM!I>qvs^9?pGdb<1?kXwSD%9Q1tYP)PAG4WH<2%g%_#{|-!y{{z>am1F zQtX}648XZYaw%n!#73bPB$_S63#NmiCd1(ibLp)JO2PyoqL)ipA*2%&@UNDu2Zw+W z;Y^a1eixI4sqbJgGsbh#K9&1FHY`FN zI(Ns09iuBOj-m%mt=DTA|0}vrm@N45JaWBiye{lfeDnOY>ATJ9EX|< zq%l+xQMAo&Wrj3uL;0_DP{eDcZYoT#*q(ELVf}IHiTF6)e3UVnb#O~t?)qPi6?&o>&028>@`$KDrhkrm{ z)%rZsyK9n{>vgM%UmvQVUK1CeGu15It}o}iUxwxB;U-%DX|g?X^X1I*)Iqt{e;mo? zZ-~ptR?3JV`t3Ag%D1l*k>QQ~w+@*}r1hkIr#D##2DcSTB^&Doy4+ZCqNZ^wj&Bpe zy(TGpDv*GV@KNaGvKx`P_b?z0R$LtO3UmuY;g4nuG$GR+CTO zG%+ojVKg`@N<^QOB^d+eU<1M1)To7ppzrV+j>dIicoQ7xY-Wp~hlx|{H0vudG^8Px z=8m_AKdZzOu6F*qQ@`2sP)PV8x5QVLxZd0^A39qV;s1R7qnQ3nU#oP(yt-u#X5;f= z;{|8;3p}6Zp}{JS@;lDCkx$$L^=}+(tQmC+JE+EF9GI-r| z(++RwI!hQ+-?q1cHXJD2s`TBgu<1vnFs(W_{epDh)t|azE{uly>dC2Pm?|^Ph~UB` zDl}R9wKSI!u&-J?YyNU=v4<8tD)GtGOf0JGuyap30uB3F+rIhXTp2!W_h-IPz_7i9 zb+n?gq0;L2zM?Kbw&LYwh;*wa=oIJg4ypOypTbR9(ivnVOHZt%m?^A^2STAc2z}15 zdnkC^>R^!L2Sl=Psdwr4uon5EVOqwghTt?)S)3rQBD`y;?)uX7C)P_T6a^=WUz9~D z(l}C4DN0;JMEkk9S1)JF(cd0nbgeBVxQ8r>G7FUbMKT&DyhIXK9lJZP_yL{D_XtVn zm*TKU4$35t@K>jnT7BwY`Xt@U!;NQ&3NY+H8}5S%dGW4h#sX>D^bXPm_a_I|Hfg*iK}mF&tolLK;p5+2^}9;Or#s9Gflnct9a# zrE_jT7OYt0^!D3|#J3T=0&iGWW&`t`#Do-7-$zS$u_kJ2sSzRmGP$D6turh-%p>J^ zryedP|Dd`R9Q*eH#yMqs1}m&0zJrnYK{;mu2h&}SGtcxgf#ZRT)_eD%YItDqL}ff zh2_SYVDc6lVnvWvEw;z_CmQ`POW#kvA^%O!vA0`^DAr|^{rS&k5L~w7rd0nJ{3c=g zk_Q$%AUhNJc#f$gk)3Td6=uo9XwmZ`QDrEhJn9C0MpT?3~WWxx=R6(beK0 z(Ghp_(^6F2#z@%G8iqZx{_-65b!vnp8}h!Bs~t_ADRMI-t^H!HB~P2Ch2eo5+=Eg^ z@$Of*#)i(=Sb1|`q4Cu0CCW`jE!qq*@8!Z6pkaN9T~!m$ z?Du^~Et3w$z2zLspXOVj+XRXBIJ5HkTBo( z>?4S}-uwDf^~WX>07+Rnvkv4T&A)rP@%*x#On<#_dPj}0Xz0pHz@{G+`1B)Cx=6jJ z^L`_=Y1%jzFvIbOKO9{iek$fV$FnHwv}jn~SWq-)gx8wy63!y9nwQ)O_v9y81vDhF0KzC)oNo+rB3=A_~9v ztN07CWz)yCfTvSlF)Hzw!)d1lZOW@Z#>YA-^}qX7yzYeEZS)U2-zjG`RG@?&n#x2L z8RXxiP*ZVGr#&Aabk{sBdXu9d7Sj>Iw(j72hNwrBLm|bs*$C8y+O$=g)lx?A_y6+( zEcAQ!346v{vkQXKdRbg(hZyaT=FJ;mhFz&EMl-QQAE?^fg)X;3v38mljlY$&FN*$n z1IR01N+Gs>uh#{`l+X9#J#{T#22<64cxH(#5%-1bPm#kkrV4ZM>=F^faN_VO70;|AaU z_v6B77~N)rYLOXHOj2s>1VSQ!k23@66mQLuX~_c+c%N2>%*0H}%$!_Q#|e6zZ^Q#n zQbf6Jy@Riup>VQ_>G_7J>UdiAGA2)qV%IuY-l^K;^|Dh<(Pz8i_t zZYk~(dLzy#N}C?fQ%$565Fo^too;)MH!0LzNI4>4eFy2S=C7d(Grc|H%_J(wd~wgl zVD9Yy_{hKUvS3CodXDdLlswyjOGH5~F`6Gj+vv1_2P#go^vh>1=ga#NQTrz*#xkR7 z_L??Ky{=74geexp^+4I%m*PMIV7i2sw6n50tADs#0j#T63pAb8yM=m)GPv3pz1C0N~#I$%gpnbal}jH2^|)71@AGS zX_vV8ltalRjE-b#M$4eh*Mrj1(t3?$dFcm72>(AM|lW-dC{G{Z1XEID`^MmOl#qr)v&2T%^0vu#5?gTfax4P_Yp6NR~f@FCq5a73hoGe|A z#dR;%OKLTj^PSUu)^(j?;wn)0dX_qrV#JjF3|2^_QqDc7Lt8~m4e#?51ifJ1>M>*Y z&JYL0tC|tL#K@Ic8%GdGjW|6-x)XdtjetkKv)CKcJ~$67fmPB}3bw^djtXzK{|yK$ zW^SL!+}B+bD??J1@5?nSBPLBdcXha{*DPpL1<%nojzTp&ez7WZbfPQkUHn1-;Sp`c z>kR~)=0s?bkQK2 z#f_8!NkUVk6qbL%yWElJ!?@#&47j!nU31-R_rr4mjFK!BshnUTZE>4!mpvsi5wCh% z#>-b_HpvF{o^{W41C+l0NG$%r1U00}JOO98{XEYv(j6TXF=(ld{jZ&0cf+1^$lsM% ze3M%>Jfm1_151L?!iZtQB9)nQJtUBGOv*%tJeON~*Y#7Xv2#Ie2vXg?cChOM%#o0Z z$+ta+sTqI&&Z?58reX}gMx4SFXLC*!6&0T6&kI%BPUM8EKe|C`?U`CKCU#>8;yF`c z7EEOvqIt*?rbK_M-xp$B`XMb$!#L?ITHz+mMjEb4EwlA)hsPkbWRz+DaVs#0sQu<3 zOcAJY;S^C0QRoZDp0fxlAOLbl>q;lvGu9NJ_uFf)W)P3qL%U9t$(NhUDIEGH-iMja z7R!3wEn6S+#WvH+n$oyFT$tth-|25=*AO&=OgrG8?#$+g;_>g8VG-%k)thmBAxc`_ zq+)q-4|as-_4KkwR6?Kk4{cx>J!mD zk9BGd!-Ioq0|=A({KbZduEK4>WgMKG2@C~mA@+5h1fFZo^7D(nduikk2l9dQCcrWt z?RWuIR-ZDv8BDDf4r{q|K8zRLgmoW?_rA7nfmZ0mYr9P*ScQd+YSv!-PaAdvdDg3^u-RV z#ds=f_y58&w3rrwN~7{}-yI;Tu@LnC+wVpL=3?Ls2a*4r;yG_epR1EuO3D|fy@?LF$2=qsPa6;5D1(E$Kj&>NGb%ZB93@eB?=yG zhsQALYR@aZ?uW#OIuHL-afGjdY}&+-Hg)VSD51U@VOYW-&B1YAq{6_!Z<80NM8CMYzFgJe48XT_*fSaQ@MT2+6#G=sg1iGnV6qpLlJ@*$*aI zBjs7h!=YMW1OOo2G1_33Vc40OnKFTI9|{a5NV3Hx#UE6-F(CDU#if_lA6FJgTdN(V4WPUXSWbX;Uw^{9k_c zg<0TSaf$50=}*pxp&IzFdv5w;M9DvR?p%7&Uq=k8LB*>Sqyoo5h#CW=W>C~UbCe|1 zI1Z;#=I;H5)XtOoz_$QEAgv3DtJZ74$uRO@ygOY*qu-8pjI{SNnJoZM=oSCO9ro3I z>+kxC^}0bCV>zXbr*3LGBN;v0pS%E@3vo68<2jkzfJ!WAi;jnSh-7)PHDwOm^ky%cWdTCLC zvFMltT*gF^SP;yGR4jBYn(C>WK}E&}-+Q)d{mwo@UPqBl4rbaleji~hGs23L4{lyJ1H23o2>~k{M4TnILPclB zg&e450-#byRFf}eh3ha0`TE?0-+GJ|Yod6R7$q3{k;R-4`5acFHvj!$_z&p~d_Hg` zyB1)ASOKpCDgjS34)}DdK6gP>#A(iSSN2K(u^K;dY~bZ|wNTlNjCt|_sl}Π`M^ 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 literal 0 HcmV?d00001 From 0219709d1f632e231428447331c4c4b0c7e6092e Mon Sep 17 00:00:00 2001 From: rtyr <36745189+rtyr@users.noreply.github.com> Date: Thu, 6 Oct 2022 22:03:26 +0200 Subject: [PATCH 03/10] Sync with PrusaSlicer-settings. --- resources/profiles/LulzBot.idx | 9 +- resources/profiles/LulzBot.ini | 329 +++++++++++++++++++-------------- 2 files changed, 195 insertions(+), 143 deletions(-) diff --git a/resources/profiles/LulzBot.idx b/resources/profiles/LulzBot.idx index 8638bdbbeb..e182c33dbb 100644 --- a/resources/profiles/LulzBot.idx +++ b/resources/profiles/LulzBot.idx @@ -1,4 +1,5 @@ -min_slic3r_version = 2.3.0-beta2 -0.0.2 Removed obsolete host keys -min_slic3r_version = 2.2.0-alpha3 -0.0.1 Initial version +min_slic3r_version = 2.3.0-beta2 +0.1.0 General rework. Added new print and filament profiles. +0.0.2 Removed obsolete host keys +min_slic3r_version = 2.2.0-alpha3 +0.0.1 Initial version diff --git a/resources/profiles/LulzBot.ini b/resources/profiles/LulzBot.ini index 2338beaee0..3ab6999227 100644 --- a/resources/profiles/LulzBot.ini +++ b/resources/profiles/LulzBot.ini @@ -1,9 +1,10 @@ -# generated by PrusaSlicer 2.1.1+win64 on 2020-02-25 at 01:51:21 UTC +# LulzBot profiles +# Based on community profiles and original profiles from Cura LulzBot Edition. [vendor] # Vendor name will be shown by the Config Wizard. name = LulzBot -config_version = 0.0.2 +config_version = 0.1.0 config_update_url = https://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/LulzBot/ [printer_model:MINI_AERO] @@ -12,18 +13,26 @@ variants = 0.5 technology = FFF #bed_model = mini_bed.stl #bed_texture = mini.svg -default_materials = ColorFabb PLA-PHA @lulzbot;PrintedSolid Jesse PLA @lulzbot +default_materials = Generic PLA @lulzbot; Generic PETG @lulzbot; Jessie PLA @lulzbot [printer_model:TAZ6_AERO] name = Taz6 Aero variants = 0.5 technology = FFF -default_materials = ColorFabb PLA-PHA @lulzbot;PrintedSolid Jesse PLA @lulzbot +default_materials = Generic PLA @lulzbot; Generic PETG @lulzbot; Jessie PLA @lulzbot -[print:0.3mm @lulzbot] +# [printer_model:TAZ_WORKHORSE] +# name = Taz Workhorse +# variants = 0.5 +# technology = FFF +# default_materials = Generic PLA @lulzbot; Generic PETG @lulzbot; Jessie PLA @lulzbot + +[print:*common*] avoid_crossing_perimeters = 0 -bottom_fill_pattern = rectilinear +bottom_fill_pattern = monotonic +top_fill_pattern = monotonic bottom_solid_layers = 3 +top_solid_layers = 4 bridge_acceleration = 500 bridge_angle = 0 bridge_flow_ratio = 1 @@ -34,26 +43,24 @@ compatible_printers = compatible_printers_condition = complete_objects = 0 default_acceleration = 500 -dont_support_bridges = 1 +dont_support_bridges = 0 elefant_foot_compensation = 0 -ensure_vertical_shell_thickness = 0 +ensure_vertical_shell_thickness = 1 +extra_perimeters = 0 external_perimeter_extrusion_width = 0.56 -external_perimeter_speed = 50% +external_perimeter_speed = 35 external_perimeters_first = 0 -extra_perimeters = 1 -extruder_clearance_height = 20 -extruder_clearance_radius = 20 extrusion_width = 0.56 fill_angle = 45 fill_density = 20% -fill_pattern = gyroid +fill_pattern = grid first_layer_acceleration = 500 first_layer_extrusion_width = 0.6 -first_layer_height = 100% -first_layer_speed = 40% +first_layer_height = 0.3 +first_layer_speed = 15 gap_fill_speed = 20 -gcode_comments = 0 -gcode_label_objects = 0 +infill_anchor = 1 +infill_anchor_max = 20 infill_acceleration = 500 infill_every_layers = 1 infill_extruder = 1 @@ -62,33 +69,31 @@ infill_first = 0 infill_only_where_needed = 0 infill_overlap = 25% infill_speed = 60 -inherits = -interface_shells = 0 -layer_height = 0.3 +layer_height = 0.25 max_print_speed = 80 max_volumetric_speed = 0 min_skirt_length = 0 -notes = -only_retract_when_crossing_perimeters = 1 +only_retract_when_crossing_perimeters = 0 ooze_prevention = 0 output_filename_format = [printer_settings_id]_[input_filename_base]_[layer_height]_[filament_type]_[print_time].gcode overhangs = 1 perimeter_acceleration = 500 perimeter_extruder = 1 perimeter_extrusion_width = 0.56 -perimeter_speed = 60 +perimeter_speed = 45 perimeters = 3 post_process = raft_layers = 0 +raft_first_layer_density = 70 resolution = 0 -seam_position = nearest +seam_position = aligned single_extruder_multi_material_priming = 1 skirt_distance = 3 skirt_height = 1 skirts = 3 slice_closing_radius = 0.049 -small_perimeter_speed = 15 -solid_infill_below_area = 70 +small_perimeter_speed = 22 +solid_infill_below_area = 0 solid_infill_every_layers = 0 solid_infill_extruder = 1 solid_infill_extrusion_width = 0.56 @@ -96,7 +101,7 @@ solid_infill_speed = 60 spiral_vase = 0 standby_temperature_delta = -5 support_material = 0 -support_material_angle = 0 +support_material_angle = 45 support_material_auto = 1 support_material_buildplate_only = 0 support_material_contact_distance = 0.2 @@ -110,17 +115,14 @@ support_material_interface_spacing = 0 support_material_interface_speed = 100% support_material_pattern = rectilinear support_material_spacing = 2.5 -support_material_speed = 60 +support_material_speed = 50 support_material_synchronize_layers = 0 support_material_threshold = 0 support_material_with_sheath = 1 -support_material_xy_spacing = 50% +support_material_xy_spacing = 60% thin_walls = 1 -threads = 12 -top_fill_pattern = rectilinear top_infill_extrusion_width = 0.52 top_solid_infill_speed = 40 -top_solid_layers = 3 travel_speed = 175 wipe_tower = 0 wipe_tower_bridging = 10 @@ -130,121 +132,116 @@ wipe_tower_x = 180 wipe_tower_y = 140 xy_size_compensation = 0 +[print:0.14mm DETAIL @lulzbot] +inherits = *common* +layer_height = 0.14 +bottom_solid_layers = 8 +top_solid_layers = 8 +infill_speed = 40 +solid_infill_speed = 50 +perimeter_speed = 35 +external_perimeter_speed = 30 +top_solid_infill_speed = 40 + +[print:0.25mm STANDARD @lulzbot] +inherits = *common* + +[print:0.30mm SPEED @lulzbot] +inherits = *common* +renamed_from = "0.3mm @lulzbot" +layer_height = 0.3 +seam_position = nearest +top_solid_layers = 3 +infill_speed = 45 +perimeter_speed = 40 +external_perimeter_speed = 35 + [filament:ColorFabb PLA-PHA @lulzbot] filament_vendor = ColorFabb bed_temperature = 60 bridge_fan_speed = 100 -compatible_printers = -compatible_printers_condition = -compatible_prints = -compatible_prints_condition = cooling = 1 disable_fan_first_layers = 3 end_filament_gcode = "; Filament-specific end gcode \n;END gcode for filament\n" extrusion_multiplier = 1 -fan_always_on = 0 +fan_always_on = 1 fan_below_layer_time = 60 filament_colour = #29B2B2 -filament_cooling_final_speed = 3.4 -filament_cooling_initial_speed = 2.2 -filament_cooling_moves = 4 filament_cost = 0 filament_density = 1.25 -filament_deretract_speed = nil filament_diameter = 2.85 -filament_load_time = 0 -filament_loading_speed = 28 -filament_loading_speed_start = 3 -filament_max_volumetric_speed = 0 -filament_minimal_purge_on_wipe_tower = 15 -filament_notes = "" -filament_ramming_parameters = "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" -filament_retract_before_travel = nil -filament_retract_before_wipe = nil -filament_retract_layer_change = nil -filament_retract_length = nil -filament_retract_lift = nil -filament_retract_lift_above = nil -filament_retract_lift_below = nil -filament_retract_restart_extra = nil -filament_retract_speed = nil filament_soluble = 0 -filament_toolchange_delay = 0 filament_type = PLA -filament_unload_time = 0 -filament_unloading_speed = 90 -filament_unloading_speed_start = 100 -filament_wipe = nil first_layer_bed_temperature = 60 first_layer_temperature = 200 -inherits = max_fan_speed = 100 min_fan_speed = 35 min_print_speed = 10 -slowdown_below_layer_time = 5 +slowdown_below_layer_time = 10 start_filament_gcode = "; Filament gcode\n" temperature = 200 -[filament:PrintedSolid Jesse PLA @lulzbot] -filament_vendor = PrintedSolid +[filament:Jessie PLA @lulzbot] +filament_vendor = Printed Solid +renamed_from = "PrintedSolid Jesse PLA @lulzbot" bed_temperature = 60 bridge_fan_speed = 100 -compatible_printers = -compatible_printers_condition = -compatible_prints = -compatible_prints_condition = cooling = 1 disable_fan_first_layers = 3 end_filament_gcode = "; Filament-specific end gcode \n;END gcode for filament\n" extrusion_multiplier = 1 -fan_always_on = 0 +fan_always_on = 1 fan_below_layer_time = 60 filament_colour = #29B2B2 -filament_cooling_final_speed = 3.4 -filament_cooling_initial_speed = 2.2 -filament_cooling_moves = 4 filament_cost = 27 -filament_density = 1.25 -filament_deretract_speed = nil +filament_density = 1.24 filament_diameter = 2.85 -filament_load_time = 0 -filament_loading_speed = 28 -filament_loading_speed_start = 3 -filament_max_volumetric_speed = 0 -filament_minimal_purge_on_wipe_tower = 15 -filament_notes = "" -filament_ramming_parameters = "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" -filament_retract_before_travel = nil -filament_retract_before_wipe = nil -filament_retract_layer_change = nil -filament_retract_length = nil -filament_retract_lift = nil -filament_retract_lift_above = nil -filament_retract_lift_below = nil -filament_retract_restart_extra = nil -filament_retract_speed = nil -filament_soluble = 0 -filament_toolchange_delay = 0 filament_type = PLA -filament_unload_time = 0 -filament_unloading_speed = 90 -filament_unloading_speed_start = 100 -filament_wipe = nil first_layer_bed_temperature = 60 first_layer_temperature = 220 -inherits = max_fan_speed = 100 -min_fan_speed = 35 +min_fan_speed = 80 min_print_speed = 10 -slowdown_below_layer_time = 5 +slowdown_below_layer_time = 10 start_filament_gcode = "; Filament gcode\n" temperature = 220 +[filament:Generic PLA @lulzbot] +inherits = Jessie PLA @lulzbot +filament_vendor = Generic + +[filament:Generic PETG @lulzbot] +filament_vendor = Generic +bed_temperature = 60 +first_layer_bed_temperature = 65 +first_layer_temperature = 235 +temperature = 230 +bridge_fan_speed = 100 +cooling = 1 +disable_fan_first_layers = 3 +end_filament_gcode = "; Filament-specific end gcode \n;END gcode for filament\n" +extrusion_multiplier = 1 +fan_always_on = 1 +fan_below_layer_time = 60 +filament_colour = #29B2B2 +filament_cost = 27 +filament_density = 1.27 +filament_diameter = 2.85 +filament_notes = "Use glue stick." +filament_soluble = 0 +filament_toolchange_delay = 0 +filament_type = PETG +max_fan_speed = 80 +min_fan_speed = 40 +min_print_speed = 10 +slowdown_below_layer_time = 10 +start_filament_gcode = "; Filament gcode\n" + [printer:Mini Aero 0.5mm] printer_model = MINI_AERO printer_variant = 0.5 -default_print_profile = 0.3mm @lulzbot -default_filament_profile = PrintedSolid Jesse PLA @lulzbot +default_print_profile = 0.25mm STANDARD @lulzbot +default_filament_profile = Jessie PLA @lulzbot bed_shape = 0x0,154x0,154x154,0x154 before_layer_gcode = between_objects_gcode = @@ -259,22 +256,23 @@ gcode_flavor = marlin high_current_on_filament_swap = 0 inherits = layer_gcode = -machine_max_acceleration_e = 10000,5000 -machine_max_acceleration_extruding = 1500,1250 -machine_max_acceleration_retracting = 1500,1250 -machine_max_acceleration_x = 9000,1000 -machine_max_acceleration_y = 9000,1000 -machine_max_acceleration_z = 100,200 -machine_max_feedrate_e = 40,120 -machine_max_feedrate_x = 800,200 -machine_max_feedrate_y = 800,200 -machine_max_feedrate_z = 8,12 -machine_max_jerk_e = 2.5,2.5 -machine_max_jerk_x = 20,10 -machine_max_jerk_y = 20,10 -machine_max_jerk_z = 0.2,0.4 -machine_min_extruding_rate = 0,0 -machine_min_travel_rate = 0,0 +machine_max_acceleration_e = 10000 +machine_max_acceleration_extruding = 1500 +machine_max_acceleration_retracting = 1500 +machine_max_acceleration_x = 9000 +machine_max_acceleration_y = 9000 +machine_max_acceleration_z = 100 +machine_max_feedrate_e = 40 +machine_max_feedrate_x = 300 +machine_max_feedrate_y = 300 +machine_max_feedrate_z = 8 +machine_max_jerk_e = 2.5 +machine_max_jerk_x = 20 +machine_max_jerk_y = 20 +machine_max_jerk_z = 0.2 +machine_min_extruding_rate = 0 +machine_min_travel_rate = 0 +machine_limits_usage = time_estimate_only max_layer_height = 0 max_print_height = 158 min_layer_height = 0.07 @@ -292,7 +290,7 @@ retract_lift_above = 0 retract_lift_below = 0 retract_restart_extra = 0 retract_restart_extra_toolchange = 0 -retract_speed = 40 +retract_speed = 30 silent_mode = 0 single_extruder_multi_material = 0 start_gcode = ;This G-Code has been generated specifically for the LulzBot Mini with Aerosturder\nM73 P0 ; clear GLCD progress bar\nM75 ; start GLCD timer\nG26 ; clear potential 'probe fail' condition\nM107 ; disable fans\nM420 S0 ; disable leveling matrix\nG90 ; absolute positioning\nM82 ; set extruder to absolute mode\nG92 E0 ; set extruder position to 0\nM140 S{first_layer_bed_temperature[0]} ; start bed heating up\nG28; home all axes\nG0 X0 Y187 Z156 F200 ; move away from endstops\nM109 R{first_layer_temperature[0] - 60} ; soften filament before retraction\n;G1 E-15 F75 ; retract filament (LulzBot Cura is apparently trying to cold pull, might be a contributing factor to hob gear filling with filament)\nM109 R{first_layer_temperature[0] - 60} ; wait for extruder to reach wiping temp\nG1 X45 Y173 F11520 ; move above wiper pad\nG1 Z0 F1200 ; push nozzle into wiper\nG1 X42 Y173 Z-.5 F4000 ; wiping\nG1 X52 Y171 Z-.5 F4000 ; wiping\nG1 X42 Y173 Z0 F4000 ; wiping\nG1 X52 Y171 F4000 ; wiping\nG1 X42 Y173 F4000 ; wiping\nG1 X52 Y171 F4000 ; wiping\nG1 X42 Y173 F4000 ; wiping\nG1 X52 Y171 F4000 ; wiping\nG1 X57 Y173 F4000 ; wiping\nG1 X77 Y171 F4000 ; wiping\nG1 X57 Y173 F4000 ; wiping\nG1 X77 Y171 F4000 ; wiping\nG1 X57 Y173 F4000 ; wiping\nG1 X87 Y171 F4000 ; wiping\nG1 X77 Y173 F4000 ; wiping\nG1 X97 Y171 F4000 ; wiping\nG1 X77 Y173 F4000 ; wiping\nG1 X97 Y171 F4000 ; wiping\nG1 X77 Y173 F4000 ; wiping\nG1 X97 Y171 F4000 ; wiping\nG1 X107 Y173 F4000 ; wiping\nG1 X97 Y171 F4000 ; wiping\nG1 X107 Y173 F4000 ; wiping\nG1 X97 Y171 F4000 ; wiping\nG1 X107 Y173 F4000 ; wiping\nG1 X112 Y171 Z-0.5 F1000 ; wiping\nG1 Z10 ; raise extruder\nG28 X0 Y0 ; home X and Y\nG0 X0 Y187 F200 ; move away from endstops\nM109 R{first_layer_temperature[0] - 60} ; wait for extruder to reach probe temp\nM204 S300 ; set probing acceleration\nG29 ; start auto-leveling sequence\nM420 S1 ; enable leveling matrix\nM425 Z ; use measured Z backlash for compensation\nM425 Z F0 ; turn off measured Z backlash compensation. (if activated in the quality settings, this command will automatically be ignored)\nM204 S2000 ; restore standard acceleration\nG28 X0 Y0 ; re-home to account for build variance of earlier mini builds\nG0 X0 Y187 F200 ; move away from endstops\nG0 Y152 F4000 ; move in front of wiper pad\nG4 S1 ; pause\nM400 ; wait for moves to finish\nM117 Heating... ; progress indicator message on LCD\nM109 R{first_layer_temperature[0]} ; wait for extruder to reach printing temp\nM190 R{first_layer_bed_temperature[0]} ; wait for bed to reach printing temp\nG1 Z2 E0 F75 ; prime tiny bit of filament into the nozzle\nM117 Mini Printing... ; progress indicator message on LCD\nM221 S74 ; Printer specific extrusion modifier. @@ -308,8 +306,8 @@ z_offset = 0 [printer:Taz6 Aero 0.5mm] printer_model = TAZ6_AERO printer_variant = 0.5 -default_print_profile = 0.3mm @lulzbot -default_filament_profile = PrintedSolid Jesse PLA @lulzbot +default_print_profile = 0.25mm STANDARD @lulzbot +default_filament_profile = Jessie PLA @lulzbot bed_shape = 0x0,280x0,280x280,0x280 before_layer_gcode = between_objects_gcode = @@ -324,22 +322,23 @@ gcode_flavor = marlin high_current_on_filament_swap = 0 inherits = layer_gcode = -machine_max_acceleration_e = 1000,5000 -machine_max_acceleration_extruding = 1000,1250 -machine_max_acceleration_retracting = 1000,1250 -machine_max_acceleration_x = 9000,1000 -machine_max_acceleration_y = 9000,1000 -machine_max_acceleration_z = 100,200 -machine_max_feedrate_e = 40,120 -machine_max_feedrate_x = 800,200 -machine_max_feedrate_y = 800,200 -machine_max_feedrate_z = 3,12 -machine_max_jerk_e = 2.5,2.5 -machine_max_jerk_x = 12,10 -machine_max_jerk_y = 12,10 -machine_max_jerk_z = 0.2,0.4 -machine_min_extruding_rate = 0,0 -machine_min_travel_rate = 0,0 +machine_max_acceleration_e = 1000 +machine_max_acceleration_extruding = 500 +machine_max_acceleration_retracting = 1000 +machine_max_acceleration_x = 9000 +machine_max_acceleration_y = 9000 +machine_max_acceleration_z = 100 +machine_max_feedrate_e = 40 +machine_max_feedrate_x = 300 +machine_max_feedrate_y = 300 +machine_max_feedrate_z = 3 +machine_max_jerk_e = 10 +machine_max_jerk_x = 8 +machine_max_jerk_y = 8 +machine_max_jerk_z = 0.4 +machine_min_extruding_rate = 0 +machine_min_travel_rate = 0 +machine_limits_usage = time_estimate_only max_layer_height = 0 max_print_height = 250 min_layer_height = 0.07 @@ -358,7 +357,7 @@ retract_lift_above = 0 retract_lift_below = 0 retract_restart_extra = 0 retract_restart_extra_toolchange = 0 -retract_speed = 40 +retract_speed = 30 silent_mode = 0 single_extruder_multi_material = 0 start_gcode = ;This G-Code has been generated specifically for the LulzBot TAZ 6 with Aerosturder\nM73 P0 ; clear GLCD progress bar\nM75 ; start GLCD timer\nG26 ; clear potential 'probe fail' condition\nM107 ; disable fans\nM420 S0 ; disable leveling matrix\nG90 ; absolute positioning\nM82 ; set extruder to absolute mode\nG92 E0 ; set extruder position to 0\nM140 S{first_layer_bed_temperature[0]} ; start bed heating up\nG28 XY ; home X and Y\nG1 X-19 Y258 F1000 ; move to safe homing position\nM109 R{first_layer_temperature[0] - 60} ; soften filament before homing Z\nG28 Z ; home Z\nG1 E-15 F100 ; retract filament\nM109 R{first_layer_temperature[0] - 60} ; wait for extruder to reach wiping temp\nG1 X-15 Y100 F3000 ; move above wiper pad\nG1 Z1 ; push nozzle into wiper\nG1 X-17 Y95 F1000 ; slow wipe\nG1 X-17 Y90 F1000 ; slow wipe\nG1 X-17 Y85 F1000 ; slow wipe\nG1 X-15 Y90 F1000 ; slow wipe\nG1 X-17 Y80 F1000 ; slow wipe\nG1 X-15 Y95 F1000 ; slow wipe\nG1 X-17 Y75 F2000 ; fast wipe\nG1 X-15 Y65 F2000 ; fast wipe\nG1 X-17 Y70 F2000 ; fast wipe\nG1 X-15 Y60 F2000 ; fast wipe\nG1 X-17 Y55 F2000 ; fast wipe\nG1 X-15 Y50 F2000 ; fast wipe\nG1 X-17 Y40 F2000 ; fast wipe\nG1 X-15 Y45 F2000 ; fast wipe\nG1 X-17 Y35 F2000 ; fast wipe\nG1 X-15 Y40 F2000 ; fast wipe\nG1 X-17 Y70 F2000 ; fast wipe\nG1 X-15 Y30 Z2 F2000 ; fast wipe\nG1 X-17 Y35 F2000 ; fast wipe\nG1 X-15 Y25 F2000 ; fast wipe\nG1 X-17 Y30 F2000 ; fast wipe\nG1 X-15 Y25 Z1.5 F1000 ; slow wipe\nG1 X-17 Y23 F1000 ; slow wipe\nG1 Z10 ; raise extruder\nM109 R{first_layer_temperature[0] - 60} ; wait for extruder to reach probe temp\nG1 X-9 Y-9 ; move above first probe point\nM204 S100 ; set probing acceleration\nG29 ; start auto-leveling sequence\nM420 S1 ; enable leveling matrix\nM425 Z ; use measured Z backlash for compensation\nM425 Z F0 ; turn off measured Z backlash compensation. (if activated in the quality settings, this command will automatically be ignored)\nM204 S500 ; restore standard acceleration\nG1 X0 Y0 Z15 F5000 ; move up off last probe point\nG4 S1 ; pause\nM400 ; wait for moves to finish\nM117 Heating... ; progress indicator message on LCD\nM109 R{first_layer_temperature[0]} ; wait for extruder to reach printing temp\nM190 R{first_layer_bed_temperature[0]} ; wait for bed to reach printing temp\nG1 Z2 E0 F75 ; prime tiny bit of filament into the nozzle\nM117 TAZ 6 Printing... ; progress indicator message on LCD\n @@ -370,3 +369,55 @@ use_volumetric_e = 0 variable_layer_height = 1 wipe = 1 z_offset = 0 + +# [printer:Taz Workhorse 0.5mm] +# printer_model = TAZ_WORKHORSE +# printer_variant = 0.5 +# printer_technology = FFF +# default_print_profile = 0.25mm STANDARD @lulzbot +# default_filament_profile = Jessie PLA @lulzbot +# bed_shape = 0x0,280x0,280x280,0x280 +# deretract_speed = 20 +# end_gcode = M400 ; wait for moves to finish\nM140 S40 ; start bed cooling\nM104 S0 ; disable hotend\nM107 ; disable fans\nG91 ; relative positioning\nG1 E-1 F300 ; filament retraction to release pressure\nG1 Z20 E-5 X-20 Y-20 F3000 ; lift up and retract even more filament\nG1 E6 ; re-prime extruder\nM117 Cooling please wait ; progress indicator message on LCD\nG90 ; absolute positioning\nG1 Y0 F3000 ; move to cooling position\nM190 R40 ; wait for bed to cool down to removal temp\nG1 Y280 F3000 ; present finished print\nM140 S0; cool downs\nM77 ; stop GLCD timer\nM84 ; disable steppers\nG90 ; absolute positioning\nM117 Print Complete. ; print complete message\n +# extra_loading_move = -2 +# extruder_colour = "" +# extruder_offset = 0x0 +# gcode_flavor = marlin +# high_current_on_filament_swap = 0 +# machine_max_acceleration_e = 3000 +# machine_max_acceleration_extruding = 500 +# machine_max_acceleration_retracting = 2000 +# machine_max_acceleration_x = 9000 +# machine_max_acceleration_y = 9000 +# machine_max_acceleration_z = 100 +# machine_max_feedrate_e = 40 +# machine_max_feedrate_x = 300 +# machine_max_feedrate_y = 300 +# machine_max_feedrate_z = 25 +# machine_max_jerk_e = 10 +# machine_max_jerk_x = 8 +# machine_max_jerk_y = 8 +# machine_max_jerk_z = 0.4 +# machine_min_extruding_rate = 0 +# machine_min_travel_rate = 0 +# machine_limits_usage = time_estimate_only +# max_layer_height = 0 +# max_print_height = 285 +# min_layer_height = 0.07 +# nozzle_diameter = 0.5 +# remaining_times = 0 +# retract_before_travel = 2 +# retract_before_wipe = 0% +# retract_layer_change = 0 +# retract_length = 2 +# retract_length_toolchange = 10 +# retract_lift = 0 +# retract_speed = 40 +# silent_mode = 0 +# single_extruder_multi_material = 0 +# start_gcode = ;This G-Code has been generated specifically for the LulzBot TAZ Workhorse with HE Tool Head\n;\n;The following lines can be uncommented for printer specific fine tuning\n;More information can be found at https://marlinfw.org/meta/gcode/\n;\n;M92 E420 ;Set Axis Steps-per-unit\n;M301 P21.0 I1.78 D61.93 ;Set Hotend PID\n;M906 E160 ;Digipot Motor Current ((875mA-750)/5+135) = 160\n;\nM73 P0 ; clear GLCD progress bar\nM75 ; start GLCD timer\nG26 ; clear potential 'probe fail' condition\nM107 ; disable fans\nM420 S0 ; disable previous leveling matrix\nG90 ; absolute positioning\nM82 ; set extruder to absolute mode\nG92 E0 ; set extruder position to 0\nM140 S{first_layer_bed_temperature[0]} ; start bed heating up\nM109 R{first_layer_temperature[0] - 60} ; soften filament before homing Z\nG28 ; Home all axis\nG1 E-15 F100 ; retract filament\nM109 R{first_layer_temperature[0] - 60} ; wait for extruder to reach wiping temp\n;M206 X0 Y0 Z0 ; uncomment to adjust wipe position (+X ~ nozzle moves left)(+Y ~ nozzle moves forward)(+Z ~ nozzle moves down)\nG12 ; wiping sequence\nM206 X0 Y0 Z0 ; reseting stock nozzle position ### CAUTION: changing this line can affect print quality ###\nM109 R{first_layer_temperature[0] - 60} ; wait for extruder to reach probe temp\nG1 X288 Y-10 F4000; move above first probe point\nM204 S100 ; set probing acceleration\nG29 ; start auto-leveling sequence\nM420 S1 ; activate bed level matrix\nM425 Z ; use measured Z backlash for compensation\nM425 Z F0 ; turn off measured Z backlash compensation. (if activated in the quality settings, this command will automatically be ignored)\nM204 S500 ; restore standard acceleration\nG1 X0 Y0 Z15 F5000 ; move up off last probe point\nG4 S1 ; pause\nM400 ; wait for moves to finish\nM117 Heating... ; progress indicator message on LCD\nM109 R{first_layer_temperature[0]} ; wait for extruder to reach printing temp\nM190 R{first_layer_bed_temperature[0]} ; wait for bed to reach printing temp\nG1 Z2 E0 F75 ; prime tiny bit of filament into the nozzle\nM117 TAZ Workhorse Printing... ; progress indicator message on LCD +# use_relative_e_distances = 0 +# use_volumetric_e = 0 +# variable_layer_height = 1 +# wipe = 1 +# z_offset = 0 From 493ada15a59a6cc6267a5e10681dab3d8a30823f Mon Sep 17 00:00:00 2001 From: Vojtech Bubnik Date: Mon, 10 Oct 2022 14:14:18 +0200 Subject: [PATCH 04/10] WIP TreeSupports: fix of calculatePlaceables() by Thomas Rahm --- src/libslic3r/TreeModelVolumes.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/libslic3r/TreeModelVolumes.cpp b/src/libslic3r/TreeModelVolumes.cpp index ad27e78712..41e78e45b1 100644 --- a/src/libslic3r/TreeModelVolumes.cpp +++ b/src/libslic3r/TreeModelVolumes.cpp @@ -666,7 +666,13 @@ void TreeModelVolumes::calculatePlaceables(const coord_t radius, const LayerInde tbb::parallel_for(tbb::blocked_range(std::max(1, start_layer), max_required_layer + 1), [this, &data, radius, start_layer](const tbb::blocked_range& range) { for (LayerIndex layer_idx = range.begin(); layer_idx < range.end(); ++ layer_idx) - data[layer_idx - start_layer] = offset(union_ex(getPlaceableAreas(0, layer_idx)), - radius, jtMiter, 1.2); + data[layer_idx - start_layer] = offset( + union_ex(getPlaceableAreas(0, layer_idx)), + // As a placeable area is calculated by (collision of the layer below) - (collision of the current layer) and the collision is offset by xy_distance, + // it can happen that a small line is considered a flat area to place something onto, even though it is mostly + // xy_distance that cant support it. Making the area smaller by xy_distance fixes this. + - (radius + m_current_min_xy_dist + m_current_min_xy_dist_delta), + jtMiter, 1.2); }); #ifdef SLIC3R_TREESUPPORTS_PROGRESS { From 5cba1e83199c017e07b22abca96d774c44f0a571 Mon Sep 17 00:00:00 2001 From: Vojtech Bubnik Date: Mon, 10 Oct 2022 14:14:55 +0200 Subject: [PATCH 05/10] Improved Point.hpp to_2d() and to_3d() templates to accept Eigen expressions --- src/libslic3r/Point.hpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/libslic3r/Point.hpp b/src/libslic3r/Point.hpp index da558e4388..949ddbad1f 100644 --- a/src/libslic3r/Point.hpp +++ b/src/libslic3r/Point.hpp @@ -111,11 +111,17 @@ inline double angle(const Eigen::MatrixBase &v1, const Eigen::MatrixBas return atan2(cross2(v1d, v2d), v1d.dot(v2d)); } -template -Eigen::Matrix to_2d(const Eigen::MatrixBase> &ptN) { return { ptN.x(), ptN.y() }; } +template +Eigen::Matrix to_2d(const Eigen::MatrixBase &ptN) { + static_assert(Derived::IsVectorAtCompileTime && int(Derived::SizeAtCompileTime) >= 3, "to_2d(): first parameter is not a 3D or higher dimensional vector"); + return { ptN.x(), ptN.y() }; +} -template -Eigen::Matrix to_3d(const Eigen::MatrixBase> & pt, const T z) { return { pt.x(), pt.y(), z }; } +template +inline Eigen::Matrix to_3d(const Eigen::MatrixBase &pt, const typename Derived::Scalar z) { + static_assert(Derived::IsVectorAtCompileTime && int(Derived::SizeAtCompileTime) == 2, "to_3d(): first parameter is not a 2D vector"); + return { pt.x(), pt.y(), z }; +} inline Vec2d unscale(coord_t x, coord_t y) { return Vec2d(unscale(x), unscale(y)); } inline Vec2d unscale(const Vec2crd &pt) { return Vec2d(unscale(pt.x()), unscale(pt.y())); } From 5cb4b633259eedf2fbfe4daf963415e5f58e26e2 Mon Sep 17 00:00:00 2001 From: Vojtech Bubnik Date: Mon, 10 Oct 2022 14:19:06 +0200 Subject: [PATCH 06/10] WIP TreeSupports: Experimental code draw_branches() to produce trees with circular cross section --- src/libslic3r/TreeSupport.cpp | 514 +++++++++++++++++++++++++++++++++- 1 file changed, 508 insertions(+), 6 deletions(-) diff --git a/src/libslic3r/TreeSupport.cpp b/src/libslic3r/TreeSupport.cpp index c408b2f85b..b440818a8a 100644 --- a/src/libslic3r/TreeSupport.cpp +++ b/src/libslic3r/TreeSupport.cpp @@ -19,6 +19,9 @@ #include "Polyline.hpp" #include "MutablePolygon.hpp" #include "SupportMaterial.hpp" +#include "TriangleMeshSlicer.hpp" +#include "OpenVDBUtils.hpp" +#include #include #include @@ -26,6 +29,7 @@ #include #include #include +#include #ifdef _WIN32 #include //todo Remove! ONLY FOR PUBLIC BETA!! #endif // _WIN32 @@ -97,6 +101,20 @@ static inline void validate_range(const LineInformations &lines) validate_range(l); } +static inline void check_self_intersections(const Polygons &polygons, const std::string_view message) +{ +#ifdef _WIN32 + if (!intersecting_edges(polygons).empty()) + ::MessageBoxA(nullptr, (std::string("TreeSupport infill self intersections: ") + std::string(message)).c_str(), "Bug detected!", MB_OK | MB_SYSTEMMODAL | MB_SETFOREGROUND | MB_ICONWARNING); +#endif // _WIN32 +} +static inline void check_self_intersections(const ExPolygon &expoly, const std::string_view message) +{ +#ifdef _WIN32 + check_self_intersections(to_polygons(expoly), message); +#endif // _WIN32 +} + static inline void clip_for_diff(const Polygon &src, const BoundingBox &bbox, Polygon &out) { out.clear(); @@ -323,6 +341,7 @@ void tree_supports_show_error(std::string message, bool critical) lower_layer.lslices); overhangs = overhangs.empty() ? std::move(enforced_overhangs) : union_(overhangs, enforced_overhangs); } + check_self_intersections(overhangs, "generate_overhangs"); out[layer_id] = std::move(overhangs); } }); @@ -675,7 +694,10 @@ static std::optional> polyline_sample_next_point_at_dis return lines; #else #ifdef _WIN32 - if (! BoundingBox(Point::new_scale(-170., -170.), Point::new_scale(170., 170.)).contains(get_extents(polygon))) + // Max dimensions for MK3 +// if (! BoundingBox(Point::new_scale(-170., -170.), Point::new_scale(170., 170.)).contains(get_extents(polygon))) + // Max dimensions for XL + if (! BoundingBox(Point::new_scale(-250., -250.), Point::new_scale(250., 250.)).contains(get_extents(polygon))) ::MessageBoxA(nullptr, "TreeSupport infill kravsky", "Bug detected!", MB_OK | MB_SYSTEMMODAL | MB_SETFOREGROUND | MB_ICONWARNING); #endif // _WIN32 @@ -702,10 +724,7 @@ static std::optional> polyline_sample_next_point_at_dis ::MessageBoxA(nullptr, "TreeSupport infill negative area", "Bug detected!", MB_OK | MB_SYSTEMMODAL | MB_SETFOREGROUND | MB_ICONWARNING); #endif // _WIN32 assert(intersecting_edges(to_polygons(expoly)).empty()); -#ifdef _WIN32 - if (! intersecting_edges(to_polygons(expoly)).empty()) - ::MessageBoxA(nullptr, "TreeSupport infill self intersections", "Bug detected!", MB_OK | MB_SYSTEMMODAL | MB_SETFOREGROUND | MB_ICONWARNING); -#endif // _WIN32 + check_self_intersections(expoly, "generate_support_infill_lines"); Surface surface(stInternal, std::move(expoly)); try { Polylines pl = filler->fill_surface(&surface, fill_params); @@ -831,6 +850,11 @@ static std::optional> polyline_sample_next_point_at_dis return union_(ret); } +static double layer_z(const SlicingParameters &slicing_params, const size_t layer_idx) +{ + return slicing_params.object_print_z_min + slicing_params.first_object_layer_height + layer_idx * slicing_params.layer_height; +} + static inline SupportGeneratorLayer& layer_initialize( SupportGeneratorLayer &layer_new, const SupporLayerType layer_type, @@ -838,7 +862,7 @@ static inline SupportGeneratorLayer& layer_initialize( const size_t layer_idx) { layer_new.layer_type = layer_type; - layer_new.print_z = slicing_params.object_print_z_min + slicing_params.first_object_layer_height + layer_idx * slicing_params.layer_height; + layer_new.print_z = layer_z(slicing_params, layer_idx); layer_new.height = layer_idx == 0 ? slicing_params.first_object_layer_height : slicing_params.layer_height; layer_new.bottom_z = layer_idx == 0 ? slicing_params.object_print_z_min : layer_new.print_z - layer_new.height; return layer_new; @@ -1082,6 +1106,8 @@ static void generate_initial_areas( overhang_regular = mesh_group_settings.support_offset == 0 ? overhang_raw : safe_offset_inc(overhang_raw, mesh_group_settings.support_offset, relevant_forbidden, mesh_config.min_radius * 1.75 + mesh_config.xy_min_distance, 0, 1); + check_self_intersections(overhang_regular, "overhang_regular1"); + // offset ensures that areas that could be supported by a part of a support line, are not considered unsupported overhang Polygons remaining_overhang = intersection( diff(mesh_group_settings.support_offset == 0 ? @@ -1108,6 +1134,7 @@ static void generate_initial_areas( remaining_overhang = diff(remaining_overhang, safe_offset_inc(overhang_regular, 1.5 * extra_total_offset_acc, raw_collision, offset_step, 0, 1)); // Extending the overhangs by the inflated remaining overhangs. overhang_regular = union_(overhang_regular, diff(safe_offset_inc(remaining_overhang, extra_total_offset_acc, raw_collision, offset_step, 0, 1), relevant_forbidden)); + check_self_intersections(overhang_regular, "overhang_regular2"); } // If the xy distance overrides the z distance, some support needs to be inserted further down. //=> Analyze which support points do not fit on this layer and check if they will fit a few layers down (while adding them an infinite amount of layers down would technically be closer the the setting description, it would not produce reasonable results. ) @@ -1159,6 +1186,7 @@ static void generate_initial_areas( if (mesh_group_settings.minimum_support_area > 0) remove_small(overhang_roofs, mesh_group_settings.minimum_roof_area); overhang_regular = diff(overhang_regular, overhang_roofs, ApplySafetyOffset::Yes); + check_self_intersections(overhang_regular, "overhang_regular3"); for (ExPolygon &roof_part : union_ex(overhang_roofs)) overhang_processing.emplace_back(std::move(roof_part), true); } @@ -3044,6 +3072,475 @@ static void draw_areas( "finalize_interface_and_support_areas " << dur_finalize << " ms"; } +#if 1 +// Test whether two circles, each on its own plane in 3D intersect. +// Circles are considered intersecting, if the lowest point on one circle is below the other circle's plane. +// Assumption: The two planes are oriented the same way. +static bool circles_intersect( + const Vec3d &p1, const Vec3d &n1, const double r1, + const Vec3d &p2, const Vec3d &n2, const double r2) +{ + assert(n1.dot(n2) >= 0); + + const Vec3d z = n1.cross(n2); + const Vec3d dir1 = z.cross(n1); + const Vec3d lowest_point1 = p1 + dir1 * (r1 / dir1.norm()); + assert(n2.dot(p1) >= n2.dot(lowest_point1)); + if (n2.dot(lowest_point1) <= 0) + return true; + const Vec3d dir2 = z.cross(n2); + const Vec3d lowest_point2 = p2 + dir2 * (r2 / dir2.norm()); + assert(n1.dot(p2) >= n1.dot(lowest_point2)); + return n1.dot(lowest_point2) <= 0; +} + +template +void triangulate_fan(indexed_triangle_set &its, int ifan, int ibegin, int iend) +{ + // at least 3 vertices, increasing order. + assert(ibegin + 3 <= iend); + assert(ibegin >= 0 && iend <= its.vertices.size()); + assert(ifan >= 0 && ifan < its.vertices.size()); + int num_faces = iend - ibegin; + its.indices.reserve(its.indices.size() + num_faces * 3); + for (int v = ibegin, u = iend - 1; v < iend; u = v ++) { + if (flip_normals) + its.indices.push_back({ ifan, u, v }); + else + its.indices.push_back({ ifan, v, u }); + } +} + +static void triangulate_strip(indexed_triangle_set &its, int ibegin1, int iend1, int ibegin2, int iend2) +{ + // at least 3 vertices, increasing order. + assert(ibegin1 + 3 <= iend1); + assert(ibegin1 >= 0 && iend1 <= its.vertices.size()); + assert(ibegin2 + 3 <= iend2); + assert(ibegin2 >= 0 && iend2 <= its.vertices.size()); + int n1 = iend1 - ibegin1; + int n2 = iend2 - ibegin2; + its.indices.reserve(its.indices.size() + (n1 + n2) * 3); + + // For the first vertex of 1st strip, find the closest vertex on the 2nd strip. + int istart2 = ibegin2; + { + const Vec3f &p1 = its.vertices[ibegin1]; + auto d2min = std::numeric_limits::max(); + for (int i = ibegin2; i < iend2; ++ i) { + const Vec3f &p2 = its.vertices[i]; + const float d2 = (p2 - p1).squaredNorm(); + if (d2 < d2min) { + d2min = d2; + istart2 = i; + } + } + } + + // Now triangulate the strip zig-zag fashion taking always the shortest connection if possible. + for (int u = ibegin1, v = istart2; n1 > 0 || n2 > 0;) { + bool take_first; + int u2, v2; + auto update_u2 = [&u2, u, ibegin1, iend1]() { + u2 = u; + if (++ u2 == iend1) + u2 = ibegin1; + }; + auto update_v2 = [&v2, v, ibegin2, iend2]() { + v2 = v; + if (++ v2 == iend2) + v2 = ibegin2; + }; + if (n1 == 0) { + take_first = false; + update_v2(); + } else if (n2 == 0) { + take_first = true; + update_u2(); + } else { + update_u2(); + update_v2(); + float l1 = (its.vertices[u2] - its.vertices[v]).squaredNorm(); + float l2 = (its.vertices[v2] - its.vertices[u]).squaredNorm(); + take_first = l1 < l2; + } + if (take_first) { + its.indices.push_back({ u, u2, v }); + -- n1; + u = u2; + } else { + its.indices.push_back({ u, v2, v }); + -- n2; + v = v2; + } + } +} + +// Discretize 3D circle, append to output vector, return ranges of indices of the points added. +static std::pair discretize_circle(const Vec3f ¢er, const Vec3f &normal, const float radius, const float eps, std::vector &pts) +{ + // Calculate discretization step and number of steps. + float angle_step = 2. * acos(1. - eps / radius); + auto nsteps = int(ceil(2 * M_PI / angle_step)); + angle_step = 2 * M_PI / nsteps; + + // Prepare coordinate system for the circle plane. + Vec3f x = normal.cross(Vec3f(0.f, -1.f, 0.f)).normalized(); + Vec3f y = normal.cross(x).normalized(); + assert(std::abs(x.cross(y).dot(normal) - 1.f) < EPSILON); + + // Discretize the circle. + int begin = int(pts.size()); + pts.reserve(pts.size() + nsteps); + float angle = 0; + x *= radius; + y *= radius; + for (int i = 0; i < nsteps; ++ i) { + pts.emplace_back(center + x * cos(angle) + y * sin(angle)); + angle += angle_step; + } + return { begin, int(pts.size()) }; +} + +static void extrude_branch( + const std::vector &path, + const TreeSupportSettings &config, + const SlicingParameters &slicing_params, + const std::vector &move_bounds, + indexed_triangle_set &result) +{ + Vec3d p1, p2, p3; + Vec3d v1, v2; + Vec3d nprev; + Vec3d ncurrent; + assert(path.size() >= 2); + static constexpr const float eps = 0.015f; + std::pair prev_strip; + +// char fname[2048]; +// static int irun = 0; + + for (size_t ipath = 1; ipath < path.size(); ++ ipath) { + const SupportElement &prev = *path[ipath - 1]; + const SupportElement ¤t = *path[ipath]; + assert(prev.state.layer_idx + 1 == current.state.layer_idx); + p1 = to_3d(unscaled(prev .state.result_on_layer), layer_z(slicing_params, prev .state.layer_idx)); + p2 = to_3d(unscaled(current.state.result_on_layer), layer_z(slicing_params, current.state.layer_idx)); + v1 = (p2 - p1).normalized(); + if (ipath == 1) { + nprev = v1; + // Extrude the bottom half sphere. + float radius = unscaled(config.getRadius(prev.state)); + float angle_step = 2. * acos(1. - eps / radius); + auto nsteps = int(ceil(M_PI / (2. * angle_step))); + angle_step = M_PI / (2. * nsteps); + int ifan = int(result.vertices.size()); + result.vertices.emplace_back((p1 - nprev * radius).cast()); + float angle = angle_step; + for (int i = 1; i < nsteps; ++ i, angle += angle_step) { + std::pair strip = discretize_circle((p1 - nprev * radius * cos(angle)).cast(), nprev.cast(), radius * sin(angle), eps, result.vertices); + if (i == 1) + triangulate_fan(result, ifan, strip.first, strip.second); + else + triangulate_strip(result, prev_strip.first, prev_strip.second, strip.first, strip.second); +// sprintf(fname, "d:\\temp\\meshes\\tree-partial-%d.obj", ++ irun); +// its_write_obj(result, fname); + prev_strip = strip; + } + } + if (ipath + 1 == path.size()) { + // End of the tube. + ncurrent = v1; + // Extrude the top half sphere. + float radius = unscaled(config.getRadius(current.state)); + float angle_step = 2. * acos(1. - eps / radius); + auto nsteps = int(ceil(M_PI / (2. * angle_step))); + angle_step = M_PI / (2. * nsteps); + float angle = M_PI / 2.; + for (int i = 0; i < nsteps; ++ i, angle -= angle_step) { + std::pair strip = discretize_circle((p2 + ncurrent * radius * cos(angle)).cast(), ncurrent.cast(), radius * sin(angle), eps, result.vertices); + triangulate_strip(result, prev_strip.first, prev_strip.second, strip.first, strip.second); +// sprintf(fname, "d:\\temp\\meshes\\tree-partial-%d.obj", ++ irun); +// its_write_obj(result, fname); + prev_strip = strip; + } + int ifan = int(result.vertices.size()); + result.vertices.emplace_back((p2 + ncurrent * radius).cast()); + triangulate_fan(result, ifan, prev_strip.first, prev_strip.second); +// sprintf(fname, "d:\\temp\\meshes\\tree-partial-%d.obj", ++ irun); +// its_write_obj(result, fname); + } else { + const SupportElement &next = *path[ipath + 1]; + assert(current.state.layer_idx + 1 == next.state.layer_idx); + p3 = to_3d(unscaled(next.state.result_on_layer), layer_z(slicing_params, next.state.layer_idx)); + v2 = (p3 - p2).normalized(); + ncurrent = (v1 + v2).normalized(); + float radius = unscaled(config.getRadius(current.state)); + std::pair strip = discretize_circle(p2.cast(), ncurrent.cast(), radius, eps, result.vertices); + triangulate_strip(result, prev_strip.first, prev_strip.second, strip.first, strip.second); + prev_strip = strip; +// sprintf(fname, "d:\\temp\\meshes\\tree-partial-%d.obj", ++irun); +// its_write_obj(result, fname); + } +#if 0 + if (circles_intersect(p1, nprev, settings.getRadius(prev), p2, ncurrent, settings.getRadius(current))) { + // Cannot connect previous and current slice using a simple zig-zag triangulation, + // because the two circles intersect. + + } else { + // Continue with chaining. + + } +#endif + } +} +#endif + +static void draw_branches( + PrintObject &print_object, + const TreeModelVolumes &volumes, + const TreeSupportSettings &config, + const std::vector &overhangs, + std::vector &move_bounds, + + SupportGeneratorLayersPtr &bottom_contacts, + SupportGeneratorLayersPtr &top_contacts, + SupportGeneratorLayersPtr &intermediate_layers, + SupportGeneratorLayerStorage &layer_storage) +{ + static int irun = 0; + + const SlicingParameters& slicing_params = print_object.slicing_parameters(); + + // All SupportElements are put into a layer independent storage to improve parallelization. + std::vector> elements_with_link_down; + std::vector linear_data_layers; + { + std::vector> map_downwards_old; + std::vector> map_downwards_new; + linear_data_layers.emplace_back(0); + for (LayerIndex layer_idx = 0; layer_idx < LayerIndex(move_bounds.size()); ++ layer_idx) { + SupportElements *layer_above = layer_idx + 1 < move_bounds.size() ? &move_bounds[layer_idx + 1] : nullptr; + map_downwards_new.clear(); + std::sort(map_downwards_old.begin(), map_downwards_old.end(), [](auto& l, auto& r) { return l.first < r.first; }); + SupportElements &layer = move_bounds[layer_idx]; + for (size_t elem_idx = 0; elem_idx < layer.size(); ++ elem_idx) { + SupportElement &elem = layer[elem_idx]; + int child = -1; + if (layer_idx > 0) { + auto it = std::lower_bound(map_downwards_old.begin(), map_downwards_old.end(), &elem, [](auto& l, const SupportElement* r) { return l.first < r; }); + if (it != map_downwards_old.end() && it->first == &elem) { + child = it->second; + // Only one link points to a node above from below. + assert(!(++it != map_downwards_old.end() && it->first == &elem)); + } + const SupportElement *pchild = child == -1 ? nullptr : &move_bounds[layer_idx - 1][child]; + if ((! pchild && elem.state.target_height == layer_idx) || (pchild && ! pchild->state.result_on_layer_is_set())) + // We either come from nowhere at the final layer or we had invalid parents 2. should never happen but just to be sure + continue; + } + for (int32_t parent_idx : elem.parents) { + SupportElement &parent = (*layer_above)[parent_idx]; + if (parent.state.result_on_layer_is_set()) + map_downwards_new.emplace_back(&parent, elem_idx); + } + + elements_with_link_down.push_back({ &elem, int(child) }); + } + std::swap(map_downwards_old, map_downwards_new); + linear_data_layers.emplace_back(elements_with_link_down.size()); + } + } + + std::unique_ptr> closest_surface_point; + { + TriangleMesh mesh = print_object.model_object()->raw_mesh(); + mesh.transform(print_object.trafo_centered()); + double scale = 10.; + openvdb::FloatGrid::Ptr grid = mesh_to_grid(mesh.its, {}, scale, 0., 0.); + closest_surface_point = openvdb::tools::ClosestSurfacePoint::create(*grid); + std::vector pts, prev, projections; + std::vector distances; + for (const std::pair &element : elements_with_link_down) { + Vec3d pt = to_3d(unscaled(element.first->state.result_on_layer), layer_z(slicing_params, element.first->state.layer_idx)) * scale; + pts.push_back({ pt.x(), pt.y(), pt.z() }); + } + + const double collision_extra_gap = 1. * scale; + const double max_nudge_collision_avoidance = 2. * scale; + const double max_nudge_smoothing = 1. * scale; + + for (size_t iter = 0; iter < 1000; ++ iter) { + prev = pts; + projections = pts; + distances.assign(pts.size(), std::numeric_limits::max()); + closest_surface_point->searchAndReplace(projections, distances); + size_t num_moved = 0; + for (size_t i = 0; i < projections.size(); ++ i) { + const SupportElement &element = *elements_with_link_down[i].first; + const int below = elements_with_link_down[i].second; + if (pts[i] != projections[i]) { + // Nudge the circle center away from the collision. + Vec3d v{ projections[i].x() - pts[i].x(), projections[i].y() - pts[i].y(), projections[i].z() - pts[i].z() }; + double depth = v.norm(); + assert(std::abs(distances[i] - depth) < EPSILON); + double radius = unscaled(config.getRadius(element.state)) * scale; + if (depth < radius) { + // Collision detected to be removed. + ++ num_moved; + double dxy = sqrt(sqr(radius) - sqr(v.z())); + double nudge_dist_max = dxy - std::hypot(v.x(), v.y()) + //FIXME 1mm gap + + collision_extra_gap; + // Shift by maximum 2mm. + double nudge_dist = std::min(std::max(0., nudge_dist_max), max_nudge_collision_avoidance); + Vec2d nudge_v = to_2d(v).normalized() * (- nudge_dist); + pts[i].x() += nudge_v.x(); + pts[i].y() += nudge_v.y(); + } + } + // Laplacian smoothing + if (! element.parents.empty() && (below != -1 || element.state.layer_idx == 0)) { + Vec2d avg{ 0, 0 }; + const SupportElements &above = move_bounds[element.state.layer_idx + 1]; + const size_t offset_above = linear_data_layers[element.state.layer_idx + 1]; + for (auto iparent : element.parents) { + avg.x() += prev[offset_above + iparent].x(); + avg.y() += prev[offset_above + iparent].y(); + } + size_t cnt = element.parents.size(); + if (below != -1) { + const size_t offset_below = linear_data_layers[element.state.layer_idx - 1]; + avg.x() += prev[offset_below + below].x(); + avg.y() += prev[offset_below + below].y(); + ++ cnt; + } + avg /= double(cnt); + static constexpr const double smoothing_factor = 0.5; + Vec2d old_pos{ pts[i].x(), pts[i].y() }; + Vec2d new_pos = (1. - smoothing_factor) * old_pos + smoothing_factor * avg; + Vec2d shift = new_pos - old_pos; + double nudge_dist_max = shift.norm(); + // Shift by maximum 1mm, less than the collision avoidance factor. + double nudge_dist = std::min(std::max(0., nudge_dist_max), max_nudge_smoothing); + Vec2d nudge_v = shift.normalized() * nudge_dist; + pts[i].x() += nudge_v.x(); + pts[i].y() += nudge_v.y(); + } + } + printf("iteration: %d, moved: %d\n", int(iter), int(num_moved)); + if (num_moved == 0) + break; + } + +#if 1 + for (size_t i = 0; i < projections.size(); ++ i) { + elements_with_link_down[i].first->state.result_on_layer.x() = scaled(pts[i].x()) / scale; + elements_with_link_down[i].first->state.result_on_layer.y() = scaled(pts[i].y()) / scale; + } +#endif + } + + std::vector support_layer_storage(move_bounds.size()); + std::vector support_roof_storage(move_bounds.size()); + + // Unmark all nodes. + for (SupportElements &elements : move_bounds) + for (SupportElement &element : elements) + element.state.marked = false; + + // Traverse all nodes, generate tubes. + // Traversal stack with nodes and thier current parent + std::vector path; + indexed_triangle_set cummulative_mesh; + indexed_triangle_set partial_mesh; + indexed_triangle_set temp_mesh; + for (LayerIndex layer_idx = 0; layer_idx + 1 < LayerIndex(move_bounds.size()); ++ layer_idx) { + SupportElements &layer = move_bounds[layer_idx]; + SupportElements &layer_above = move_bounds[layer_idx + 1]; + + for (SupportElement &start_element : layer) + if (! start_element.state.marked && ! start_element.parents.empty()) { + // Collect elements up to a bifurcation above. + start_element.state.marked = true; + for (size_t parent_idx = 0; parent_idx < start_element.parents.size(); ++ parent_idx) { + path.clear(); + path.emplace_back(&start_element); + // Traverse each branch until it branches again. + SupportElement &first_parent = layer_above[start_element.parents[parent_idx]]; + assert(path.back()->state.layer_idx + 1 == first_parent.state.layer_idx); + path.emplace_back(&first_parent); + if (first_parent.parents.size() < 2) + first_parent.state.marked = true; + if (first_parent.parents.size() == 1) { + for (SupportElement *parent = &first_parent;;) { + SupportElement &next_parent = move_bounds[parent->state.layer_idx + 1][parent->parents.front()]; + assert(path.back()->state.layer_idx + 1 == next_parent.state.layer_idx); + path.emplace_back(&next_parent); + if (next_parent.parents.size() > 1) + break; + next_parent.state.marked = true; + if (next_parent.parents.size() == 0) + break; + parent = &next_parent; + } + } + // Triangulate the tube. + partial_mesh.clear(); + extrude_branch(path, config, slicing_params, move_bounds, partial_mesh); +#if 0 + char fname[2048]; + sprintf(fname, "d:\\temp\\meshes\\tree-raw-%d.obj", ++ irun); + its_write_obj(partial_mesh, fname); +#if 0 + temp_mesh.clear(); + cut_mesh(partial_mesh, layer_z(slicing_params, path.back()->state.layer_idx) + EPSILON, nullptr, &temp_mesh, false); + sprintf(fname, "d:\\temp\\meshes\\tree-trimmed1-%d.obj", irun); + its_write_obj(temp_mesh, fname); + partial_mesh.clear(); + cut_mesh(temp_mesh, layer_z(slicing_params, path.front()->state.layer_idx) - EPSILON, &partial_mesh, nullptr, false); + sprintf(fname, "d:\\temp\\meshes\\tree-trimmed2-%d.obj", irun); +#endif + its_write_obj(partial_mesh, fname); +#endif + its_merge(cummulative_mesh, partial_mesh); + } + } + } + + std::vector slice_z; + for (size_t layer_idx = 0; layer_idx < move_bounds.size(); ++ layer_idx) { + double print_z = slicing_params.object_print_z_min + slicing_params.first_object_layer_height + layer_idx * slicing_params.layer_height; + double layer_height = layer_idx == 0 ? slicing_params.first_object_layer_height : slicing_params.layer_height; + slice_z.emplace_back(float(print_z - layer_height * 0.5)); + } + // Remove the trailing slices. + while (! slice_z.empty()) + if (move_bounds[slice_z.size() - 1].empty()) + slice_z.pop_back(); + else + break; + +#if 0 + its_write_obj(cummulative_mesh, "d:\\temp\\meshes\\tree.obj"); +#endif + + MeshSlicingParamsEx params; + params.closing_radius = float(print_object.config().slice_closing_radius.value); + params.mode = MeshSlicingParams::SlicingMode::Positive; + std::vector slices = slice_mesh_ex(cummulative_mesh, slice_z, params); + for (size_t layer_idx = 0; layer_idx < slice_z.size(); ++ layer_idx) + if (! slices[layer_idx].empty()) { + SupportGeneratorLayer *&l = intermediate_layers[layer_idx]; + if (l == nullptr) + l = &layer_allocate(layer_storage, SupporLayerType::Base, slicing_params, layer_idx); + append(l->polygons, to_polygons(std::move(slices[layer_idx]))); + } + + finalize_interface_and_support_areas(print_object, volumes, config, overhangs, support_layer_storage, support_roof_storage, + bottom_contacts, top_contacts, intermediate_layers, layer_storage); +} + /*! * \brief Create the areas that need support. * @@ -3147,8 +3644,13 @@ static void generate_support_areas(Print &print, const BuildVolume &build_volume auto t_place = std::chrono::high_resolution_clock::now(); // ### draw these points as circles +#if 0 draw_areas(*print.get_object(processing.second.front()), volumes, config, overhangs, move_bounds, bottom_contacts, top_contacts, intermediate_layers, layer_storage); +#else + draw_branches(*print.get_object(processing.second.front()), volumes, config, overhangs, move_bounds, + bottom_contacts, top_contacts, intermediate_layers, layer_storage); +#endif auto t_draw = std::chrono::high_resolution_clock::now(); auto dur_pre_gen = 0.001 * std::chrono::duration_cast(t_precalc - t_start).count(); From 4fb7bb8deca1b9e21ccfd3ea453a47b3d98014d9 Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Mon, 10 Oct 2022 14:41:05 +0200 Subject: [PATCH 07/10] SPE-1342 - Fixed crash after undo in SLA support point gizmo --- src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp index 026fae17b6..b562eb49a0 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp @@ -78,14 +78,14 @@ void GLGizmoSlaSupports::data_changed() if (mo) { if (mo->sla_points_status == sla::PointsStatus::Generating) get_data_from_backend(); - } #if ENABLE_RAYCAST_PICKING - if (m_raycasters.empty()) - on_register_raycasters_for_picking(); - else - update_raycasters_for_picking_transform(); + if (m_raycasters.empty()) + on_register_raycasters_for_picking(); + else + update_raycasters_for_picking_transform(); #endif // ENABLE_RAYCAST_PICKING + } } From 418734f41b5f1e7a02c9e78a3062955568408933 Mon Sep 17 00:00:00 2001 From: Vojtech Bubnik Date: Mon, 10 Oct 2022 16:58:43 +0200 Subject: [PATCH 08/10] WIP Tree supports with circular crossections: Clipping the remaining collisions with the object. --- src/libslic3r/TreeSupport.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/libslic3r/TreeSupport.cpp b/src/libslic3r/TreeSupport.cpp index b440818a8a..258d554dec 100644 --- a/src/libslic3r/TreeSupport.cpp +++ b/src/libslic3r/TreeSupport.cpp @@ -3537,6 +3537,16 @@ static void draw_branches( append(l->polygons, to_polygons(std::move(slices[layer_idx]))); } + // Trim the slices. + tbb::parallel_for(tbb::blocked_range(0, intermediate_layers.size()), + [&](const tbb::blocked_range &range) { + for (size_t layer_idx = range.begin(); layer_idx < range.end(); ++ layer_idx) + if (SupportGeneratorLayer *layer = intermediate_layers[layer_idx]; layer) { + Polygons &poly = intermediate_layers[layer_idx]->polygons; + poly = diff_clipped(poly, volumes.getCollision(0, layer_idx, true)); + } + }); + finalize_interface_and_support_areas(print_object, volumes, config, overhangs, support_layer_storage, support_roof_storage, bottom_contacts, top_contacts, intermediate_layers, layer_storage); } From 009fe1cab43a1488c2ab5262a17980b7459864b9 Mon Sep 17 00:00:00 2001 From: Vojtech Bubnik Date: Wed, 12 Oct 2022 14:12:07 +0200 Subject: [PATCH 09/10] New method ConfigOptionDef::set_enum_values() to initialize enum names / values for UI combo boxes using an initializer list of pairs of values. --- src/libslic3r/Config.hpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/libslic3r/Config.hpp b/src/libslic3r/Config.hpp index 151043a04f..a8d0473b7b 100644 --- a/src/libslic3r/Config.hpp +++ b/src/libslic3r/Config.hpp @@ -1786,6 +1786,17 @@ public: // Initialized by ConfigOptionEnum::get_enum_values() const t_config_enum_values *enum_keys_map = nullptr; + void set_enum_values(std::initializer_list> il) { + enum_values.clear(); + enum_values.reserve(il.size()); + enum_labels.clear(); + enum_labels.reserve(il.size()); + for (const std::pair p : il) { + enum_values.emplace_back(p.first); + enum_labels.emplace_back(p.second); + } + } + bool has_enum_value(const std::string &value) const { for (const std::string &v : enum_values) if (v == value) From 2365b3a8ddf4d5666d3c4d5ddac323cd9bc3696f Mon Sep 17 00:00:00 2001 From: Vojtech Bubnik Date: Wed, 12 Oct 2022 14:33:36 +0200 Subject: [PATCH 10/10] WIP TreeSupports: Now it is possible to switch between the normal and the "organic" supports. --- src/libslic3r/PrintConfig.cpp | 15 +- src/libslic3r/PrintConfig.hpp | 2 +- src/libslic3r/PrintObject.cpp | 2 +- src/libslic3r/SupportMaterial.cpp | 1 + src/libslic3r/TreeModelVolumes.cpp | 2 +- src/libslic3r/TreeSupport.cpp | 245 ++++++++++++++++++++++++----- 6 files changed, 216 insertions(+), 51 deletions(-) diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 9a3bc3ce6f..841bee5b9f 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -138,7 +138,8 @@ CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(SupportMaterialPattern) static const t_config_enum_values s_keys_map_SupportMaterialStyle { { "grid", smsGrid }, { "snug", smsSnug }, - { "tree", smsTree } + { "tree", smsTree }, + { "organic", smsOrganic } }; CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(SupportMaterialStyle) @@ -2782,12 +2783,12 @@ void PrintConfigDef::init_fff_params() "will create more stable supports, while snug support towers will save material and reduce " "object scarring."); def->enum_keys_map = &ConfigOptionEnum::get_enum_values(); - def->enum_values.push_back("grid"); - def->enum_values.push_back("snug"); - def->enum_values.push_back("tree"); - def->enum_labels.push_back(L("Grid")); - def->enum_labels.push_back(L("Snug")); - def->enum_labels.push_back(L("Tree")); + def->set_enum_values({ + { "grid", L("Grid") }, + { "snug", L("Snug") }, + { "tree", L("Tree") }, + { "organic", L("Organic") } + }); def->mode = comAdvanced; def->set_default_value(new ConfigOptionEnum(smsGrid)); diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index 48493aa0bd..0a6daf2d28 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -85,7 +85,7 @@ enum SupportMaterialPattern { }; enum SupportMaterialStyle { - smsGrid, smsSnug, smsTree, + smsGrid, smsSnug, smsTree, smsOrganic, }; enum SupportMaterialInterfacePattern { diff --git a/src/libslic3r/PrintObject.cpp b/src/libslic3r/PrintObject.cpp index 7ea55a3a4e..9ffb57a723 100644 --- a/src/libslic3r/PrintObject.cpp +++ b/src/libslic3r/PrintObject.cpp @@ -2197,7 +2197,7 @@ void PrintObject::combine_infill() void PrintObject::_generate_support_material() { - if (m_config.support_material_style == smsTree) { + if (m_config.support_material_style == smsTree || m_config.support_material_style == smsOrganic) { fff_tree_support_generate(*this, std::function([this](){ this->throw_if_canceled(); })); } else { PrintObjectSupportMaterial support_material(this, m_slicing_params); diff --git a/src/libslic3r/SupportMaterial.cpp b/src/libslic3r/SupportMaterial.cpp index 4910168873..b1b6600bc2 100644 --- a/src/libslic3r/SupportMaterial.cpp +++ b/src/libslic3r/SupportMaterial.cpp @@ -800,6 +800,7 @@ public: { switch (m_style) { case smsTree: + case smsOrganic: assert(false); [[fallthrough]]; case smsGrid: diff --git a/src/libslic3r/TreeModelVolumes.cpp b/src/libslic3r/TreeModelVolumes.cpp index 41e78e45b1..e098636fd4 100644 --- a/src/libslic3r/TreeModelVolumes.cpp +++ b/src/libslic3r/TreeModelVolumes.cpp @@ -39,7 +39,7 @@ TreeSupportMeshGroupSettings::TreeSupportMeshGroupSettings(const PrintObject &pr // Support must be enabled and set to Tree style. assert(config.support_material); - assert(config.support_material_style == smsTree); + assert(config.support_material_style == smsTree || config.support_material_style == smsOrganic); // Calculate maximum external perimeter width over all printing regions, taking into account the default layer height. coordf_t external_perimeter_width = 0.; diff --git a/src/libslic3r/TreeSupport.cpp b/src/libslic3r/TreeSupport.cpp index 258d554dec..fecbef8313 100644 --- a/src/libslic3r/TreeSupport.cpp +++ b/src/libslic3r/TreeSupport.cpp @@ -211,7 +211,7 @@ static std::vector>> group_me #endif // NDEBUG // Support must be enabled and set to Tree style. assert(object_config.support_material); - assert(object_config.support_material_style == smsTree); + assert(object_config.support_material_style == smsTree || object_config.support_material_style == smsOrganic); bool found_existing_group = false; TreeSupportSettings next_settings{ TreeSupportMeshGroupSettings{ print_object } }; @@ -330,18 +330,39 @@ void tree_supports_show_error(std::string message, bool critical) if (! (enforced_layer || blockers_layers.empty() || blockers_layers[layer_id].empty())) overhangs = diff(overhangs, blockers_layers[layer_id], ApplySafetyOffset::Yes); } - if (! enforcers_layers.empty() && ! enforcers_layers[layer_id].empty()) + //check_self_intersections(overhangs, "generate_overhangs1"); + if (! enforcers_layers.empty() && ! enforcers_layers[layer_id].empty()) { // Has some support enforcers at this layer, apply them to the overhangs, don't apply the support threshold angle. - if (Polygons enforced_overhangs = intersection(raw_overhangs_calculated ? raw_overhangs : diff(current_layer.lslices, lower_layer.lslices), enforcers_layers[layer_id]); + //enforcers_layers[layer_id] = union_(enforcers_layers[layer_id]); + //check_self_intersections(enforcers_layers[layer_id], "generate_overhangs - enforcers"); + //check_self_intersections(to_polygons(lower_layer.lslices), "generate_overhangs - lowerlayers"); + if (Polygons enforced_overhangs = intersection(raw_overhangs_calculated ? raw_overhangs : diff(current_layer.lslices, lower_layer.lslices), enforcers_layers[layer_id] /*, ApplySafetyOffset::Yes */); ! enforced_overhangs.empty()) { //FIXME this is a hack to make enforcers work on steep overhangs. - enforced_overhangs = diff(offset(enforced_overhangs, + //check_self_intersections(enforced_overhangs, "generate_overhangs - enforced overhangs1"); + //Polygons enforced_overhangs_prev = enforced_overhangs; + //check_self_intersections(to_polygons(union_ex(enforced_overhangs)), "generate_overhangs - enforced overhangs11"); + //check_self_intersections(offset(union_ex(enforced_overhangs), + //FIXME this is a fudge constant! + // scaled(0.4)), "generate_overhangs - enforced overhangs12"); + enforced_overhangs = diff(offset(union_ex(enforced_overhangs), //FIXME this is a fudge constant! scaled(0.4)), lower_layer.lslices); +#ifdef TREESUPPORT_DEBUG_SVG + if (! intersecting_edges(enforced_overhangs).empty()) { + static int irun = 0; + SVG::export_expolygons(debug_out_path("treesupport-self-intersections-%d.svg", ++irun), + { { { union_ex(enforced_overhangs_prev) }, { "prev", "yellow", 0.5f } }, + { { lower_layer.lslices }, { "lower_layer.lslices", "gray", 0.5f } }, + { { union_ex(enforced_overhangs) }, { "enforced_overhangs", "red", "black", "", scaled(0.1f), 0.5f } } }); + } +#endif // TREESUPPORT_DEBUG_SVG + //check_self_intersections(enforced_overhangs, "generate_overhangs - enforced overhangs2"); overhangs = overhangs.empty() ? std::move(enforced_overhangs) : union_(overhangs, enforced_overhangs); + //check_self_intersections(overhangs, "generate_overhangs - enforcers"); } - check_self_intersections(overhangs, "generate_overhangs"); + } out[layer_id] = std::move(overhangs); } }); @@ -1106,7 +1127,7 @@ static void generate_initial_areas( overhang_regular = mesh_group_settings.support_offset == 0 ? overhang_raw : safe_offset_inc(overhang_raw, mesh_group_settings.support_offset, relevant_forbidden, mesh_config.min_radius * 1.75 + mesh_config.xy_min_distance, 0, 1); - check_self_intersections(overhang_regular, "overhang_regular1"); + //check_self_intersections(overhang_regular, "overhang_regular1"); // offset ensures that areas that could be supported by a part of a support line, are not considered unsupported overhang Polygons remaining_overhang = intersection( @@ -1134,7 +1155,7 @@ static void generate_initial_areas( remaining_overhang = diff(remaining_overhang, safe_offset_inc(overhang_regular, 1.5 * extra_total_offset_acc, raw_collision, offset_step, 0, 1)); // Extending the overhangs by the inflated remaining overhangs. overhang_regular = union_(overhang_regular, diff(safe_offset_inc(remaining_overhang, extra_total_offset_acc, raw_collision, offset_step, 0, 1), relevant_forbidden)); - check_self_intersections(overhang_regular, "overhang_regular2"); + //check_self_intersections(overhang_regular, "overhang_regular2"); } // If the xy distance overrides the z distance, some support needs to be inserted further down. //=> Analyze which support points do not fit on this layer and check if they will fit a few layers down (while adding them an infinite amount of layers down would technically be closer the the setting description, it would not produce reasonable results. ) @@ -1186,7 +1207,7 @@ static void generate_initial_areas( if (mesh_group_settings.minimum_support_area > 0) remove_small(overhang_roofs, mesh_group_settings.minimum_roof_area); overhang_regular = diff(overhang_regular, overhang_roofs, ApplySafetyOffset::Yes); - check_self_intersections(overhang_regular, "overhang_regular3"); + //check_self_intersections(overhang_regular, "overhang_regular3"); for (ExPolygon &roof_part : union_ex(overhang_roofs)) overhang_processing.emplace_back(std::move(roof_part), true); } @@ -2397,6 +2418,8 @@ static void set_points_on_areas(const SupportElement &elem, SupportElements *lay next_elem.state.result_on_layer = move_inside_if_outside(next_elem.influence_area, elem.state.result_on_layer); // do not call recursive because then amount of layers would be restricted by the stack size } + // Mark the parent element as accessed from a valid child element. + next_elem.state.marked = true; } } @@ -2515,15 +2538,23 @@ static void create_nodes_from_area( { // Initialize points on layer 0, with a "random" point in the influence area. // Point is chosen based on an inaccurate estimate where the branches will split into two, but every point inside the influence area would produce a valid result. - for (SupportElement &init : move_bounds.front()) { - init.state.result_on_layer = move_inside_if_outside(init.influence_area, init.state.next_position); - // Also set the parent nodes, as these will be required for the first iteration of the loop below. - set_points_on_areas(init, move_bounds.size() > 1 ? &move_bounds[1] : nullptr); + { + SupportElements *layer_above = move_bounds.size() > 1 ? &move_bounds[1] : nullptr; + for (SupportElement &elem : *layer_above) + elem.state.marked = false; + for (SupportElement &init : move_bounds.front()) { + init.state.result_on_layer = move_inside_if_outside(init.influence_area, init.state.next_position); + // Also set the parent nodes, as these will be required for the first iteration of the loop below and mark the parent nodes. + set_points_on_areas(init, layer_above); + } } for (LayerIndex layer_idx = 1; layer_idx < LayerIndex(move_bounds.size()); ++ layer_idx) { auto &layer = move_bounds[layer_idx]; auto *layer_above = layer_idx + 1 < move_bounds.size() ? &move_bounds[layer_idx + 1] : nullptr; + if (layer_above) + for (SupportElement &elem : *layer_above) + elem.state.marked = false; for (SupportElement &elem : layer) { assert(! elem.state.deleted); assert(elem.state.layer_idx == layer_idx); @@ -2537,11 +2568,6 @@ static void create_nodes_from_area( } // we dont need to remove yet the parents as they will have a lower dtt and also no result_on_layer set elem.state.deleted = true; - for (int32_t parent_idx : elem.parents) - // When the roof was not able to generate downwards enough, the top elements may have not moved, and have result_on_layer already set. - // As this branch needs to be removed => all parents result_on_layer have to be invalidated. - (*layer_above)[parent_idx].state.result_on_layer_reset(); - continue; } else { // set the point where the branch will be placed on the model if (elem.state.to_model_gracious) @@ -2550,13 +2576,67 @@ static void create_nodes_from_area( set_to_model_contact_simple(elem); } } - if (! elem.state.deleted) - // element is valid now setting points in the layer above + if (! elem.state.deleted && ! elem.state.marked && elem.state.target_height == layer_idx) + // Just a tip surface with no supporting element. + elem.state.deleted = true; + if (elem.state.deleted) { + for (int32_t parent_idx : elem.parents) + // When the roof was not able to generate downwards enough, the top elements may have not moved, and have result_on_layer already set. + // As this branch needs to be removed => all parents result_on_layer have to be invalidated. + (*layer_above)[parent_idx].state.result_on_layer_reset(); + } + if (! elem.state.deleted) { + // Element is valid now setting points in the layer above and mark the parent nodes. set_points_on_areas(elem, layer_above); + } } } +#ifndef NDEBUG + // Verify the tree connectivity including the branch slopes. + for (LayerIndex layer_idx = 0; layer_idx + 1 < LayerIndex(move_bounds.size()); ++ layer_idx) { + auto &layer = move_bounds[layer_idx]; + auto &above = move_bounds[layer_idx + 1]; + for (SupportElement &elem : layer) + if (! elem.state.deleted) { + for (int32_t iparent : elem.parents) { + SupportElement &parent = above[iparent]; + assert(! parent.state.deleted); + assert(elem.state.result_on_layer_is_set() == parent.state.result_on_layer_is_set()); + if (elem.state.result_on_layer_is_set()) { + double radius_increase = config.getRadius(elem.state) - config.getRadius(parent.state); + assert(radius_increase >= 0); + double shift = (elem.state.result_on_layer - parent.state.result_on_layer).cast().norm(); + assert(shift < radius_increase + 2. * config.maximum_move_distance_slow); + } + } + } + } +#endif // NDEBUG + remove_deleted_elements(move_bounds); + +#ifndef NDEBUG + // Verify the tree connectivity including the branch slopes. + for (LayerIndex layer_idx = 0; layer_idx + 1 < LayerIndex(move_bounds.size()); ++ layer_idx) { + auto &layer = move_bounds[layer_idx]; + auto &above = move_bounds[layer_idx + 1]; + for (SupportElement &elem : layer) { + assert(! elem.state.deleted); + for (int32_t iparent : elem.parents) { + SupportElement &parent = above[iparent]; + assert(! parent.state.deleted); + assert(elem.state.result_on_layer_is_set() == parent.state.result_on_layer_is_set()); + if (elem.state.result_on_layer_is_set()) { + double radius_increase = config.getRadius(elem.state) - config.getRadius(parent.state); + assert(radius_increase >= 0); + double shift = (elem.state.result_on_layer - parent.state.result_on_layer).cast().norm(); + assert(shift < radius_increase + 2. * config.maximum_move_distance_slow); + } + } + } + } +#endif // NDEBUG } // For producing circular / elliptical areas from SupportElements (one DrawArea per one SupportElement) @@ -2677,7 +2757,8 @@ static void generate_branch_areas(const TreeModelVolumes &volumes, const TreeSup polygons_with_correct_center.emplace_back(std::move(part)); } // Increase the area again, to ensure the nozzle path when calculated later is very similar to the one assumed above. - polygons = diff_clipped(offset(polygons_with_correct_center, config.support_line_width / 2, jtMiter, 1.2), + assert(contains(polygons, draw_area.element->state.result_on_layer)); + polygons = diff_clipped(offset(polygons_with_correct_center, config.support_line_width / 2, jtMiter, 1.2), //FIXME Vojtech: Clipping may split the region into multiple pieces again, reversing the fixing effort. collision); } @@ -2723,10 +2804,12 @@ static void smooth_branch_areas( [&](const tbb::blocked_range &range) { for (size_t processing_idx = range.begin(); processing_idx < range.end(); ++ processing_idx) { DrawArea &draw_area = linear_data[processing_base + processing_idx]; + assert(draw_area.element->state.layer_idx == layer_idx); double max_outer_wall_distance = 0; bool do_something = false; for (int32_t parent_idx : draw_area.element->parents) { const SupportElement &parent = layer_above[parent_idx]; + assert(parent.state.layer_idx == layer_idx + 1); if (config.getRadius(parent.state) != config.getCollisionRadius(parent.state)) { do_something = true; max_outer_wall_distance = std::max(max_outer_wall_distance, (draw_area.element->state.result_on_layer - parent.state.result_on_layer).cast().norm() - (config.getRadius(*draw_area.element) - config.getRadius(parent))); @@ -2734,14 +2817,35 @@ static void smooth_branch_areas( } max_outer_wall_distance += max_radius_change_per_layer; // As this change is a bit larger than what usually appears, lost radius can be slowly reclaimed over the layers. if (do_something) { + assert(contains(draw_area.polygons, draw_area.element->state.result_on_layer)); Polygons max_allowed_area = offset(draw_area.polygons, float(max_outer_wall_distance), jtMiter, 1.2); for (int32_t parent_idx : draw_area.element->parents) { const SupportElement &parent = layer_above[parent_idx]; +#ifndef NDEBUG + assert(parent.state.layer_idx == layer_idx + 1); + assert(contains(linear_data[processing_base_above + parent_idx].polygons, parent.state.result_on_layer)); + double radius_increase = config.getRadius(draw_area.element->state) - config.getRadius(parent.state); + assert(radius_increase >= 0); + double shift = (draw_area.element->state.result_on_layer - parent.state.result_on_layer).cast().norm(); + assert(shift < radius_increase + 2. * config.maximum_move_distance_slow); +#endif // NDEBUG if (config.getRadius(parent.state) != config.getCollisionRadius(parent.state)) { // No other element on this layer than the current one may be connected to &parent, // thus it is safe to update parent's DrawArea directly. Polygons &dst = linear_data[processing_base_above + parent_idx].polygons; - dst = intersection(dst, max_allowed_area); +// Polygons orig = dst; + if (! dst.empty()) { + dst = intersection(dst, max_allowed_area); +#if 0 + if (dst.empty()) { + static int irun = 0; + SVG::export_expolygons(debug_out_path("treesupport-extrude_areas-smooth-error-%d.svg", irun ++), + { { { union_ex(max_allowed_area) }, { "max_allowed_area", "yellow", 0.5f } }, + { { union_ex(orig) }, { "orig", "red", "black", "", scaled(0.1f), 0.5f } } }); + ::MessageBoxA(nullptr, "TreeSupport smoothing bug", "Bug detected!", MB_OK | MB_SYSTEMMODAL | MB_SETFOREGROUND | MB_ICONWARNING); + } +#endif + } } } } @@ -3010,9 +3114,7 @@ static void draw_areas( // Only one link points to a node above from below. assert(! (++ it != map_downwards_old.end() && it->first == &elem)); } - if ((! child && elem.state.target_height == layer_idx) || (child && !child->state.result_on_layer_is_set())) - // We either come from nowhere at the final layer or we had invalid parents 2. should never happen but just to be sure - continue; + assert(child ? child->state.result_on_layer_is_set() : elem.state.target_height > layer_idx); } for (int32_t parent_idx : elem.parents) { SupportElement &parent = (*layer_above)[parent_idx]; @@ -3026,12 +3128,66 @@ static void draw_areas( linear_data_layers.emplace_back(linear_data.size()); } +#ifndef NDEBUG + for (size_t i = 0; i < move_bounds.size(); ++ i) { + size_t begin = linear_data_layers[i]; + size_t end = linear_data_layers[i + 1]; + for (size_t j = begin; j < end; ++ j) + assert(linear_data[j].element == &move_bounds[i][j - begin]); + } +#endif // NDEBUG + auto t_start = std::chrono::high_resolution_clock::now(); // Generate the circles that will be the branches. generate_branch_areas(volumes, config, move_bounds, linear_data); + +#if 0 + assert(linear_data_layers.size() == move_bounds.size() + 1); + for (const auto &draw_area : linear_data) + assert(contains(draw_area.polygons, draw_area.element->state.result_on_layer)); + for (size_t i = 0; i < move_bounds.size(); ++ i) { + size_t begin = linear_data_layers[i]; + size_t end = linear_data_layers[i + 1]; + for (size_t j = begin; j < end; ++ j) { + const auto &draw_area = linear_data[j]; + assert(draw_area.element == &move_bounds[i][j - begin]); + assert(contains(draw_area.polygons, draw_area.element->state.result_on_layer)); + } + } +#endif + +#if 0 + for (size_t area_layer_idx = 0; area_layer_idx + 1 < linear_data_layers.size(); ++ area_layer_idx) { + size_t begin = linear_data_layers[area_layer_idx]; + size_t end = linear_data_layers[area_layer_idx + 1]; + Polygons polygons; + for (size_t area_idx = begin; area_idx < end; ++ area_idx) { + DrawArea &area = linear_data[area_idx]; + append(polygons, area.polygons); + } + SVG::export_expolygons(debug_out_path("treesupport-extrude_areas-raw-%d.svg", area_layer_idx), + { { { union_ex(polygons) }, { "parent", "red", "black", "", scaled(0.1f), 0.5f } } }); + } +#endif + auto t_generate = std::chrono::high_resolution_clock::now(); // In some edgecases a branch may go though a hole, where the regular radius does not fit. This can result in an apparent jump in branch radius. As such this cases need to be caught and smoothed out. smooth_branch_areas(config, move_bounds, linear_data, linear_data_layers); + +#if 0 + for (size_t area_layer_idx = 0; area_layer_idx + 1 < linear_data_layers.size(); ++area_layer_idx) { + size_t begin = linear_data_layers[area_layer_idx]; + size_t end = linear_data_layers[area_layer_idx + 1]; + Polygons polygons; + for (size_t area_idx = begin; area_idx < end; ++area_idx) { + DrawArea& area = linear_data[area_idx]; + append(polygons, area.polygons); + } + SVG::export_expolygons(debug_out_path("treesupport-extrude_areas-smooth-%d.svg", area_layer_idx), + { { { union_ex(polygons) }, { "parent", "red", "black", "", scaled(0.1f), 0.5f } } }); + } +#endif + auto t_smooth = std::chrono::high_resolution_clock::now(); // drop down all trees that connect non gracefully with the model drop_non_gracious_areas(volumes, linear_data, support_layer_storage); @@ -3256,7 +3412,7 @@ static void extrude_branch( float angle_step = 2. * acos(1. - eps / radius); auto nsteps = int(ceil(M_PI / (2. * angle_step))); angle_step = M_PI / (2. * nsteps); - float angle = M_PI / 2.; + auto angle = float(M_PI / 2.); for (int i = 0; i < nsteps; ++ i, angle -= angle_step) { std::pair strip = discretize_circle((p2 + ncurrent * radius * cos(angle)).cast(), ncurrent.cast(), radius * sin(angle), eps, result.vertices); triangulate_strip(result, prev_strip.first, prev_strip.second, strip.first, strip.second); @@ -3335,9 +3491,7 @@ static void draw_branches( assert(!(++it != map_downwards_old.end() && it->first == &elem)); } const SupportElement *pchild = child == -1 ? nullptr : &move_bounds[layer_idx - 1][child]; - if ((! pchild && elem.state.target_height == layer_idx) || (pchild && ! pchild->state.result_on_layer_is_set())) - // We either come from nowhere at the final layer or we had invalid parents 2. should never happen but just to be sure - continue; + assert(pchild ? pchild->state.result_on_layer_is_set() : elem.state.target_height > layer_idx); } for (int32_t parent_idx : elem.parents) { SupportElement &parent = (*layer_above)[parent_idx]; @@ -3370,7 +3524,8 @@ static void draw_branches( const double max_nudge_collision_avoidance = 2. * scale; const double max_nudge_smoothing = 1. * scale; - for (size_t iter = 0; iter < 1000; ++ iter) { + static constexpr const size_t num_iter = 100; // 1000; + for (size_t iter = 0; iter < num_iter; ++ iter) { prev = pts; projections = pts; distances.assign(pts.size(), std::numeric_limits::max()); @@ -3404,18 +3559,24 @@ static void draw_branches( Vec2d avg{ 0, 0 }; const SupportElements &above = move_bounds[element.state.layer_idx + 1]; const size_t offset_above = linear_data_layers[element.state.layer_idx + 1]; + double weight = 0.; for (auto iparent : element.parents) { - avg.x() += prev[offset_above + iparent].x(); - avg.y() += prev[offset_above + iparent].y(); + double w = config.getRadius(above[iparent].state); + avg.x() += w * prev[offset_above + iparent].x(); + avg.y() += w * prev[offset_above + iparent].y(); + weight += w; } size_t cnt = element.parents.size(); if (below != -1) { const size_t offset_below = linear_data_layers[element.state.layer_idx - 1]; - avg.x() += prev[offset_below + below].x(); - avg.y() += prev[offset_below + below].y(); + const double w = weight; // config.getRadius(move_bounds[element.state.layer_idx - 1][below].state); + avg.x() += w * prev[offset_below + below].x(); + avg.y() += w * prev[offset_below + below].y(); ++ cnt; + weight += w; } - avg /= double(cnt); + //avg /= double(cnt); + avg /= weight; static constexpr const double smoothing_factor = 0.5; Vec2d old_pos{ pts[i].x(), pts[i].y() }; Vec2d new_pos = (1. - smoothing_factor) * old_pos + smoothing_factor * avg; @@ -3654,13 +3815,15 @@ static void generate_support_areas(Print &print, const BuildVolume &build_volume auto t_place = std::chrono::high_resolution_clock::now(); // ### draw these points as circles -#if 0 - draw_areas(*print.get_object(processing.second.front()), volumes, config, overhangs, move_bounds, - bottom_contacts, top_contacts, intermediate_layers, layer_storage); -#else - draw_branches(*print.get_object(processing.second.front()), volumes, config, overhangs, move_bounds, - bottom_contacts, top_contacts, intermediate_layers, layer_storage); -#endif + + if (print_object.config().support_material_style == smsTree) + draw_areas(*print.get_object(processing.second.front()), volumes, config, overhangs, move_bounds, + bottom_contacts, top_contacts, intermediate_layers, layer_storage); + else { + assert(print_object.config().support_material_style == smsOrganic); + draw_branches(*print.get_object(processing.second.front()), volumes, config, overhangs, move_bounds, + bottom_contacts, top_contacts, intermediate_layers, layer_storage); + } auto t_draw = std::chrono::high_resolution_clock::now(); auto dur_pre_gen = 0.001 * std::chrono::duration_cast(t_precalc - t_start).count();