From 22bb81e0cd9955146474a3e9e8ac02e4ed45551a Mon Sep 17 00:00:00 2001 From: tao wang Date: Wed, 27 Nov 2024 11:50:10 +0800 Subject: [PATCH] NEW:support previewing pad types jira:[none] Change-Id: I75285e8665a1efbfa02c2d859962ed958098bd07 --- resources/images/bed_cool.png | Bin 0 -> 2024 bytes resources/images/bed_cool_supertack.png | Bin 0 -> 1554 bytes resources/images/bed_engineering.png | Bin 0 -> 3053 bytes resources/images/bed_high_templ.png | Bin 0 -> 1996 bytes resources/images/bed_pei.png | Bin 0 -> 4498 bytes src/slic3r/GUI/SelectMachine.cpp | 37 +++++++++++++++++++----- src/slic3r/GUI/SelectMachine.hpp | 3 +- 7 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 resources/images/bed_cool.png create mode 100644 resources/images/bed_cool_supertack.png create mode 100644 resources/images/bed_engineering.png create mode 100644 resources/images/bed_high_templ.png create mode 100644 resources/images/bed_pei.png diff --git a/resources/images/bed_cool.png b/resources/images/bed_cool.png new file mode 100644 index 0000000000000000000000000000000000000000..3154344b58403b2d31f554b810073f30faf63722 GIT binary patch literal 2024 zcmVP)n^}ctesp_5{_w@8U*4kY;lFRbWba!=iRabR&b@c$8!RrZ3zg)d~^-{at z{uW=Cb$u9yf}Wgnq49)}uc7C8K~!dl=NU8wV+^ZBAe%W73zLIJG!z3YVgd1l=0^_8 zWEp8=ok1W}xY*G{x?Hy7UnoLZ<@@}}us{4}eSQ7N*L_~Rc<~($`XxBPWJW^}1W*LB zmzn|)p~$5vOC*MH;Te+=l6*qe(7Z6AS_yA)sSd5>7VPdm`xUEx;BhC$s*uH`L%34F zlq%%ZGL~$z%W@#aY#s=r$ytnV7$4mD>IU4sdlwqbdW*`YaA7V{OF&}IX3z$cQ5UXD zK+YJj9Gtk3fhm{5L+kkS_dh_4g_MOu0catz1TotSg)L||5bX*lt#}%u$Nl^FVS9TU z`op1=%M?!7jFx7`8Z@uXr3o@M(=Nz;abjJhX_9?05w%HGLoDRwmCJDb`gN#Rt1028 z1`|yR3Ctauu`5jJg>oqLLyk%>nbCL*4<0;-(R`Q@kbq?zk@j|`Fv6e#+B0&F^enf) zl-6h*!u<)I2|1K{wI+S^%!JDVm%v)U;|h%o<$$RvXf_(Ka^(u_J=>MSCDt6w0ZN%{ za%(et%k`Obr`k$Xu~PA&R;kH%oczX0+WrnM*7vBt~|-?U05Y(23UNo@fJ0@59g zMo?R*$(mR=436QnfW6!bXI*!|30q!X28!jWICpQUL25P9UaBqn7m(vyB8bCFeDQn_ z4)*t<+wDkA#loTHf=nh{L`w$KS^J%n_}z{@#*0&#hhv!j;Dt- zyJHN$NVpGHR@5Pzes0~m^(LC-hj2=u>>Sw^RH;^>*Xz+tNZ>bb-h6+5e}Ao7tzLo| zLGE$MW#J;*L&lMr<5a|D{3)Q_?kdeSo6V1KkSmxI=}gnKQcO*OZV`=Mw+ppe4O*?1 z5>9RA;&3n+{0yf65@)vpTw8mM#sY2wJxpwkj@Mj(E)=s!Fl#8Iy@@=reeOlGeCO?V zVQ+8GNHa_^IGMz>r@aK4jYUdP!lxg9rcUCx)_{~IV?7~ex`(-doPZtr+({MOhdt%wxHY+nG3>V8W{Ux88Hk5#QX;r8kpEG%6LTDyy zjf4`Wxz(CeDf41&=vkVp*)o>Tn$afDc$zg&?c$vB`m7*$n|6w?s1GYK-Kn5kr?*i^ zyxLG^Ny2f?mM}v3B#+RvHD>QontnVf1;a7(=m2U$$OgBcY#r}&Nc0!Z{d?#&--0=U zJy)5*cczdmMT@$QgK>N-#c$ufebDa@KF71r2FwxiJXpeiGpo+sL$(Dd*yGK|(0SEA zPBYxOb7yBb9InG_3R>H=oosDy0j)DxHV~#8F62PSvb`>afy_Q;m*I>w7Y2CG_#B$` z%8;t!Gy@Jcw|q+89h{kdkk1MH*rP{};Njm7?{$wlzfsvYh)y+f&h@U2tyP}Bqu@Pj zZ3%q=k^$)Y|LTY0i_Oi=U0Js1&jnn!ItjM5d!H}~-Wv>l{AYdrUtNxcD|5#^OK|FB zQZK+DVSVPB6RuR-NkOh1aIYC>sxM+o*n5O4wdWoYD&Qq*xXsXM29_Hq3J64yX!czM zB&rc|O(L}M!Aki)dAMetuMm=I_lpKOnKmaAEK|6gTUQs@M?zCLmNj^cP;f$KW}ze` z_BCdWE0Wi7MZvqB2Qv3LC<2$Dag9Dy<}e_fUk63+W-dTLYJwb9Y5LZ2{=`vbrqNB>o+{X9AeCpBYOEFtk)KX+|vSHcJ#rzMngPPTitlh*Yc9A;6oHPPYS?c89~mL(B~} zp?%bbrKKf_=li}qM?HW3A2gZ`SXfw)3!BVeUP=JS8yQL=Qq;cKT!i6p054y?ly_+{ zgQ301T7i1o$WIF?cP|G)yk4&lhX?yG91Ky&5W?u2N)`!n?2J?{ z#Pp(u0up;K^-@J4DPdZno50sE*REY##oL~*>F7i1MTUH2xH ztvtDO0^w8Q2gi^LiL3%eME1OwgHG@Jjg5^hID<1dz3@LuA%}9UvIErs0000*fD9xgW50k?5-eGk2uS<{NW=tw0p5dmfXpXEOn`)ZA^;)a zye#AGS@&#B?e|sp98OH#&Fyq|b^Uey_3jlfFE4*oRrRy`VBo#~y&Nd^Y4HBN`(W_) z_V%fi6ZiM`?&jtuEHrZixavYw6g9Ep_yE{_u`T4n4EGWs8)50J{Qc6jov?9`D z5D%#cT3=mVb$fez?(*`o9(%nxK2b^eNP-9#DJzB1`}Dj8+Hi=*?Ch*tUte#=C1b3W zL5xx-iRQICYuCzE65&5SKDyJ>Q#Ug+Q;*@v>GwF+r-_&{dUA}6f@tbJGTxDaA08gu z{{DWQRH$+(-%lyT1hgQRmW)lU;L_5Po1UI-*1aagERE*TyPji;Xu3MdFjuwY{QUV( z_uH?(xG!J+s^`aI4k@75ETMG*VK`mmRmU2p>)m8oxCuWzGtUrH{*Q2_rP+z*D34A@ z11vMu@Tpuiu3Rc!P+HgXDABNe43L7_MWqL{jOs?TOGcQv4JyD@mF_+mZZ22}XOsXd zCv@XQoDpRiEQON`$ZahdT3+Lda2p5+_1H5)R@`-kROXcYEVoW&&7j_Ee^kb3%(1}F zv8*LLgV^*kdML|kx<&X?j6Bo3giu-lB#g#qMq-V0DhpSMMAwX4=>#Mc3s~l2bIirw zlT_GsXShB*tw_JLh*TNHRYR(dNx{0(X6wz|;PX|qj*W7+x3^7W%r25$nZ5^4??ERO z*V+>y_J&Z$-1YUfJ2^R_gef7#JVI_VVlgJya$UKm9sc?vR)XQlot>Szr>7@apyNg> zxW||z_Q}|_G9w!!2wpcaP;7d#Y>v*yg{`eEm;mIb1t{gqs}sAVB9OQ-E9>lu!Y0lX z|7zEi0`EN(R*t&{J90xQY%b)6h8WfVb}9udsPmcTdx5T_3{T3Xp|lnyuv1_K`&+W2 z24sWmGNKu(upOzEBBeb90kgUC&u=W+{kp zv{Kp&Qcbwr6W;r;;bt?$F*}r$|EG$-G>Ejc700N)6-K9`Y5nlyPi}5*t{(fGO>A9T zP0n{I1={Yb90d6`T6!OUUB;A!kA#n(%q4Y9YJBN&W!X+4 z^oNj~6F@0j3ze#8NO(DBiH6}z@Q5Kg9aN~%dK4s8ALBa$W=PFH6}MT9Ga73qdOZ~{ zIi64%ZCMWZT*Q>cQt4mPVRM?tc*pNy1Hp`#taEX*wyKV+E?G?ji>K7drFg=aLk!~@ ziZ_Oj@X*-W$4--lh=fuT3r#Rf>vGK2bL*Gfr~69ASI#jd9aAnML&2vJ6IMWi&YkX+Hy z;6DHajT@T=1*6zFwtV*4_x4-|2jH^K#ef8nWzjzB=3p2R@Du^f1kcJrw3tCB_$F4ah_?r9_9~7;;2`QkombmBj+RJe%^A@Pg8nDI}Wl z?mp1=d$(@g`ZRVf;(u4KUVUq|Ui~`UE)%Db$w+GUz&r$Uf%_=3&m0EvF^NcVt$a_w zOtaduTGH%%R|JHtGoKU?g{=Z7Wfyg#^d|~bo&nYPv~p1-e8ah&?}Y0gMY!Y5#`$WJ zq zqT;q?p8JySPhmha=K#$ZRL|af=}-4wxghqbtSLCWn#6xqn>Gtl(x$iB+utsbQ+@=)@KUj{*r_>#={1HSLpBIw2#W!I3)mh+QGZ7E$p zn1QH4U4YY~U|mu-VicAG-a*= z3x!yhyhfoA!2K`6brRur0$Pn*1`c>lK-V5yQ+f=ko32YnQ0m7O={hTPi42!P}+hI_-Pyi&<)pfpwn3&c|xrD&Wh^-hqJ zgV*=>estx^`(L-&68kJSs#iwPHn5wbu3c6O!~zWKqDDkmX=qO{Yp4Yliv=8K53o+;yYFqAy^0SalTU|3M`#gf~eOcJXX7=5VhmcUpxDB`%r_06icMxkk zRiZln*cIbeq!oUg!Qy|358Zg5XtqENyb>jowV383Hui`>ix%wVln=YiL{un) zw?w*T<-$skF=_sp0-g*pi^K#fiJ-ktW6>rHz4g-88YLl(W?sB_kv0R1h@w3D8FZpn zf>djuXr_f;AR$AVv(jIYt_Y%1w;roKXP8AnK`^Xgr0Hh2Oj*+}z=NGk{XR?=*EWU# zPEQ`pcmB^8f354Ztpf&_cjetK9Bi`F&oQBFHe13a_)-e;Au1E(#arCi#)?K4gVl>6 zeHN^Y)7sVrzS~`w`P#y#;Y+q+?7eW|0=)Ci*TBt=l5i6^15VBE07@YHzNTbFxWNwv zRA-AgrL}4$K3))^p}rH>QyH}NB8eKR8jVGKyIBKs2I(-ZaW@T=^_ImN2aTo8J8fb8 z9H%(!b_Ojiey>Bs*L`RO6ll>-6mGMfQ?_(vQqHCd_UMVSI6$vCu_T97wU$_nnj-_U z3K0u}t)sfdeuu8x1+*n0d^CZ>!-F6s`9;u;2S0xsQ(ChiwnH8b8UPuaeW=C|*3#h6 zxRq!gbb40xPp?g2<4czY>g!-^i^UWKJW2QA8v)+mZvBtLAjb@7Q*(-ycMkg^+%BSp z(eVPc=+EA!=~^Gv+Da2zvFue`uo>Mj5Lm6&uv{*^J2=?;U@=X<*UXyJ-3Air(j;G& zz}BX$*7TjIq8;eJ7YKc}6k4dKm8?+;U-f30`HX^2lY>|DOz!5*n=9w$kHU8`FWVfz zE~#|wGs|0?H5KQW&*4HS|R3|i#|i^2Z>KDlj4D9-It+KH2`K{|;r z0j)i3_F(ln&NrY(=8?jIG7nAz-%VW|SrjY|j)8u1auQ_P&Pll01rx^9=>}hC(K0tG z;v8F*aWu6}Vp7*S0$a2}g#cP%^jdn}$ZgM`KM!wz^{rY8;*I)#V6mOHo>I7BNHiTj z3F1`d!*IM_!`ven7uABBdJ7hn@H5k!=Q%K zpxtel7-GYC>b5r_g?nKNf-p*71*SAMNUW{#h=ReAA-JL6Iuv#dA+ zzgTf-U0%bq7TM@l=VasT?d?H1+S@wKOovjatz#e-7G(f+3mc1prJaDaO7UEFTE^w9 z#nmtvArp32f@%kjE0>X- zF;%8D&=w(Ew;6;FGo+DFi&fjW6Blkzw8g4`FIUIk3iX@z_osD9D9c`$LX5TAW;J12 zts~e}WmsJ&Ti9e>m!QcHrZ(#2qkj?-nV#QWET7}#ezMtY7=CTy3lf1;kk8>fB5JDr zivxrvX7Wv^ZFRhxEM(7L;&NyBc5%S1(1VRtO#QXiK~#7F?Hap| z6i2YSXK$C|fIA7@`D_U}A~3QXIJn566Nm5zmiz+_NO0zq1QU=uBk>m)Sw@yXfK24r z3F2hX9fG^vd+hE^xvFQnx4Nh2waa2GQKz}>=|^={S9iU706xI~6O?>GM0MxRowb)Q zU+S%`t!y|Pn)Y+&&LPzS)w#ZxE?vrO`Ps8)Iz)W_{CV8i*g#kSUcY|r=sP?-RGXWd zrrhuM71K5vjnvW6ks`YF$;pZ7d*jB9{StFGZ{A$Hd-v{>G)*r|&^`&{Zp8A<~t<3Mn#`^6?4W`e8Nu6==N`jxG4%$+%N29^N|^9Qi3 zTg*09xpYy~S!Pr*-q!o4IPc)bBlcgscyW>Vcw(C!b6V?#G+PsNl}bx#IUxE^A3S*Q z8;C99m}8X+{{bi{&X8A`pHau)Osvtf$dF}O|H|iAe%;&K`^MJ2Gs%IY&o>2f>&Z&F z0~PoMC2&D8J|PCQ(qH!ngO6-?$K3JpF}#l;8ORIqeu++C&>zs#p9#zsR##WyT|vx{ zdw|uRf$SrT8R1h}fld-vuVF#xdhlaoO7D=L#nQO2jK$c(mzkz1A1`OG7iKO-+;X9M zF5V4NH!aK@!hCwDX=|Dm;nmp6x^*Onnzg2TcfKWS%ccoKkAjV-!o?V@11!#-q^a(x zj>lt2r!z0oNiIo}mMWMC7iL6WN<}2!CgLek0Ze?YK6^f&(+7zgI ziSX9e6<$XZc#=>Ut+#WyvR1O8hOSuv;I<{3f`fyD*(5dIfW?n9YnuNc)T{U?p81qf z>k>*VyLT%&hcq@(C&H`;q3S)Bu&tD2RX!ds?8!s#63#61 z^U8)f66b^le=B35**sYLUIksf953o%r#vrI&KpK43@o)GfG}WiT)1%IHu-hi&6;ZY z+tJL!|1v)&X|qr(D}9is%P@EA)~(;^is)Ju0?c#q&=qRU30C(v%2NBZWFi2w4s{rk zaac5&jNL$|S|}C$c-fL^0vna&FVGn#Waq|oS7+ZHb9CN18nh*VcaB)P%9l=EkV*rF zqa$9FQ(GtFxgNY_=(1WF`oy8?clYVG>IeJom?Mq()~~R->?{m!8{24U zW6RNH0J5#kt*iI%-+yS^owP`eDlbNw$1!oP7Z`1)BJEX*Bu{DN=?$YiYRmwLY3wAF z&p9B*{*djx_=sv~NZC6G(|}FjY3i77IR`lAPEJl-jvk$d5V{efjM1X&7vrf)YEnzi zt+C4+#m_iR;4V(Nzhm9FOV{Y59wR<=MWFu|@1`EUNL& zoU|#<0X8pCx*x-a)P~e84MY_gW%|U4rS#@JwU8ZHx3iv?;Ow`sNHn%u9PNhv{a1UWlZr6w)0 zUMP*`oetPKZJaj27R)>zi$Z7FqeQ<+AziC!C(NV<5MF= zzMng$e!Zjz!{N{{V=ppBqmdzYJk1F;c=*#g>chnHeV|F^=-GDUIk=A7xonw;*}`xe z)1~9nkU5Xrot>SFg#1%Nu8FYHN)SRM;xm4zJ>`B@5fNiZjPunqk}Jns97%dpVl3m2 z=BRDThL(sP*yJhq;a|?YaU0{ZAN%keG%n#e3I-J6O$aCQT*ddBg)+wp1>1k`?d=`H e2lxQ*H~b5fPdRJ;{LN00O`gNG1RT`~qI$AK(NLkO6WE5?JVENJ#txGDpZFBjH0x z1PDkVAi$Eb!Lo$#jG2!&b8nxs_omibRl9GG#yOUKM^|(EboV~Hs#dL9Rr{p$gYq-y zm&=^<`{?(}_&>k>8}_U}{_!t9`OVp%{b3oYlw8wH!`>`r@ZhJiT`9GtIVRt;H~i}} zW&3=>HNLXNC*I7dcUvqMy~JAf8QpuPz7MVK+vo$IwN>o@-t9x#_Sv}}@74RBb17UG zEA0C|$LQJaZOifwWz2or>*wY6qd)rixBld-ZCTl0|Mp>~pB!_;SAA1wE|e2C-&4Q8 zPq|hamG7}jPGu?eANoR z+qwSay=JPojV;PG?eF91Ha+>VpGhyDe)~7X zPyE`qy;#>9cfYoWWosV$2b>_d zWH;0tWnNa!PB&(9eY?mgDjF8mLvaKk!jD!wmxt+tw~y{@ID*U!F{w%0Gx z>Cp$*#!bs&dJFJ?r*~l)MpT32zHeMCqJz(5yN*rt?i-wG!L;zbLW7eV)5p#z(iH(I ze753-B982N3ZvwV!F8}6t|dCtAbU8_5lkV%cBV%keK!60&;FXNcbHek8E(lBbBM)| zQ=?B$=#h@clW@QkocdfJzM(<~aHDQeu7Hn>hB=H%iTo1*;C*-=QNYF(5hJs5fhi!% zbxU@KG#Y|E0WtVKKWE>0^Wtgx*1!B!+U{QF>&P)#6bZs=&UFLAr;EJ?nT@#9&1jIK z*Ma}uedA(CL{Ygnl}mn|-0euHt??RO*LolX$i!T3_T;#9BxeO55v%$;9Ed1d z3FbW;jrGWpQIV6lexOm}0%oouCKEMrzc%jEsHf|kv&^#lG!X@Bkrv=B##jyrXn=a1 zK;`{Xz1a4}sLY?~H17liGqL&PL^Fm*IBS!>q{@W9D*icJojb-lf~oFJQe*C(Qn~ra zkk$F+b}??I^ZCwk+|q8FY)D|=5F!R80^?Cg3pXb|2HpjwO3D@lr)vqXn}oC1wXAFS zUQLlha}iH*l!!f(1cCj75h(817YMEtp=UB>aN{k#e){ir>G+m$_DzI*u)ZitUG63v z0GsULFBV}sb|S}i!H(~ZMe%_}NIAkYB*J!hK(g|3x_kR)a7X$n2^xR47Dse|hqg9Bb4$`3@r_)X9cTd%vTKU=c;iwXNU>Kt~rbsVU=A%f? z0x?66>W}t!fBwfmegEBW{7or$KLV=l`z`_7hp0MF5Aa+Y;`pE_0wfe9JV<7LNwFR3 zW72zImG?~&*~X^5Z}KR4W071NLS*Nm-feQNxil(an;zSTWQ-l_8CrMBw#oci; zUOoTiHn-C#x1W+wEg9u$)uf5dx*|dGPE+Kvq*=b`P>@7*RYP$N)|?Cs^0vM6~?bmFS4v5UTodL zgeQ%i(XVAM?s&hX=|;mD*_%~5B8za?Nzbl!#@P`mAjKnLz*0cW=7p5#1VW?25v>+c zzmpl|U{UYq%q!!z&2Eo2eb59^xkBQz4ta{`D(a}|br#a$9(ARWRU$|lP%?zvk3z^= z@Lv*g94~NGAoVhwSwm=h^Cbr)cVzXFzzLlC#BTgx5%MmgE+L)MrB!Qe5~pP#l*4>j zPhE*4f<;50ly|>nK*XYq9BoYthiZs!eTtL_m7$HQB&gYB?s+|A9RuV#n%dz_a&#g| z>^M|j=upmGikFB=Muy}1_UV$g4YdUGzjAE3->Z1i(=KcB!yLk9IilNnT~Nq=Q#1MS z0sp6fZVs;uF?>q%_@SUQ6}h}3R$Nen%nS7?RU*3h?5z)>*Vp)v3MtD`EDb}wB!^q) zSF65R-75-)@FCph;$$HmsOBJ3NP|rQFXf=;V&Hb5CZeY8_C3rcquSZVtR2bYP9r`1 zopu)KG4GXML*0m)R6*Y9#k-3jn<84_aOkjRI!>b0pTkqf=AX8`oxGJ->)>Lyy0J4~ z+G{2`Ra3txiK*sszke>!78Tl&HOA{xd03AhvFGaB3rmF_ugLeb1bC2_DO1oSiX@r=?z#*;^ z+o$eimDU(TqByJ$5Dop3u*wqNrQW1al@^{;-tNEixjDBxX+%x5rgsL*mBNVMQl7&c zG6XUiE|_vgVfAeQO&}OdvD0IEha)_nn&on7lPIqFclQ}fhdOs=bfN79n@UE)W^Hru z48jTJ!_WNOU)ogVKSn>_gjkMGvW<5oGG=kFWjAPY$~(MwS{w7jju;fta8Sy&YlGdU zQ^ttx@IFfc8F@x=NsfZCA{666wO&G%rUBj4CVM`1asx(#C3(*M;upU7oqzbspZ@BL zSO4}k8#6o>^M|wwW0DVk{1hikU;5NXxo3;c{DG?v70l^S5zB#COdKB?^NyT$bG#A= z=na$UPjuA=dat=!i*RLKj4^#m5h9|%m=mW%_y7A1@AkYa_?0hy>A(N_&wlrtv+qC8 z-mN&iF$c6Saa@kE9|~xxE3fFe>IR&jC6Ru2PnTeEURO=B$nEfS)Ho*!9~|{8vmoF@ zO_b;n!2m@`SiL>c)cN6@rLg{H%p1~!8HzJ9AlNq0}dlrh=v-eYFhv@wm={ARkKKbu(o)M~Lp zdKt^C$Ef~Ykt085?$nXccX3w0DKPSn z&FjHEeK80C69S@f)ef?&8%C)|Ui*Pct$u2n{79>+uk+OzX&*hZ!z;mkD)2^5TYB%O zKK_M|zx4N4#^Jo#Yv`K)!&?}wsfgx_%vz_Qn5j%QPMY(_+s)^Z+6>|DWo2@(qcc7Y zl{Oky9~?)s#N@OjSWLZ&=UUErp-Z(;=-6`o=U;Neu8cFy=rQ+pV;%5GnGYuNaV7fD zn2RA%JyhEtP*T$J@Lm&ZpQC{K&j#=21K8>LI$Xx3n9KOUiB5IOk0DjGLi53pDw_x? z`SK*gRnDnC4{!ZdjH8|4uoi};m}aTDgm7gCPHHXuy3R~u0+!dHhnmoju4>k%d4jas zr-;198X5%-7s+1aQ(BX>IFyObfTR6A3eQ`{MSD0s*uzC=oK2$z5nR z=V)llgIVQB=lin`ET;-NuB~nZq8i85v#k0Rk9Ncn@u}8yiRezY)K(5YiKKG=9+ArgqKYTmkvV)M zP#q$Xk7?C0)u-x(Uet}K^{x%<=Z&8^*m*h!IlB%pde?zQ)W2Bim+CjlxZRtnbi=v*Wjkg?(Eh~!6F zRm0zSHYG{`u0fA#mJ=E?7&EV2B*Xf6@14e(m${W1=h{QYg-&$zBxixu>Vy|n^z}Zb z$E(TAWql_c5;aW-Eq;pRt9w0D(e~~;x@|Xd4TH04pifB9@xPlb+wsV3?EWwra|#E5 zLyXsMPE2-usQcUm?M0tHkVW!)-XtoPbb(uXFbYU%kff0 ze@``aow=v^5Qf*r*+56r)T}2Opc0Zl&m~QGUOEzwL}8SMVG+)>H7M#%Ak^;*lKA0Z z3GY2ne)~@}l8WAVEw@sptJ>xN4QJA<@w1b?Uwa#SfOv2p=_^ggnny9^-a35!wtZ6 zyZdh1*s%I>aU79_bLU7giDr7ZUKD$}>c=S%=a+*HpgYoCU@HH`#jiyNKWI8IRH->7&CGzyrtvqV?(tW zm)|gTTGjC`wIrc?QTD-xI54qOO@Cx6^FcU{38_M2s5Dk>aa@xi?S_6vC5ocD2a^)FdcS(l!Y`!|( ke)tFJhd)33`Tza%e}vK;n0Oy%*8l(j07*qoM6N<$f;Up;ZU6uP literal 0 HcmV?d00001 diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index 8cfb9434c..4de4c05e2 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -319,8 +319,8 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater) m_comboBox_printer = new ComboBox(printer_staticbox, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, 0, nullptr, wxCB_READONLY); m_comboBox_printer->SetBorderWidth(0); - m_comboBox_printer->SetMinSize(wxSize(FromDIP(260), FromDIP(60))); - m_comboBox_printer->SetMaxSize(wxSize(FromDIP(260), FromDIP(60))); + m_comboBox_printer->SetMinSize(wxSize(FromDIP(250), FromDIP(60))); + m_comboBox_printer->SetMaxSize(wxSize(FromDIP(250), FromDIP(60))); m_comboBox_printer->SetBackgroundColor(*wxWHITE); m_comboBox_printer->Bind(wxEVT_COMBOBOX, &SelectMachineDialog::on_selection_changed, this); @@ -345,15 +345,15 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater) bed_staticbox->SetMaxSize(wxSize(FromDIP(98), FromDIP(68))); bed_staticbox->SetBorderColor(wxColour(0xCECECE)); - m_bed_image = new wxStaticBitmap(printer_staticbox, wxID_ANY, create_scaled_bitmap("printer_preview_BL-P001", this, 32)); - m_bed_image->SetBackgroundColour(*wxGREEN); + m_bed_image = new wxStaticBitmap(bed_staticbox, wxID_ANY, create_scaled_bitmap("bed_cool", this, 32)); + m_bed_image->SetBackgroundColour(*wxWHITE); m_bed_image->SetMinSize(wxSize(FromDIP(32), FromDIP(32))); m_bed_image->SetMaxSize(wxSize(FromDIP(32), FromDIP(32))); m_text_bed_type = new Label(bed_staticbox); m_text_bed_type->SetForegroundColour(0xCECECE); - m_text_bed_type->SetMaxSize(wxSize(FromDIP(80), 0)); - m_text_bed_type->SetFont(Label::Body_13); + m_text_bed_type->SetMaxSize(wxSize(FromDIP(80), FromDIP(24))); + m_text_bed_type->SetFont(Label::Body_10); sizer_bed_staticbox->Add(0, 0, 0, wxTOP, FromDIP(16)); sizer_bed_staticbox->Add(m_bed_image, 0, wxALIGN_CENTER, 0); @@ -4134,8 +4134,7 @@ bool SelectMachineDialog::Show(bool show) m_text_bed_type->Hide(); } else { - plate_name = "Plate: " + plate_name; - m_text_bed_type->SetLabelText(plate_name); + m_text_bed_type->SetLabelText(format_bed_name(plate_name)); m_text_bed_type->Show(); } @@ -4151,6 +4150,28 @@ bool SelectMachineDialog::Show(bool show) return DPIDialog::Show(show); } +wxString SelectMachineDialog::format_bed_name(std::string plate_name) +{ + wxString name; + if (plate_name == "Cool Plate") { + name = _L("Cool"); + m_bed_image->SetBitmap(create_scaled_bitmap("bed_cool", this, 32)); + } else if (plate_name == "Engineering Plate") { + name = _L("Engineering"); + m_bed_image->SetBitmap(create_scaled_bitmap("bed_engineering", this, 32)); + } else if (plate_name == "High Temp Plate") { + name = _L("High Temp"); + m_bed_image->SetBitmap(create_scaled_bitmap("bed_high_templ", this, 32)); + } else if (plate_name == "Textured PEI Plate") { + name = "PEI"; + m_bed_image->SetBitmap(create_scaled_bitmap("bed_pei", this, 32)); + } else if (plate_name == "Supertack Plate") { + name = _L("Cool(Supertack)"); + m_bed_image->SetBitmap(create_scaled_bitmap("bed_cool_supertack", this, 32)); + } + return name; +} + SelectMachineDialog::~SelectMachineDialog() { delete m_refresh_timer; diff --git a/src/slic3r/GUI/SelectMachine.hpp b/src/slic3r/GUI/SelectMachine.hpp index f6fa39484..47741eebb 100644 --- a/src/slic3r/GUI/SelectMachine.hpp +++ b/src/slic3r/GUI/SelectMachine.hpp @@ -429,7 +429,7 @@ public: int update_print_required_data(Slic3r::DynamicPrintConfig config, Slic3r::Model model, Slic3r::PlateDataPtrs plate_data_list, std::string file_name, std::string file_path); void set_print_type(PrintFromType type) {m_print_type = type;}; bool Show(bool show); - bool do_ams_mapping(MachineObject* obj_); + bool do_ams_mapping(MachineObject *obj_); bool get_ams_mapping_result(std::string& mapping_array_str, std::string& mapping_array_str2, std::string& ams_mapping_info); bool can_hybrid_mapping(ExtderData data); void auto_supply_with_ext(std::vector slots); @@ -438,6 +438,7 @@ public: std::string get_print_status_info(PrintDialogStatus status); PrintFromType get_print_type() {return m_print_type;}; + wxString format_bed_name(std::string plate_name); wxString format_steel_name(NozzleType type); wxString format_text(wxString &m_msg); PrintDialogStatus get_status() { return m_print_status; }