From f75d79860b2085e83fb75cd35ffff930a39dca73 Mon Sep 17 00:00:00 2001 From: tarman3 Date: Mon, 12 May 2025 16:57:30 +0300 Subject: [PATCH] CAM: Simulator - Decrease speed button (#21222) * CAM: Simulator - Decrease speed button * CAM: Simulator - Move slider upper * CAM: Simulator - Changed speed icons --- src/Mod/CAM/Gui/Resources/Path.qrc | 11 +++-- src/Mod/CAM/Gui/Resources/gl_simulator/0.png | Bin 952 -> 0 bytes src/Mod/CAM/Gui/Resources/gl_simulator/1.png | Bin 456 -> 318 bytes src/Mod/CAM/Gui/Resources/gl_simulator/10.png | Bin 0 -> 761 bytes src/Mod/CAM/Gui/Resources/gl_simulator/25.png | Bin 0 -> 1206 bytes src/Mod/CAM/Gui/Resources/gl_simulator/4.png | Bin 826 -> 0 bytes src/Mod/CAM/Gui/Resources/gl_simulator/5.png | Bin 0 -> 701 bytes src/Mod/CAM/Gui/Resources/gl_simulator/50.png | Bin 0 -> 1219 bytes .../CAM/Gui/Resources/gl_simulator/Faster.png | Bin 980 -> 1023 bytes .../CAM/Gui/Resources/gl_simulator/Slower.png | Bin 0 -> 1022 bytes src/Mod/CAM/Gui/Resources/gl_simulator/X.png | Bin 874 -> 0 bytes src/Mod/CAM/Gui/Resources/gl_simulator/x.png | Bin 0 -> 936 bytes .../CAM/PathSimulator/AppGL/GuiDisplay.cpp | 45 +++++++++++------- src/Mod/CAM/PathSimulator/AppGL/GuiDisplay.h | 11 +++-- .../PathSimulator/AppGL/MillSimulation.cpp | 25 ++++++++-- .../CAM/PathSimulator/AppGL/TextureLoader.cpp | 23 +++++---- 16 files changed, 77 insertions(+), 38 deletions(-) delete mode 100644 src/Mod/CAM/Gui/Resources/gl_simulator/0.png create mode 100644 src/Mod/CAM/Gui/Resources/gl_simulator/10.png create mode 100644 src/Mod/CAM/Gui/Resources/gl_simulator/25.png delete mode 100644 src/Mod/CAM/Gui/Resources/gl_simulator/4.png create mode 100644 src/Mod/CAM/Gui/Resources/gl_simulator/5.png create mode 100644 src/Mod/CAM/Gui/Resources/gl_simulator/50.png create mode 100644 src/Mod/CAM/Gui/Resources/gl_simulator/Slower.png delete mode 100644 src/Mod/CAM/Gui/Resources/gl_simulator/X.png create mode 100644 src/Mod/CAM/Gui/Resources/gl_simulator/x.png diff --git a/src/Mod/CAM/Gui/Resources/Path.qrc b/src/Mod/CAM/Gui/Resources/Path.qrc index b8462b1868..164f44a755 100644 --- a/src/Mod/CAM/Gui/Resources/Path.qrc +++ b/src/Mod/CAM/Gui/Resources/Path.qrc @@ -126,11 +126,14 @@ panels/TaskPathSimulator.ui panels/TaskCAMSimulator.ui panels/ZCorrectEdit.ui - gl_simulator/0.png - gl_simulator/1.png - gl_simulator/4.png - gl_simulator/X.png + gl_simulator/Slower.png gl_simulator/Faster.png + gl_simulator/x.png + gl_simulator/1.png + gl_simulator/5.png + gl_simulator/10.png + gl_simulator/25.png + gl_simulator/50.png gl_simulator/Pause.png gl_simulator/Play.png gl_simulator/Rotate.png diff --git a/src/Mod/CAM/Gui/Resources/gl_simulator/0.png b/src/Mod/CAM/Gui/Resources/gl_simulator/0.png deleted file mode 100644 index 4ce56804690e4e0218eced68499181555c09ab66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 952 zcmV;p14sOcP)ecBAMY z;g4GpjDZbA-6T^dyAs9GjWy|piP2UxU-;f$BuCEqOpNTnfj94Y-Uq&O!g&uOLb(at z1V({v;1lp4@G~$B)K{#lAd3MhKq}1lz*pB20?z;&kj~CdSzcb2v$HeFWHPe2xG2$R zR7vx|(<_C*W1s-Y*w~mjjw9~jIF5{uk1J^b=q@V+8i2n5866$HByx}8;bA3x2l&eg ze*~nhtxfXzd{yE3`MHEbAtill2!T7mM?h9rSB=7aJ}>cjT;lP#*tTt~t*opl;W2Pa z7rq9hx3||Qux(rV`uZ+TcVJ-PlC-*jx;wnEBI^RTR;MVfFV3SK9;(=IsqKuKEQK8VzHP3?(Xg? zSr(`%%`6~$dwT|}ZObzYcnHwi+KN8b*49+GE+PdHDF7P)>+9R%hYPAn6;0u73mKFm_r_(BYr=|Y{NTpH+8wdncc-I1a0DiyUfHIkk z3J>)(KsK8-Sf9_QLazmQ0lZ$X0ck~gb+(GoXQ@d2ht%+RJQty!cCEQ<9Sb-D$mMbd zq-}w|7k<|ouG*XhkpvJ~V6@ICun*o}dnhbV-e_w@v zTfh#$&d!bjg~MSLc4+AcKzn<;!D_X?*C^rU=B5EfA`uln@_0No6b~c}(9zLhuv=SO zD*QuzMzzb~8{j)CTn@Fhwd!)Xr;dCJkh!@z1D>3m)UU4(fJ{$M8_dkijAD}defSEH zo}L~9wryMb`};30*jOwkg+jq#y1Kg5`U_on8#tj%3$Sfl5{ZN)5{YUppg~+s>IXnV zq0s+nQg5V8*Yi_qqa!0DRfR)CLsz#^aW(qE!NKb^dK-uu4*f?-`jp}`L!!~BEG;d` z>FKE)9v;fV!h%F15hXhZzQ0uOPL!kr6dy!aJ(ix7tu2=WN+rFI}e4iBL{Q4GJ0x0000DNk~Le0000E0000W2nGNE03z;5mjD0&32;bR za{vGi%>V!n%>iTP7s8*|KHPh)dg0p3GVM8l$9-%8h#uzo5%~-Ssfg@mUj8VJYPDF9=8Bn9q zSQ{7wffc?3@;vX?pvh#SQmK>(Q-BN5?RJSW9*-#&i*!02Y`F%MPN!9`*VSsZl*{D= zD4)+;x4H#9#2hUv+-;UL15S)F$G{=51H3JEk{rdK)xEz~Oj&2OWCJ(wze5jTI2;m& z;di6!xpF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10)|OM zK~zYI?Uu1iomUvffA9N6(IHU~Z*fRwhpX6YO0N!*N&f^f4oL=aickV}(y7o%y0)4n zBu+OJl#U{F(Imt>C=Oy4^I=>ZtjR6(%l*#N!F*r8Km;jtDBK4Q9L{;pkN2E2ybtdF z22eKK{T%oWs7N9kKqv6X%y!(pk@?N6>Fy`MGhiU|8=!Kz%;@MS0F6e2_4W18Xf%=# z!W~I3&FqGmZAkj2zrR0>jEs0&TN{~}DRdJdquxj7YebabSio}M&{ zqF0}){n^a4yu7T-6vwg3<#PJzHaEWrmZXJ+h3t9CX7<qMFTSzBf2H7|iS?z!TuLyZ=$C zRMO0_wY8OjUjRBhJd`A*X{x@yzNWjMn%O>})z#G;JUu3Jw4^*2 zB_)6gYeZ3mBzOKJwZJWK3)}*?!2cg`0LZ#aAx~U0vo^rm+uL(dpxC;0^!1?(( z0KL7vluD)4-5&zK0}Krf<>s@qGu-|CRltV;`}_OAMenQCYSGx(*jK~D!{5%&&oenW znVa|a_7p-mC}y+Aot>R|`>)sQS^NL)Uj>#cfFA(An3+~qRxX9cajb!Xfz;jq1a4g` z-Z@DUo1L8nF7iV`^X^`mnVGr0w6qke)v6aiERJI~H#b9)Btg=BNpFi4e@`LKauHEK r0(bOzjD6+qANV}Rz5|{DgBkB{j;1IKO@j7c00000NkvXXu0mjfLm6vM literal 0 HcmV?d00001 diff --git a/src/Mod/CAM/Gui/Resources/gl_simulator/25.png b/src/Mod/CAM/Gui/Resources/gl_simulator/25.png new file mode 100644 index 0000000000000000000000000000000000000000..52db8e19a68b84a2335cc30b19a51a86031fd93c GIT binary patch literal 1206 zcmV;n1WEgeP)P001Be1^@s6=bY0900009a7bBm000id z000id0mpBsWB>pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H11Vc$g zK~zYI)t665+*c6CKQq5=E1EV~qi!*UP%v!49PBOBKNk;)hzc5-N(@O4DWsP`a}l95 zHUSB=_mt49r_fYv2wNI+mI;qkV?TAH)@cq(KfrkH$8NJKh||!6Ue1scrd@2 zdGnq3=Dm6R0FD4zz>0^eJ`<57@EPEl89)RW6Oq45%_$mL;7A1c0EqPU^-)t(Lm}4J z*WbQ%>(4F#Ef z1)KwHZf>rme}Ggf70fxSJEoFHBog7$rAr(>eAra=9Prj|bGF3@gn@wpDl01iP*n~c zI>hMcD7CeshrZ3t z&7P{Zh)DHIlZZ&KnKkzG^n|**ckc$`7(gPC2yN%jpT{}(4)ATsj7yxV231{YXlU>= znM`==o0^)Os-}TARrUAk>S{loPKPJ#)TvX!=^NY@vxp!fBGaDdx#{WYFu?Hea1h{& zykDD$xQ>nv=llPi^7Zv~i^XETsy+u|7c2 z2z?(scwiM36~3y@0+riHfTJSfIy*bfIcH{OOG`^uS6An&>JuPZl#q%@Ttr+v9uJAG zUcDNu`pOm(;C)qH-M@dozp}DoW@fou&f44CO+<1)+YVi!UR590*4Fxqi;E%Ai4!LR zqEGXFsE8yZk%*g_nJHC=;how=L49&mLtg%4HefXkw^qdjsX0;ckf<*b8|D?rhFDlK;3Qx1@%c(RaJ%CZDtmW z#hi$wP}SwGuCCB9F))@ zea1z^FEYOXz5~7l-Y7JPNQ0Tt($W&@*4EY#k!RaTjvYJ3GE&O6;aj20|yR7J32a~+{A^21#aB90dO7Y?e6X-8jWu8 zan3P6KTk55v|KKiHM395>^eZN=Xs0l{u^K-@(*xML`wc@h{y|7T>yRnJ`7sUzpu5{ UsBOjIvH$=807*qoM6N<$g3@_2oB#j- literal 0 HcmV?d00001 diff --git a/src/Mod/CAM/Gui/Resources/gl_simulator/4.png b/src/Mod/CAM/Gui/Resources/gl_simulator/4.png deleted file mode 100644 index 976c6cb86d7a9d278d260f2ee1b5b04d671d0b0f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 826 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 literal 0 HcmV?d00001 diff --git a/src/Mod/CAM/Gui/Resources/gl_simulator/Faster.png b/src/Mod/CAM/Gui/Resources/gl_simulator/Faster.png index ef68900620e36c7703d01778c52528650683582e..2af36947b652bf67d7b2f546f5a92b66a386d09f 100644 GIT binary patch delta 999 zcmVh6aq0tdqNg2 z+E^P`L6T@K9+c}BG7iBi(D8;$`F_?XW`;CxM*yl)<|gc-dK~K zZwu#$_}X$Z8u$kI8-Mr{xDS|!S-t=i zkH-~@#RLeL^Az|NP<3^+!Z37<>8JunH8nLlI5+9R#l%71}g zUja#4TU%3ARh5h}r$CRFfF#Y$&AFjGxIUCo1SDyCdfK%jcYk##BMC^-=;){eYyo$C z1+29i8X9tpbs+Q-xHgnu`wB=GL)q2U(2Q*CXn1^xqGlFvRc zFficEKUW1?u_X2P_dCWX^4W@)mX=&_4@guZu&}V;7=KxyI&2rA3=a=Kc7{X}NT<^>#>g0R1TBi?d^{7 z?k#y91VNy5IxTChCMPFdaFd9aRN(h847I(zt@HD9jgOCCy${@YNd=r;rFa?g5uhLlR99E$7)QYKw`R+LQ7(?gA}H`P@N(4RS0p|Jc7aF025>h@?tjV!n%>iTPglDcalP@x5(4b*Nas}@(+uFkre z-Cqvt8-`7GGv5q+FqhxMGc)hJ-}fR3;0xdha0xsF-jjsO0zL=+1b?0aKLZ~)WVr*V zXq^D>IzT=J@s0rK&ezpl9b70)Ya8xj18dbRT2W^zvA(@nwpvnG8aH1 z3n-h-K4&Bn3AMJi8h_)SvxFo?qfyn=)EH#MRYH=swzgDTTWgFjoh2k`adFWA8KBEm zLXwu2mW*)$+;oa#KpyhdV6~f5(8>oB`z;76^TTQ z@hk9}lY}H49v-T#t<4}yt`d@zOeWRd-foQh&JvQey}hlvx_>%@eB~-3Njp0`s;{p% z#y8FqlC-?Mtcr>XQE2ZGR|!d4Sy?eg4*1wvLXsvYC+$i8w)$|9kff=pDP#N#Tz8hp z<#PUx`gItITrQ{X?rvjz>ntG^Ua7U@FcOlqwzg)BN1-GR4h{_PUs#Fb<6~o_t`Xu& zCX>%^!{mz@p?@S+S6A)!x3Ch$45!a=a&n^P=4N}9kuaYlolg6A*jr8#`Fvh|eSH>= zDny^i=kppE7%;|Tx%P?a>1hie0dI$qn4O(9#{a-OP7>?u>#D4*v`%+hA=>uF#)hh@ zszl*DdPgp8dv|wN4Gj(U1m7vd1{ROU)!5i*jJtB#z<)f?^LNPaforZ3nM_8Vot?&5 zr|8`JN{Qj&VGI8Oyk0C2L}FxQ#2CB4n=i?imYAQPw{V&=b4WRfg@pxUctA&q{L3Xa zH#b#XU2R45St)^X60um!e^?$WlYdbnkw~berNzQC;6xj12Hmp!^l&6X5qNnOM+pk;p9yJK|H| d7vM(F>@$_AQEp}XBohDt002ovPDHLkV1lpVvDp9s diff --git a/src/Mod/CAM/Gui/Resources/gl_simulator/Slower.png b/src/Mod/CAM/Gui/Resources/gl_simulator/Slower.png new file mode 100644 index 0000000000000000000000000000000000000000..0d400eb22ca7a761596436d26aad95d6189a6e72 GIT binary patch literal 1022 zcmVpF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H11B*#S zK~z|UotI5WTvr%C&-dO;>NAcywj#O^yATy5(nyhRinuCNP}+@%fd)50f;+)QHbN{E z1PugIq#Nz7C|Cq57E3Fgl^ekt8m$Xk8AMZmqBDXz@9Sdj$XLgj_uhqBp7Wi@yL!p{K>hr{YPjsgmN=QChD<0vXB$~azl z0lx&?NF?H}udnOD!GV^Ql_`(_ERVw<0UC`)-ObHSjmP7e4>>3VHi^hP5z(2M8O^Mw zrl!mn-1jj2BN0j3wyg^b3)ha?+S;@u4;Tfu038__(d^|l0H^}~26Sv}?1m$6fH^P= zfOd6tX)2ZS9RP%ZUjgmy?bZLULIK|Z+R)IT$H&LFV2=SW0c~k%(L^HQJplLua7#)` z+>MQmTcDSK>_fM`y`9sMGXQuXA_>c~bbfw5Cs-%|cqk(0wr%U;;^Li-TLC}?@E4$? zqoa3%`2v6{5!nTFVqzk%<3<2r13v-U-QBIO>-r8bhwe8(`}+Fw^0@-W0Bvq=*3;9| zg76&yuK;arZPjEl={*4W1aQmC%iXQ5t%6{#0H6cV%F0T2XJ^NgBRgOo(CO)EPv9K^ zzW_QrJL}nz9k5?qT&$Oumw^JzrF9yOMhl*uTmcqfhr?k)p%4L=0%6B-5E0+71-v;q zIUyE{1)HAUgE#SboVB&JK#oU%wzakC)zy{nElAJj383xm?Vh(G`wZB?Dxl-z<3R)N z0e=8GIXUSszz7}y7mnlHd3WavFpf6hsW5qWD_maeR<1P!PWkrUgtb#-;sUw{!j2DGuU zQP0oMui^Uo`bLtK98b#zJ<1oAekG%?7NWXd# sr2nox@j5)q@iDLhB!NGHuT+))0MRnMwspNQ(f|Me07*qoM6N<$f=R~2ga7~l literal 0 HcmV?d00001 diff --git a/src/Mod/CAM/Gui/Resources/gl_simulator/X.png b/src/Mod/CAM/Gui/Resources/gl_simulator/X.png deleted file mode 100644 index c983441030552bb2ca26916bc3dbce71018f26c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 874 zcmV-w1C{)VP)FnDWKDIWlk6<#3{#V^HRBC8G9`giD^W&3QCD&?eG?*9LuU*A3VJP(op62M!a z0ek{p15YF|Y66ddUjg5E-vSA<$3x%}P~ZFu@J2vqfG-1l7r+C6mw;wwW)uX0PESv@ zyu55hO<-aG^l>N@`V44kX-Ow1CptSjQ#PBmz9QzY>*(l6-D7@!-ij&%z!gAqb8|hO zgM$O>`3UeQpv%k49#OqsS2P;6Laz(z0g6VWs@Lm1p7Zl_s}BI)0ovKwQU53wi&p3Z zVKaR|#bVLXZ*Ol~{T~270!pXTYPZ`x!d9!LR4Qe~c{7ztrPOM*dbI6!TT@e0R{H|r zKJWohxmqEe}JUt|+drBZQp<#O5TJ^=UaxjhFIkH>X&b>*0Hxm+ila=Dzd-)J-x zi^Z(wxg;z&1pE$Yb#>J-`o6DlIIM6uEZ_H?{gss!3;hiUb-)Jx6ljl)jp^|4&@t!p zd9AOnJL}bIRpaC10@^^j!&7g3mH|yqPdk8Sv#DmY>8xim8T+;69#$XtJNvwMcXu5~ z|JdK(x6msfJ``-=tAG-Tgs!izheB^|ZZt75VZkd7X8?E%I0RHE6o!H~Ha0A@3XIkhZQy}hAOJH9&H__hbKH4w}#PkL=_P5FG@Ss(eNxvM0ENt>})OpQjvF?ycYNt>SM zIs1KS^O<4(KZ$;8Ys>0R4f9S)(=v=GrlnG8XfZ97N{+t2nBH0WAK0+W&dz>w!%_m2 z&1O}r)pUG(tc8UI0Wxh=asar~Vl6H%%J+TMYPIgi@-zI~z+KpI>Y9HuBqbVn)@b^D zb>Mp|N&s)n54;Cn0S|^jyWkIjUySF%Fn*B4Kf+gJ3x+iV_y7O^07*qoM6N<$f<;t` A`Tzg` diff --git a/src/Mod/CAM/Gui/Resources/gl_simulator/x.png b/src/Mod/CAM/Gui/Resources/gl_simulator/x.png new file mode 100644 index 0000000000000000000000000000000000000000..45d981d28d2c1e1e872db4ecb73344caf451ed78 GIT binary patch literal 936 zcmV;Z16TZsP)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H112suR zK~y-6ZI#bU<5v{LKlkOwfWab`XsNaXDmG9wg~CWV`oM;ds?{s0lnT+PbcXQr7ymRjPzV`s0 z18V-v>?QD662Mz#c5%N4cpe4}U}|cLNF>79*%>PF`xg@DjC`uaKmu~>|up&^`e zX#g`zClU$Y+1Uv|E|;TTIS1@J=T7qZd;pS4rObQ(o|!!chQ`LmT!WFz;hg(V(%;mj z{T_`*eYIMZBrPs32GV{6w6L(yuoQ_zJg^{%fcyoZwY4=#($UdTKz<46@bFNQw7R+) z;Gat(kh2aDNbl?GqpPdS1MTs6+z$*4-1mDoAW2BVIrs0#$cR_HGMS73WipunQZkwJ z&bfaAPJ;~m8VZH{<>jR$X?J&5larI$-`|%cot~b`IVa%fR^-nBWwTkes->l+!0)FG zwY;izK+TagS1y;s%slW{fHlaH%FekLdwY8=$)!>WGdq^_;sM#r-uB+VIXpbvlAKH? z@!r2W&mt$Z3Rl70TheHyIh?kolZOF zT-wac0q=Y7-)PRaSS;e4s{((R+3oiB_G@{2?>m76z*m3@g+e2eo}Qi>kPjjp92{)q zmCxq`OJ4#khQncheSIxSDwoT_;ty)NJufaUBuUk3HMolA!_K+USS)5UGcy2`%jG~} zptUIJo9XFk;_)~DZEbB guiFileNames = {"Slider.png", "Pause.png", "Play.png", "SingleStep.png", + "Slower.png", "Faster.png", - "Rotate.png", - "X.png", - "0.png", + "x.png", "1.png", - "4.png", + "5.png", + "10.png", + "25.png", + "50.png", + "Rotate.png", "Path.png", "AmbientOclusion.png", "View.png"}; @@ -73,8 +79,9 @@ void GuiDisplay::UpdateProjection() mat4x4_ortho(projmat, 0, gWindowSizeW, gWindowSizeH, 0, -1, 1); mShader.Activate(); mShader.UpdateProjectionMat(projmat); - mThumbMaxMotion = guiItems[eGuiItemView].posx() - guiItems[eGuiItemSlider].posx() - - guiItems[eGuiItemThumb].texItem.w; + mThumbMaxMotion = guiItems[eGuiItemAmbientOclusion].posx() + + guiItems[eGuiItemAmbientOclusion].texItem.w + - guiItems[eGuiItemSlider].posx(); // - guiItems[eGuiItemThumb].texItem.w; HStretchGlItem(&(guiItems[eGuiItemSlider]), mThumbMaxMotion, 10.0f); } @@ -263,8 +270,10 @@ void MillSim::GuiDisplay::SetupTooltips() QCoreApplication::translate("CAM:Simulator:Tooltips", "Play simulation", nullptr); guiItems[eGuiItemSingleStep].toolTip = QCoreApplication::translate("CAM:Simulator:Tooltips", "Single step simulation", nullptr); + guiItems[eGuiItemSlower].toolTip = + QCoreApplication::translate("CAM:Simulator:Tooltips", "Decrease simulation speed", nullptr); guiItems[eGuiItemFaster].toolTip = - QCoreApplication::translate("CAM:Simulator:Tooltips", "Change simulation speed", nullptr); + QCoreApplication::translate("CAM:Simulator:Tooltips", "Increase simulation speed", nullptr); guiItems[eGuiItemPath].toolTip = QCoreApplication::translate("CAM:Simulator:Tooltips", "Show/Hide tool path", nullptr); guiItems[eGuiItemRotate].toolTip = QCoreApplication::translate("CAM:Simulator:Tooltips", @@ -366,9 +375,11 @@ void GuiDisplay::UpdatePlayState(bool isRunning) void MillSim::GuiDisplay::UpdateSimSpeed(int speed) { - guiItems[eGuiItemChar0Img].hidden = speed == 1; - guiItems[eGuiItemChar1Img].hidden = speed == 40; - guiItems[eGuiItemChar4Img].hidden = speed != 40; + guiItems[eGuiItem1].hidden = speed != 1; + guiItems[eGuiItem5].hidden = speed != 5; + guiItems[eGuiItem10].hidden = speed != 10; + guiItems[eGuiItem25].hidden = speed != 25; + guiItems[eGuiItem50].hidden = speed != 50; } void MillSim::GuiDisplay::HandleKeyPress(int key) diff --git a/src/Mod/CAM/PathSimulator/AppGL/GuiDisplay.h b/src/Mod/CAM/PathSimulator/AppGL/GuiDisplay.h index 567cb42c38..19e54579a2 100644 --- a/src/Mod/CAM/PathSimulator/AppGL/GuiDisplay.h +++ b/src/Mod/CAM/PathSimulator/AppGL/GuiDisplay.h @@ -40,12 +40,15 @@ enum eGuiItems eGuiItemPause, eGuiItemPlay, eGuiItemSingleStep, + eGuiItemSlower, eGuiItemFaster, + eGuiItemX, + eGuiItem1, + eGuiItem5, + eGuiItem10, + eGuiItem25, + eGuiItem50, eGuiItemRotate, - eGuiItemCharXImg, - eGuiItemChar0Img, - eGuiItemChar1Img, - eGuiItemChar4Img, eGuiItemPath, eGuiItemAmbientOclusion, eGuiItemView, diff --git a/src/Mod/CAM/PathSimulator/AppGL/MillSimulation.cpp b/src/Mod/CAM/PathSimulator/AppGL/MillSimulation.cpp index 2a166343eb..74a3a8e4d8 100644 --- a/src/Mod/CAM/PathSimulator/AppGL/MillSimulation.cpp +++ b/src/Mod/CAM/PathSimulator/AppGL/MillSimulation.cpp @@ -467,12 +467,15 @@ void MillSimulation::HandleGuiAction(eGuiItems actionItem, bool checked) mSingleStep = true; break; - case eGuiItemFaster: - if (mSimSpeed == 1) { + case eGuiItemSlower: + if (mSimSpeed == 50) { + mSimSpeed = 25; + } + else if (mSimSpeed == 25) { mSimSpeed = 10; } else if (mSimSpeed == 10) { - mSimSpeed = 40; + mSimSpeed = 5; } else { mSimSpeed = 1; @@ -480,6 +483,22 @@ void MillSimulation::HandleGuiAction(eGuiItems actionItem, bool checked) guiDisplay.UpdateSimSpeed(mSimSpeed); break; + case eGuiItemFaster: + if (mSimSpeed == 1) { + mSimSpeed = 5; + } + else if (mSimSpeed == 5) { + mSimSpeed = 10; + } + else if (mSimSpeed == 10) { + mSimSpeed = 25; + } + else { + mSimSpeed = 50; + } + guiDisplay.UpdateSimSpeed(mSimSpeed); + break; + case eGuiItemPath: simDisplay.updateDisplay = true; break; diff --git a/src/Mod/CAM/PathSimulator/AppGL/TextureLoader.cpp b/src/Mod/CAM/PathSimulator/AppGL/TextureLoader.cpp index f4f15aef18..46f1f9595b 100644 --- a/src/Mod/CAM/PathSimulator/AppGL/TextureLoader.cpp +++ b/src/Mod/CAM/PathSimulator/AppGL/TextureLoader.cpp @@ -25,20 +25,23 @@ using namespace MillSim; TextureItem texItems[] = { - {1, 36, 0, 0}, + {1, 40, 0, 0}, {1, 1, 0, 0}, {70, 1, 0, 0}, {100, 1, 0, 0}, - {134, 1, 0, 0}, - {172, 1, 0, 0}, + {135, 1, 0, 0}, + {30, 1, 0, 0}, + {170, 1, 0, 0}, + {1, 130, 0, 0}, + {30, 130, 0, 0}, + {55, 130, 0, 0}, + {85, 130, 0, 0}, + {140, 130, 0, 0}, + {195, 130, 0, 0}, {210, 1, 0, 0}, - {2, 50, 0, 0}, - {70, 50, 0, 0}, - {27, 50, 0, 0}, - {44, 50, 0, 0}, - {90, 50, 0, 0}, - {128, 50, 0, 0}, - {168, 50, 0, 0}, + {95, 50, 0, 0}, + {130, 50, 0, 0}, + {170, 50, 0, 0}, };