From 503d91396ef8b131b8280724c26c9dd2c9460efd Mon Sep 17 00:00:00 2001 From: Emmanuele Sassi Date: Wed, 28 Dec 2022 09:15:28 +0100 Subject: [PATCH 01/35] - modifiche grafiche TopPanel --- Icarus/Icarus.vbproj | 13 +- Icarus/Project/ProjectV.xaml | 7 +- Icarus/Resources/ProjectManager/GoToProd.png | Bin 652 -> 0 bytes Icarus/Resources/ProjectManager/GoToProj.png | Bin 622 -> 0 bytes Icarus/Resources/ProjectManager/Import.png | Bin 671 -> 299 bytes Icarus/Resources/ProjectManager/ImportBTL.png | Bin 610 -> 0 bytes Icarus/Resources/ProjectManager/New.png | Bin 538 -> 365 bytes Icarus/Resources/ProjectManager/Open.png | Bin 647 -> 468 bytes Icarus/Resources/ProjectManager/Options.png | Bin 2381 -> 562 bytes Icarus/Resources/ProjectManager/Save.png | Bin 610 -> 308 bytes Icarus/Resources/ProjectManager/SaveAs.png | Bin 951 -> 344 bytes Icarus/Resources/ProjectManager/Send.png | Bin 1036 -> 650 bytes Icarus/Resources/ProjectManager/UpdateBTL.png | Bin 797 -> 0 bytes .../Resources/SplashScreen/LogoEgalware.png | Bin 4844 -> 4998 bytes Icarus/Resources/TopPanel/MachiningDb.png | Bin 0 -> 787 bytes Icarus/Resources/TopPanel/ManagePart.png | Bin 0 -> 532 bytes Icarus/Resources/TopPanel/MaterialDb.png | Bin 0 -> 1053 bytes Icarus/TopPanel/TopPanelV.xaml | 396 ++++++++++-------- Icarus/Utility/Dictionary.xaml | 121 ++++-- 19 files changed, 313 insertions(+), 224 deletions(-) delete mode 100644 Icarus/Resources/ProjectManager/GoToProd.png delete mode 100644 Icarus/Resources/ProjectManager/GoToProj.png delete mode 100644 Icarus/Resources/ProjectManager/ImportBTL.png delete mode 100644 Icarus/Resources/ProjectManager/UpdateBTL.png create mode 100644 Icarus/Resources/TopPanel/MachiningDb.png create mode 100644 Icarus/Resources/TopPanel/ManagePart.png create mode 100644 Icarus/Resources/TopPanel/MaterialDb.png diff --git a/Icarus/Icarus.vbproj b/Icarus/Icarus.vbproj index a9dbcfa..99f3afb 100644 --- a/Icarus/Icarus.vbproj +++ b/Icarus/Icarus.vbproj @@ -550,16 +550,12 @@ - - - - @@ -671,6 +667,15 @@ + + + + + + + + + IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\Icarus\IcarusR32.exe diff --git a/Icarus/Project/ProjectV.xaml b/Icarus/Project/ProjectV.xaml index 4644c34..4d400d7 100644 --- a/Icarus/Project/ProjectV.xaml +++ b/Icarus/Project/ProjectV.xaml @@ -5,12 +5,7 @@ xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5" xmlns:PrintApp="clr-namespace:Icarus"> - - - - - - + diff --git a/Icarus/Resources/ProjectManager/GoToProd.png b/Icarus/Resources/ProjectManager/GoToProd.png deleted file mode 100644 index ca0eb96b08d8b7df6b35458239e487e5764764f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 652 zcmV;70(1R|P)Gk+S&>}_qlAM~HR9cuv3vX}r^bH#B1pc%@nQr}zvoB}@X=C6jLlMaAH zts2U#@z~Bf0%|k=1?-1otYVbvyd7;v#&*#*Iw#Ny>aS?dT8z zb8XV8Mf!~LcH9B@Fb;<@yDFQUuXmoYIn5lGZ*~Eni(_HSmA-EcW%if57rhhG*qjmL z_>qO;Q#4}UNEzkrxMx(ZjM$`XI%3D6%zBO&9QU;fgd!G&q7&I!9RT~}-#N|fdtGE{ zng7Qg^rlaXJE|Cwi)EXvG#4E2`AtZjE~HgZbRu94%e%I0R}YxXe+?}Ar01`O!mS_m z1Up$a17;lUIR3(Kf?)p)#U1TgU5m3oo2X~?>Tg22gHDE06$QI*;dZbuytFH%SD~zP zcgZI~B>)wy&bha-D!T~KWLI+%lv>;er0vqHCe^<}o!to}dQ1Q^iyv(u>dtO8)R4}e z_56`?+;58tVrwYqpkD#>8oK|SP`(S-nseeCs!?yNIsvF*oAAmPsV)NKspS| z=F$R+i%Va5^8mRjE%x$6=wRFOz0u)mj!@}2@LW2%I%nA728y0F03={98E~ mBljDa<|Lp^n>KCI0`LXwd_6p;28$^G0000U#@GUeSCiaWPFWnAlBnA0I@O+5VS{;Op7$xxts+f)!UR^ z1rR%5(=`gF2x>sRO_>8IGxxaUjT9ExMu1ipkc`5?0W?9oSb07ApsWRaTARM&0J@1n zZ&S_$&@==@uIf_)?TR!RD}g3>q}&__F(9%dr3B(UnJR%s28eS^15|^8gAmXO30ztB zwZuh{?f!)TVv!@t_Ab;smw9aU0^SCjR@N>k=*i6R!DL+m=j7k ziY4b3V})RU!ooMj;s6`D-Tf%IOHj_e%P6dcI7>D;vgI`=9Dg8dX# zx_9`iM8DeG5miBvz9J1+S5cA27+8}{o*Aei9ZjPY_6t z{lQ}^_vn|duYPgBB12_&?wA6Iykwkku;z;VZPlvPKNAss1KcG$UY@^dQUCw|07*qo IM6N<$f|a2MZ~y=R diff --git a/Icarus/Resources/ProjectManager/Import.png b/Icarus/Resources/ProjectManager/Import.png index 1e19eab77d33beeb81c84ab451ba99edfb7a50df..3cc8ac08bdb61fa517fe0f40dcbf1a715cbdf78c 100644 GIT binary patch delta 272 zcmV+r0q_2w1*-y(B!3BTNLh0L01FZT01FZU(%pXi0002pNkl z`{)MhCN5AS*~60BMY@4?1Kq$CoFH;kw4{Pp?kExNLAmxvF0bjOM-XFFxlZ92wQ?;(LQ_}U*YGod9o>}9caoe-g?|?d09FIB8-TSWp~mM+ zS4Ff+P?BnYJWobkQ|RmJouqWWkml3ceU~JP(2{DCn1xiAL>Y>wnR||>nY~sbmEEU} zHDoTM-q+MskoK;LTubKO}&l{P0jb>m(F1A?U-!_FWfx zUwB%ixRlvB(_ji48gck@QJl!+ zvvvM@247}Xt+|$b{_3LZ?PXhKGQ-O+{^s3&!ZR>T(YtrsidkD3UH2!O*DN|8!c`xe zykqGKmDLlLE}Oq%;o$;Fovr3ke!ukm7QOzLt+_dLg@AGS$KdVvTc_N*8M7$GXy$fq z&8_=)JH9+D;%mRQrTkc%*T?MSwFl2DH7h<2dUm0{k(Gj&i5B} z^d*dfUp;pcUV1rm7XRJPy!=8TSudwr)%{-Z$f|zUQRucdbT%eLq3dp#|G$64LO zYl6yQ8;%UdJT%@zd0eqN}d-f0dl|c3rb-&Q(M89W&0YFO9o;`qky& z0~2NjoqT(B&$hmUNze8??us+oU8ZM{vh2!r5B^-<`z@?Ze?ooar4RAF{C`Sg7SQCG zL7f+BEq<89oT--y|0UWgzf#MDxlytE`@P6{uXpjbKTCEIH*){`@Y}^-jtM8y?wiQ{ zd426>ovT;oBHvoa*X)gozkh5hQ@$8J-EwtBe68F6Ciz~I)$JL76)>X(5=)U!{xCic XPnh-fCff^Of@1J=^>bP0l+XkK*v>D) diff --git a/Icarus/Resources/ProjectManager/ImportBTL.png b/Icarus/Resources/ProjectManager/ImportBTL.png deleted file mode 100644 index 7be9497dcb115f5c687f61a5e18906622143e77b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 610 zcmV-o0-gPdP)tD;4BgbWgj7QzRWHUY=JtKZ-v!tn z646&En2>73^N8poP^^@QeuPx1C(wk5-U8PMhGO;Lv9n-8Du!7`*pGs$1q0A1(sneI z6^!FeNVRDK#OgMg46u!mYD`3*2xy!4Rz;qyeT{~AiWl8Ep7C~V96-||PsRc3P)BcI zE1oRlc1517kPckluxZTmH2ZVQn6k)|SG}XFP3Yl`IiGBeiTC_fg44=ldQ36(+BYC!;F;YY3j{lrhYppZ zNlIXY9Q+v$Kp6_;QX?pUar_PV(*_W=kf-*-0Wh~QTD4HPa_AMF)5Fg3OxG5v<1pS= zKAz%}F*88d2=bF>nlj|H1rgculT#rv#i^o$Mfh$tD)MBGz6@g)+(uutVglVvtgR~~ z(3e805^=&{t(-KQLOjJF-zdxsHn|j3h^OAGY>&eI5*on13XUlN_1nx#rb0Z$x6JDI zzNC20n+d7(v{75|eV{m?kBnH1ZnYX{_L-_Zy|qxt#%D7!%8Utq(&wwj1^E&(J;nb< whJOtzMZLPJbf~F*`@4dIZW1@$^uI+!zaq!K?Z%%CfB*mh07*qoM6N<$f}kQ382|tP diff --git a/Icarus/Resources/ProjectManager/New.png b/Icarus/Resources/ProjectManager/New.png index 78a5a0b370a7195a57b7a80d2d0a714b7e701a0d..b1ed7be55abe593cc40433f1b74a456f324b91f8 100644 GIT binary patch delta 330 zcmV-Q0k!^`1nmNlEPoOJ01FZU(%pXi0003WNklYh-=m=#3 z-GB)Qh6!B2O6>x=fg7kBFoGkv0j5bw2tj&Qiay+z^Z~-%eJSNyP*v5a<5=v4tKJmj zb9Ghxg_M)Ol$td!w2~VDE6-e~G|L}@OPRy~=AOB300xnon19t?qm`^&0X@V3A|qGN z*eChYET4pu5&+B+5NVb_yB;z%ngU&fSm;Xt#Wx8;eSL{ma_bu$vLzg}lENo2bf3Ct zCEG3L?g|PmW!lS0E4ip|q*?Bqy)ioa()K?xV{J2Qt>o@kQV+Xkx`xn7MwBE&HqSHh zHI?rgYfXFa`$LAr4i~ZAC*Q*7DJm>Qg{7#l6cv`D!ctUNiV90nVJRwYDRa&aiTQyj cdkX+~0f0@lph;0WVgLXD07*qoM6N<$f){j+djJ3c delta 504 zcmV>6Y_3I>3dG<2oq z5Xjz;X5c~pgnzz%&&_YIUVjCL7|=1GXuJS)&_iH|ZTQgd@nAr5pSF@{e&5FPpO78a zAFQYVjLruGRwU?Zh~4@4^S3>+!+=q_V4%yX1Yqa{lm;6wfB5X6O5670lgjd;mnzFBmn9bHBe$vuA8m{wH;*-#bg65RT1ih)a^H)k1yMD ug{n~#<)c$TNDbrY_|&MQMuMXN0t^6UI-YgGKbn{T0000EW!e^b+SO#k6a>C>78-0iRBcUBPEcPftp0O zgHN=H(&R1AtbpN#+G66(mf z$j1h?(@HK9d#ldmhb{z_x#NIR`^#tfQ0NnbSpmw2LKlA+6Vwn^uy=*^O9+*_WTURS zV5?k0;h8gli~k87VC&*+;EfpQ82e-E=hQPDPpN1FSu1^?(n{KVS`Y!{bzSZB(JWOH cRFVMT2eh?)S48N-vH$=807*qoM6N<$f=)2d&;S4c delta 614 zcmV-s0-62P1BV5WEPoRK01FcV0GgZ_0000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+ zQe|Oed2z{QJOBU!6iGxuRCwBA{Qv(y!(anU41*AiI%?EWqmCMN)L?fM3n2xoimWbh zvNL=@7W@5&fdg0%ObG5iwt|p;Mn*;lDDwfZ_IN@dhA10Cmg; zpu-3{iVK3WSOdk5V&o8IcyM$TgO%QI22sJkWM}nHUzr$Qzh~J>aXIy!+k}CG zgM;DSo#PZa2n6mtV)^mx&A(=f9rc4ZnmijXG+WI0_)Z0C?2E0y!npT>t<807*qoM6N<$f_=Rq AMF0Q* diff --git a/Icarus/Resources/ProjectManager/Options.png b/Icarus/Resources/ProjectManager/Options.png index 6fb84bbce86dc5c047a597e9952657f3c421f940..63f018caaf3223e409b029bf4addd336feaead98 100644 GIT binary patch literal 562 zcmV-20?qx2P)B_83&18@Y4agXCWzF3!RdVxU}3IAmvVA>EH}k>s>Mr7 zE}BM;ijv}PV*_B+5=O;yATcgO?h|tlAwp&kNRvteVn(*XlOdm7`AO##Y1=p;^j2xJ zsXnBSFGO&+bwY?hDr0+U!`%K&loX5OgnN4%CAUD0jw71QoRy-Vg3jK@nlj|ijYMx1 zyi?r9EG>nmyvVo*i%W_Ly|;v{ls2=zNQG9PuiKo~8^XWBONtlsnJW0s*bB(}e5y-H z?YlLD%iN_$onc=_U7%`v37B{rFjo+~iO!AMcfe!|rA?zZItAXGVjapoVP&6h3!&9V z$MV)fsMj~EPBv5IY4y5SDLR?yQ4fnkDhdGn0I;dK!JE?h!T&q+D$gs9HtAs6hl&;z7WQ1yqQNQK@Hyh(w|h1L7GaDu;+7U=%|{Eq{2R6{FC2 zQ=nQEY)k2}yY=_TmJGwp?96nhTar%lGCQ4l-+S+S-|_pt?=>T%@9MkyuHJNw9#!n~ z`vV0Pb1E~FeVgU;4`W#FX^N&_rWs}m`Z&(og=6wAm)l)N(aa`?)7gR6>2gy$c|pk2 z>Jtcta-A;s5%O(U1C8GqmR-j4Lg87(0A3I;b-G+X%NNtt+!XbRRzJ6!TC3KFG|+2= zloXyV65zmuk83T4G>#X>D*F`|k7KawNA>&hPg$8$W=}H#`aGupgpUYOL>_}|X6LM0&9 zhxNqTN(0S5*-|XMiAj##@;j7WOBQWVw+sh7TVNUNDQ$r`fz0p}yJp)+T$Q0SwbC z7Tntx{(zKYb}S&oiC{#F+3_HilWb!^c1~WTD;P4`D2jfyJ3AAU!g-)mXOijf*(n7R zO{&0gh&J8baS=FOAhSV98-lcrwlN_uFaLT|Qb03RsTvy#TW4_Gm>`N1ZDRtgdWi`s z_{}QJ)d{zPD>+I}2ss}65!i0D%7S&5K*&%#7?>f?=4iL}#b!uk>m-oE@-z@man=5WDh-o~y+BJ*gZs5Re9&K#bM422oht zZBT=wMkd1x!n72s-ZC?2RTMp=Y+(R=u^W>)W&$<-iXG|pxH&m_IiU5g872TZ7TU#x zklC;n(lEbU$;$IaxnT=-nT#T9Y*PiIX9$h=n9T{oSgpWfOve#`!u_zIYO{<7nw?{- zQN#dKtkn&uPvA`?FSRj|o1#a;Xnn58-7k>k_xxDYKMEIAJGgL&SI4jW@XbmKMU`YWr6ClG z2zE%ob7~b}NW^RSy$$VC4KUI_N#bRw9g@KD{31It$g?ff5%wCOyW9>YxZTvxMh<|P z$|pp^+1qeyH$xO&zy+1LNY9AI3zKKVjKo)vyJ(ha=fy3W_Jp2RhjPGb4!zc#S1`jJ)RRYa{aS=T^)o_Twr@27$Qs z2*7p&+7>4p2cEeI^eRK)NNGwvfsUTWJsz*2oM55|Qmr8gwUu)hxH5Y4gAmtrKnf~M#u3E&H_B<~<{)T# z2~^<_bp50;6h%(~o=*_u$#VSIv@imb-h5g<&f~q@bR;Q?wMLkLMamPTe-IQZ&l-b4 zi)~-8sxNjrTTlDQ;qaKuFlDs0wRuj@1_%3VRH^>Pcz-1x`=MP4AXOx*DhWkJW8Cv@ zyTjjOQV)k=z4R;dMn; zsM>ZWfctOg9DQ43kdYUX)Rq<} zu;{PgEvAw}OP4#uB8J0mJgdS0Qu|w<*!6bUf$0jEe$pPmXwKAu@=qoTxI6Om2Y7mf z5zv29M%zt}#6o`;EC1(6)>;tc{D%AAS|}3>n01o56E5caSdxVTid+eGDoGm?Frnv@6*|<;0vLeT!a3&* z^5NUvIyr*R;V#o3bg3Pbg!oRDbuf*{V%`(lP6-w9p*)b00000NkvXXu0mjfsKS2a diff --git a/Icarus/Resources/ProjectManager/Save.png b/Icarus/Resources/ProjectManager/Save.png index 0eca26039c38c97a380275d355f192ef802a4768..8178e49efb32dc145ffc2aa4324a5d403669049c 100644 GIT binary patch delta 273 zcmV+s0q*|d1hfK>EPoOJ01FZU(%pXi0002yNklEe zAq=$xAP)73qPP)>GK@LYBL3PSb^Ewc6gP_ECiO_T0JvvZmwMcBZZL(SSJvy=qTpS% zgwmSgMp4`-iW^07qbP1tZH7J&9~ssymIhO(!@3q;w5GUuZy(joO@QZBzw-Wh0(b(i X%q~`2dW`D;015yANkvXXu0mjf`jmSp delta 577 zcmV-H0>1sU0^$UaEPoRK01FcV0GgZ_0000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+ zQe|Oed2z{QJOBUz?@2^KRCwBA{Qv(y!(anU41*AiI%?EW)CMfLB))(DE&!wqXlVBZ zPEO7bBsmJ?px=N0?|A+7|96-GFFPX#xi0wro8i}=fB*l1*ngtjjGU~@j2=Md0a6{s z0CG^^p|=7s{z)HEvV-OP!>=4q9=v1FR|Xl!{XvS4ad4!m;sf^>F5dk>ewv~-U}j=u znCPL-peN5ecyiz2H-8veWWI5=}lV1$` zKK-V=n!yI9J%9PmaO2Y-23rYsqV-&Q_nTq;o1fIF`*49<-~KZ2zxz#-Xd}x}Jvw|0 zwhHVF_ul;_T8}gz6GQ5!e+;FkJ}^A_^N+fY%97z^&=F^2$lUv$;oSE>L_11`g^8ib zkdL8KhnFGy!bj>RbXz%2hD|rWf*s_={vV9>nF!}bP=Dyuo&UsOBEv?T-1qzkB=~Iw znHb*Rd&%G~LR>%-8*LO7o-f{gXIT00-DrtE>L`+n1U6>u@}MSdFN4y6IO+nhqwu>_ zk(;6WK5Ctpbo~dA1ok0b{iTVc81W5o0J~YB9?c0*2ZEo2k@x%W|4hHgbcYll6XUZ_ z|2`o1W;%dftOF!F3g$2%1?qyR05K1xeLZ6OeT<_+L8Fcub<_X>fB*vk(NeP|k`R0v P00000NkvXXu0mjfuu&8z diff --git a/Icarus/Resources/ProjectManager/SaveAs.png b/Icarus/Resources/ProjectManager/SaveAs.png index 1d5cfaef973eac427f942bac7f5405d3b6bda223..a802304f7777ff75a9f9e7d7b9acb3645197a355 100644 GIT binary patch delta 309 zcmV-50m}Zj2iO9TEPoOJ01FZU(%pXi0003BNklX^^jKBzNf@!P?5{id_?L)uh9!SgOOM6^NH*MP@G`2o`w2}uCu5m9? z05Thc_>vkWN>K??YW0?&l`H^Uh|{l(i^5BvvZ62oL*ucgsDC7QE$0ouvG-2RxX7m_ z)Jj&J$DDCdPtEaODI=8jqAy9Mo2SxB4&`ZVj7qJ=&We2;DU6G|313pMVr5@!jDHq- z8KM-KC`Bb1nU`uMz5FZ3?V}Q;I>M0i3ZMj_bW00000NkvXX Hu0mjf)Io*m delta 921 zcmV;K17`f#0=EZ{EPoRK01FcV0GgZ_0000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+ zQe|Oed2z{QJOBU#L`g(JRCwC#m`zL*K@`XTyW8$|DbRxQSt=Ni0uclhL8H+VF_blsK@ z575%q7C7{uOm{l-Hv8MzH*e+*!Eqcmnn-Lw`JjAIo|a&xMuWi+!(U>&^-z{&n_PzC zRWN0=lusEkV>2QNk`;n>7h=lD%`Da<14$`=A>4sN^Po|5vqvYg*7G(qxRMp<_QM#_SqSs2nnL0(axf*sUH<0ArhiJ4CN=HkQys- z$=>$Kf*4dBQecOZ_X^fxHkEcy^S?Y`s}3zP*0WI4GjnMBKDn&@&x97|a^pbLwD&@S zJz4$ZRCd&|_HRlRx|B+o2q}`{#|DHDNr^J#JZQzIiy1gu z-3~KBL4Ob`@jO(NfW+f@p597s|6pShd zpcofn}k%0 zBd|4rVi^hniP0!;RN4NQWo`+hNwRs}69;g*&aceGXJhd0;v zr#oC2>>Y57Oz2BQLh|mY&Z4(wAV0Mhw@yN6errXM1ZSA#w2RpcpJEYiK`rEe2N$ZT v|LIcJ7}Do#-beV3f_zXusCCj`0R{koZ4w5s6{Z}I00000NkvXXu0mjf|53E? diff --git a/Icarus/Resources/ProjectManager/Send.png b/Icarus/Resources/ProjectManager/Send.png index a9bcbe4cd51b66bd5c3b882382f499af988adabe..c15e8f6bd85e083a57775cf1f106301857de2b2b 100644 GIT binary patch delta 625 zcmV-%0*?KR2#N)eB!3BTNLh0L01FZT01FZU(%pXi0006!Nkl_93|JAe*M1vu-xn~5QJ*~;&I@A%l; zdz)~w-EQgFbaqTUMV=0bC^-tKB2R}zG-Dtl`aURBk*6cT+<#Y2X9uaNB2ULeG$*2) zhRc`#nyDgB6Tn%BvvcxO1yTf#Hi=k7!Ca#p4S7^~%8pinQImD|9fZ%Ui* zUZGGgiKBQWTG*JV-Dk}XnQ;}bM5WSZVBxjY^~b7bq3r zgDs{45v3Covj8DK(VGRZ2o$pw1p}v4sd)WIV?qT`O%!9|ybN<$MuKj+n5I-Se z#8w^;W*lUW^)k|0i#r+zQ9j&_=g9N)kA1`MWMjvS`I@cD#y&R4c(sd` ziBaZWY@n!lTvlmL>;wqjDCwnbo&kc|I-E`4vo|vv@#PVIZ9h!E-;0h7Yf`Jc=Ecyo8QGtPV;bf|t4bia@DU3b1691$9k8H-cG`H}M3@VnxBXhM+}Y_|PrZe=R1%F!*q@X}1w)zkU&4 zBuwn!7nF${97I+bl-v~|edzB!M~}sd*>90gj!EH@SAQ}(RDigG#S{ly7V73Q?mjn) zClX>}&A&Qrh^>_roEc>5A4lSa95omg25$;0v!jDVfBAa;q?`3QEUc`@z!^0dPP8xm kH12q-v9sr diff --git a/Icarus/Resources/ProjectManager/UpdateBTL.png b/Icarus/Resources/ProjectManager/UpdateBTL.png deleted file mode 100644 index 18fa216a614c7f8f39103bd62a0d71f5f52de89b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 797 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 Y)BrWErq6FgA`bBFnw6a;#vGFLKLut14*&oF delta 4208 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 Bh4}yg diff --git a/Icarus/Resources/TopPanel/MachiningDb.png b/Icarus/Resources/TopPanel/MachiningDb.png new file mode 100644 index 0000000000000000000000000000000000000000..393b5ad437d782dcecd415daf1f2931ba10f5477 GIT binary patch literal 787 zcmV+u1MK{XP)y!ffQ3gc_)70LPeSTgIq_MldhmZ7qq9@X!Ejm?8r`1@T4g6B(}%%-kW{v zgZX@peTzGL#|Xe(2^g*V0J;Kx2;et>Yk^PVB%O(KPXOdTUN@G~XS5mu_)y~-R{(kd zUI4J?9ul(=#YuX)2`QPr0e}kt_u?cya326;08a(>8bAlYcK{;*=KvnZNorNLWU@__ zlBDcS234ewlQbvUNA^MDB(=&+`17r5Mysd^Qk%pd080-MC+QTxS1P{~QojHkv&j9h zN*)=lPIf`cs&W}nrN?glR`-Ik`{pckSyM;6aR?u?utz+8X*-Yq{b{oa-~m%wDOP-n zvQGq-mEcob^hT>se4sPh!8srFISapX(T7M)+yz}2t!5>-Q_rgPjD&neEuqY4)vao% zO)fKU0o>3?{cr|axf2^BMHNn|jKs4#>1%pHcBU!S%IlbEqomkjXEIfunGTE3Ziy5l zD=^cHYOOWX#!0b5F9K>!=xJ-!YHP@|s=P8<^#b^D0B@fZCy14$hx66tIqR8itvA?1d=B^#iMS7m0}8Y$0ALpRTMLW)r|fm%|XA~S83lxLbUg|jj<-NwEz zrwvHcbSl1)Cxk|qzR^lz-4eX8i$F6qT8*ieo3SDu{{`?Kz?XHTqQHcCSb~=tA;YRQ zGFshmGM%!nJ_7h*mn3f|6eKkW40HB)Sb)oEbR{^Meg^Qw?x1}FMk{Bsi@Mw9yM%WD z?o%Z{hH^>TCaIj?(x06Ai>V?+sk zgBv5`dgyA=5!8O2$$ej+a&{`-#9pk{)|~3(?AqHGA##`V|4m-i*gsML{sGg;B`tjM RSq}gJ002ovPDHLkV1m6!VJZLs literal 0 HcmV?d00001 diff --git a/Icarus/Resources/TopPanel/ManagePart.png b/Icarus/Resources/TopPanel/ManagePart.png new file mode 100644 index 0000000000000000000000000000000000000000..4fde81399cf9fd13cf5247f19e5b4b758db1634d GIT binary patch literal 532 zcmV+v0_**WP)c<~+9Xo4O?$f+h^sqY>;IOkGGJ8|kaaXY#L zaD$RlV=BZGv+Z932Svp?JsrSk6f4Ost_G=6@vqsNLQ11Y?rE9YG{12h``@yKr zTDG*j$ZlOBR>q0P;o6#FfCGpwG^~B08lXZY)jX-4ct7zp(C&*1NdoFYU=F7h0DJ+6 W5uEx`Fs9M~0000(PvZt8(gcwppPX6*AeKYRt z&S*}qxCf3~-ktY(e(&@3KC^S{>+5Vbncs9oTTm@zQ$lUuNaaPI4S_Cj4j3jOJ=bL4 zhIy*UvlRmkfHCk*k!Ood_HKx$3?zVV64EtbROFced-mFFs3OmneJUv$B_ZuKFswa& zV9kaG{%Yj^B~S^upb$1W)O?X=1D~Lb|3ghS`q^c}$lx0_Kwkn!fL%VsOqqLm_@We( zgml?T)Z%{yb^<>G7l3=cb{2TRN`H~DB%}(>gTR}>Co)_Cx(~P?*amzG+){pDCv`b> z#-95S=vb+|8Gt99xbG_5MV={i&&yyL_9D;ZxerR9B&1(>T?c%t$g`)WRbpNBt$5S- z`ja=3kPhromA0TS0yj8hUnLYd^u(4>({0}aJ_3FNPWwJPSmfD7 z=SG|_3PV-{^l%c=x4qW&?JOwNHCBf%RnIdTNq{{X`h6LH?c~HmUM!bAcb#Y78)M9M?R*kTgW=TwCrKl;&oUn?NVHUBBdg|O@c_Gi5${4Y?~LbiT&X)0S#jRg1u Xx~vf*GW4ou00000NkvXXu0mjf5whk# literal 0 HcmV?d00001 diff --git a/Icarus/TopPanel/TopPanelV.xaml b/Icarus/TopPanel/TopPanelV.xaml index 8bf3f33..0e4bd94 100644 --- a/Icarus/TopPanel/TopPanelV.xaml +++ b/Icarus/TopPanel/TopPanelV.xaml @@ -1,197 +1,227 @@ - - - - - - - - - - - - - - - - - - + + - + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/Icarus/Utility/Dictionary.xaml b/Icarus/Utility/Dictionary.xaml index 681b201..d8d1fbd 100644 --- a/Icarus/Utility/Dictionary.xaml +++ b/Icarus/Utility/Dictionary.xaml @@ -88,6 +88,13 @@ + + + + + + + @@ -140,7 +147,7 @@ - + @@ -238,6 +245,21 @@ + + + + @@ -255,7 +277,7 @@ - + @@ -371,7 +393,7 @@ - --> + + + + @@ -430,11 +478,9 @@ + + + + + + + + + @@ -948,33 +1026,14 @@ - - - - - - - - - From 7c277f129bf9708fc26581ec3c8242288fed07f6 Mon Sep 17 00:00:00 2001 From: Emmanuele Sassi Date: Thu, 29 Dec 2022 16:59:13 +0100 Subject: [PATCH 02/35] - Aggiornamento grafica ProjManager, TopPanel e LeftPanel --- .../DispositionPanel/DispositionPanelV.xaml | 180 +--- Icarus/LeftPanel/LeftPanelV.xaml | 3 +- Icarus/MainWindow/MainWindowV.xaml | 6 +- Icarus/ManagePartPanel/ManagePartPanelV.xaml | 13 +- Icarus/ProjManager/ProjManagerV.xaml | 42 +- Icarus/Project/ProjectV.xaml | 14 +- Icarus/ReferencePanel/ReferencePanelV.xaml | 11 +- Icarus/Resources/DrawPanel/AddPointCurve.png | Bin 901 -> 765 bytes Icarus/Resources/DrawPanel/ApproxCurve.png | Bin 1424 -> 0 bytes Icarus/Resources/DrawPanel/Arc3P.png | Bin 790 -> 0 bytes Icarus/Resources/DrawPanel/ArcCSE.png | Bin 708 -> 0 bytes Icarus/Resources/DrawPanel/ArcFlip.png | Bin 1665 -> 0 bytes Icarus/Resources/DrawPanel/ArcPDP.png | Bin 780 -> 0 bytes Icarus/Resources/DrawPanel/BreakCurve.png | Bin 707 -> 0 bytes Icarus/Resources/DrawPanel/Chamfer.png | Bin 422 -> 0 bytes Icarus/Resources/DrawPanel/ChangeColor.png | Bin 994 -> 0 bytes .../Resources/DrawPanel/ChangeColorAlpha.png | Bin 1277 -> 0 bytes Icarus/Resources/DrawPanel/ChangeLayer.png | Bin 1350 -> 0 bytes Icarus/Resources/DrawPanel/ChangeStart.png | Bin 764 -> 0 bytes Icarus/Resources/DrawPanel/Circle3P.png | Bin 1300 -> 0 bytes Icarus/Resources/DrawPanel/CircleCD.png | Bin 713 -> 0 bytes Icarus/Resources/DrawPanel/CircleCP.png | Bin 662 -> 0 bytes Icarus/Resources/DrawPanel/Delete.png | Bin 658 -> 448 bytes Icarus/Resources/DrawPanel/ExplodeCurve.png | Bin 932 -> 0 bytes Icarus/Resources/DrawPanel/ExplodeSurf.png | Bin 1069 -> 0 bytes Icarus/Resources/DrawPanel/ExtendCurve.png | Bin 555 -> 0 bytes .../Resources/DrawPanel/ExtractFacetLoops.png | Bin 1034 -> 0 bytes Icarus/Resources/DrawPanel/ExtractLoops.png | Bin 1432 -> 0 bytes .../Resources/DrawPanel/ExtractSurfFacet.png | Bin 1117 -> 0 bytes Icarus/Resources/DrawPanel/Extrude.png | Bin 1243 -> 912 bytes Icarus/Resources/DrawPanel/Fillet.png | Bin 594 -> 0 bytes .../Resources/DrawPanel/IntersectSurfSurf.png | Bin 1894 -> 0 bytes Icarus/Resources/DrawPanel/InvertCurve.png | Bin 509 -> 0 bytes Icarus/Resources/DrawPanel/InvertSurf.png | Bin 714 -> 0 bytes Icarus/Resources/DrawPanel/JoinCurve.png | Bin 1079 -> 0 bytes Icarus/Resources/DrawPanel/Line2P.png | Bin 595 -> 522 bytes Icarus/Resources/DrawPanel/LinePDL.png | Bin 735 -> 0 bytes .../Resources/DrawPanel/LinearDimension.png | Bin 921 -> 0 bytes Icarus/Resources/DrawPanel/MergeSurf.png | Bin 749 -> 0 bytes Icarus/Resources/DrawPanel/Mirror.png | Bin 437 -> 0 bytes Icarus/Resources/DrawPanel/Mirror3D.png | Bin 538 -> 0 bytes Icarus/Resources/DrawPanel/ModifyCurve.png | Bin 707 -> 732 bytes Icarus/Resources/DrawPanel/ModifyText.png | Bin 749 -> 0 bytes Icarus/Resources/DrawPanel/Move.png | Bin 1115 -> 792 bytes Icarus/Resources/DrawPanel/Offset.png | Bin 658 -> 0 bytes Icarus/Resources/DrawPanel/Plane.png | Bin 686 -> 0 bytes Icarus/Resources/DrawPanel/Point.png | Bin 308 -> 406 bytes Icarus/Resources/DrawPanel/Polygon.png | Bin 682 -> 0 bytes Icarus/Resources/DrawPanel/PolygonSide.png | Bin 620 -> 0 bytes Icarus/Resources/DrawPanel/Rectangle2P.png | Bin 549 -> 0 bytes Icarus/Resources/DrawPanel/RemoveColor.png | Bin 1048 -> 0 bytes .../Resources/DrawPanel/RemovePointCurve.png | Bin 1166 -> 859 bytes Icarus/Resources/DrawPanel/Revolve.png | Bin 2519 -> 0 bytes Icarus/Resources/DrawPanel/Rotate.png | Bin 511 -> 477 bytes Icarus/Resources/DrawPanel/Rotate3D.png | Bin 667 -> 0 bytes Icarus/Resources/DrawPanel/Ruled.png | Bin 1096 -> 0 bytes Icarus/Resources/DrawPanel/Scale.png | Bin 567 -> 0 bytes Icarus/Resources/DrawPanel/Scale3D.png | Bin 687 -> 0 bytes Icarus/Resources/DrawPanel/Screw.png | Bin 1582 -> 0 bytes Icarus/Resources/DrawPanel/SolidAddSurf.png | Bin 1567 -> 0 bytes .../DrawPanel/SolidIntersectSurf.png | Bin 1126 -> 0 bytes .../Resources/DrawPanel/SolidSubtractSurf.png | Bin 1408 -> 0 bytes Icarus/Resources/DrawPanel/SplitCurve.png | Bin 675 -> 0 bytes Icarus/Resources/DrawPanel/Swept.png | Bin 2088 -> 0 bytes Icarus/Resources/DrawPanel/Text.png | Bin 705 -> 0 bytes Icarus/Resources/DrawPanel/ThickCurve.png | Bin 758 -> 0 bytes Icarus/RibPanel/RibPanelV.xaml | 465 +++------ .../ShellNumberPanel/ShellNumberPanelV.xaml | 533 +++-------- Icarus/SliceManager/SliceManagerV.xaml | 2 +- Icarus/StartMachPanel/StartMachPanelV.xaml | 398 +++----- Icarus/TopPanel/TopPanelV.xaml | 80 +- Icarus/Utility/Dictionary.xaml | 896 +++++++++++++++++- 72 files changed, 1393 insertions(+), 1250 deletions(-) delete mode 100644 Icarus/Resources/DrawPanel/ApproxCurve.png delete mode 100644 Icarus/Resources/DrawPanel/Arc3P.png delete mode 100644 Icarus/Resources/DrawPanel/ArcCSE.png delete mode 100644 Icarus/Resources/DrawPanel/ArcFlip.png delete mode 100644 Icarus/Resources/DrawPanel/ArcPDP.png delete mode 100644 Icarus/Resources/DrawPanel/BreakCurve.png delete mode 100644 Icarus/Resources/DrawPanel/Chamfer.png delete mode 100644 Icarus/Resources/DrawPanel/ChangeColor.png delete mode 100644 Icarus/Resources/DrawPanel/ChangeColorAlpha.png delete mode 100644 Icarus/Resources/DrawPanel/ChangeLayer.png delete mode 100644 Icarus/Resources/DrawPanel/ChangeStart.png delete mode 100644 Icarus/Resources/DrawPanel/Circle3P.png delete mode 100644 Icarus/Resources/DrawPanel/CircleCD.png delete mode 100644 Icarus/Resources/DrawPanel/CircleCP.png delete mode 100644 Icarus/Resources/DrawPanel/ExplodeCurve.png delete mode 100644 Icarus/Resources/DrawPanel/ExplodeSurf.png delete mode 100644 Icarus/Resources/DrawPanel/ExtendCurve.png delete mode 100644 Icarus/Resources/DrawPanel/ExtractFacetLoops.png delete mode 100644 Icarus/Resources/DrawPanel/ExtractLoops.png delete mode 100644 Icarus/Resources/DrawPanel/ExtractSurfFacet.png delete mode 100644 Icarus/Resources/DrawPanel/Fillet.png delete mode 100644 Icarus/Resources/DrawPanel/IntersectSurfSurf.png delete mode 100644 Icarus/Resources/DrawPanel/InvertCurve.png delete mode 100644 Icarus/Resources/DrawPanel/InvertSurf.png delete mode 100644 Icarus/Resources/DrawPanel/JoinCurve.png delete mode 100644 Icarus/Resources/DrawPanel/LinePDL.png delete mode 100644 Icarus/Resources/DrawPanel/LinearDimension.png delete mode 100644 Icarus/Resources/DrawPanel/MergeSurf.png delete mode 100644 Icarus/Resources/DrawPanel/Mirror.png delete mode 100644 Icarus/Resources/DrawPanel/Mirror3D.png delete mode 100644 Icarus/Resources/DrawPanel/ModifyText.png delete mode 100644 Icarus/Resources/DrawPanel/Offset.png delete mode 100644 Icarus/Resources/DrawPanel/Plane.png delete mode 100644 Icarus/Resources/DrawPanel/Polygon.png delete mode 100644 Icarus/Resources/DrawPanel/PolygonSide.png delete mode 100644 Icarus/Resources/DrawPanel/Rectangle2P.png delete mode 100644 Icarus/Resources/DrawPanel/RemoveColor.png delete mode 100644 Icarus/Resources/DrawPanel/Revolve.png delete mode 100644 Icarus/Resources/DrawPanel/Rotate3D.png delete mode 100644 Icarus/Resources/DrawPanel/Ruled.png delete mode 100644 Icarus/Resources/DrawPanel/Scale.png delete mode 100644 Icarus/Resources/DrawPanel/Scale3D.png delete mode 100644 Icarus/Resources/DrawPanel/Screw.png delete mode 100644 Icarus/Resources/DrawPanel/SolidAddSurf.png delete mode 100644 Icarus/Resources/DrawPanel/SolidIntersectSurf.png delete mode 100644 Icarus/Resources/DrawPanel/SolidSubtractSurf.png delete mode 100644 Icarus/Resources/DrawPanel/SplitCurve.png delete mode 100644 Icarus/Resources/DrawPanel/Swept.png delete mode 100644 Icarus/Resources/DrawPanel/Text.png delete mode 100644 Icarus/Resources/DrawPanel/ThickCurve.png diff --git a/Icarus/DispositionPanel/DispositionPanelV.xaml b/Icarus/DispositionPanel/DispositionPanelV.xaml index 7ad69dc..3574294 100644 --- a/Icarus/DispositionPanel/DispositionPanelV.xaml +++ b/Icarus/DispositionPanel/DispositionPanelV.xaml @@ -1,14 +1,16 @@  + Margin="5,0,0,0"> + + @@ -23,26 +25,21 @@ + - + Margin="0,0,0,2.5" + Style="{StaticResource LeftPanel_ToggleButton}"/> + Style="{StaticResource LeftPanel_Popup_Border}"> @@ -56,132 +53,65 @@ + VerticalAlignment="Center"/> + Grid.Column="1" + Margin="5,0,0,0" + Style="{StaticResource LeftPanel_TextBox}"/> + Margin="0,2.5,0,2.5"> + VerticalAlignment="Center"/> + Grid.Column="1" + Margin="5,0,0,0" + Style="{StaticResource LeftPanel_TextBox}"/> + Margin="0,2.5,0,2.5"> + VerticalAlignment="Center"/> + Grid.Column="1" + Margin="5,0,0,0" + Style="{StaticResource LeftPanel_TextBox}"/> + Margin="0,2.5,0,0"> + + + + + + + + + - + diff --git a/Icarus/TSFEditor/TFSEditorVM.vb b/Icarus/TSFEditor/TFSEditorVM.vb index 8b433d2..211332f 100644 --- a/Icarus/TSFEditor/TFSEditorVM.vb +++ b/Icarus/TSFEditor/TFSEditorVM.vb @@ -16,8 +16,8 @@ Public Class TFSEditorVM HEIGHT = 1 SECTIONCHANGE = 2 SELECTION = 3 - SELECTION_WAIT = 4 - FEED_INCREMENT = 5 + FEED_INCREMENT = 4 + SELECTION_WAIT = 5 End Enum Public Enum Filters As Integer @@ -60,10 +60,15 @@ Public Class TFSEditorVM End Set End Property - Private m_MediaTypeList As New List(Of String)({"Slice Number", "Section change", "Selection", "Selection Wait", "Feed Increment"}) + Private m_MediaTypeList As New List(Of String)({"Feed by Slice Number", "Feed by Section change", "Feed by Selection", "Wait by Selection", "Feed by Increment"}) Public ReadOnly Property MediaTypeList As List(Of String) Get - Return m_MediaTypeList + If bWaitingTime Then + Return New List(Of String)({"Feed by Slice Number", "Feed by Section change", "Feed by Selection", "Feed by Increment", "Wait by Selection"}) + Else + Return New List(Of String)({"Feed by Slice Number", "Feed by Section change", "Feed by Selection", "Feed by Increment"}) + End If + ' Return m_MediaTypeList End Get End Property @@ -76,179 +81,54 @@ Public Class TFSEditorVM m_nSelMediaType = value + 1 Select Case m_nSelMediaType Case MediaTypes.HEIGHT - SetMediaHeightVisibility(True) - SetFCurrVisibility(False) - SetDifference_Visibility(False) - SetWaitVisibility(False) - SetFeedIncrementVisibility(False) SetSetVisibility(False) SetMediaVisibility(True) Case MediaTypes.SECTIONCHANGE - SetMediaHeightVisibility(False) - SetFCurrVisibility(False) - SetDifference_Visibility(True) - SetWaitVisibility(False) - SetFeedIncrementVisibility(False) SetSetVisibility(False) SetMediaVisibility(True) Case MediaTypes.SELECTION - SetMediaHeightVisibility(False) - SetFCurrVisibility(True) - SetDifference_Visibility(False) - SetWaitVisibility(False) - SetFeedIncrementVisibility(False) SetSetVisibility(True) SetMediaVisibility(True) Case MediaTypes.SELECTION_WAIT - SetMediaHeightVisibility(False) - SetFCurrVisibility(False) - SetDifference_Visibility(False) - SetWaitVisibility(True) - SetFeedIncrementVisibility(False) SetSetVisibility(True) SetMediaVisibility(False) Case MediaTypes.FEED_INCREMENT - SetMediaHeightVisibility(False) - SetFCurrVisibility(False) - SetDifference_Visibility(False) - SetWaitVisibility(False) - SetFeedIncrementVisibility(True) SetSetVisibility(True) SetMediaVisibility(False) End Select + NotifyPropertyChanged(NameOf(Modify_Msg)) End Set End Property - Private m_nMediaHeight As Integer - Public Property sMediaHeight As String + Private m_dModifyValue As Double + Public Property sModifyValue As String Get - Return m_nMediaHeight + Select Case m_nSelMediaType + Case MediaTypes.HEIGHT + Return DoubleToString(m_dModifyValue, 0) + Case Else + Return DoubleToString(m_dModifyValue, 1) + End Select End Get Set(value As String) - Dim nNewValue As Integer = 0 - If Integer.TryParse(value, nNewValue) Then - m_nMediaHeight = nNewValue - Else - NotifyPropertyChanged(NameOf(sMediaHeight)) - End If + Dim dNewValue As Double = 0 + Select Case m_nSelMediaType + Case MediaTypes.HEIGHT + If Integer.TryParse(value, dNewValue) Then + m_dModifyValue = dNewValue + Else + NotifyPropertyChanged(NameOf(sModifyValue)) + End If + Case Else + If StringToDouble(value, dNewValue) Then + m_dModifyValue = dNewValue + Else + NotifyPropertyChanged(NameOf(sModifyValue)) + End If + End Select End Set End Property - Private m_MediaHeight_Visibility As Visibility - Public ReadOnly Property MediaHeight_Visibility As Visibility - Get - Return m_MediaHeight_Visibility - End Get - End Property - Private Sub SetMediaHeightVisibility(bValue As Boolean) - m_MediaHeight_Visibility = If(bValue, Visibility.Visible, Visibility.Collapsed) - NotifyPropertyChanged(NameOf(MediaHeight_Visibility)) - End Sub - - Private m_nDifference As Integer - Public Property sDifference As String - Get - Return m_nDifference - End Get - Set(value As String) - Dim nNewValue As Integer = 0 - If Integer.TryParse(value, nNewValue) Then - m_nDifference = nNewValue - Else - NotifyPropertyChanged(NameOf(sDifference)) - End If - End Set - End Property - - Private m_Difference_Visibility As Visibility = Visibility.Collapsed - Public ReadOnly Property Difference_Visibility As Visibility - Get - Return m_Difference_Visibility - End Get - End Property - Private Sub SetDifference_Visibility(bValue As Boolean) - m_Difference_Visibility = If(bValue, Visibility.Visible, Visibility.Collapsed) - NotifyPropertyChanged(NameOf(Difference_Visibility)) - End Sub - - Private m_dFCurr As Double - Public Property sFCurr As String - Get - Return LenToString(m_dFCurr, 2) - End Get - Set(value As String) - Dim nNewValue As Integer = 0 - If StringToLen(value, nNewValue) Then - m_dFCurr = nNewValue - Else - NotifyPropertyChanged(NameOf(sFCurr)) - End If - End Set - End Property - - Private m_FCurr_Visibility As Visibility = Visibility.Collapsed - Public ReadOnly Property FCurr_Visibility As Visibility - Get - Return m_FCurr_Visibility - End Get - End Property - Private Sub SetFCurrVisibility(bValue As Boolean) - m_FCurr_Visibility = If(bValue, Visibility.Visible, Visibility.Collapsed) - NotifyPropertyChanged(NameOf(FCurr_Visibility)) - End Sub - - Private m_dWait As Double - Public Property sWait As String - Get - Return LenToString(m_dWait, 2) - End Get - Set(value As String) - Dim nNewValue As Integer = 0 - If StringToLen(value, nNewValue) Then - m_dWait = nNewValue - Else - NotifyPropertyChanged(NameOf(sWait)) - End If - End Set - End Property - - Private m_Wait_Visibility As Visibility = Visibility.Collapsed - Public ReadOnly Property Wait_Visibility As Visibility - Get - Return m_Wait_Visibility - End Get - End Property - Private Sub SetWaitVisibility(bValue As Boolean) - m_Wait_Visibility = If(bValue, Visibility.Visible, Visibility.Collapsed) - NotifyPropertyChanged(NameOf(Wait_Visibility)) - End Sub - - Private m_dFeedIncrement As Double - Public Property sFeedIncrement As String - Get - Return DoubleToString(m_dFeedIncrement, 0) - End Get - Set(value As String) - Dim nNewValue As Integer = 0 - If StringToLen(value, nNewValue) Then - m_dFeedIncrement = nNewValue - Else - NotifyPropertyChanged(NameOf(sFeedIncrement)) - End If - End Set - End Property - - Private m_FeedIncrement_Visibility As Visibility = Visibility.Collapsed - Public ReadOnly Property FeedIncrement_Visibility As Visibility - Get - Return m_FeedIncrement_Visibility - End Get - End Property - Private Sub SetFeedIncrementVisibility(bValue As Boolean) - m_FeedIncrement_Visibility = If(bValue, Visibility.Visible, Visibility.Collapsed) - NotifyPropertyChanged(NameOf(FeedIncrement_Visibility)) - End Sub - Private m_Media_Visibility As Visibility = Visibility.Visible Public ReadOnly Property Media_Visibility As Visibility Get @@ -290,6 +170,11 @@ Public Class TFSEditorVM End Property Private m_bColExtend As Boolean = False + Public ReadOnly Property bColExtend As Boolean + Get + Return m_bColExtend + End Get + End Property Public ReadOnly Property ColExtend_Visibility As Visibility Get Return If(m_bColExtend, Visibility.Visible, Visibility.Collapsed) @@ -297,7 +182,7 @@ Public Class TFSEditorVM End Property Public ReadOnly Property ControlWidth As Double Get - Return If(m_bColExtend, 600, 300) + Return If(m_bColExtend, 620, 310) End Get End Property @@ -329,6 +214,7 @@ Public Class TFSEditorVM For Each Layer In m_LayerList Layer.NotifyPropertyChanged(NameOf(Layer.Background)) Next + NotifyPropertyChanged(NameOf(MediaTypeList)) NotifyPropertyChanged(NameOf(ColWait_Visibility)) End Set End Property @@ -338,6 +224,25 @@ Public Class TFSEditorVM End Get End Property + Public ReadOnly Property Modify_Msg As String + Get + Select Case m_nSelMediaType + Case MediaTypes.HEIGHT + Return "Slice Number:" + Case MediaTypes.SECTIONCHANGE + Return "Difference:" + Case MediaTypes.SELECTION + Return "Feed:" + Case MediaTypes.SELECTION_WAIT + Return "Wait:" + Case MediaTypes.FEED_INCREMENT + Return "Increment(%):" + Case Else + Return "" + End Select + End Get + End Property + ' Definizione comandi Private m_cmdSet As ICommand Private m_cmdMedia As ICommand @@ -360,6 +265,7 @@ Public Class TFSEditorVM ' inizializzo contatore per aggiornare grafica su selezione m_Selection_Timer.Interval = TimeSpan.FromMilliseconds(10) AddHandler m_Selection_Timer.Tick, AddressOf SelectionTimer_Tick + NotifyPropertyChanged(NameOf(MediaTypeList)) End Sub #End Region ' CONSTRUCTORS @@ -460,31 +366,17 @@ Public Class TFSEditorVM Select Case m_nSelMediaType Case MediaTypes.SELECTION For Each Layer In m_SelLayers - Layer.SetFCurr(m_dFCurr) + Layer.SetFCurr(m_dModifyValue) Next Case MediaTypes.SELECTION_WAIT For Each Layer In m_SelLayers - Layer.SetTWait(m_dWait) + Layer.SetTWait(m_dModifyValue) Next Case MediaTypes.FEED_INCREMENT For Each Layer In m_SelLayers - Layer.SetFCurr(Layer.dFCurr * (m_dFeedIncrement / 100)) + Layer.SetFCurr(Layer.dFCurr * (m_dModifyValue / 100)) Next End Select - '' salvo selezione corrente - 'Dim SelIndexList As New List(Of Integer) - 'For Each SelLayer In m_SelLayers - ' SelIndexList.Add(SelLayer.nIndex) - 'Next - '' ricalcolo valori - 'Map.refSliceManagerVM.CalcSlice(False, True) - '' ripristino layer selezionati - 'For Each Index In SelIndexList - ' Dim NewLayer As TFSLayer = m_LayerList.FirstOrDefault(Function(x) x.nIndex = Index) - ' If Not IsNothing(NewLayer) Then - ' m_SelLayers.Add(NewLayer) - ' End If - 'Next End Sub #End Region ' Set @@ -510,16 +402,18 @@ Public Class TFSEditorVM If m_LayerList.Count <= 0 Then Return Select Case m_nSelMediaType Case MediaTypes.HEIGHT - If m_nMediaHeight <= 0 Then Return - For Index = 0 To Math.Ceiling(m_LayerList.Count() / m_nMediaHeight) - 1 + ' verifico che sia un intero + Dim nMediaHeight As Integer = Math.Floor(m_dModifyValue) + If nMediaHeight <= 0 Then Return + For Index = 0 To Math.Ceiling(m_LayerList.Count() / nMediaHeight) - 1 Dim dFSum As Double = 0 Dim dFIndex As Double = 0 - For Index2 = (m_nMediaHeight * Index) To Math.Min(m_nMediaHeight * (Index + 1), m_LayerList.Count() - 1) + For Index2 = (nMediaHeight * Index) To Math.Min(nMediaHeight * (Index + 1), m_LayerList.Count() - 1) dFSum += m_LayerList(Index2).sFCurr dFIndex += 1 Next Dim dNewFCurr As Double = dFSum / dFIndex - For Index2 = (m_nMediaHeight * Index) To Math.Min(m_nMediaHeight * (Index + 1), m_LayerList.Count() - 1) + For Index2 = (nMediaHeight * Index) To Math.Min(nMediaHeight * (Index + 1), m_LayerList.Count() - 1) m_LayerList(Index2).SetFCurr(dNewFCurr) Next Next @@ -529,7 +423,7 @@ Public Class TFSEditorVM ' recupero punti di rottura For Index = 1 To m_LayerList.Count() - 1 Dim dCurrLength = m_LayerList(Index) - If dPrevLength < m_LayerList(Index).dLength * (1 - (m_nDifference / 100)) OrElse dPrevLength > m_LayerList(Index).dLength * (1 + (m_nDifference / 100)) Then + If dPrevLength < m_LayerList(Index).dLength * (1 - (m_dModifyValue / 100)) OrElse dPrevLength > m_LayerList(Index).dLength * (1 + (m_dModifyValue / 100)) Then ChangeIndexList.Add(Index) End If dPrevLength = m_LayerList(Index).dLength @@ -629,6 +523,7 @@ Public Class TFSEditorVM ''' Public Sub Extend() m_bColExtend = Not m_bColExtend + NotifyPropertyChanged(NameOf(bColExtend)) NotifyPropertyChanged(NameOf(ColExtend_Visibility)) NotifyPropertyChanged(NameOf(ControlWidth)) End Sub @@ -725,6 +620,7 @@ Public Class TFSLayer ' Imposto flag di ricalcolo generate EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_TFS, True) NotifyPropertyChanged(NameOf(Background)) + NotifyPropertyChanged(NameOf(Foreground)) Else NotifyPropertyChanged(NameOf(sTWait)) End If @@ -737,6 +633,7 @@ Public Class TFSLayer ' Imposto flag di ricalcolo generate EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_TFS, True) NotifyPropertyChanged(NameOf(Background)) + NotifyPropertyChanged(NameOf(Foreground)) NotifyPropertyChanged(NameOf(sTWait)) End Sub @@ -782,6 +679,7 @@ Public Class TFSLayer ' Imposto flag di ricalcolo generate EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_TFS, True) NotifyPropertyChanged(NameOf(Background)) + NotifyPropertyChanged(NameOf(Foreground)) Else NotifyPropertyChanged(NameOf(sFCurr)) End If @@ -794,6 +692,7 @@ Public Class TFSLayer ' Imposto flag di ricalcolo generate EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_TFS, True) NotifyPropertyChanged(NameOf(Background)) + NotifyPropertyChanged(NameOf(Foreground)) NotifyPropertyChanged(NameOf(sFCurr)) End Sub Public ReadOnly Property dFCurr As Double @@ -833,11 +732,11 @@ Public Class TFSLayer If m_bFCurr_IsModified OrElse m_bTWait_IsModified Then Return Brushes.White ElseIf (Not Map.refTFSEditorVM.bWaitingTime AndAlso m_dTCurr + 1 < m_dTMin) OrElse (Map.refTFSEditorVM.bWaitingTime AndAlso m_dTCurr + m_dTWait + 1 < m_dTMin) Then - Return Brushes.Red + Return Dictionary.Icarus_Orange ElseIf m_dTCurr - 1 > m_dTMax Then - Return Brushes.MediumOrchid + Return Dictionary.Icarus_Purple Else - Return Brushes.LightGreen + Return Dictionary.Icarus_Green End If End Get End Property @@ -847,7 +746,7 @@ Public Class TFSLayer If m_bFCurr_IsModified OrElse m_bTWait_IsModified Then Return Brushes.Black ElseIf m_dSpeed <= Map.refTFSEditorVM.dSpeedMin OrElse m_dSpeed >= Map.refTFSEditorVM.dSpeedMax Then - Return Brushes.DeepSkyBlue + Return Brushes.White Else Return Brushes.Black End If @@ -894,6 +793,7 @@ Public Class TFSLayer End If End If NotifyPropertyChanged(NameOf(Background)) + NotifyPropertyChanged(NameOf(Foreground)) End Sub Sub New(nId As Integer, nIndex As Integer, dLength As Double, dTMin As Double, dTTrg As Double, dTMax As Double, dTCurr As Double, dTWait As Double, dFMin As Double, dFTrg As Double, dFMax As Double, dFCurr As Double, dSpeed As Double) diff --git a/Icarus/TopPanel/TopPanelVM.vb b/Icarus/TopPanel/TopPanelVM.vb index 8f344b8..7e4810b 100644 --- a/Icarus/TopPanel/TopPanelVM.vb +++ b/Icarus/TopPanel/TopPanelVM.vb @@ -472,6 +472,7 @@ Public Class TopPanelVM Map.refSliderManagerVM.SetLayerIndexIsEnabled(False) Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(False) Map.refInstrumentPanelVM.SetEdgeAnalysisIsEnabled(False) + Map.refSliderManagerVM.SetSliderVisibility(False) ' imposto pagina Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.MATERIALDB) End Sub @@ -485,6 +486,7 @@ Public Class TopPanelVM Map.refSliderManagerVM.SetLayerIndexIsEnabled(True) Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(True) Map.refInstrumentPanelVM.SetEdgeAnalysisIsEnabled(True) + Map.refSliderManagerVM.SetSliderVisibility(True) Return True End Function @@ -497,6 +499,7 @@ Public Class TopPanelVM Map.refSliderManagerVM.SetLayerIndexIsEnabled(False) Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(False) Map.refInstrumentPanelVM.SetEdgeAnalysisIsEnabled(False) + Map.refSliderManagerVM.SetSliderVisibility(False) ' imposto pagina Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.PRINTPARAMDB) End Sub @@ -510,6 +513,7 @@ Public Class TopPanelVM Map.refSliderManagerVM.SetLayerIndexIsEnabled(True) Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(True) Map.refInstrumentPanelVM.SetEdgeAnalysisIsEnabled(True) + Map.refSliderManagerVM.SetSliderVisibility(True) Return True End Function @@ -546,6 +550,7 @@ Public Class TopPanelVM Map.refSliderManagerVM.SetLayerIndexIsEnabled(False) Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(False) Map.refInstrumentPanelVM.SetEdgeAnalysisIsEnabled(False) + Map.refSliderManagerVM.SetSliderVisibility(False) ' tolgo mark da pezzo selezionato If Not IsNothing(SelPart) Then EgtResetMark(SelPart.nPrintSolidId) @@ -562,6 +567,7 @@ Public Class TopPanelVM Map.refSliderManagerVM.SetLayerIndexIsEnabled(True) Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(True) Map.refInstrumentPanelVM.SetEdgeAnalysisIsEnabled(True) + Map.refSliderManagerVM.SetSliderVisibility(True) ' ripristino mark su pezzo selezionato If Not IsNothing(SelPart) Then EgtSetMark(SelPart.nPrintSolidId) diff --git a/Icarus/Utility/Dictionary.xaml b/Icarus/Utility/Dictionary.xaml index 5f2a809..71ba31c 100644 --- a/Icarus/Utility/Dictionary.xaml +++ b/Icarus/Utility/Dictionary.xaml @@ -2,6 +2,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:PrintApp="clr-namespace:Icarus" + xmlns:Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero2" xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5" xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"> @@ -303,6 +304,14 @@ + + @@ -576,6 +585,7 @@ @@ -616,11 +626,6 @@ - - + + + + @@ -654,6 +670,17 @@ + + @@ -1120,56 +1147,6 @@ - - - - - - - - - - - - - - - - - - @@ -1269,6 +1246,15 @@ + + @@ -1822,6 +1808,284 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1919,19 +2183,6 @@ - - - - - - + + + + + + + From 0be02be5f71b8c31ff01f918dce5133a0a51cd91 Mon Sep 17 00:00:00 2001 From: Emmanuele Sassi Date: Mon, 9 Jan 2023 15:38:10 +0100 Subject: [PATCH 06/35] - modificato stile slider - modificato TFSEditor --- .../DispositionPanel/DispositionPanelV.xaml | 1 - Icarus/DispositionPanel/DispositionPanelVM.vb | 20 - Icarus/Icarus.vbproj | 5 + Icarus/Project/ProjectV.xaml | 31 +- .../Resources/SliderManager/FromSelected.png | Bin 0 -> 284 bytes .../Resources/SliderManager/OnlySelected.png | Bin 0 -> 215 bytes .../Resources/SliderManager/UntilSelected.png | Bin 0 -> 272 bytes Icarus/RibPanel/RibPanelV.xaml | 1 - Icarus/RightPanel/RightPanelV.xaml | 6 +- .../ShellNumberPanel/ShellNumberPanelV.xaml | 1 - .../ShowValueSlider/ShowValueSlider.xaml.vb | 21 + .../LayerAdvancementSliderV.xaml | 6 +- Icarus/SliderManager/LayerIndexSliderV.xaml | 63 +- Icarus/SliderManager/SliderManagerVM.vb | 85 ++- Icarus/StartMachPanel/StartMachPanelV.xaml | 1 - Icarus/TSFEditor/TFSEditorV.xaml | 13 +- Icarus/TSFEditor/TFSEditorVM.vb | 4 +- Icarus/Utility/Dictionary.xaml | 650 ++++++++++++++++-- Icarus/Utility/Dictionary.xaml.vb | 24 +- 19 files changed, 817 insertions(+), 115 deletions(-) create mode 100644 Icarus/Resources/SliderManager/FromSelected.png create mode 100644 Icarus/Resources/SliderManager/OnlySelected.png create mode 100644 Icarus/Resources/SliderManager/UntilSelected.png diff --git a/Icarus/DispositionPanel/DispositionPanelV.xaml b/Icarus/DispositionPanel/DispositionPanelV.xaml index 3574294..6f85827 100644 --- a/Icarus/DispositionPanel/DispositionPanelV.xaml +++ b/Icarus/DispositionPanel/DispositionPanelV.xaml @@ -7,7 +7,6 @@ Margin="5,0,0,0"> - diff --git a/Icarus/DispositionPanel/DispositionPanelVM.vb b/Icarus/DispositionPanel/DispositionPanelVM.vb index 0d006a1..5fdb1b3 100644 --- a/Icarus/DispositionPanel/DispositionPanelVM.vb +++ b/Icarus/DispositionPanel/DispositionPanelVM.vb @@ -307,26 +307,6 @@ Public Class DispositionPanelVM End Class -Public Class CenterToolTipConverter - Implements IMultiValueConverter - - Public Function Convert(ByVal values As Object(), ByVal targetType As Type, ByVal parameter As Object, ByVal culture As CultureInfo) As Object Implements IMultiValueConverter.Convert - For Each value In values - If TypeOf (value) IsNot Double Then - Return Double.NaN - End If - Next - Dim placementTargetHeight As Double = CDbl(values(0)) - Dim toolTipHeight As Double = CDbl(values(1)) - Return (placementTargetHeight / 2.0) - (toolTipHeight / 2.0) - End Function - - Public Function ConvertBack(ByVal value As Object, ByVal targetTypes As Type(), ByVal parameter As Object, ByVal culture As CultureInfo) As Object() Implements IMultiValueConverter.ConvertBack - Throw New NotSupportedException() - End Function - -End Class - Public Class FromBooleanToVisibility Implements IValueConverter diff --git a/Icarus/Icarus.vbproj b/Icarus/Icarus.vbproj index 339bb53..a726866 100644 --- a/Icarus/Icarus.vbproj +++ b/Icarus/Icarus.vbproj @@ -681,6 +681,11 @@ + + + + + IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\Icarus\IcarusR32.exe diff --git a/Icarus/Project/ProjectV.xaml b/Icarus/Project/ProjectV.xaml index ecbe545..f8a3797 100644 --- a/Icarus/Project/ProjectV.xaml +++ b/Icarus/Project/ProjectV.xaml @@ -7,8 +7,7 @@ - + @@ -18,32 +17,46 @@ + + + + + - - - - + --> @@ -72,9 +85,9 @@ - + - + 2BR0px`-A z7srr@*0<9SavpLJaE(7wyn#hJAV(pAQS%Vno`?<(vjj~iDUPrN&aw@0HXfU-eOe;T z4fu<0*8h`q+Y~cU^ literal 0 HcmV?d00001 diff --git a/Icarus/Resources/SliderManager/OnlySelected.png b/Icarus/Resources/SliderManager/OnlySelected.png new file mode 100644 index 0000000000000000000000000000000000000000..4ab1b9281eb0da078f17fd46252416c1f0138714 GIT binary patch literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^svyk41|*NpQ(y*CoCO|{#S9GGLLkg|>2BR0pkSw` zi(^Pc>)UG^c^ec&S{`1u=vZvgvNZX|?uKLwj>S7T*_b*PT1oGGwC{;%Nj--^n}qU} zo+8)2Uk3tp+&9V`EfVoI%F4QC-LTgAIO~Ho-QT7gO#gX1R&BNQ)+sM_msGmTG6i~m zc$;k570O>F@baYWrS~CQwf4Obs`(w!mt@)XRAbuWh`vP(6%5DLNUB);6b=JAiow&> K&t;ucLK6U1;ZO7c literal 0 HcmV?d00001 diff --git a/Icarus/Resources/SliderManager/UntilSelected.png b/Icarus/Resources/SliderManager/UntilSelected.png new file mode 100644 index 0000000000000000000000000000000000000000..d43c45f15ae1ebcb280105f2c5d857678be1c091 GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^svyk41|*NpQ(y*CoCO|{#S9GGLLkg|>2BR0px_}- z7srr@*0)m+avpLJaE(90wB`Vxi1ddCwyrlC#JM?}RBtv!G^%#+u5sC;vHP%w&z%GH z6TH<@pv+9CT~nJjo4QZ)(}{b~dSQW#B9Hd(#lSZo$k?M!ROtV!mymzH8Eyv{T)p z_l0h-e|z_M_Y;Q#;t literal 0 HcmV?d00001 diff --git a/Icarus/RibPanel/RibPanelV.xaml b/Icarus/RibPanel/RibPanelV.xaml index f93269e..484fbbd 100644 --- a/Icarus/RibPanel/RibPanelV.xaml +++ b/Icarus/RibPanel/RibPanelV.xaml @@ -5,7 +5,6 @@ xmlns:PrintApp="clr-namespace:Icarus" Margin="5"> - diff --git a/Icarus/RightPanel/RightPanelV.xaml b/Icarus/RightPanel/RightPanelV.xaml index fa8d706..b453b10 100644 --- a/Icarus/RightPanel/RightPanelV.xaml +++ b/Icarus/RightPanel/RightPanelV.xaml @@ -3,10 +3,12 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5" xmlns:PrintApp="clr-namespace:Icarus" - Margin="5"> + Margin="5,0,5,0"> + BorderThickness="0" + Margin="0" + Padding="0"> - + - + - - - - - - @@ -1808,7 +1797,7 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2335,7 +2504,7 @@ - + @@ -2357,8 +2526,6 @@ - - --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NaN + NaN + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -578,6 +656,18 @@ + + @@ -627,7 +717,7 @@ @@ -727,6 +817,15 @@ + + @@ -1150,11 +1249,11 @@ - + + @@ -2568,284 +2675,6 @@ - - + 28 @@ -2893,7 +2723,8 @@ @@ -2941,19 +2772,25 @@ - - - + + + - + + + + + + + + VerticalAlignment="Stretch"> + VerticalAlignment="Center"/> @@ -3089,7 +2925,8 @@ @@ -3143,19 +2980,25 @@ - - - + + + - + + + + + + + + Visibility="Hidden"/> @@ -3196,11 +3037,11 @@ + VerticalAlignment="Top"/> diff --git a/Icarus/ViewPanel/ViewPanelV.xaml b/Icarus/ViewPanel/ViewPanelV.xaml index 4eaf7fc..1002559 100644 --- a/Icarus/ViewPanel/ViewPanelV.xaml +++ b/Icarus/ViewPanel/ViewPanelV.xaml @@ -6,50 +6,58 @@ From 55d69bdcf7cb70230e040c5802f3e1d3fc6d116f Mon Sep 17 00:00:00 2001 From: Emmanuele Sassi Date: Thu, 19 Jan 2023 11:21:20 +0100 Subject: [PATCH 08/35] - modificata grafica MachiningDb e CurrMachining - migliorata gestione colori - customizzato expander --- .../CurrMachiningPanelV.xaml | 303 +++++++------ Icarus/Icarus.vbproj | 3 + Icarus/MachiningDb/MachiningDbV.xaml | 222 ++++----- Icarus/TSFEditor/TFSEditorV.xaml | 1 + Icarus/Utility/Dictionary.xaml | 425 +++++++++++++++++- 5 files changed, 696 insertions(+), 258 deletions(-) diff --git a/Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml b/Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml index 116945f..0195714 100644 --- a/Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml +++ b/Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml @@ -1,141 +1,162 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + ItemsSource="{Binding MachiningList}" + SelectedItem="{Binding SelMachining}" + DisplayMemberPath="ghName" + Visibility="{Binding Combo_Visibility}" + HorizontalAlignment="Stretch" + Margin="2.5,0,2.5,0" + Style="{StaticResource RightPanel_ComboBox}"/> + IsExplicitFocused="{Binding UserShouldEditValueNow}" + Visibility="{Binding Name_Visibility}" + Margin="2.5,0,2.5,0" + Style="{StaticResource OptionTextBox}"/> + IsEnabled="{Binding IsEnabled}" + VerticalScrollBarVisibility="Auto" + HorizontalScrollBarVisibility="Disabled" + Margin="1,0,0,2.5" + Padding="0" + BorderThickness="0" + Style="{StaticResource RightPanel_ScrollViewer}"> + ItemsSource="{Binding SelectedItem.CathegoryList, ElementName=MachiningCombo}" + BorderThickness="0" + Margin="0" + Padding="0"> - + - + FontWeight="Bold" + IsExpanded="{Binding Cathegory_IsExpanded}" + VerticalContentAlignment="Top"> + - + - + - - + - + Text="{Binding sValue}" + Margin="2.5,0,0,0" + Style="{StaticResource ParameterList_TextBox}"/> - + - - + - + - + ItemsSource="{Binding ValueList}" + SelectedItem="{Binding SelValue}" + HorizontalAlignment="Stretch" + Margin="2.5,0,0,0" + Style="{StaticResource RightPanel_ComboBox}"/> - + - - + - + IsChecked="{Binding bValue}" + HorizontalAlignment="Center" + VerticalAlignment="Center" + Margin="2.5,0,0,0"/> - + - - + - + IsChecked="{Binding bValue}" + HorizontalAlignment="Center" + VerticalAlignment="Center" + Margin="2.5,0,0,0"/> @@ -193,11 +195,11 @@ - - + + + - - - + + + - + ItemsSource="{Binding SelectedItem.CathegoryList, ElementName=MaterialCombo}" + IsEnabled="{Binding IsEnabled}"> @@ -165,9 +192,10 @@ - + - + @@ -59,8 +58,12 @@ Name="MaterialCombo" ItemsSource="{Binding MaterialList}" SelectedItem="{Binding SelMaterial}" - DisplayMemberPath="ghName"/> - + DisplayMemberPath="ghName" + Visibility="{Binding Combo_Visibility}" + Style="{StaticResource FeatureComboBox}"/> + - - diff --git a/Icarus/AboutBoxWindow/AboutBoxV.xaml.vb b/Icarus/AboutBoxWindow/AboutBoxV.xaml.vb index 42fc809..0d57a6a 100644 --- a/Icarus/AboutBoxWindow/AboutBoxV.xaml.vb +++ b/Icarus/AboutBoxWindow/AboutBoxV.xaml.vb @@ -16,30 +16,29 @@ Public Class AboutBoxV Dim sKlev As String = Map.refMainWindowVM.MainWindowM.nKeyLevel.ToString() Dim sOpts As String = Map.refMainWindowVM.MainWindowM.nKeyOptions.ToString() Dim sLeftDays As String = "" - Dim nLeftDays As Integer - if EgtGetKeyLeftDays( nLeftDays) AndAlso nLeftDays < 500 Then sLeftDays= " (" & nLeftDays.ToString() & ")" - sInfo = If( EgtIsDebug(), "*** Debug Libraries ***" & Environment.NewLine, "") + Dim nLeftDays As Integer + If EgtGetKeyLeftDays(nLeftDays) AndAlso nLeftDays < 500 Then sLeftDays = " (" & nLeftDays.ToString() & ")" + sInfo = If(EgtIsDebug(), "*** Debug Libraries ***" & Environment.NewLine, "") sInfo &= "User " & Environment.MachineName & "\" & Environment.UserName & " Inst" & Map.refMainWindowVM.MainWindowM.nInstance.ToString() & " Ulv" & Map.refMainWindowVM.MainWindowM.nUserLevel.ToString() & - " Dbg" & Map.refMainWindowVM.MainWindowM.DebugLevel().ToString() & Environment.NewLine + " Dbg" & Map.refMainWindowVM.MainWindowM.DebugLevel().ToString() & Environment.NewLine sInfo &= sKey & " - " & sKlev & " - " & sOpts & sLeftDays & Environment.NewLine sInfo &= "DataRoot " & Map.refMainWindowVM.MainWindowM.sDataRoot & Environment.NewLine sInfo &= "MachinesRoot " & Map.refMainWindowVM.MainWindowM.sMachinesRoot & Environment.NewLine Dim sOpSys As String = String.Empty - EgtGetOsInfo( sOpSys) + EgtGetOsInfo(sOpSys) sInfo &= sOpSys & Environment.NewLine Dim sCPU As String = String.Empty - EgtGetCpuInfo( sCPU) + EgtGetCpuInfo(sCPU) sInfo &= sCPU & Environment.NewLine Dim sMem As String = String.Empty - EgtGetMemoryInfo( sMem) + EgtGetMemoryInfo(sMem) sInfo &= sMem & Environment.NewLine Dim sScene As String = String.Empty EgtGetSceneInfo(sScene) sInfo &= sScene InfoLbl.Text = sInfo - ExitBtn.Content = EgtMsg(MSG_MISSINGKEYWD + 4) 'Ok End Sub End Class diff --git a/Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml b/Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml index 5f054f5..b67e184 100644 --- a/Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml +++ b/Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml @@ -74,13 +74,13 @@ Margin="2.5,0,2.5,0" Style="{StaticResource RightPanel_ComboBox}"/> + diff --git a/Icarus/ManagePartPanel/ManagePartPanelVM.vb b/Icarus/ManagePartPanel/ManagePartPanelVM.vb index d0f0cc2..7f83613 100644 --- a/Icarus/ManagePartPanel/ManagePartPanelVM.vb +++ b/Icarus/ManagePartPanel/ManagePartPanelVM.vb @@ -451,6 +451,7 @@ Public Class ManagePartPanelVM Map.refTopPanelVM.PartList.Add(NewPart) ' aggiorno riferimento Map.refReferencePanelVM.UpdateFramePosition(NewPart) + Map.refSliceManagerVM.UpdateDimensions() Next End If 'EgtAddMachGroup("3dPrint") diff --git a/Icarus/ManagePartPanel/ManagePartUtility.vb b/Icarus/ManagePartPanel/ManagePartUtility.vb index efeb459..267900f 100644 --- a/Icarus/ManagePartPanel/ManagePartUtility.vb +++ b/Icarus/ManagePartPanel/ManagePartUtility.vb @@ -775,7 +775,7 @@ Public Class GeomEntity_MenuItem ' aggiorno riferimenti nel context menu item m_OrigEntity.UpdateContextMenu() Case ManagePartPanelVM.ManagePartType.MODIFY - Dim bIsMovedRib As Boolean = False + Dim bIsMovedPartOrRib As Boolean = False ' recupero layer da pezzo Dim nLayerId As Integer = GDB_ID.NULL Select Case m_Type @@ -806,11 +806,12 @@ Public Class GeomEntity_MenuItem EgtMove(m_OrigEntity.nId, -vtMoved, GDB_RT.GLOB) EgtRemoveInfo(nPartId, KEY_MOVEDPART) End If + bIsMovedPartOrRib = True Case ManagePart_Layer.LayerType.MACH_START Case ManagePart_Layer.LayerType.RIBS EgtRemoveInfo(m_OrigEntity.nId, KEY_RIB_TYPE) EgtRemoveInfo(m_OrigEntity.nId, RIB_ID) - bIsMovedRib = True + bIsMovedPartOrRib = True Case ManagePart_Layer.LayerType.SHELL_NUMBER EgtRemoveInfo(m_OrigEntity.nId, KEY_SHELLNBR_TYPE) Case ManagePart_Layer.LayerType.AUX_SOLIDS @@ -837,6 +838,7 @@ Public Class GeomEntity_MenuItem EgtSetColor(m_OrigEntity.nId, c3Print) ' rimuovo eventuale nota spostamento per 45 gradi EgtRemoveInfo(m_OrigEntity.OrigLayer.OrigPart.nId, KEY_MOVEDPART) + bIsMovedPartOrRib = True Case ManagePart_Layer.LayerType.MACH_START EgtSetName(m_OrigEntity.nId, LAY_MACH_START) EgtSetColor(m_OrigEntity.nId, c3MachStart) @@ -845,7 +847,7 @@ Public Class GeomEntity_MenuItem EgtSetInfo(m_OrigEntity.nId, KEY_RIB_TYPE, RibEntity.RibTypes.FROMIMPORT) EgtSetInfo(m_OrigEntity.nId, RIB_ID, RibPanelVM.GetNextRibIndex()) EgtSetColor(m_OrigEntity.nId, c3Rib) - bIsMovedRib = True + bIsMovedPartOrRib = True Case ManagePart_Layer.LayerType.SHELL_NUMBER EgtSetName(m_OrigEntity.nId, LAY_SHELL_NBR) EgtSetInfo(m_OrigEntity.nId, KEY_SHELLNBR_TYPE, ShellNumberEntity.ShellNumberTypes.FROMIMPORT) @@ -859,9 +861,10 @@ Public Class GeomEntity_MenuItem EgtSetColor(m_OrigEntity.nId, c3Others) End Select ' se spostato un Rib, aggiorno posizione riferimento e pezzo - If bIsMovedRib Then + If bIsMovedPartOrRib Then Map.refReferencePanelVM.UpdateFramePosition(NewPart.PrintPart) Map.refDispositionPanelVM.UpdateZPos() + Map.refSliceManagerVM.UpdateDimensions() End If EgtDraw() ' aggiorno riferimenti nel context menu item diff --git a/Icarus/ProjManager/ProjManagerV.xaml b/Icarus/ProjManager/ProjManagerV.xaml index 8662140..8433dd3 100644 --- a/Icarus/ProjManager/ProjManagerV.xaml +++ b/Icarus/ProjManager/ProjManagerV.xaml @@ -63,8 +63,10 @@ + - + Margin="5,2.5,5,5" + Style="{StaticResource Icarus_ProgressBar}"/> + diff --git a/Icarus/SliceManager/SliceManagerVM.vb b/Icarus/SliceManager/SliceManagerVM.vb index 707e429..c475936 100644 --- a/Icarus/SliceManager/SliceManagerVM.vb +++ b/Icarus/SliceManager/SliceManagerVM.vb @@ -126,6 +126,18 @@ Public Class SliceManagerVM End Get End Property + Public ReadOnly Property ghDimensions As String + Get + If Not IsNothing(Map.refTopPanelVM.SelPart) Then + Dim b3Print As BBox3d = Map.refDispositionPanelVM.GetSolidForReferenceBBox(Map.refTopPanelVM.SelPart) + Return "[ " & DoubleToString(b3Print.DimX, 1) & " x " & DoubleToString(b3Print.DimY, 1) & " x " & DoubleToString(b3Print.DimZ, 1) & " ]" + End If + End Get + End Property + Friend Sub UpdateDimensions() + NotifyPropertyChanged(NameOf(ghDimensions)) + End Sub + Public ReadOnly Property Time_Visibility As Visibility Get Return If(m_dTime > 0, Visibility.Visible, Visibility.Collapsed) diff --git a/Icarus/StartMachPanel/StartMachPanelV.xaml b/Icarus/StartMachPanel/StartMachPanelV.xaml index 874fd42..afdb55c 100644 --- a/Icarus/StartMachPanel/StartMachPanelV.xaml +++ b/Icarus/StartMachPanel/StartMachPanelV.xaml @@ -251,11 +251,11 @@ - + Style="{StaticResource Move_TextBlock}"/> + @@ -264,11 +264,11 @@ - + Style="{StaticResource Move_TextBlock}"/> + @@ -277,11 +277,11 @@ - + Style="{StaticResource Move_TextBlock}"/> + diff --git a/Icarus/TopPanel/TopPanelVM.vb b/Icarus/TopPanel/TopPanelVM.vb index 7626df4..b2f0fde 100644 --- a/Icarus/TopPanel/TopPanelVM.vb +++ b/Icarus/TopPanel/TopPanelVM.vb @@ -182,6 +182,7 @@ Public Class TopPanelVM SetSelMachining(DbMachining) ' notifico posizione pezzo Map.refDispositionPanelVM.RefreshPos() + Map.refSliceManagerVM.UpdateDimensions() End If End Set End Property @@ -558,10 +559,10 @@ Public Class TopPanelVM Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(False) Map.refInstrumentPanelVM.SetEdgeAnalysisIsEnabled(False) Map.refSliderManagerVM.SetSliderVisibility(False) - ' tolgo mark da pezzo selezionato - If Not IsNothing(SelPart) Then - EgtResetMark(SelPart.nPrintSolidId) - End If + '' tolgo mark da pezzo selezionato + 'If Not IsNothing(SelPart) Then + ' EgtResetMark(SelPart.nPrintSolidId) + 'End If ' imposto pagina Map.refLeftPanelVM.SetSelPanel(LeftPanelVM.Panels.MODIFYPART) End Sub @@ -575,10 +576,10 @@ Public Class TopPanelVM Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(True) Map.refInstrumentPanelVM.SetEdgeAnalysisIsEnabled(True) Map.refSliderManagerVM.SetSliderVisibility(True) - ' ripristino mark su pezzo selezionato - If Not IsNothing(SelPart) Then - EgtSetMark(SelPart.nPrintSolidId) - End If + '' ripristino mark su pezzo selezionato + 'If Not IsNothing(SelPart) Then + ' EgtSetMark(SelPart.nPrintSolidId) + 'End If Return True End Function diff --git a/Icarus/Utility/Dictionary.xaml b/Icarus/Utility/Dictionary.xaml index 4885569..f86dd7f 100644 --- a/Icarus/Utility/Dictionary.xaml +++ b/Icarus/Utility/Dictionary.xaml @@ -112,11 +112,6 @@ - - - - - @@ -797,6 +792,24 @@ + + + + + + @@ -820,8 +833,9 @@ - + + + + @@ -1327,7 +1351,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 7592a8d8889bc34ffc3de622c79f0a1a2be3fde4 Mon Sep 17 00:00:00 2001 From: Emmanuele Sassi Date: Wed, 1 Mar 2023 10:36:46 +0100 Subject: [PATCH 18/35] - Aggiunti FilledSolid - Aggiunto ShellNumberId fisso - Gestiti messaggi in StatusBar per misure - Aggiornate icone TopPanel --- Icarus/Constants/Const3dPrint.vb | 2 + .../CurrMachiningPanelV.xaml | 7 +- .../FilledSolidPanel/FilledSolidPanelV.xaml | 361 +++++ .../FilledSolidPanelV.xaml.vb | 3 + Icarus/FilledSolidPanel/FilledSolidPanelVM.vb | 1358 +++++++++++++++++ .../FilledSolidParamPanelV.xaml | 100 ++ .../FilledSolidParamPanelV.xaml.vb | 3 + .../FilledSolidParamPanelVM.vb | 441 ++++++ Icarus/Icarus.vbproj | 26 + Icarus/LeftPanel/LeftPanelV.xaml | 2 +- Icarus/LeftPanel/LeftPanelVM.vb | 5 +- Icarus/ManagePartPanel/ManagePartPanelVM.vb | 6 + Icarus/ManagePartPanel/ManagePartUtility.vb | 18 +- Icarus/Project/ProjectV.xaml | 3 + Icarus/Resources/CurrMachining/SaveInDb.png | Bin 0 -> 580 bytes Icarus/Resources/ProjectManager/Import.png | Bin 396 -> 285 bytes .../TopPanel/MaterialDb.horizontal.png | Bin 0 -> 1053 bytes Icarus/Resources/TopPanel/MaterialDb.png | Bin 1053 -> 912 bytes Icarus/Resources/TopPanel/Offset.png | Bin 924 -> 455 bytes Icarus/Resources/TopPanel/StrandH.png | Bin 432 -> 344 bytes Icarus/Resources/TopPanel/StrandW.png | Bin 422 -> 329 bytes Icarus/RibPanel/RibPanelVM.vb | 30 +- Icarus/RightPanel/RightPanelV.xaml | 2 +- Icarus/RightPanel/RightPanelVM.vb | 2 + Icarus/SceneHost/MySceneHostVM.vb | 161 ++ Icarus/ShellNumberPanel/ShellNumberPanelVM.vb | 49 +- Icarus/StatusBar/MessagePanelV.xaml | 19 + Icarus/StatusBar/MessagePanelV.xaml.vb | 3 + Icarus/StatusBar/MyStatusBarVM.vb | 20 +- Icarus/TopPanel/TopPanelV.xaml | 30 +- Icarus/Utility/Dictionary.xaml | 5 + Icarus/Utility/Map.vb | 418 +---- 32 files changed, 2598 insertions(+), 476 deletions(-) create mode 100644 Icarus/FilledSolidPanel/FilledSolidPanelV.xaml create mode 100644 Icarus/FilledSolidPanel/FilledSolidPanelV.xaml.vb create mode 100644 Icarus/FilledSolidPanel/FilledSolidPanelVM.vb create mode 100644 Icarus/FilledSolidParamPanel/FilledSolidParamPanelV.xaml create mode 100644 Icarus/FilledSolidParamPanel/FilledSolidParamPanelV.xaml.vb create mode 100644 Icarus/FilledSolidParamPanel/FilledSolidParamPanelVM.vb create mode 100644 Icarus/Resources/CurrMachining/SaveInDb.png create mode 100644 Icarus/Resources/TopPanel/MaterialDb.horizontal.png create mode 100644 Icarus/StatusBar/MessagePanelV.xaml create mode 100644 Icarus/StatusBar/MessagePanelV.xaml.vb diff --git a/Icarus/Constants/Const3dPrint.vb b/Icarus/Constants/Const3dPrint.vb index e72f458..d34df6b 100644 --- a/Icarus/Constants/Const3dPrint.vb +++ b/Icarus/Constants/Const3dPrint.vb @@ -15,6 +15,8 @@ Public Const RIB_EXTRUSION = "RibExtrusion" Public Const RIB_CURVE = "RibCurve" Public Const RIB_ID = "RibId" + Public Const SHELLNUMBER_ID = "ShellNumberId" + Public Const FILLEDSOLID_ID = "FilledSolidId" Public Const VIEWPARAMS = "ViewParams" Public Const IMPORTED_SOLID = "ImportedSolid" Public Const RESULT_READ_PROG = "ResultReadProg" diff --git a/Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml b/Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml index b67e184..2eb7cec 100644 --- a/Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml +++ b/Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml @@ -198,10 +198,13 @@ - diff --git a/Icarus/FilledSolidPanel/FilledSolidPanelV.xaml b/Icarus/FilledSolidPanel/FilledSolidPanelV.xaml new file mode 100644 index 0000000..ef181f8 --- /dev/null +++ b/Icarus/FilledSolidPanel/FilledSolidPanelV.xaml @@ -0,0 +1,361 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -176,76 +174,52 @@ - + - - - - - diff --git a/Icarus/Utility/Dictionary.xaml b/Icarus/Utility/Dictionary.xaml index f86dd7f..55518c5 100644 --- a/Icarus/Utility/Dictionary.xaml +++ b/Icarus/Utility/Dictionary.xaml @@ -43,6 +43,8 @@ + + @@ -117,6 +119,9 @@ None + + + diff --git a/Icarus/Utility/Map.vb b/Icarus/Utility/Map.vb index 7698fe0..837d91b 100644 --- a/Icarus/Utility/Map.vb +++ b/Icarus/Utility/Map.vb @@ -5,49 +5,18 @@ Module Map Private m_refMainWindowVM As MainWindowVM Private m_refMyStatusBarVM As MyStatusBarVM Private m_refProjManagerVM As ProjManagerVM - 'Private m_refProdManagerVM As ProdManagerVM Private m_refProjectVM As ProjectVM Private m_refSecondaryWindowVM As SecondaryWindowVM Private m_refSecondaryWindowV As SecondaryWindowV - 'Private m_refMainMenuVM As MainMenuVM Private m_refMachinePanelVM As MachinePanelVM - ''Private m_refMyMachGroupPanelVM As MyMachGroupPanelVM Private m_refLeftPanelVM As LeftPanelVM Private m_refRightPanelVM As RightPanelVM Private m_refDispositionPanelVM As DispositionPanelVM Private m_refStartMachPanelVM As StartMachPanelVM Private m_refRibPanelVM As RibPanelVM Private m_refControllerInputPanelVM As ControllerInputPanelVM - 'Private m_refBottomPanelVM As BottomPanelVM - 'Private m_refShowBeamPanelVM As ShowBeamPanelVM - 'Private m_refConfigurationPageVM As ConfigurationPageVM - 'Private m_refRawPartListVM As RawPartListVM - 'Private m_refPartInRawPartListVM As PartInRawPartListVM - 'Private m_refWarehouseWndVM As WarehouseWndVM - 'Private m_refFeatureListVM As FeatureListVM - 'Private m_refFreeContourManagerVM As FreeContourManagerVM - 'Private m_refFreeContourInputVM As FreeContourInputVM - 'Private m_refPartManagerVM As PartManagerVM Private m_refInstrumentPanelVM As InstrumentPanelVM Private m_refTopPanelVM As TopPanelVM - 'Private m_refOptimizePanelVM As OptimizePanelVM - 'Private m_refCALCPanelVM As CALCPanelVM - 'Private m_refPartListVM As BTLPartListVM - 'Private m_refFeatureInPartInRawPartListVM As FeatureInPartInRawPartListVM - 'Private m_refStatisticsVM As StatisticsVM - 'Private m_refPParameterListVM As PParameterListVM - 'Private m_refQParameterListVM As QParameterListVM - 'Private m_refFeatureManagerVM As FeatureManagerVM - 'Private m_refAddSectionXMaterialWndVM As AddSectionXMaterialWndVM - 'Private m_refStatisticsTimePanelVM As StatisticsTimePanelVM - 'Private m_refOpenProjectFileDialogVM As OpenProjectFileDialogVM - 'Private m_refRawPartTabVM As RawPartTabVM - 'Private m_refNestingTabVM As NestingTabVM - 'Private m_refMachiningTabVM As MachiningTabVM - 'Private m_refSplitModeVM As SplitModeVM - 'Private m_refMoveRawModeVM As MoveRawModeVM - 'Private m_refSimulTabVM As SimulTabVM - ''Private m_refImportPanelVM As ImportPanelVM Private m_refSliceManagerVM As SliceManagerVM Private m_refTFSEditorVM As TFSEditorVM Private m_refCurrMachiningPanelVM As CurrMachiningPanelVM @@ -60,8 +29,9 @@ Module Map Private m_refViewLayerManagerVM As ViewLayerManagerVM Private m_refShellNumberPanelVM As ShellNumberPanelVM Private m_refShellNumberParamPanelVM As ShellNumberParamPanelVM + Private m_refFilledSolidPanelVM As FilledSolidPanelVM + Private m_refFilledSolidParamPanelVM As FilledSolidParamPanelVM Private m_refSplashScreen As SplashScreen - ''Private m_refModifyPartPanelVM As ModifyPartPanelVM Private m_refManagePartPanelVM As ManagePartPanelVM #Region "Get" @@ -113,12 +83,6 @@ Module Map End Get End Property - 'Public ReadOnly Property refMainMenuVM As MainMenuVM - ' Get - ' Return m_refMainMenuVM - ' End Get - 'End Property - Public ReadOnly Property refMachinePanelVM As MachinePanelVM Get Return m_refMachinePanelVM @@ -161,72 +125,6 @@ Module Map End Get End Property - 'Public ReadOnly Property refMachGroupPanelVM As MyMachGroupPanelVM - ' Get - ' Return CoreMap.refMachGroupPanelVM - ' End Get - 'End Property - - 'Public ReadOnly Property refBottomPanelVM As BottomPanelVM - ' Get - ' Return m_refBottomPanelVM - ' End Get - 'End Property - - 'Public ReadOnly Property refShowBeamPanelVM As ShowBeamPanelVM - ' Get - ' Return m_refShowBeamPanelVM - ' End Get - 'End Property - - 'Public ReadOnly Property refConfigurationPageVM As ConfigurationPageVM - ' Get - ' Return m_refConfigurationPageVM - ' End Get - 'End Property - - 'Public ReadOnly Property refRawPartListVM As RawPartListVM - ' Get - ' Return m_refRawPartListVM - ' End Get - 'End Property - - 'Public ReadOnly Property refPartInRawPartListVM As PartInRawPartListVM - ' Get - ' Return m_refPartInRawPartListVM - ' End Get - 'End Property - - 'Public ReadOnly Property refWarehouseWndVM As WarehouseWndVM - ' Get - ' Return m_refWarehouseWndVM - ' End Get - 'End Property - - 'Public ReadOnly Property refFeatureListVM As FeatureListVM - ' Get - ' Return m_refFeatureListVM - ' End Get - 'End Property - - 'Public ReadOnly Property refFreeContourManagerVM As FreeContourManagerVM - ' Get - ' Return m_refFreeContourManagerVM - ' End Get - 'End Property - - 'Public ReadOnly Property refFreeContourInputVM As FreeContourInputVM - ' Get - ' Return m_refFreeContourInputVM - ' End Get - 'End Property - - 'Public ReadOnly Property refPartManagerVM As PartManagerVM - ' Get - ' Return m_refPartManagerVM - ' End Get - 'End Property - Public ReadOnly Property refInstrumentPanelVM As MyInstrumentPanelVM Get Return m_refInstrumentPanelVM @@ -239,120 +137,6 @@ Module Map End Get End Property - 'Public ReadOnly Property refOptimizePanelVM As OptimizePanelVM - ' Get - ' Return m_refOptimizePanelVM - ' End Get - 'End Property - - 'Public ReadOnly Property refCALCPanelVM As CALCPanelVM - ' Get - ' Return m_refCALCPanelVM - ' End Get - 'End Property - - 'Public ReadOnly Property refPartListVM As BTLPartListVM - ' Get - ' Return m_refPartListVM - ' End Get - 'End Property - - 'Public ReadOnly Property refFeatureInPartInRawPartListVM As FeatureInPartInRawPartListVM - ' Get - ' Return m_refFeatureInPartInRawPartListVM - ' End Get - 'End Property - - 'Public ReadOnly Property refStatisticsVM As StatisticsVM - ' Get - ' Return m_refStatisticsVM - ' End Get - 'End Property - - 'Public ReadOnly Property refPParameterListVM As PParameterListVM - ' Get - ' Return m_refPParameterListVM - ' End Get - 'End Property - - 'Public ReadOnly Property refQParameterListVM As QParameterListVM - ' Get - ' Return m_refQParameterListVM - ' End Get - 'End Property - - 'Public ReadOnly Property refFeatureManagerVM As FeatureManagerVM - ' Get - ' Return m_refFeatureManagerVM - ' End Get - 'End Property - - 'Public ReadOnly Property refAddSectionXMaterialWndVM As AddSectionXMaterialWndVM - ' Get - ' Return m_refAddSectionXMaterialWndVM - ' End Get - 'End Property - - 'Public ReadOnly Property refStatisticsTimePanelVM As StatisticsTimePanelVM - ' Get - ' Return m_refStatisticsTimePanelVM - ' End Get - 'End Property - - 'Public ReadOnly Property refOpenProjectFileDialogVM As OpenProjectFileDialogVM - ' Get - ' Return m_refOpenProjectFileDialogVM - ' End Get - 'End Property - - 'Public ReadOnly Property refOptionPanelVM As OptionPanelVM - ' Get - ' Return m_refOptionPanelVM - ' End Get - 'End Property - - 'Public ReadOnly Property refRawPartTabVM As RawPartTabVM - ' Get - ' Return m_refRawPartTabVM - ' End Get - 'End Property - - 'Public ReadOnly Property refNestingTabVM As NestingTabVM - ' Get - ' Return m_refNestingTabVM - ' End Get - 'End Property - - 'Public ReadOnly Property refMachiningTabVM As MachiningTabVM - ' Get - ' Return m_refMachiningTabVM - ' End Get - 'End Property - - 'Public ReadOnly Property refSplitModeVM As SplitModeVM - ' Get - ' Return m_refSplitModeVM - ' End Get - 'End Property - - 'Public ReadOnly Property refMoveRawModeVM As MoveRawModeVM - ' Get - ' Return m_refMoveRawModeVM - ' End Get - 'End Property - - 'Public ReadOnly Property refSimulTabVM As SimulTabVM - ' Get - ' Return m_refSimulTabVM - ' End Get - 'End Property - - 'Public ReadOnly Property refImportPanelVM As ImportPanelVM - ' Get - ' Return m_refImportPanelVM - ' End Get - 'End Property - Public ReadOnly Property refSliceManagerVM As SliceManagerVM Get Return m_refSliceManagerVM @@ -425,18 +209,24 @@ Module Map End Get End Property + Public ReadOnly Property refFilledSolidPanelVM As FilledSolidPanelVM + Get + Return m_refFilledSolidPanelVM + End Get + End Property + + Public ReadOnly Property refFilledSolidParamPanelVM As FilledSolidParamPanelVM + Get + Return m_refFilledSolidParamPanelVM + End Get + End Property + Public ReadOnly Property refSplashScreen As SplashScreen Get Return m_refSplashScreen End Get End Property - ''Public ReadOnly Property refModifyPartPanelVM As ModifyPartPanelVM - '' Get - '' Return m_refModifyPartPanelVM - '' End Get - ''End Property - Public ReadOnly Property refManagePartPanelVM As ManagePartPanelVM Get Return m_refManagePartPanelVM @@ -457,21 +247,11 @@ Module Map Return Not IsNothing(m_refProjManagerVM) End Function - 'Friend Function SetRefProdManagerVM(ProdManagerVM As ProdManagerVM) As Boolean - ' m_refProdManagerVM = ProdManagerVM - ' Return Not IsNothing(m_refProdManagerVM) - 'End Function - Friend Function SetRefProjectVM(ProjectVM As ProjectVM) As Boolean m_refProjectVM = ProjectVM Return Not IsNothing(m_refProjectVM) End Function - 'Friend Function SetRefMainMenuVM(MainMenuVM As MainMenuVM) As Boolean - ' m_refMainMenuVM = MainMenuVM - ' Return Not IsNothing(m_refMainMenuVM) - 'End Function - Friend Function SetRefSceneHostVM(SceneHostVM As SceneHostVM) As Boolean LibMap.SetRefSceneHostVM(SceneHostVM) Return Not IsNothing(LibMap.refSceneHostVM) @@ -486,11 +266,6 @@ Module Map Return Not IsNothing(m_refSecondaryWindowV) End Function - 'Friend Function SetRefShowPanelVM(ShowPanelVM As ShowPanelVM) As Boolean - ' LibMap.SetRefShowPanelVM(ShowPanelVM) - ' Return Not IsNothing(LibMap.refShowPanelVM) - 'End Function - Friend Function SetRefMachinePanelVM(MachinePanelVM As MachinePanelVM) As Boolean m_refMachinePanelVM = MachinePanelVM Return Not IsNothing(m_refMachinePanelVM) @@ -526,61 +301,6 @@ Module Map Return Not IsNothing(m_refControllerInputPanelVM) End Function - 'Friend Function SetRefMachGroupPanelVM(MachGroupPanelVM As MyMachGroupPanelVM) As Boolean - ' CoreMap.SetRefMachGroupPanelVM(MachGroupPanelVM) - ' Return Not IsNothing(CoreMap.refMachGroupPanelVM) - 'End Function - - 'Friend Function SetRefBottomPanelVM(BottomPanelVM As BottomPanelVM) As Boolean - ' m_refBottomPanelVM = BottomPanelVM - ' Return Not IsNothing(m_refBottomPanelVM) - 'End Function - - 'Friend Function SetRefShowBeamPanelVM(ShowBeamPanelVM As ShowBeamPanelVM) As Boolean - ' m_refShowBeamPanelVM = ShowBeamPanelVM - ' Return Not IsNothing(m_refShowBeamPanelVM) - 'End Function - - 'Friend Function SetRefConfigurationPageVM(ConfigurationPageVM As ConfigurationPageVM) As Boolean - ' m_refConfigurationPageVM = ConfigurationPageVM - ' Return Not IsNothing(m_refConfigurationPageVM) - 'End Function - - 'Friend Function SetRefRawPartListVM(RawPartListVM As RawPartListVM) As Boolean - ' m_refRawPartListVM = RawPartListVM - ' Return Not IsNothing(m_refRawPartListVM) - 'End Function - - 'Friend Function SetRefPartInRawPartListVM(PartInRawPartListVM As PartInRawPartListVM) As Boolean - ' m_refPartInRawPartListVM = PartInRawPartListVM - ' Return Not IsNothing(m_refPartInRawPartListVM) - 'End Function - - 'Friend Function SetRefWarehouseWndVM(WarehouseWndVM As WarehouseWndVM) As Boolean - ' m_refWarehouseWndVM = WarehouseWndVM - ' Return Not IsNothing(m_refWarehouseWndVM) - 'End Function - - 'Friend Function SetRefFeatureListVM(FeatureListVM As FeatureListVM) As Boolean - ' m_refFeatureListVM = FeatureListVM - ' Return Not IsNothing(m_refFeatureListVM) - 'End Function - - 'Friend Function SetRefFreeContourManagerVM(FreeContourManagerVM As FreeContourManagerVM) As Boolean - ' m_refFreeContourManagerVM = FreeContourManagerVM - ' Return Not IsNothing(m_refFreeContourManagerVM) - 'End Function - - 'Friend Function SetRefFreeContourInputVM(FreeContourInputVM As FreeContourInputVM) As Boolean - ' m_refFreeContourInputVM = FreeContourInputVM - ' Return Not IsNothing(m_refFreeContourInputVM) - 'End Function - - 'Friend Function SetRefPartManagerVM(PartManagerVM As PartManagerVM) As Boolean - ' m_refPartManagerVM = PartManagerVM - ' Return Not IsNothing(m_refPartManagerVM) - 'End Function - Friend Function SetRefInstrumentPanelVM(InstrumentPanelVM As InstrumentPanelVM) As Boolean m_refInstrumentPanelVM = InstrumentPanelVM Return Not IsNothing(m_refInstrumentPanelVM) @@ -591,101 +311,6 @@ Module Map Return Not IsNothing(m_refTopPanelVM) End Function - 'Friend Function SetRefOptimizePanelVM(OptimizePanelVM As OptimizePanelVM) As Boolean - ' m_refOptimizePanelVM = OptimizePanelVM - ' Return Not IsNothing(m_refOptimizePanelVM) - 'End Function - - 'Friend Function SetRefCALCPanelVM(CALCPanelVM As CALCPanelVM) As Boolean - ' m_refCALCPanelVM = CALCPanelVM - ' Return Not IsNothing(m_refCALCPanelVM) - 'End Function - - 'Friend Function SetRefPartListVM(PartListVM As BTLPartListVM) As Boolean - ' m_refPartListVM = PartListVM - ' Return Not IsNothing(m_refPartListVM) - 'End Function - - 'Friend Function SetRefFeatureInPartInRawPartListVM(FeatureInPartInRawPartListVM As FeatureInPartInRawPartListVM) As Boolean - ' m_refFeatureInPartInRawPartListVM = FeatureInPartInRawPartListVM - ' Return Not IsNothing(m_refFeatureInPartInRawPartListVM) - 'End Function - - 'Friend Function SetRefStatisticsVM(StatisticsVM As StatisticsVM) As Boolean - ' m_refStatisticsVM = StatisticsVM - ' Return Not IsNothing(m_refStatisticsVM) - 'End Function - - 'Friend Function SetRefPParameterListVM(PParameterListVM As PParameterListVM) As Boolean - ' m_refPParameterListVM = PParameterListVM - ' Return Not IsNothing(m_refPParameterListVM) - 'End Function - - 'Friend Function SetRefQParameterListVM(QParameterListVM As QParameterListVM) As Boolean - ' m_refQParameterListVM = QParameterListVM - ' Return Not IsNothing(m_refQParameterListVM) - 'End Function - - 'Friend Function SetRefFeatureManagerVM(FeatureManagerVM As FeatureManagerVM) As Boolean - ' m_refFeatureManagerVM = FeatureManagerVM - ' Return Not IsNothing(m_refFeatureManagerVM) - 'End Function - - 'Friend Function SetRefAddSectionXMaterialWndVM(AddSectionXMaterialWndVM As AddSectionXMaterialWndVM) As Boolean - ' m_refAddSectionXMaterialWndVM = AddSectionXMaterialWndVM - ' Return Not IsNothing(m_refAddSectionXMaterialWndVM) - 'End Function - - 'Friend Function SetRefStatisticsTimePanelVM(StatisticsTimePanelVM As StatisticsTimePanelVM) As Boolean - ' m_refStatisticsTimePanelVM = StatisticsTimePanelVM - ' Return Not IsNothing(m_refStatisticsTimePanelVM) - 'End Function - - 'Friend Function SetRefOpenProjectFileDialogVM(OpenProjectFileDialogVM As OpenProjectFileDialogVM) As Boolean - ' m_refOpenProjectFileDialogVM = OpenProjectFileDialogVM - ' Return Not IsNothing(m_refOpenProjectFileDialogVM) - 'End Function - - 'Friend Function SetRefOptionPanelVM(OptionPanelVM As OptionPanelVM) As Boolean - ' m_refOptionPanelVM = OptionPanelVM - ' Return Not IsNothing(m_refOptionPanelVM) - 'End Function - - 'Friend Function SetRefRawPartTabVM(RawPartTabVM As RawPartTabVM) As Boolean - ' m_refRawPartTabVM = RawPartTabVM - ' Return Not IsNothing(m_refRawPartTabVM) - 'End Function - - 'Friend Function SetRefNestingTabVM(NestingTabVM As NestingTabVM) As Boolean - ' m_refNestingTabVM = NestingTabVM - ' Return Not IsNothing(m_refNestingTabVM) - 'End Function - - 'Friend Function SetRefMachiningTabVM(MachiningTabVM As MachiningTabVM) As Boolean - ' m_refMachiningTabVM = MachiningTabVM - ' Return Not IsNothing(m_refMachiningTabVM) - 'End Function - - 'Friend Function SetRefSplitModeVM(SplitModeVM As SplitModeVM) As Boolean - ' m_refSplitModeVM = SplitModeVM - ' Return Not IsNothing(m_refSplitModeVM) - 'End Function - - 'Friend Function SetRefMoveRawModeVM(MoveRawModeVM As MoveRawModeVM) As Boolean - ' m_refMoveRawModeVM = MoveRawModeVM - ' Return Not IsNothing(m_refMoveRawModeVM) - 'End Function - - 'Friend Function SetRefSimulTabVM(SimulTabVM As SimulTabVM) As Boolean - ' m_refSimulTabVM = SimulTabVM - ' Return Not IsNothing(m_refSimulTabVM) - 'End Function - - ''Friend Function SetRefImportPanelVM(ImportPanelVM As ImportPanelVM) As Boolean - '' m_refImportPanelVM = ImportPanelVM - '' Return Not IsNothing(m_refImportPanelVM) - ''End Function - Friend Function SetRefSliceManagerVM(SliceManagerVM As SliceManagerVM) As Boolean m_refSliceManagerVM = SliceManagerVM Return Not IsNothing(m_refSliceManagerVM) @@ -746,16 +371,21 @@ Module Map Return Not IsNothing(m_refShellNumberParamPanelVM) End Function + Friend Function SetRefFilledSolidPanelVM(FilledSolidPanelVM As FilledSolidPanelVM) As Boolean + m_refFilledSolidPanelVM = FilledSolidPanelVM + Return Not IsNothing(m_refFilledSolidPanelVM) + End Function + + Friend Function SetRefFilledSolidParamPanelVM(FilledSolidParamPanelVM As FilledSolidParamPanelVM) As Boolean + m_refFilledSolidParamPanelVM = FilledSolidParamPanelVM + Return Not IsNothing(m_refFilledSolidParamPanelVM) + End Function + Friend Function SetRefSplashScreen(SplashScreen As SplashScreen) As Boolean m_refSplashScreen = SplashScreen Return Not IsNothing(m_refSplashScreen) End Function - ''Friend Function SetRefModifyPartPanelVM(ModifyPartPanelVM As ModifyPartPanelVM) As Boolean - '' m_refModifyPartPanelVM = ModifyPartPanelVM - '' Return Not IsNothing(m_refModifyPartPanelVM) - ''End Function - Friend Function SetRefManagePartPanelVM(ManagePartPanelVM As ManagePartPanelVM) As Boolean m_refManagePartPanelVM = ManagePartPanelVM Return Not IsNothing(m_refManagePartPanelVM) From 2b4d5f9c922ad3db4c934db1e1b9e19ca5a9d65d Mon Sep 17 00:00:00 2001 From: Emmanuele Sassi Date: Wed, 1 Mar 2023 13:16:19 +0100 Subject: [PATCH 19/35] - eliminato plurale da nomi per evitare scroll orizzontale - salvato a parte nuova grafica finestra opzioni --- Icarus/CurrMachiningPanel/CurrMachining.vb | 14 +- Icarus/MachiningDb/Machining.vb | 28 +-- .../OptionWindowV-NewGraphics.xaml | 223 ++++++++++++++++++ 3 files changed, 244 insertions(+), 21 deletions(-) create mode 100644 Icarus/OptionsWindow/OptionWindowV-NewGraphics.xaml diff --git a/Icarus/CurrMachiningPanel/CurrMachining.vb b/Icarus/CurrMachiningPanel/CurrMachining.vb index d79d33d..3b463c8 100644 --- a/Icarus/CurrMachiningPanel/CurrMachining.vb +++ b/Icarus/CurrMachiningPanel/CurrMachining.vb @@ -1025,13 +1025,13 @@ Public Class CurrOrderedMachiningParam Machining.MPAR_PRINT_ORDER.RIB_INTERNAL, Machining.MPAR_PRINT_ORDER.RIB_SUPPORT}) m_ValueList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_PRINT_ORDER.SHELL, "Shell"), - New IdNameStruct(Machining.MPAR_PRINT_ORDER.EXTRA_SHELL, "Extra Shells"), - New IdNameStruct(Machining.MPAR_PRINT_ORDER.INFILL, "Infills"), - New IdNameStruct(Machining.MPAR_PRINT_ORDER.AUX_SOLID, "Filled Solids"), - New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_UNBOUNDED, "Unbounded Ribs"), - New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_EXTERNAL, "External Ribs"), - New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_INTERNAL, "Internal Ribs"), - New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_SUPPORT, "Support Ribs")}) + New IdNameStruct(Machining.MPAR_PRINT_ORDER.EXTRA_SHELL, "Extra Shell"), + New IdNameStruct(Machining.MPAR_PRINT_ORDER.INFILL, "Infill"), + New IdNameStruct(Machining.MPAR_PRINT_ORDER.AUX_SOLID, "Filled Solid"), + New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_UNBOUNDED, "Unbounded Rib"), + New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_EXTERNAL, "External Rib"), + New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_INTERNAL, "Internal Rib"), + New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_SUPPORT, "Support Rib")}) Dim sValue As String = "" bReadFromPart = EgtGetInfo(nPartId, MAC_PRINTORDER, sValue) Value = sValue diff --git a/Icarus/MachiningDb/Machining.vb b/Icarus/MachiningDb/Machining.vb index 4aee8a2..1a406e2 100644 --- a/Icarus/MachiningDb/Machining.vb +++ b/Icarus/MachiningDb/Machining.vb @@ -1384,13 +1384,13 @@ Public Class OrderedMachiningParam Machining.MPAR_PRINT_ORDER.RIB_INTERNAL, Machining.MPAR_PRINT_ORDER.RIB_SUPPORT}) m_ValueList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_PRINT_ORDER.SHELL, "Shell"), - New IdNameStruct(Machining.MPAR_PRINT_ORDER.EXTRA_SHELL, "Extra Shells"), - New IdNameStruct(Machining.MPAR_PRINT_ORDER.INFILL, "Infills"), - New IdNameStruct(Machining.MPAR_PRINT_ORDER.AUX_SOLID, "Filled Solids"), - New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_UNBOUNDED, "Unbounded Ribs"), - New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_EXTERNAL, "External Ribs"), - New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_INTERNAL, "Internal Ribs"), - New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_SUPPORT, "Support Ribs")}) + New IdNameStruct(Machining.MPAR_PRINT_ORDER.EXTRA_SHELL, "Extra Shell"), + New IdNameStruct(Machining.MPAR_PRINT_ORDER.INFILL, "Infill"), + New IdNameStruct(Machining.MPAR_PRINT_ORDER.AUX_SOLID, "Filled Solid"), + New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_UNBOUNDED, "Unbounded Rib"), + New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_EXTERNAL, "External Rib"), + New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_INTERNAL, "Internal Rib"), + New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_SUPPORT, "Support Rib")}) m_SelValue = Nothing End Select Else @@ -1405,13 +1405,13 @@ Public Class OrderedMachiningParam Machining.MPAR_PRINT_ORDER.RIB_INTERNAL, Machining.MPAR_PRINT_ORDER.RIB_SUPPORT}) m_ValueList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_PRINT_ORDER.SHELL, "Shell"), - New IdNameStruct(Machining.MPAR_PRINT_ORDER.EXTRA_SHELL, "Extra Shells"), - New IdNameStruct(Machining.MPAR_PRINT_ORDER.INFILL, "Infills"), - New IdNameStruct(Machining.MPAR_PRINT_ORDER.AUX_SOLID, "Filled Solids"), - New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_UNBOUNDED, "Unbounded Ribs"), - New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_EXTERNAL, "External Ribs"), - New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_INTERNAL, "Internal Ribs"), - New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_SUPPORT, "Support Ribs")}) + New IdNameStruct(Machining.MPAR_PRINT_ORDER.EXTRA_SHELL, "Extra Shell"), + New IdNameStruct(Machining.MPAR_PRINT_ORDER.INFILL, "Infill"), + New IdNameStruct(Machining.MPAR_PRINT_ORDER.AUX_SOLID, "Filled Solid"), + New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_UNBOUNDED, "Unbounded Rib"), + New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_EXTERNAL, "External Rib"), + New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_INTERNAL, "Internal Rib"), + New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_SUPPORT, "Support Rib")}) ReadMachiningParamString(nIndex, MAC_PRINTORDER, "", Value) End Select End If diff --git a/Icarus/OptionsWindow/OptionWindowV-NewGraphics.xaml b/Icarus/OptionsWindow/OptionWindowV-NewGraphics.xaml new file mode 100644 index 0000000..d72726b --- /dev/null +++ b/Icarus/OptionsWindow/OptionWindowV-NewGraphics.xaml @@ -0,0 +1,223 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + From ad24522010894f91a753450a07ab7fa9df819018 Mon Sep 17 00:00:00 2001 From: Emmanuele Sassi Date: Thu, 2 Mar 2023 10:44:00 +0100 Subject: [PATCH 20/35] - aggiunti titoli CurrMach, MachDb, MatDb - aggiornamento grafica MaterialDb - correzioni aggiornamento tempo e massa --- .../CurrMachiningPanelV.xaml | 421 +++++++-------- Icarus/Icarus.vbproj | 5 + Icarus/MachiningDb/MachiningDbV.xaml | 487 +++++++++--------- Icarus/MaterialDb/MaterialDbV.xaml | 154 ++++-- Icarus/SceneHost/MySceneHostVM.vb | 6 +- Icarus/SliceManager/SliceManagerV.xaml | 4 - Icarus/SliceManager/SliceManagerVM.vb | 8 +- 7 files changed, 581 insertions(+), 504 deletions(-) diff --git a/Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml b/Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml index 2eb7cec..9edef53 100644 --- a/Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml +++ b/Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml @@ -1,210 +1,223 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/Icarus/Icarus.vbproj b/Icarus/Icarus.vbproj index 94de932..75b47bc 100644 --- a/Icarus/Icarus.vbproj +++ b/Icarus/Icarus.vbproj @@ -779,6 +779,11 @@ + + + + + IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\Icarus\IcarusR32.exe diff --git a/Icarus/MachiningDb/MachiningDbV.xaml b/Icarus/MachiningDb/MachiningDbV.xaml index 4d3bc3e..c58ef38 100644 --- a/Icarus/MachiningDb/MachiningDbV.xaml +++ b/Icarus/MachiningDb/MachiningDbV.xaml @@ -1,244 +1,255 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Style="{StaticResource RightPanel_ScrollViewer}"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Icarus/MaterialDb/MaterialDbV.xaml b/Icarus/MaterialDb/MaterialDbV.xaml index 27cd55b..e4c146c 100644 --- a/Icarus/MaterialDb/MaterialDbV.xaml +++ b/Icarus/MaterialDb/MaterialDbV.xaml @@ -1,19 +1,32 @@ - - - + + + + + + + + + + - - + @@ -24,62 +37,81 @@ - + - - + HorizontalAlignment="Stretch" + Margin="2.5,0,2.5,0" + Style="{StaticResource RightPanel_ComboBox}"/> + - + HorizontalScrollBarVisibility="Disabled" + Margin="1,0,0,2.5" + Padding="0" + BorderThickness="0" + Style="{StaticResource RightPanel_ScrollViewer}"> + - + @@ -88,11 +120,14 @@ IsExpanded="{Binding Cathegory_IsExpanded}" VerticalContentAlignment="Top" Visibility="{Binding Cathegory_Visibility}"> - + - + @@ -102,25 +137,32 @@ - + - + + Text="{Binding dValue}" + Margin="2.5,0,0,0" + Style="{StaticResource ParameterList_TextBox}"/> - + - + - + @@ -135,29 +177,37 @@ - + - + + HorizontalAlignment="Stretch" + Margin="2.5,0,0,0" + Style="{StaticResource RightPanel_ComboBox}"/> - + - + + VerticalAlignment="Center" + Margin="2.5,0,0,0"/> @@ -167,12 +217,14 @@ - - - + diff --git a/Icarus/SceneHost/MySceneHostVM.vb b/Icarus/SceneHost/MySceneHostVM.vb index 32bb71f..36ba98a 100644 --- a/Icarus/SceneHost/MySceneHostVM.vb +++ b/Icarus/SceneHost/MySceneHostVM.vb @@ -1094,10 +1094,8 @@ Public Class MySceneHostVM ' aggiorno colori entita' GeomEntityColors.UpdateColors(LayerType.ALL) - ' se non e' da ricalcolare, recupero tempo e massa - If Not bProjectToRecalc Then - Map.refSliceManagerVM.UpdateTimeAndMass() - End If + ' aggiorno tempo e massa + Map.refSliceManagerVM.UpdateTimeAndMass() Map.refSliderManagerVM.SetLayerIndexToMax() diff --git a/Icarus/SliceManager/SliceManagerV.xaml b/Icarus/SliceManager/SliceManagerV.xaml index 593bce0..5985fd4 100644 --- a/Icarus/SliceManager/SliceManagerV.xaml +++ b/Icarus/SliceManager/SliceManagerV.xaml @@ -42,10 +42,6 @@ Visibility="{Binding Loading_Visibility}" Margin="5,2.5,5,2.5" Style="{StaticResource Icarus_ProgressBar}"/> - GDB_ID.NULL Then - EgtGetInfo(nLayTFSCalcId, "Ttot", m_dTime) - EgtGetInfo(nLayTFSCalcId, KEY_MASS, m_dMass) + If Not EgtGetInfo(nLayTFSCalcId, "Ttot", m_dTime) Then m_dTime = 0 + If Not EgtGetInfo(nLayTFSCalcId, KEY_MASS, m_dMass) Then m_dMass = 0 Else m_dTime = 0 m_dMass = 0 @@ -413,6 +413,8 @@ Public Class SliceManagerVM MessageBox.Show(sOut, "Error", MessageBoxButton.OK, MessageBoxImage.Error) End If End If + ' aggiorno tempo e massa + Map.refSliceManagerVM.UpdateTimeAndMass() ' Aggiorno intestazione programma Map.refSceneHostVM.EmitTitle() ' nascondo barre di caricamento From 08088592f9f8a01b49653d7df38c341810c4f578 Mon Sep 17 00:00:00 2001 From: Emmanuele Sassi Date: Thu, 2 Mar 2023 14:22:36 +0100 Subject: [PATCH 21/35] - aggiunta vista SE --- Icarus/Icarus.vbproj | 3 ++ Icarus/Resources/ViewPanel/LookFromISO_SE.png | Bin 0 -> 536 bytes Icarus/Resources/ViewPanel/LookFromISO_SW.png | Bin 536 -> 607 bytes Icarus/ViewPanel/ViewPanelV.xaml | 7 +++++ Icarus/ViewPanel/ViewPanelVM.vb | 26 +++++++++++++++++- 5 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 Icarus/Resources/ViewPanel/LookFromISO_SE.png diff --git a/Icarus/Icarus.vbproj b/Icarus/Icarus.vbproj index 75b47bc..8280b76 100644 --- a/Icarus/Icarus.vbproj +++ b/Icarus/Icarus.vbproj @@ -784,6 +784,9 @@ + + + IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\Icarus\IcarusR32.exe diff --git a/Icarus/Resources/ViewPanel/LookFromISO_SE.png b/Icarus/Resources/ViewPanel/LookFromISO_SE.png new file mode 100644 index 0000000000000000000000000000000000000000..949dcb2f7085edce141a3976a12c05e72a6e5842 GIT binary patch literal 536 zcmV+z0_XjSP)IJhb0++_R-mg$$;Cny^xG4~54VVFr051_L4E#CZ5NH5f#=5g2Xu`n1 z1Ezrs;E|-`3j@EYK;oT-vFwj1Gz~FiD;u=FzPdlcPOEA_+B3%P- zS?b?dwk{P^R#i}0RY7G{1(j75R900`NzxIl^*!*G4y8cSfwqiw-O`~3fPT8r(x8%n zN`s03bq0Y-fr4e-6vuyFP6(thV3SHMgkWXtEX1U=(pU*% z;Xx{Om@uC}I~&Ivrm#`;3kb<4NCFmiDp=TgjS#^iV3R^QdGT$s#NBm{yIoJ%KU{J1 z-p>AR=FRZ_cVajkGHvQi9nrKxbw^2#!LI@5f&H3zW`Q$FP=7J_d0-1z0(OAy8i1C8 z6;f6z27e293H$_J10Rib4<|_zgMY42@`IPVxqwiv12=SN6F3cAkz`}tN(_FYF#6ti zz(v3r>-sVHVOIlpbv5$J;GP-l?$rQuR#qLD0j?VB-ej?k)=R(Q`P-T^NgyeS&%jsU zLLLaMDOsgc6@PO`>}?Ew7dXe!Ru^eOPf(`0g1SAa<1dVLYekdD11YO8n~)>=1nlL$ z@9HP72f(*7pbToSESOVYi}0Y($2om5_|?DV$c?^{Fjq>>#MCj?4S-(7ggwn^4vOE~ z@d~)97i6XnGN!Rcb$Bw2bsI7G@4zFepQb_bYFn37wSQ2lYN1lqLZzyOO4a}G`?T3x zsOUV4G#ItZNQR2Ri|4x!e97A4L@mYO|7f?xwTuO&Kw?0jjO+Pg@CQa#EL+Jt)>F*r zVRBu))$w;!7W%&cqU!XiL2Vp}vYN^{=3di4Wl-0E%fKaL-TOL#)U=lFLJ^ew`(ebS zj(8uXN-NCoV%07jhk6QJ2kz7Wlj#TWxU?*QUquPHG`Ke&g#Z8m07*qoM6N<$g8!fp AOaK4? delta 490 zcmV7knaoV|`+deu zlVe8&)Up_bfnNve1+y#ym&Ur@uTWv&dq4-cDG+E4m;sIeFMkm#4E#CZ5NH5f#=5g2 zXu`n11Ezrs;E|-`3j@EYK;oT-vF3&8dpThS-<_sr8k7W|_n#T2o<9A{+9E5u#N^8_ zHnC193`)yLTK4v|?2HbIFEB}-Am-7n7UbCaSNIRvSSK}a2{;B`ffZw2Bdz3&q)RZ? zNg`bXZ&~W!Shg+|R900`Sye%0RRxt*6;xJLP)X7etYh^(@RkmxK+=J>jCI}8p$33{ zy3o>~l7LEsiU4&6fl7gj0Cly8AJV9yrXxUJl2LSu_5NX0Pt&?WoumOpp=3T2w-%`@ g;M`cZpSlU~0eVV_n|7$~3IG5A07*qoM6N<$g7e$jH~;_u diff --git a/Icarus/ViewPanel/ViewPanelV.xaml b/Icarus/ViewPanel/ViewPanelV.xaml index 1002559..cff3a79 100644 --- a/Icarus/ViewPanel/ViewPanelV.xaml +++ b/Icarus/ViewPanel/ViewPanelV.xaml @@ -52,6 +52,13 @@ + - - - + diff --git a/Icarus/MainWindow/MainWindowV.xaml b/Icarus/MainWindow/MainWindowV.xaml index 6d24674..329bb36 100644 --- a/Icarus/MainWindow/MainWindowV.xaml +++ b/Icarus/MainWindow/MainWindowV.xaml @@ -1,25 +1,14 @@ - - - - - - + @@ -28,14 +17,5 @@ - - - + diff --git a/Icarus/MainWindow/MainWindowV.xaml.vb b/Icarus/MainWindow/MainWindowV.xaml.vb index be52be3..8cb3d42 100644 --- a/Icarus/MainWindow/MainWindowV.xaml.vb +++ b/Icarus/MainWindow/MainWindowV.xaml.vb @@ -5,7 +5,6 @@ Imports System.Windows.Interop Class MainWindowV Private m_MainWindowVM As MainWindowVM - Private m_SceneHostWnd As SecondaryWindowV #Region "CONSTRUCTOR" @@ -20,8 +19,8 @@ Class MainWindowV AddHandler Me.Closing, AddressOf MainWindowV_Closing AddHandler Me.KeyDown, AddressOf MainWindowV_KeyDown AddHandler Me.StateChanged, AddressOf MainWindowV_StateChanged - AddHandler Me.LocationChanged, AddressOf MainWindowV_LocationChanged - AddHandler Me.SizeChanged, AddressOf MainWindowV_SizeChanged + 'AddHandler Me.LocationChanged, AddressOf MainWindowV_LocationChanged + 'AddHandler Me.SizeChanged, AddressOf MainWindowV_SizeChanged End Sub #End Region ' CONSTRUCTOR @@ -62,7 +61,6 @@ Class MainWindowV Me.Activate() ' Recupero l'array di stringhe con i nomi del file Dim sFiles() As String = DirectCast(e.Data.GetData(DataFormats.FileDrop), String()) - End If End Sub @@ -82,8 +80,7 @@ Class MainWindowV End Sub Private Sub MainWindowV_StateChanged(sender As Object, e As EventArgs) - 'If Not IsNothing(Map.refSecondaryWindowV) AndAlso Not Map.refSecondaryWindowV.WindowChangingState Then - If Not IsNothing(Map.refSecondaryWindowV) Then + If Not IsNothing(Map.refSecondaryWindowV) AndAlso Not Map.refSecondaryWindowV.WindowChangingState Then Map.refSecondaryWindowV.WindowState = Me.WindowState End If End Sub diff --git a/Icarus/MainWindow/MainWindowVM.vb b/Icarus/MainWindow/MainWindowVM.vb index c2deb97..ef0879a 100644 --- a/Icarus/MainWindow/MainWindowVM.vb +++ b/Icarus/MainWindow/MainWindowVM.vb @@ -80,12 +80,6 @@ Public Class MainWindowVM '#Region "METHODS" - Friend Sub SetTitle(sTitle As String) - NotifyPropertyChanged(NameOf(sTitle)) - NotifyPropertyChanged(NameOf(sProjectName)) - NotifyPropertyChanged(NameOf(sProjectPath)) - End Sub - Friend Sub ContentRendered() End Sub diff --git a/Icarus/OptionsWindow/MachineBox.xaml b/Icarus/OptionsWindow/MachineBox.xaml deleted file mode 100644 index 398f316..0000000 --- a/Icarus/OptionsWindow/MachineBox.xaml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - + + + diff --git a/Icarus/OptionsWindow/OptionWindowVM.vb b/Icarus/OptionsWindow/OptionWindowVM.vb index 655e310..11d122b 100644 --- a/Icarus/OptionsWindow/OptionWindowVM.vb +++ b/Icarus/OptionsWindow/OptionWindowVM.vb @@ -980,16 +980,17 @@ Public Class OptionWindowVM Dim bOldExists As Boolean = My.Computer.FileSystem.DirectoryExists( sMachDir) Dim bUpdate As Boolean = True If bOldExists Then - Dim MachBox As New MachineBox( Application.Current.MainWindow, sMachName) - Select MachBox.ShowDialog() - Case MessageBoxResult.Yes - bUpdate = False - Case MessageBoxResult.No - bUpdate = True - Case MessageBoxResult.Cancel - ' Rimuovo il direttorio temporaneo ed esco - My.Computer.FileSystem.DeleteDirectory( sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents) - Return + Dim MachBox As New UpdateMachineV(Application.Current.MainWindow, New UpdateMachineVM(sMachName)) + MachBox.ShowDialog() + Select Case MachBox.DialogResult + Case MessageBoxResult.Yes + bUpdate = False + Case MessageBoxResult.No + bUpdate = True + Case MessageBoxResult.Cancel + ' Rimuovo il direttorio temporaneo ed esco + My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents) + Return End Select ' Faccio una copia di backup della macchina corrente Dim sBackupDir As String = sMachDir & ".old" diff --git a/Icarus/RibParamPanel/CopyFromWndV.xaml b/Icarus/RibParamPanel/CopyFromWndV.xaml index 6dc8457..6325322 100644 --- a/Icarus/RibParamPanel/CopyFromWndV.xaml +++ b/Icarus/RibParamPanel/CopyFromWndV.xaml @@ -1,35 +1,45 @@ - - + + + Margin="20,20,20,2.5" + Style="{StaticResource DialogWindow_TextBlock}"/> + Width="160" + HorizontalAlignment="Center" + HorizontalContentAlignment="Center" + Margin="2.5,10,2.5,2.5" + Style="{StaticResource RightPanel_ComboBox}"/> - + - + diff --git a/Icarus/SceneHost/MySceneHostVM.vb b/Icarus/SceneHost/MySceneHostVM.vb index 74ee307..9b75b8d 100644 --- a/Icarus/SceneHost/MySceneHostVM.vb +++ b/Icarus/SceneHost/MySceneHostVM.vb @@ -234,19 +234,8 @@ Public Class MySceneHostVM End Sub Friend Sub EmitTitle() - '' nome file - 'Dim sTitle As String = MainController.GetCurrFile() - 'If String.IsNullOrEmpty(sTitle) Then - ' sTitle = EgtMsg(MSG_TOPCOMMANDBAR + 1) & Map.refMainWindowVM.MainWindowM.nInstance.ToString() - 'End If - '' indicazione di modificato - 'If MainController.GetModified() Then - ' sTitle += "*" - 'End If - '' dati del prodotto - 'sTitle += " - Icarus" ' emissione del titolo - Map.refMainWindowVM.SetTitle("") + Map.refSecondaryWindowVM.SetTitle() End Sub #End Region ' METHODS diff --git a/Icarus/SecondaryWindow/SecondaryWindowV.xaml b/Icarus/SecondaryWindow/SecondaryWindowV.xaml index 5ed7014..29861c0 100644 --- a/Icarus/SecondaryWindow/SecondaryWindowV.xaml +++ b/Icarus/SecondaryWindow/SecondaryWindowV.xaml @@ -1,21 +1,22 @@ - - + @@ -23,7 +24,5 @@ - - - + diff --git a/Icarus/SecondaryWindow/SecondaryWindowV.xaml.vb b/Icarus/SecondaryWindow/SecondaryWindowV.xaml.vb index bc2f628..3185872 100644 --- a/Icarus/SecondaryWindow/SecondaryWindowV.xaml.vb +++ b/Icarus/SecondaryWindow/SecondaryWindowV.xaml.vb @@ -22,13 +22,9 @@ Public Class SecondaryWindowV AddHandler Me.ContentRendered, AddressOf SecondaryWindowV_ContentRendered AddHandler Me.Loaded, AddressOf SecondaryWindowV_Loaded AddHandler Me.Closing, AddressOf SecondaryWindowV_Closing - 'AddHandler Me.LocationChanged, AddressOf SecondaryWindowV_LocationChanged - 'AddHandler Me.SizeChanged, AddressOf SecondaryWindowV_SizeChanged - 'AddHandler Me.StateChanged, AddressOf SecondaryWindowV_StateChanged - End Sub - - Private Sub SecondaryWindowV_ContentRendered(sender As Object, e As EventArgs) - m_SecondaryWindowVM.ContentRendered() + AddHandler Me.LocationChanged, AddressOf SecondaryWindowV_LocationChanged + AddHandler Me.SizeChanged, AddressOf SecondaryWindowV_SizeChanged + AddHandler Me.StateChanged, AddressOf SecondaryWindowV_StateChanged End Sub Private Sub SecondaryWindowV_Loaded(sender As Object, e As RoutedEventArgs) @@ -36,6 +32,10 @@ Public Class SecondaryWindowV WinPosFromIniToWindow(S_GENERAL, K_WINPLACE, Me) End Sub + Private Sub SecondaryWindowV_ContentRendered(sender As Object, e As EventArgs) + m_SecondaryWindowVM.ContentRendered() + End Sub + Private Sub SecondaryWindowV_Closing(sender As Object, e As System.ComponentModel.CancelEventArgs) If (Keyboard.Modifiers And ModifierKeys.Alt) = ModifierKeys.Alt OrElse Keyboard.IsKeyDown(Key.F4) Then e.Cancel = True @@ -66,15 +66,6 @@ Public Class SecondaryWindowV Application.Current.MainWindow.Topmost = True Application.Current.MainWindow.Topmost = False m_WindowChangingState = False - ''Dim x = Me.WindowState - 'If Me.WindowState <> Application.Current.MainWindow.WindowState Then - ' Me.WindowState = Application.Current.MainWindow.WindowState - 'End If - 'm_WindowChangingState = True - 'Application.Current.MainWindow.WindowState = Me.WindowState - 'Application.Current.MainWindow.Topmost = True - 'Application.Current.MainWindow.Topmost = False - 'm_WindowChangingState = False End Sub #End Region ' CONSTRUCTOR diff --git a/Icarus/SecondaryWindow/SecondaryWindowVM.vb b/Icarus/SecondaryWindow/SecondaryWindowVM.vb index b91f988..580deb3 100644 --- a/Icarus/SecondaryWindow/SecondaryWindowVM.vb +++ b/Icarus/SecondaryWindow/SecondaryWindowVM.vb @@ -1,5 +1,6 @@ Imports EgtWPFLib5 Imports EgtUILib +Imports System.IO Imports System.Windows.Threading Public Class SecondaryWindowVM @@ -9,15 +10,34 @@ Public Class SecondaryWindowVM Private m_WaitAfterRender As Integer = 0 ' Titolo - Private m_sTitle As String - Public Property sTitle As String + Public ReadOnly Property sTitle As String Get - Return m_sTitle + Return "Icarus" + End Get + End Property + + Public ReadOnly Property sProjectName As String + Get + Dim sFilePath As String = "" + EgtGetCurrFilePath(sFilePath) + If String.IsNullOrEmpty(sFilePath) Then + sFilePath = EgtMsg(MSG_TOPCOMMANDBAR + 1) & Map.refMainWindowVM.MainWindowM.nInstance.ToString() + Return sFilePath + Else + Return Path.GetFileNameWithoutExtension(sFilePath) & If(EgtGetModified(), "*", "") + End If + End Get + End Property + + Public ReadOnly Property sProjectPath As String + Get + Dim sFilePath As String = "" + EgtGetCurrFilePath(sFilePath) + If String.IsNullOrEmpty(sFilePath) Then + sFilePath = EgtMsg(MSG_TOPCOMMANDBAR + 1) & Map.refMainWindowVM.MainWindowM.nInstance.ToString() + End If + Return sFilePath End Get - Set(value As String) - m_sTitle = value - NotifyPropertyChanged(NameOf(sTitle)) - End Set End Property Private m_Visibility As Boolean @@ -37,11 +57,13 @@ Public Class SecondaryWindowVM End If End Sub - Friend Sub SetTitle(sTitle As String) - m_sTitle = sTitle + Friend Sub SetTitle() NotifyPropertyChanged(NameOf(sTitle)) + NotifyPropertyChanged(NameOf(sProjectName)) + NotifyPropertyChanged(NameOf(sProjectPath)) End Sub + ' definizione comandi Private m_cmdAboutBox As ICommand Private m_cmdCloseApplication As ICommand @@ -110,5 +132,52 @@ Public Class SecondaryWindowVM Return False End Function +#Region "COMMANDS" + +#Region "AboutBoxCommand" + + ' Returns a command that manage the MainWindow_Unloaded command + Public ReadOnly Property AboutBoxCommand() As ICommand + Get + If m_cmdAboutBox Is Nothing Then + m_cmdAboutBox = New Command(AddressOf AboutBox) + End If + Return m_cmdAboutBox + End Get + End Property + + ' Manage the MainWindow_Unloaded event. This method is invoked by the cmdMainWindow_Unloaded. + Public Sub AboutBox(ByVal param As Object) + Dim AboutBoxWindow As New AboutBoxV + AboutBoxWindow.Owner = Application.Current.MainWindow + AboutBoxWindow.ShowDialog() + End Sub + +#End Region ' AboutBoxCommand + +#Region "CloseApplicationCommand" + + ' Returns a command that manage the MainWindow_Unloaded command + Public ReadOnly Property CloseApplicationCommand() As ICommand + Get + If m_cmdCloseApplication Is Nothing Then + m_cmdCloseApplication = New Command(AddressOf CloseApplication) + End If + Return m_cmdCloseApplication + End Get + End Property + + ' Manage the MainWindow_Unloaded event. This method is invoked by the cmdMainWindow_Unloaded. + Public Sub CloseApplication(ByVal param As Object) + If Map.refSliceManagerVM.bCalculating Then + MessageBox.Show("Impossible closing software! Wait end of calculation!", "Error", MessageBoxButton.OK, MessageBoxImage.Error) + Return + End If + Map.refMainWindowVM.CloseApplication() + End Sub + +#End Region ' CloseApplicationCommand + +#End Region ' COMMANDS End Class diff --git a/Icarus/UpdateMachine/UpdateMachineV.xaml b/Icarus/UpdateMachine/UpdateMachineV.xaml new file mode 100644 index 0000000..d5fa321 --- /dev/null +++ b/Icarus/UpdateMachine/UpdateMachineV.xaml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + diff --git a/Icarus/UpdateMachine/UpdateMachineV.xaml.vb b/Icarus/UpdateMachine/UpdateMachineV.xaml.vb new file mode 100644 index 0000000..a9802e9 --- /dev/null +++ b/Icarus/UpdateMachine/UpdateMachineV.xaml.vb @@ -0,0 +1,24 @@ +Imports EgtUILib + +Public Class UpdateMachineV + + Private WithEvents m_UpdateMachineVM As UpdateMachineVM + + Public Shadows DialogResult As MessageBoxResult = MessageBoxResult.Cancel + + + Public Sub New(Owner As Window, UpdateMachineVM As UpdateMachineVM) + MyBase.New(Owner) + ' This call is required by the designer. + InitializeComponent() + Me.DataContext = UpdateMachineVM + ' Assegno al riferimento locale al VM il VM preso dal DataContext + m_UpdateMachineVM = UpdateMachineVM + End Sub + + Private Sub CloseWindow(DialogResult As MessageBoxResult) Handles m_UpdateMachineVM.m_CloseWindow + Me.DialogResult = DialogResult + Me.Close() + End Sub + +End Class diff --git a/Icarus/UpdateMachine/UpdateMachineVM.vb b/Icarus/UpdateMachine/UpdateMachineVM.vb new file mode 100644 index 0000000..8a58562 --- /dev/null +++ b/Icarus/UpdateMachine/UpdateMachineVM.vb @@ -0,0 +1,108 @@ +Imports EgtUILib +Imports EgtWPFLib5 +Imports System.Collections.ObjectModel +Imports System.Windows.Forms + +Public Class UpdateMachineVM + +#Region "FIELDS & PROPERTIES" + + Friend Event m_CloseWindow(bDialogResult As MessageBoxResult) + + Private m_MachineName As String = "" + +#Region "MESSAGES" + + Public ReadOnly Property UpdateMachine_Msg As String + Get + Return String.Format(EgtMsg(6528), m_MachineName) ' La macchina "{0}" esiste già,
cosa vuoi fare ? + + End Get + End Property + + Public ReadOnly Property Replace_Msg As String + Get + Return EgtMsg(6531) ' Sostituisci + End Get + End Property + + Public ReadOnly Property Update_Msg As String + Get + Return EgtMsg(6532) ' Aggiorna + End Get + End Property + + +#End Region ' MESSAGES + + ' Definizione comandi + Private m_cmdReplace As ICommand + Private m_cmdUpdate As ICommand + Private m_cmdCancel As ICommand + +#End Region ' FIELDS & PROPERTIES + +#Region "CONSTRUCTOR" + + Sub New(MachineName As String) + m_MachineName = MachineName + End Sub + +#End Region ' CONSTRUCTOR + +#Region "COMMANDS" + +#Region "Replace" + + Public ReadOnly Property Replace_Command As ICommand + Get + If m_cmdReplace Is Nothing Then + m_cmdReplace = New Command(AddressOf Replace) + End If + Return m_cmdReplace + End Get + End Property + + Public Sub Replace() + RaiseEvent m_CloseWindow(MessageBoxResult.Yes) + End Sub + +#End Region ' Replace + +#Region "Update" + + Public ReadOnly Property Update_Command As ICommand + Get + If m_cmdUpdate Is Nothing Then + m_cmdUpdate = New Command(AddressOf Update) + End If + Return m_cmdUpdate + End Get + End Property + + Public Sub Update() + RaiseEvent m_CloseWindow(MessageBoxResult.No) + End Sub + +#End Region ' Update + +#Region "Cancel" + + Public ReadOnly Property Cancel_Command As ICommand + Get + If m_cmdCancel Is Nothing Then + m_cmdCancel = New Command(AddressOf Cancel) + End If + Return m_cmdCancel + End Get + End Property + + Public Sub Cancel() + RaiseEvent m_CloseWindow(MessageBoxResult.Cancel) + End Sub + +#End Region ' Replace + +#End Region ' COMMANDS + +End Class diff --git a/Icarus/Utility/Dictionary.xaml b/Icarus/Utility/Dictionary.xaml index 1c3a6ed..90801b0 100644 --- a/Icarus/Utility/Dictionary.xaml +++ b/Icarus/Utility/Dictionary.xaml @@ -124,7 +124,8 @@ 30 - + 2 + 2 @@ -330,7 +331,7 @@ - + - - - - --> + --> +