From 3a8f94f027b7ac2e4d39248569942cb8fe57d4b8 Mon Sep 17 00:00:00 2001 From: DarioS Date: Thu, 12 Jan 2023 09:25:56 +0100 Subject: [PATCH] 3dPrinting : - eliminati tutti i file non per Icarus (lua e immagini) - eliminata cartella Images - compilazione 32 e 64 bit unificata con direttorio destinazione bin. --- .gitlab-ci.yml | 2 - 3dPrinting.ini | 16 --- CalcMachParamFromSW.lua | 5 +- CalcSolids.lua | 5 +- Compile.bat | 17 --- GcodeGenerate.lua | 5 +- Images/GcodeGenerate.png | Bin 1057 -> 0 bytes Images/MachiningParamCalc.png | Bin 1077 -> 0 bytes Images/MachiningParamEdit.png | Bin 1158 -> 0 bytes Images/MaterialParamEdit.png | Bin 809 -> 0 bytes Images/PartPositioning.png | Bin 913 -> 0 bytes Images/ShowManager.png | Bin 919 -> 0 bytes Images/SliceAdvancement.png | Bin 443 -> 0 bytes Images/SlicePalette.png | Bin 391 -> 0 bytes Images/Slicing.png | Bin 485 -> 0 bytes Images/ViewManager.png | Bin 467 -> 0 bytes LuaLibs/CSVManager.lua | 75 ----------- LuaLibs/RunMachiningParamCalc.lua | 198 ---------------------------- LuaLibs/RunMachiningParamEdit.lua | 57 -------- LuaLibs/RunMaterialParamEdit.lua | 56 -------- LuaLibs/RunPartPositioning.lua | 209 ------------------------------ LuaLibs/RunShowManager.lua | 138 -------------------- LuaLibs/RunSliceAdvancement.lua | 186 -------------------------- LuaLibs/RunSlicePalette.lua | 113 ---------------- LuaLibs/RunViewManager.lua | 195 ---------------------------- MachiningParamCalc.lua | 18 --- MachiningParamEdit.lua | 18 --- MaterialParamEdit.lua | 18 --- PartPositioning.lua | 20 --- ShowManager.lua | 18 --- SliceAdvancement.lua | 18 --- SlicePalette.lua | 18 --- Slicing.lua | 5 +- ViewManager.lua | 18 --- bin/Images/.placeholder | 0 35 files changed, 8 insertions(+), 1420 deletions(-) delete mode 100644 3dPrinting.ini delete mode 100644 Images/GcodeGenerate.png delete mode 100644 Images/MachiningParamCalc.png delete mode 100644 Images/MachiningParamEdit.png delete mode 100644 Images/MaterialParamEdit.png delete mode 100644 Images/PartPositioning.png delete mode 100644 Images/ShowManager.png delete mode 100644 Images/SliceAdvancement.png delete mode 100644 Images/SlicePalette.png delete mode 100644 Images/Slicing.png delete mode 100644 Images/ViewManager.png delete mode 100644 LuaLibs/CSVManager.lua delete mode 100644 LuaLibs/RunMachiningParamCalc.lua delete mode 100644 LuaLibs/RunMachiningParamEdit.lua delete mode 100644 LuaLibs/RunMaterialParamEdit.lua delete mode 100644 LuaLibs/RunPartPositioning.lua delete mode 100644 LuaLibs/RunShowManager.lua delete mode 100644 LuaLibs/RunSliceAdvancement.lua delete mode 100644 LuaLibs/RunSlicePalette.lua delete mode 100644 LuaLibs/RunViewManager.lua delete mode 100644 MachiningParamCalc.lua delete mode 100644 MachiningParamEdit.lua delete mode 100644 MaterialParamEdit.lua delete mode 100644 PartPositioning.lua delete mode 100644 ShowManager.lua delete mode 100644 SliceAdvancement.lua delete mode 100644 SlicePalette.lua delete mode 100644 ViewManager.lua delete mode 100644 bin/Images/.placeholder diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e4e7f88..7e3ace3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -50,7 +50,6 @@ variables: net use R: /delete net use R: $env:NET_SHARE_R /u:$env:NET_USERQ $ZDRIVE_PASSWD ROBOCOPY /MIR bin R:\EgtData\$env:APP_NAME\bin - ROBOCOPY /MIR Images R:\EgtData\$env:APP_NAME\bin\Images SLEEP 2 net use R: /delete @@ -60,7 +59,6 @@ variables: net use Z: /delete net use Z: $env:NET_SHARE_Z /u:$env:NET_USERQ $ZDRIVE_PASSWD ROBOCOPY /MIR bin Z:\EgtData\$env:APP_NAME\bin - ROBOCOPY /MIR Images Z:\EgtData\$env:APP_NAME\bin\Images SLEEP 2 net use Z: /delete diff --git a/3dPrinting.ini b/3dPrinting.ini deleted file mode 100644 index 25e9d21..0000000 --- a/3dPrinting.ini +++ /dev/null @@ -1,16 +0,0 @@ -[3dPrinting] -Enable=1 -BaseDir=C:\EgtData\3dPrinting -Button1=PartPositioning.lua,Images\PartPositioning.png,Disponi pezzo sulla tavola macchina -Button2=Slicing.lua,Images\Slicing.png,Calcola lo slicing, i solidi e i percorsi utensile -Button3=MachiningParamCalc.lua,Images\MachiningParamCalc.png,Calcola parametri di lavorazione (Tempo layer, F, S) -Button4=GcodeGenerate.lua,Images\GcodeGenerate.png,Genera codice CN -Button5=ShowManager.lua,Images\ShowManager.png,Gestore visualizzazione -Button6=ViewManager.lua,Images\ViewManager.png,Nascondi Visualizza strato -Button7=SliceAdvancement.lua,Images\SliceAdvancement.png,Mostra avanzamento strato -Button8=SlicePalette.lua,Images\SlicePalette.png,Gestore colori strato -Button9=MachiningParamEdit.lua,Images\MachiningParamEdit.png,Edita i parametri di stampa -Button10=MaterialParamEdit.lua,Images\MaterialParamEdit.png,Edita i parametri del materiale -ParamFile=C:\EgtData\3dPrinting\Machinings\Params.ini -ResultReadProg="C:\Program Files\Microsoft Office\root\Office16\EXCEL.EXE" -MachiningEditProg="C:\Windows\System32\notepad.exe" \ No newline at end of file diff --git a/CalcMachParamFromSW.lua b/CalcMachParamFromSW.lua index 400bca9..5d13947 100644 --- a/CalcMachParamFromSW.lua +++ b/CalcMachParamFromSW.lua @@ -1,4 +1,4 @@ --- CalcMachParamFromSW.lua by Egaltech s.r.l. 2022/09/15 +-- CalcMachParamFromSW.lua by Egaltech s.r.l. 2023/01/11 -- Calcolo dei parametri di stampa -- Intestazioni @@ -7,8 +7,7 @@ _ENV = EgtProtectGlobal() EgtEnableDebug( false) -- Imposto direttorio libreria specializzata per Stampa 3d -local sBaseDir = EgtGetSourceDir() -EgtAddToPackagePath( sBaseDir .. 'LuaLibs\\?.lua') +EgtAddToPackagePath( PRINT.BASEDIR .. '\\LuaLibs\\?.lua') -- Librerie _G.package.loaded.RunMachParamFromSWCalc = nil diff --git a/CalcSolids.lua b/CalcSolids.lua index c0adffa..5f3fe91 100644 --- a/CalcSolids.lua +++ b/CalcSolids.lua @@ -1,4 +1,4 @@ --- CalcSolids.lua by Egaltech s.r.l. 2022/09/26 +-- CalcSolids.lua by Egaltech s.r.l. 2023/01/11 -- Calcola i solidi a partire dallo slicing -- Intestazioni @@ -7,8 +7,7 @@ _ENV = EgtProtectGlobal() EgtEnableDebug( false) -- Imposto direttorio libreria specializzata per Stampa 3d -local sBaseDir = EgtGetSourceDir() -EgtAddToPackagePath( sBaseDir .. 'LuaLibs\\?.lua') +EgtAddToPackagePath( PRINT.BASEDIR .. '\\LuaLibs\\?.lua') -- Librerie _G.package.loaded.RunCalcSolids = nil diff --git a/Compile.bat b/Compile.bat index d8ae439..62cf277 100644 --- a/Compile.bat +++ b/Compile.bat @@ -8,28 +8,11 @@ REM Compilazione 32 e 64 bit \EgtProg\Dll32\luac54 -o bin\LuaLibs\CalcPaths.lua LuaLibs\CalcPaths.lua \EgtProg\Dll32\luac54 -o bin\LuaLibs\CalcSlices.lua LuaLibs\CalcSlices.lua \EgtProg\Dll32\luac54 -o bin\LuaLibs\CalcToolPath.lua LuaLibs\CalcToolPath.lua -\EgtProg\Dll32\luac54 -o bin\LuaLibs\CSVManager.lua LuaLibs\CSVManager.lua \EgtProg\Dll32\luac54 -o bin\LuaLibs\RunCalcSolids.lua LuaLibs\RunCalcSolids.lua \EgtProg\Dll32\luac54 -o bin\LuaLibs\RunGcodeGenerate.lua LuaLibs\RunGcodeGenerate.lua -\EgtProg\Dll32\luac54 -o bin\LuaLibs\RunMachiningParamCalc.lua LuaLibs\RunMachiningParamCalc.lua -\EgtProg\Dll32\luac54 -o bin\LuaLibs\RunMachiningParamEdit.lua LuaLibs\RunMachiningParamEdit.lua \EgtProg\Dll32\luac54 -o bin\LuaLibs\RunMachParamFromSWCalc.lua LuaLibs\RunMachParamFromSWCalc.lua -\EgtProg\Dll32\luac54 -o bin\LuaLibs\RunMaterialParamEdit.lua LuaLibs\RunMaterialParamEdit.lua -\EgtProg\Dll32\luac54 -o bin\LuaLibs\RunPartPositioning.lua LuaLibs\RunPartPositioning.lua -\EgtProg\Dll32\luac54 -o bin\LuaLibs\RunShowManager.lua LuaLibs\RunShowManager.lua -\EgtProg\Dll32\luac54 -o bin\LuaLibs\RunSliceAdvancement.lua LuaLibs\RunSliceAdvancement.lua -\EgtProg\Dll32\luac54 -o bin\LuaLibs\RunSlicePalette.lua LuaLibs\RunSlicePalette.lua \EgtProg\Dll32\luac54 -o bin\LuaLibs\RunSlicing.lua LuaLibs\RunSlicing.lua -\EgtProg\Dll32\luac54 -o bin\LuaLibs\RunViewManager.lua LuaLibs\RunViewManager.lua \EgtProg\Dll32\luac54 -o bin\CalcMachParamFromSW.lua CalcMachParamFromSW.lua \EgtProg\Dll32\luac54 -o bin\CalcSolids.lua CalcSolids.lua \EgtProg\Dll32\luac54 -o bin\GcodeGenerate.lua GcodeGenerate.lua -\EgtProg\Dll32\luac54 -o bin\MachiningParamCalc.lua MachiningParamCalc.lua -\EgtProg\Dll32\luac54 -o bin\MachiningParamEdit.lua MachiningParamEdit.lua -\EgtProg\Dll32\luac54 -o bin\MaterialParamEdit.lua MaterialParamEdit.lua -\EgtProg\Dll32\luac54 -o bin\PartPositioning.lua PartPositioning.lua -\EgtProg\Dll32\luac54 -o bin\ShowManager.lua ShowManager.lua -\EgtProg\Dll32\luac54 -o bin\SliceAdvancement.lua SliceAdvancement.lua -\EgtProg\Dll32\luac54 -o bin\SlicePalette.lua SlicePalette.lua \EgtProg\Dll32\luac54 -o bin\Slicing.lua Slicing.lua -\EgtProg\Dll32\luac54 -o bin\ViewManager.lua ViewManager.lua diff --git a/GcodeGenerate.lua b/GcodeGenerate.lua index 1047d2b..703149d 100644 --- a/GcodeGenerate.lua +++ b/GcodeGenerate.lua @@ -1,4 +1,4 @@ --- GcodeGenerate.lua by Egaltech s.r.l. 2022/04/11 +-- GcodeGenerate.lua by Egaltech s.r.l. 2023/01/11 -- Calcoli prima fase per Stampa 3d -- Intestazioni @@ -7,8 +7,7 @@ _ENV = EgtProtectGlobal() EgtEnableDebug( false) -- Imposto direttorio libreria specializzata per Stampa 3d -local sBaseDir = EgtGetSourceDir() -EgtAddToPackagePath( sBaseDir .. 'LuaLibs\\?.lua') +EgtAddToPackagePath( PRINT.BASEDIR .. '\\LuaLibs\\?.lua') -- Librerie _G.package.loaded.RunGcodeGenerate = nil diff --git a/Images/GcodeGenerate.png b/Images/GcodeGenerate.png deleted file mode 100644 index 67d90568b6db370c89ec75d569f092f23173b19a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1057 zcmV++1m63JP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TQ64HQE90nk$(vMdQ0#+`mxts< zxkYx9jwW)Q+$YCz!DF~QVZ#hV9tz>Lvkxc4=>|;a2XvyqcEa{GyvZ-_szqeru z61gBpN&dcFI=CNQ_)5;?LNT0^{x~@=58E($DBa-ZX=m6l#Z9^1hEZopi;gsBHdzLG zNwkzlBwfZ#;kZk-kT6@i?mWu{k8P6KmxRRm&an8H^oA^niumZ$K=Qiy8yJ_q{|I$e z-|}H*U%g8#kWjwb=U62t+c3o~>Aw(1NLTv?$(@qf8T#EIg=!xxkz5NUHC29)%woqA z$vdl~d5ykV3T&nDYDOM;S^AcwO)g16str_qxbsHZ(kv$%hS6sP=)I!jyOmYWav<_Oil?@GBPzxJ`3bXDI`sHH+MD_JBuSYaf4 zCPOkQm?)V!Jf*9B%$_+i2}QP482s-f4^CmG_ekDdt}#;U zbT_7as#}nOa^+-G%4hq_?vl;N!dNyWDctN!Qd0%l!PI{yDJQ^Moqb^PEuSKkR81CS zU}Le`h6WynEj;)5EmK=|mk^dGGONjgyitCZ%gvePg`~w<=naMMZoJQJsR!vN(l*@3K5M&Z5}mMJZ(8 bKZ^bUfz@+8#Q6Fa00000NkvXXu0mjf{R!}5 diff --git a/Images/MachiningParamCalc.png b/Images/MachiningParamCalc.png deleted file mode 100644 index ffe23a784828d6f224ca64eda4fade7a3aef26e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1077 zcmV-51j_q~P)h((pGibPR9HvNm~Ci{VHn3BMp&$T zpjNWTrbwBZnU_TQAWF0^d@=7ctu%@zFU3b$*e0bmMOi7SB@_y!$;$`HYa}0h+2mz5 zX&nFm({-J$=RVh1&3at*d(LzJp6hIX=bSy)xkZ^w=D)+0Y2(VYaV0@DIy?o_L5t~Y z0=4$J;;R6kGfvjW0ekglHH6PmTuD%?ga_afSPNEyV$dZ$MSv$?Kwj|tH*#&Vtlxs| zUY+Q1&O&Iu*weV`1?03XEhU_+e-^&sanXmO%^(=6u(=X`gZa6#T^4XK%xHp{&1y&;$b7; z+*>VfAGirP!^k}Gt$?==^(Er(f)7axWi26!?`U5G0c6hn;-++g3nQt;09gt$^c{nJpWLckCEuCUMI zN(J>3c%c}!8&KR6&rt0D3MkHtXQL z9XUFp5~0Ms1f>aQ7qP(YAM6EO91+J*+_K*Syx(jQuc0_v_|-*kk_`0<=qM@|?}d5@ z;)kGd+V1)c{&; zPwW#5Y^4C-9{#2Au}VBcHQ8SA48@Zkd4!HVL-FLBJobubDE7Vv6x_xqKICyW& diff --git a/Images/MachiningParamEdit.png b/Images/MachiningParamEdit.png deleted file mode 100644 index f65d28caa8e65a055e7ec1a89d370b00c1e4f5be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1158 zcmV;11bO?3P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!2kdb!2!6DYwZ941RF_2K~z{r?U-q- zokJLa54A*!M3hEq50%u~+69T7D$x=YwbWK(`yu?|mq_r#9ziUjEeSi-Xvy zKXS1rC!!0(&zarw_IP%;d^DbiU*l#t8Q;LY@dkVhhfxl-omzf-P-{BtkQ>sBzr{X5E6*>ZT>TVku*uQf&xd0PlHFs%2c@$LC_g5!xviM-rVHi;jY8%jsxa z=sxA|xM!*j;hOpecTBY*F2vh&v2zTr$i-&rk=h*ldHd#~(^G0FSXi~GBPzZO&!VGy zoDFN54H}eQ?SWyVUYDb+TNt@xAK(( z@Q_?gn8#*dTw@OVD;In61e$V8!c*~5Eb)yt0~qt><1=^`4#OJ+#;0R(9-8UZXlrLb z$7}IrG$x&n2ULEA*P-8e{U_+#npF z#OHAW?$+S8Xi_yE8Skz}<57vz?~XwX5!+yyI~(~PC*l$`nj1?TYJdDQ29f(pO(}LL zQi$o~u3Q{}9r6KhO|=$W3zwlc4?e@$=q66gcXbZ5nF}eZln~l&L&q}q7(_x$6wJ`_1_Gx?~&NDKVw^6kDg-aQx1kW{&jGDL#zR-ovFiuqjzf zbV#P42a8s`xe-=8#k%Eiq@vA{Iwuzs9z5;1kvk5WQYUIHxeeWs^rUH|#AAh z3*BkID%JYL>5C^0T*T${`7a!IpKjt@U*hz+^<5PnbRz+W-{Km>|1p)s6t>Z4BJOnl Y1%h7Y-Vbk{hX4Qo07*qoM6N<$f@Py6bpQYW diff --git a/Images/MaterialParamEdit.png b/Images/MaterialParamEdit.png deleted file mode 100644 index eef597753c7833aeac10d4a4992902adc67cca97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 809 zcmV+^1J?YBP)N2bZe?^J zG%heMGBNQWX_Wu~0;WksK~z{r&6iJz%~2G`PZWh36PqbD$yWZ9q%7EtSy-4Tu@G5N zHl_)M$wK3A!bT=SlA@HFNG2@kW7{2R)Gg_5j1-*evi-FMvIX@0-FJ6*Rvzjw~( zp8I>J-h02!qei3g-{H#KxH31bfN0(XblF37!P@BgDp~>2C%}Qnh&@yXtWA1$nYTX? zt$?W0@D)G&o*h z-$!a=A(H4FxEeXWTr&Bvy7ijR(tL~NUQ@q7kLEMMcd(mt%U?;5L~p?5$nmAuuc`Y{JvVjSI`Od(N%S1lY3glMQ`OYHsGgfTVV(F`h$MOn>NJJ0R5NK! z$+M+husS?ng)4L8%G|gzH?GW$D|6Gl_=8=+KMi>8(7Yrb@Y2E6Tn1D-aI0KVr<-RlBB!AZ?~0S7C>`xQYD2?jiM z;bX@d0vt@$e3#}c!8afchI*TbNHE|Tw-jsurvQsiv-b?}Bsy--$X-dL8Sv(V7l0G~ zm`60WO&wNuyKrHzB+?9c{Jk4Bd#eEl(iGMr%@65oUr{UjHW86#z&i_GgBhChkAZ`t zsk>lU<7;4yPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!2kdb!2!6DYwZ94113pCK~z{r&6ZC{ zR6!WPzcF1_X;)iP%q=0%gh&WNFXbU9-2ULHL+YVhf82t)*&zrD>L3JJ3U%qC(kY5U zC8%Wc;MQ#;C`Hj)qx`#W?uMq*d~av;y|=T^_uiVjKlu1&zBfDj+c*2>4WX1mwvoeg zR*{ubwwA9e7^VyHWvKSLdBr~cpQqq_T{-O8kxzKZx>Pq4YUv5_-sW)S=w7(hP-Ra_ z2$i@T@GH6m^Y?sf6Ita_cZl|U2rKQE{#rOv;aQu@^nXeS9Vl}_Q|)eEwTBRDtnu=S z7E@Acp;wn{!I^9S`A`dWHdRaS^oFzRg$ncY(q1wnA;eHB6GBKzsZ0qWQmIS|AxTnP zhzg;i0taD$It2QV%2mbqpdxT;n-H7n4L41G{ zWg#7>0+-YlGAR$w3OX6lcCjcF*JQzvF25OMAI#BBzUA2dHUE?JqzGw{L@B>&8{1N& zkI!Oyu8-F>$9}M!7P&lI!uPZdJd4Q>U$A^1Jo`BVgM^ep`;bz@%~5F>5DG8g=E-|j zrTnCC>PO$F$JYG#; z^-k5bOm!t%m5C&1`&b3rBgre*>Z?e4#YE!E^wfi(BGl1X%}%mj%^1`FDSWx|W?BfL zPm@up5MoM7yzSG)j1aP+l=}E#hL~$7ra`5n!mJQtC}rh5DlSd?;Bijb00000NkvXXu0mjfCeo_a diff --git a/Images/ShowManager.png b/Images/ShowManager.png deleted file mode 100644 index ad9d17b43275c5b4a87c4040d7ab3fa4938733da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 919 zcmV;I18Dq-P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf11w2IK~z{r?N&=q z6HyrbZVN4i7Fs}>fFT5o4>m0HKd>;7m>71j(47gaOpJ*!(S9=0 z6(+hNDn4RBG@ukn3Y2#{*K?+ilsbiJQ^zhi$;mhO`)+&BeD|K2QCe#$H@H%`)Du-pV!1dynV{vbTlmxP1Yz7NjUf=Hj4Z$cREGz96)K zKF|+VgI+L%+9yQQ2w*K3N-@YBYo$c)0p{Wq#tx;sH4Zvzgk67zj!Yq}gLNRgw1C`q zL?Q%I5YHLKvYQmnF-=l3SlwX^yyBe=4H@c)Gq2qXGZcDR@OV@VH zoNF7!Y+qg@Y&=o(u1a|WSsuM50lg#sgdrXN^ExBmju8qLMdUNW=bNg#twrt`hD6kk z`0&?(p9|7|?5cjnx?Lj_C2B7$4XM#8mz?4j;>&O>bW!&)Ux*QkIa7P0)+MtZoF#9C z)CYXRm%NEWj8Jk>w_eKl@T6RS^iHl_8I{c47h;5xZ=VXb_exFc2A*PZiB0?U>dbJe zl-CG>3rQEJwUoS5Iy&{(H8mq6oKA0|-V! t>pL8mg{WMVrKnsu?mjy>5M>V{e*llQitu(}xcvYC002ovPDHLkV1h%4k|+QG diff --git a/Images/SliceAdvancement.png b/Images/SliceAdvancement.png deleted file mode 100644 index 4ced7f5349138988c8145a0ed9334258d8ef930e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 443 zcmeAS@N?(olHy`uVBq!ia0vp^svyk41|*NpQ(y*CEa{HEjtmSN`?>!lvI6;>1s;*b z3=DjSL74G){)!Z!pk#?_L`iUdT1k0gQ7S`0VrE{6US4X6f{C7io{`~4h0Li842%|@ zE{-7)?r*0U@*OhZajh0`<2!ob7}s=%j%bCAjO~wk7S@ZRdw;63$8XOo^A2je8Iv%;=ZcnYoVv)A{?ximIpRO}On fdiv(HE42)!RawX8obb#81~h}GtDnm{r-UW|-hi^0 diff --git a/Images/SlicePalette.png b/Images/SlicePalette.png deleted file mode 100644 index 0918ad55ca42bb80746338679614dee57f0f7a0e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 391 zcmeAS@N?(olHy`uVBq!ia0vp^svyk41|*NpQ(y*CEa{HEjtmSN`?>!lvI6;>1s;*b z3=DjSL74G){)!Z!pk#?_L`iUdT1k0gQ7S`0VrE{6US4X6f{C7io{`~4h0Li842&$E zE{-7)?r$$`opIu*7mwZ6rx)!$eP!A4VvX3E_&sMP*%@rhEthQ9;=NUJ{ks4Ebrl&aq7=Re zuTtYkU7Xb%Aa;sbncUU3Ym0-8k zQP5+KeV0Os=ao;}%#QZGRuf4&UMkGB@$oLs)*FR$S(iF`@Kik57%?+R|H9G$o|YpI zI)AY_C4F$>ZJZ!s6QC&|gTe~DWM4f7Z#F= diff --git a/Images/Slicing.png b/Images/Slicing.png deleted file mode 100644 index 58e76e2bf0999f5b3649a2afcf13543ce33b17fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 485 zcmeAS@N?(olHy`uVBq!ia0vp^svyk41|*NpQ(y*CEa{HEjtmSN`?>!lvI6;>1s;*b z3=DjSL74G){)!Z!pk#?_L`iUdT1k0gQ7S`0VrE{6US4X6f{C7io{`~4h0Li842(&h zE{-7)?q@Fa|V=JaCa9eR@ zK}HB)fQXj(i}X@mo~gnjEvI-7Z5B73VSD-6MbTWD@2f3y$I1mY3U4+qe&yh(@q3|**i+_*me#Af9KY?Id$q14TC^o3 zP){JpS(kaO{I`r>7UtK}-F`Y;-_HN+)uo0T6PQG~opKmX$tg{AJ=!239kd|Hv4dB$ z{!4&BlCxKc2FFH4Q7yI>sJaPmZ?~UY!lvI6;>1s;*b z3=DjSL74G){)!Z!pk#?_L`iUdT1k0gQ7S`0VrE{6US4X6f{C7io{`~4h0Li842%Ju zE{-7)?r$#{dNDhS9Q(MpQGCOeZvyiU7`4uw>msnnk>lP0H;*mdWn7G$P8|tOP9`k^ zj#~teTr#$Ku08Fm>iN4fQ}3PO605)QUBTG?go;bZ&LgRBz$ozWQSMUtW%sIT|C=07 zd%pQ}PFDXs&CI=lMgJZy-TO@S>o4Wvk}~$)8#L}Oi2B@R)|YpB@fL@rfwL9_Y2;2Y z)?zuqDazHdCP2|~g@CA3OHtt8mvhSe*JnOo^L*)Fw`^X8sohdN>Lms-RjcbR2@0P*Isj?7QFoN^en{!Z) string.len(s) - return t -end - ---------------------------------------------------------------------- -function read_file( path) - local file = io.open( path, "r") -- r read mode and b binary mode - if not file then return nil end - local CSVTable = {} - - for line in io.lines( path) do - CSVTable[#CSVTable + 1] = fromCSV( line) - end - - file:close() - - return CSVTable -end - ---------------------------------------------------------------------- -return CSVManager diff --git a/LuaLibs/RunMachiningParamCalc.lua b/LuaLibs/RunMachiningParamCalc.lua deleted file mode 100644 index f73bf5e..0000000 --- a/LuaLibs/RunMachiningParamCalc.lua +++ /dev/null @@ -1,198 +0,0 @@ --- RunMachiningParamCalc.lua by Egaltech s.r.l. 2022/04/13 --- Gestione visualizzazione per Stampa 3d - --- Tabella per definizione modulo -local RunMachiningParamCalc = {} - --- Intestazioni -require( 'EgtBase') - -EgtOutLog( ' RunMachiningParamCalc started', 1) - --- Costanti generali -local AMD = require( 'AddManData') -local CSV = require( 'CSVManager') - ---------------------------------------------------------------------- -function RunMachiningParamCalc.Exec() - - -- Dati recuperati dalla macchina - local sMachIni = EgtGetCurrMachineDir() .. '\\' .. EgtGetCurrMachineName() .. '.ini' - local dCoeffX = tonumber( EgtGetStringFromIni( SEC_3DPRINTING, KEY_COEFF_X, 0, sMachIni)) - local dCoeffY = tonumber( EgtGetStringFromIni( SEC_3DPRINTING, KEY_COEFF_Y, 0, sMachIni)) - - -- File dei risultati - local sCalcBaseDir = EgtGetStringFromIni( '3dPrinting', 'BaseDir', 'C:\\ProgramData\\Egaltech\\EgtCam5\\3dPrinting', EgtGetIniFile()) - local sCurrProjectPath = EgtGetCurrFilePath() - local sResultFile = EgtChangePathExtension( sCurrProjectPath, '.csv') - local bResultFile = EgtExistsFile( sResultFile) - - -- carico eventuale file dei risultati - local CSVOldResult - if bResultFile then - CSVOldResult = read_file( sResultFile) - end - - -- tabella del csv del risultato - local CSVNewResult = {} - - -- ciclo sui pezzi - local nPartId = EgtGetFirstPart() - while nPartId do - if not EgtGetInfo( nPartId, KEY_PART_ON_TABLE, 'b') then - nPartId = EgtGetNextPart( nPartId) - goto continue - end - -- recupero i parametri di lavorazione del pezzo - local dMachiningFeed = EgtGetInfo( nPartId, KEY_FEED, 'd') - local dSliceStep = EgtGetInfo( nPartId, KEY_SLICE_STEP, 'd') - local dStrand = EgtGetInfo( nPartId, KEY_STRAND, 'd') - local sMaterial = EgtGetInfo( nPartId, KEY_MATERIAL) - -- verifico la definizione dei parametri - if not dMachiningFeed then - EgtOutBox( 'Impossible calculating before applying a machining.', 'Error', 'ERROR') - return - end - -- calcolo intervallo tempi consentito - local sMaterialPath = sCalcBaseDir .. '\\Materials\\' .. sMaterial .. '.csv' - local MaterialCSV = read_file( sMaterialPath) - local dMinTime = 0 - local dMaxTime = 0 - if not MaterialCSV then - EgtOutBox( 'Material csv file not found.', 'Error', 'ERROR') - return - end - local bSectionFound = false - for nSectionIndex = 1, #MaterialCSV do - local Section = MaterialCSV[nSectionIndex] - if tonumber( Section[1]) == dStrand and tonumber( Section[2]) == dSliceStep then - dMinTime = tonumber(Section[3]) - dMaxTime = tonumber(Section[4]) - bSectionFound = true - break - end - end - if not bSectionFound then - EgtOutBox( 'Section not found in Material csv file.', 'Error', 'ERROR') - return - end - -- ciclo sui layer - local nLayerIndex = 1 - local nLayerId = EgtGetFirstNameInGroup( nPartId, SLICE_LAYER .. nLayerIndex) - while nLayerId do - local sLayerName = EgtGetName( nLayerId) - local nLayerIndex = tonumber( sLayerName:sub( #SLICE_LAYER + 1)) - -- rimuovo eventuale info precedente del tempo di attesa - EgtRemoveInfo( nLayerId, KEY_WAITING_TIME) - -- calcolo lunghezza totale del layer - local dTotLayerLength = 0 - local nCrvId = EgtGetFirstGroupInGroup( nLayerId) - while nCrvId do - local nToolPathId = EgtGetFirstNameInGroup( nCrvId, TOOLPATH_GRP) - -- sommo lunghezze percorsi - local dTotCrvLength = 0 - nShellId = EgtGetFirstInGroup( nToolPathId) - while nShellId do - --local nType = EgtGetInfo( nShellId, KEY_TYPE, 'i') - dTotCrvLength = dTotCrvLength + EgtCurveLength( nShellId) - nShellId = EgtGetNext( nShellId) - end - dTotLayerLength = dTotLayerLength + dTotCrvLength - nCrvId = EgtGetNext( nCrvId) - end - -- recupero feed del layer - local dLayerFeed = 0 - if bResultFile then - -- leggo il valore dal file - local bResultFound = false - for nResultIndex = 1, #CSVOldResult do - local OldResult = CSVOldResult[nResultIndex] - if tonumber( OldResult[1]) == nLayerIndex then - dLayerFeed = tonumber( OldResult[5]) - bResultFound = true - break - end - end - if not bResultFound then - -- uso valore di default - dLayerFeed = dMachiningFeed - end - else - -- uso valore di default - dLayerFeed = dMachiningFeed - end - -- calcolo tempo stimato del layer - local dEsteemedTime = dTotLayerLength / dLayerFeed * 60 - -- calcolo speed - local dSpeed = ((( dLayerFeed * dSliceStep * dStrand ) / 60) - dCoeffX) / dCoeffY - -- scrivo info feed e speed in group toolpath - nCrvId = EgtGetFirstNameInGroup( nLayerId, CONTOUR_GRP .. '*') - while nCrvId do - local nToolPathId = EgtGetFirstNameInGroup( nCrvId, TOOLPATH_GRP) - EgtSetInfo( nToolPathId, KEY_FEED, dLayerFeed) - EgtSetInfo( nToolPathId, KEY_SPEED, dSpeed) - nCrvId = EgtGetNextName( nCrvId, CONTOUR_GRP .. '*') - end - -- salvo e riporto valori calcolati in tabella per csv - local sStatus = '' - if dEsteemedTime < dMinTime then - EgtSetInfo( nLayerId, KEY_RESULT, RESULT.KO_MINUS) - EgtSetInfo( nLayerId, KEY_WAITING_TIME, dMinTime - dEsteemedTime) - sStatus = 'KO(-)' - elseif dEsteemedTime > dMinTime and dEsteemedTime < dMaxTime then - EgtSetInfo( nLayerId, KEY_RESULT, RESULT.OK) - sStatus = 'OK' - elseif dEsteemedTime > dMaxTime then - EgtSetInfo( nLayerId, KEY_RESULT, RESULT.KO_PLUS) - sStatus = 'KO(+)' - end - --table.insert( CSVOutTable, { Index = nLayerIndex, EsteemedTime = dEsteemedTime, Feed = dLayerFeed, Speed = dSpeed}) - table.insert( CSVNewResult, { nLayerIndex, dTotLayerLength, dEsteemedTime, sStatus, dLayerFeed, dSpeed}) - nLayerIndex = nLayerIndex + 1 - nLayerId = EgtGetFirstNameInGroup( nPartId, SLICE_LAYER .. nLayerIndex) - end - nPartId = EgtGetNextPart( nPartId) - ::continue:: - end - - -- aggiorno palette - local nViewId = EgtGetFirstNameInGroup( GDB_ID.ROOT, VIEWPARAMS) - local nPaletteType = EgtGetInfo( nViewId, KEY_PALETTE, 'i') - if nPaletteType == PALETTE_TYPE.RESULTS then - local RSP = require( 'RunSlicePalette') - RSP.UpdateColors( nPaletteType) - end - -- scrivo nuovo file csv di risultato - local file = io.open( sResultFile, "w") - if file then - file:write('LayerIndex; Len; Time; Status; Feed; Speed') - file:write('\n') - for NewResultIndex = 1, #CSVNewResult do - local CSVOutLine = CSVNewResult[NewResultIndex] - local sParams = '' - for ParamIndex = 1, #CSVOutLine do - if ParamIndex > 1 then - sParams = sParams .. ";" - end - if ParamIndex == 4 then - sParams = sParams .. CSVOutLine[ParamIndex] - else - sParams = sParams .. EgtNumToString( CSVOutLine[ParamIndex], 1) - end - end - file:write(sParams) - file:write('\n') - end - file:close() - local sReadProgPath = EgtGetStringFromIni( '3dPrinting', RESULT_READ_PROG, "", EgtGetIniFile()) - if not sReadProgPath or not EgtWinExec( '"'..sReadProgPath..'" "'..sResultFile..'"') then - EgtOutBox( 'Impossible opening software to show results. You can find them in ' .. sResultFile, 'Error', 'ERROR') - end - else - EgtOutBox( 'Impossible writing results file in ' .. sResultFile, 'Error', 'ERROR') - end - -end - ---------------------------------------------------------------------- -return RunMachiningParamCalc diff --git a/LuaLibs/RunMachiningParamEdit.lua b/LuaLibs/RunMachiningParamEdit.lua deleted file mode 100644 index 2cf8f29..0000000 --- a/LuaLibs/RunMachiningParamEdit.lua +++ /dev/null @@ -1,57 +0,0 @@ --- RunMachiningParamEdit.lua by Egaltech s.r.l. 2022/04/05 --- Gestione visualizzazione per Stampa 3d - --- Tabella per definizione modulo -local RunMachiningParamEdit = {} - --- Intestazioni -require( 'EgtBase') - -EgtOutLog( ' RunMachiningParamEdit started', 1) - --- Costanti generali -local AMD = require( 'AddManData') - ---------------------------------------------------------------------- -function RunMachiningParamEdit.Exec() - -- recupero cartella delle lavorazioni - local sCalcBaseDir = EgtGetStringFromIni( '3dPrinting', 'BaseDir', 'C:\\ProgramData\\Egaltech\\EgtCam5\\3dPrinting', EgtGetIniFile()) - local sMachiningDirPath = sCalcBaseDir .. '\\Machinings\\' - - -- recupero file delle lavorazioni - --local Machinings = {} - local sMachinings = '' - - local f = io.popen("dir " .. sMachiningDirPath .. " /B", "r") - for entry in f:lines() do - --Machinings[#Machinings + 1] = entry - local sDir, sFile, sExt = EgtSplitPath(entry) - if sExt == '.ini' then - if sMachinings ~= "" then - sMachinings = sMachinings .. ',' - end - sMachinings = sMachinings .. sFile - end - end - - -- chiedo quale file aprire - MachiningValues = EgtDialogBox( 'Machinings edit', { 'Machining', 'CB:' .. sMachinings}) - if not MachiningValues or #MachiningValues < 1 then return end - - -- verifico esistenza file - local sSelMachiningPath = sMachiningDirPath .. MachiningValues[1] .. '.ini' - if not EgtExistsFile( sSelMachiningPath) then - EgtOutBox( 'Machining file not found', 'Error', 'ERROR') - return - end - - -- apro programma di edit - local sEditProgPath = EgtGetStringFromIni( '3dPrinting', 'MachiningEditProg', "", EgtGetIniFile()) - if not sEditProgPath or not EgtWinExec( '"'..sEditProgPath..'" "'.. sSelMachiningPath..'"') then - EgtOutBox( 'Impossible opening software to show Machining. You can find it in ' .. sSelMachiningPath, 'Error', 'ERROR') - end - -end - ---------------------------------------------------------------------- -return RunMachiningParamEdit diff --git a/LuaLibs/RunMaterialParamEdit.lua b/LuaLibs/RunMaterialParamEdit.lua deleted file mode 100644 index eb8ad75..0000000 --- a/LuaLibs/RunMaterialParamEdit.lua +++ /dev/null @@ -1,56 +0,0 @@ --- RunMaterialParamEdit.lua by Egaltech s.r.l. 2022/04/09 --- Gestione edit parametri materiali per Stampa 3d - --- Tabella per definizione modulo -local RunMaterialParamEdit = {} - --- Intestazioni -require( 'EgtBase') - -EgtOutLog( ' RunMaterialParamEdit started', 1) - --- Costanti generali -local AMD = require( 'AddManData') - ---------------------------------------------------------------------- -function RunMaterialParamEdit.Exec() - -- recupero cartella dei materiali - local sCalcBaseDir = EgtGetStringFromIni( '3dPrinting', 'BaseDir', 'C:\\ProgramData\\Egaltech\\EgtCam5\\3dPrinting', EgtGetIniFile()) - local sMaterialDirPath = sCalcBaseDir .. '\\Materials\\' - - -- recupero elenco file dei materiali - local Files = EgtFindAllFiles( sMaterialDirPath..'*.csv') - if not Files then - EgtOutBox( 'Material files not found', 'Error', 'ERROR') - return - end - local sMaterials = '' - for i = 1, #Files do - local sDir, sFile, sExt = EgtSplitPath( Files[i]) - if sMaterials ~= "" then - sMaterials = sMaterials .. ',' - end - sMaterials = sMaterials .. sFile - end - - -- chiedo quale file aprire - MaterialValues = EgtDialogBox( 'Materials edit', { 'Material', 'CB:' .. sMaterials}) - if not MaterialValues or #MaterialValues < 1 then return end - - -- verifico esistenza file - local sSelMaterialPath = sMaterialDirPath .. MaterialValues[1] .. '.csv' - if not EgtExistsFile( sSelMaterialPath) then - EgtOutBox( 'Material file not found', 'Error', 'ERROR') - return - end - - -- apro programma di edit - local sEditProgPath = EgtGetStringFromIni( '3dPrinting', RESULT_READ_PROG, "", EgtGetIniFile()) - if not sEditProgPath or not EgtWinExec( '"'..sEditProgPath..'" "'..sSelMaterialPath..'"') then - EgtOutBox( 'Impossible opening software to show Material. You can find them it in ' .. sSelMaterialPath, 'Error', 'ERROR') - end - -end - ---------------------------------------------------------------------- -return RunMaterialParamEdit diff --git a/LuaLibs/RunPartPositioning.lua b/LuaLibs/RunPartPositioning.lua deleted file mode 100644 index 14ffef8..0000000 --- a/LuaLibs/RunPartPositioning.lua +++ /dev/null @@ -1,209 +0,0 @@ --- RunPartPositioning.lua by Egaltech s.r.l. 2022/08/29 --- Gestione calcolo disposizione e lavorazioni per stampa 3d --- 2022/03/21 Creazione file - --- Tabella per definizione modulo -local RunPartPositioning = {} - --- Intestazioni -require( 'EgtBase') - -EgtOutLog( ' RunPartPositioning started', 1) - --- Costanti generali -local AMD = require( 'AddManData') - ---------------------------------------------------------------------- -function RunPartPositioning.Exec() - -- Verifico che la macchina corrente sia adatta alla stampa 3d - local sMachIni = EgtGetCurrMachineDir() .. '\\' .. EgtGetCurrMachineName() .. '.ini' - local sMachMaterial = EgtGetStringFromIni( 'General', 'Material', '', sMachIni) - if sMachMaterial ~= 'Additive' then - EgtOutBox( 'Current machine unsuitable for additive manufacturing', 'Warning', 'WARNING') - return - end - -- Recupero ultimo oggetto selezionato - local nSolidId = EgtGetLastSelectedObj() - local nLayerId = EgtGetParent( nSolidId) - local nPartId = EgtGetParent( nLayerId) - -- Verifico sia in un pezzo valido - if nPartId then - if EgtIsPart( nPartId) then - local sName = EgtGetName( nPartId) - if sName == TABLE then - EgtOutBox( 'No selected part. Please select a part before moving it on the table.', 'Warning', 'WARNING') - return - end - local sLayer = EgtGetName( nLayerId) - if sLayer == LAY_RIBS or sLayer == LAY_AUX_SOLIDS or sLayer == LAY_SHELL_NBR then - EgtOutBox( 'No selected solid. Please select a solid before moving it on the table.', 'Warning', 'WARNING') - return - end - else - EgtOutBox( 'No selected part. Please select a part before moving it on the table.', 'Warning', 'WARNING') - return - end - else - EgtOutBox( 'No selected part. Please select a part before moving it on the table.', 'Warning', 'WARNING') - return - end - - -- Assegno nome pezzo e layer - if not EgtGetName( nPartId) then - local nPartIndex = 1 - while EgtGetFirstNameInGroup( GDB_ID.ROOT, PART .. nPartIndex) do - nPartIndex = nPartIndex + 1 - end - EgtSetName( nPartId, PART .. nPartIndex) - EgtSetName( nLayerId, PRINT_SOLID) - end - -- Recupero o creo layer ausiliario - local nAuxId = EgtGetFirstNameInGroup( nPartId, LAY_AUX) - if not nAuxId then - nAuxId = EgtGroup( nPartId) - EgtSetName( nAuxId, LAY_AUX) - else - EgtEmptyGroup( nAuxId) - end - - -- Rimuovo eventuale gruppo di lavoro - local nMchGrpId = EgtGetMachGroupId( '3dPrint') - EgtRemoveMachGroup( nMchGrpId or GDB_ID.NULL) - - -- Recupero dati tavola (creando gruppo di lavoro temporaneo) - local nQqqId = EgtAddMachGroup( 'qqq') - EgtSetTable( 'Tab') - local b3Tab = EgtGetTableArea() - dTabX = b3Tab:getDimX() - dTabY = b3Tab:getDimY() - EgtRemoveMachGroup( nQqqId or GDB_ID.NULL) - - -- Richiedo posizione origine e offset pezzo - local b3Solid = EgtGetBBoxGlob( nSolidId, GDB_BB.EXACT) - local b3Part = EgtGetBBoxGlob( nPartId, GDB_BB.EXACT) - local nRefX = 1 - local nRefY = 1 - local dPosX = b3Tab:getDimX() / 2 - b3Solid:getDimX() / 2 - local dPosY = b3Tab:getDimY() / 2 - b3Solid:getDimY() / 2 - local Positions = EgtDialogBox( 'Part position on table:', { 'Reference', 'CB:Left,Center,Right'}, - { '', 'CB:Bottom,Middle,Top'}, - { 'X', EgtNumToString( EgtToUiUnits( dPosX), 1)}, - { 'Y', EgtNumToString( EgtToUiUnits( dPosY), 1)}) - if not Positions then return end - dPosX = EgtFromUiUnits( tonumber( Positions[3])) - dPosY = EgtFromUiUnits( tonumber( Positions[4])) - if Positions[1] == 'Center' then - nRefX = 2 - dPosX = dPosX - b3Solid:getDimX() / 2 - elseif Positions[1] == 'Right' then - nRefX = 3 - dPosX = dPosX - b3Solid:getDimX() - end - if Positions[2] == 'Middle' then - nRefY = 2 - dPosY = dPosY - b3Solid:getDimY() / 2 - elseif Positions[2] == 'Top' then - nRefY = 3 - dPosY = dPosY - b3Solid:getDimY() - end - - -- Creo disegno tavola - local nTabPart = EgtGetFirstNameInGroup( GDB_ID.ROOT, TABLE) - EgtErase( nTabPart) - -- Disegno tavola - nTabPart = EgtGroup( GDB_ID.ROOT) - EgtSetMode( nTabPart, GDB_MD.LOCKED) - EgtSetLevel( nTabPart, GDB_LV.SYSTEM) - EgtSetName( nTabPart, TABLE) - local nTabLayer = EgtGroup( nTabPart) - EgtSetName( nTabLayer, TABLE) - local nTabOutlineId = EgtRectangle2P( nTabLayer, Point3d( 0, 0, 0), Point3d( dTabX, dTabY, 0)) - local nTabSurfId = EgtSurfFlatRegion( nTabLayer, nTabOutlineId) - EgtSetColor( nTabSurfId, 'GRAY') - EgtSetAlpha( nTabSurfId, 70) - - -- Aggiungo il box del solido - local nBoxId = EgtSurfTmBBox( nAuxId, b3Solid, false, GDB_RT.GLOB) - - -- Posiziono il pezzo e aggiorno il suo box - local vtMove = Point3d( dPosX, dPosY, 0) - b3Solid:getMin() - EgtMove( nPartId, vtMove) - b3Solid:move( vtMove) - b3Part:move( vtMove) - - -- Creo il frame del pezzo - local ptOrig = b3Solid:getMin() - if nRefX == 2 then - ptOrig = ptOrig + b3Solid:getDimX() / 2 * X_AX() - elseif nRefX == 3 then - ptOrig = ptOrig + b3Solid:getDimX() * X_AX() - end - if nRefY == 2 then - ptOrig = ptOrig + b3Solid:getDimY() / 2 * Y_AX() - elseif nRefY == 3 then - ptOrig = ptOrig + b3Solid:getDimY() * Y_AX() - end - - -- Svuoto o creo layer per il frame - local nFrameLay = EgtGetFirstNameInGroup( nPartId, LAY_FRAME) - if not nFrameLay then - nFrameLay = EgtGroup( nPartId) - EgtSetName( nFrameLay, LAY_FRAME) - else - EgtEmptyGroup( nFrameLay) - end - - local frPart = Frame3d( ptOrig, Z_AX()) - nFrameId = EgtFrame( nFrameLay, frPart, GDB_RT.GLOB) - if nFrameId then - EgtSetName( nFrameId, FRAME_PART) - EgtSetMode( nFrameId, GDB_MD.LOCKED) - end - - -- Definisco e posiziono il grezzo sulla tavola - EgtAddMachGroup( '3dPrint') - EgtSetTable( 'Tab') - - local nRawId = EgtAddRawPartWithPart( nPartId, nBoxId, 0, Color3d( 128, 128, 128, 30)) - EgtMoveToCornerRawPart( nRawId, Point3d( dPosX, dPosY, 0), MCH_CR.BL) - - EgtResetCurrMachGroup() - - -- Recupero/creo gruppo per punti e curve di partenza - local nMachStartId = EgtGetFirstNameInGroup( nPartId, LAY_MACH_START) - if not nMachStartId then - nMachStartId = EgtGroup( nPartId) - EgtSetName( nMachStartId, LAY_MACH_START) - end - - local vStartId = EgtGetNameInGroup( nLayerId, START_GEOM) - if vStartId then - for j = 1, #vStartId do - EgtRelocateGlob( vStartId[j], nMachStartId) - EgtSetColor( vStartId[j], EgtStdColor( "RED")) - end - else - -- se non ci sono punti/curve di inizio definiti e non ve ne sono nemmeno nel gruppo, creo un punto - local vOldStart = EgtGetNameInGroup( nMachStartId, START_GEOM) - if not vOldStart then - local ptStart = b3Solid:getCenter() - 0.6 * b3Solid:getDimY() * Y_AX() - 0.5 * b3Solid:getDimZ() * Z_AX() - nPtStartId = EgtPoint( nMachStartId, ptStart, GDB_RT.GLOB) - EgtSetName( nPtStartId, START_GEOM) - EgtSetColor( nPtStartId, EgtStdColor( "RED")) - end - end - - -- Dichiaro pezzo posizionato - EgtSetInfo( nPartId, KEY_PART_ON_TABLE, 1) - - -- Deseleziono tutto - EgtDeselectAll() - - EgtSetView( SCE_VD.ISO_SW, false) - EgtZoom( SCE_ZM.ALL) - - EgtOutLog( ' +++ RunPartPositioning completed') -end - ---------------------------------------------------------------------- -return RunPartPositioning diff --git a/LuaLibs/RunShowManager.lua b/LuaLibs/RunShowManager.lua deleted file mode 100644 index 8c19016..0000000 --- a/LuaLibs/RunShowManager.lua +++ /dev/null @@ -1,138 +0,0 @@ --- RunShowManager.lua by Egaltech s.r.l. 2022/09/15 --- Gestione visualizzazione per Stampa 3d - --- Tabella per definizione modulo -local RunShowManager = {} - --- Intestazioni -require( 'EgtBase') - -EgtOutLog( ' RunShowManager started', 1) - --- Costanti generali -local AMD = require( 'AddManData') - --- Librerie -_G.package.loaded.RunCalcSolids = nil -local CSOLIDS = require( 'RunCalcSolids') - ---------------------------------------------------------------------- -local function ShowImportedSolid( nPartId, bShow) - local nSolidLayId = EgtGetFirstNameInGroup( nPartId, PRINT_SOLID) - EgtSetStatus( nSolidLayId or GDB_ID.NULL, EgtIf( bShow, GDB_ST.ON, GDB_ST.OFF)) - local nRibsLayId = EgtGetFirstNameInGroup( nPartId, LAY_RIBS) - EgtSetStatus( nRibsLayId or GDB_ID.NULL, EgtIf( bShow, GDB_ST.ON, GDB_ST.OFF)) - local nShellNbrLay = EgtGetFirstNameInGroup( nPartId, LAY_SHELL_NBR) - EgtSetStatus( nShellNbrLay or GDB_ID.NULL, EgtIf( bShow, GDB_ST.ON, GDB_ST.OFF)) - local nAuxSolidsLay = EgtGetFirstNameInGroup( nPartId, LAY_AUX_SOLIDS) - EgtSetStatus( nAuxSolidsLay or GDB_ID.NULL, EgtIf( bShow, GDB_ST.ON, GDB_ST.OFF)) -end - ---------------------------------------------------------------------- -function RunShowManager.Exec() - -- Verifico esistenza gruppo stato visualizzazione progetto - local nViewId = EgtGetFirstNameInGroup( GDB_ID.ROOT, VIEWPARAMS) - local bImportedSolid = false - local bOuterCrv = false - local bPath = false - local bSolid = false - local bToolPath = false - - if not nViewId then - nViewId = EgtGroup( GDB_ID.ROOT) - EgtSetName( nViewId, VIEWPARAMS) - EgtSetLevel( nViewId, GDB_LV.SYSTEM) - else - bImportedSolid = EgtGetInfo( nViewId, IMPORTED_SOLID, 'b') - bOuterCrv = EgtGetInfo( nViewId, OUTER_CRV, 'b') - bPath = EgtGetInfo( nViewId, PATH_GRP, 'b') - bSolid = EgtGetInfo( nViewId, SOLID_GRP, 'b') - bToolPath = EgtGetInfo( nViewId, TOOLPATH_GRP, 'b') - end - - local bCurrImportedSolid = bImportedSolid - local bCurrOuterCrv = bOuterCrv - local bCurrPath = bPath - local bCurrSolid = bSolid - local bCurrToolPath = bToolPath - - if EgtGetUserLevel() == 1 then - local ViewValues = EgtDialogBox( 'Show Manager', { 'Imported Solid', 'CK:' .. EgtIf( bImportedSolid, '1', '0')}, - { 'Solid', 'CK:' .. EgtIf( bSolid, '1', '0')}, - { 'ToolPath', 'CK:' .. EgtIf( bToolPath, '1', '0')}) - if not ViewValues or #ViewValues < 3 then return end - bCurrImportedSolid = ( ViewValues[1] == '1') - bCurrSolid = ( ViewValues[2] == '1') - bCurrToolPath = ( ViewValues[3] == '1') - else - local ViewValues = EgtDialogBox( 'Show Manager', { 'Imported Solid', 'CK:' .. EgtIf( bImportedSolid, '1', '0')}, - { 'OuterCrv', 'CK:' .. EgtIf( bOuterCrv, '1', '0')}, - { 'Path', 'CK:' .. EgtIf( bPath, '1', '0')}, - { 'Solid', 'CK:' .. EgtIf( bSolid, '1', '0')}, - { 'ToolPath', 'CK:' .. EgtIf( bToolPath, '1', '0')}) - if not ViewValues or #ViewValues < 5 then return end - bCurrImportedSolid = ( ViewValues[1] == '1') - bCurrOuterCrv = ( ViewValues[2] == '1') - bCurrPath = ( ViewValues[3] == '1') - bCurrSolid = ( ViewValues[4] == '1') - bCurrToolPath = ( ViewValues[5] == '1') - end - - -- ciclo sui pezzi - local nPartIndex = 1 - local nPartId = EgtGetFirstNameInGroup( GDB_ID.ROOT, PART .. nPartIndex) - while nPartId do - -- eventuale calcolo dei solidi - local bHasSolids = EgtGetInfo( nPartId, KEY_HAS_SOLIDS, 'b') or false - if not bHasSolids and bCurrSolid then - EgtSetInfo( nPartId, KEY_CALC_SOLIDS, true) - CSOLIDS.Exec() - end - - if bImportedSolid ~= bCurrImportedSolid then - ShowImportedSolid( nPartId, bCurrImportedSolid) - end - -- ciclo sui layer per dis/attivare il resto - local nLayerIndex = 1 - local nLayerId = EgtGetFirstNameInGroup( nPartId, SLICE_LAYER .. nLayerIndex) or EgtGetFirstNameInGroup( nPartId, "__" .. SLICE_LAYER .. nLayerIndex) - while nLayerId do - local nCrvId = EgtGetFirstGroupInGroup( nLayerId) - while nCrvId do - if bOuterCrv ~= bCurrOuterCrv then - local nOuterCrvId = EgtGetFirstNameInGroup( nCrvId, OUTER_CRV) - EgtSetStatus( nOuterCrvId or GDB_ID.NULL, EgtIf( bCurrOuterCrv, GDB_ST.ON, GDB_ST.OFF)) - end - if bPath ~= bCurrPath then - local nPathId = EgtGetFirstNameInGroup( nCrvId, PATH_GRP) - EgtSetStatus( nPathId or GDB_ID.NULL, EgtIf( bCurrPath, GDB_ST.ON, GDB_ST.OFF)) - end - if bSolid ~= bCurrSolid then - local nSolidId = EgtGetFirstNameInGroup( nCrvId, SOLID_GRP) - EgtSetStatus( nSolidId or GDB_ID.NULL, EgtIf( bCurrSolid, GDB_ST.ON, GDB_ST.OFF)) - end - if bToolPath ~= bCurrToolPath then - local nToolPathId = EgtGetFirstNameInGroup( nCrvId, TOOLPATH_GRP) - EgtSetStatus( nToolPathId or GDB_ID.NULL, EgtIf( bCurrToolPath, GDB_ST.ON, GDB_ST.OFF)) - end - nCrvId = EgtGetNext( nCrvId) - end - nLayerIndex = nLayerIndex + 1 - nLayerId = EgtGetFirstNameInGroup( nPartId, SLICE_LAYER .. nLayerIndex) or EgtGetFirstNameInGroup( nPartId, "__" .. SLICE_LAYER .. nLayerIndex) - end - nPartIndex = nPartIndex + 1 - nPartId = EgtGetFirstNameInGroup( GDB_ID.ROOT, PART .. nPartIndex) - end - - -- riporto impostazioni in gruppo apposito - EgtSetInfo( nViewId, IMPORTED_SOLID, bCurrImportedSolid) - EgtSetInfo( nViewId, OUTER_CRV, bCurrOuterCrv) - EgtSetInfo( nViewId, PATH_GRP, bCurrPath) - EgtSetInfo( nViewId, SOLID_GRP, bCurrSolid) - EgtSetInfo( nViewId, TOOLPATH_GRP, bCurrToolPath) - - EgtDraw() - -end - ---------------------------------------------------------------------- -return RunShowManager diff --git a/LuaLibs/RunSliceAdvancement.lua b/LuaLibs/RunSliceAdvancement.lua deleted file mode 100644 index 9471ada..0000000 --- a/LuaLibs/RunSliceAdvancement.lua +++ /dev/null @@ -1,186 +0,0 @@ --- RunSliceAdvancement.lua by Egaltech s.r.l. 2022/06/28 --- Gestione visualizzazione per Stampa 3d - --- Tabella per definizione modulo -local RunSliceAdvancement = {} - --- Intestazioni -require( 'EgtBase') - -EgtOutLog( ' RunSliceAdvancement started', 1) - --- Costanti generali -local AMD = require( 'AddManData') - --- Librerie -_G.package.loaded.RunCalcSolids = nil -local CSOLIDS = require( 'RunCalcSolids') - ---------------------------------------------------------------------- -local function ManageSegmentVisibility( SegmentList, nLastActiveIndex, ToHideList) - for Index = 1, #SegmentList do - EgtSetStatus( SegmentList[Index], EgtIf( Index <= nLastActiveIndex, GDB_ST.ON, GDB_ST.OFF)) - end - if ToHideList and #ToHideList > 0 then - for Index = 1, #ToHideList do - EgtSetStatus( ToHideList[Index], GDB_ST.OFF) - end - end -end - ---------------------------------------------------------------------- -local function CalcType( nEntId, nOldType) - local nType = EgtGetInfo( nEntId, KEY_TYPE, 'i') - if not nType or nType == TYPE.LINK or nType == TYPE.COASTING or nType == TYPE.WIPE then - nType = nOldType - end - if nType == TYPE.RIB or nType == TYPE.AUX_SOLID then - nType = TYPE.INFILL - end - if nType == TYPE.EXTRA_SHELL then - nType = TYPE.INNER_SHELL - end - return nType -end - ---------------------------------------------------------------------- -function RunSliceAdvancement.Exec() - -- verifico ci sia almeno uno slice - local nFirstPartId = EgtGetFirstNameInGroup( GDB_ID.ROOT, PART .. 1) - if not nFirstPartId then - EgtOutBox( 'No sliced part in this project!', 'Error', 'ERROR') - return - else - local nLayerId = EgtGetFirstNameInGroup( nFirstPartId, SLICE_LAYER .. 1) or EgtGetFirstNameInGroup( nFirstPartId, "__" .. SLICE_LAYER .. 1) - if not nLayerId then - EgtOutBox( 'No sliced part in this project!', 'Error', 'ERROR') - return - end - end - local nAdvancementType = 1 -- 1 = All, 2 = Only Outer, 3 = Only Inner, 4 = Only Infill - local nPercentage = 30 - -- leggo ultimi valori - local nViewId = EgtGetFirstNameInGroup( GDB_ID.ROOT, VIEWPARAMS) - if nViewId then - nAdvancementType = EgtGetInfo( nViewId, KEY_SLICE_ADV_MODE, 'i') or SLICE_ADV_TYPE.ALL - nPercentage = EgtGetInfo( nViewId, KEY_SLICE_ADV_PERC, 'i') or 30 - end - local sAdvTypeCombo = '' - if nAdvancementType == SLICE_ADV_TYPE.ALL then - sAdvTypeCombo = 'CB:*All,Only Outer,Only Inner,Only Infill' - elseif nAdvancementType == SLICE_ADV_TYPE.OUTER then - sAdvTypeCombo = 'CB:All,*Only Outer,Only Inner,Only Infill' - elseif nAdvancementType == SLICE_ADV_TYPE.INNER then - sAdvTypeCombo = 'CB:All,Only Outer,*Only Inner,Only Infill' - elseif nAdvancementType == SLICE_ADV_TYPE.INFILL then - sAdvTypeCombo = 'CB:All,Only Outer,Only Inner,*Only Infill' - end - ViewValues = EgtDialogBox( 'Slice advancement', { 'Type', sAdvTypeCombo}, - { 'Percentage (0-100)', tostring( nPercentage)}) - if not ViewValues or #ViewValues < 1 then return end - - if ViewValues[1] == 'All' then - nAdvancementType = SLICE_ADV_TYPE.ALL - elseif ViewValues[1] == 'Only Outer' then - nAdvancementType = SLICE_ADV_TYPE.OUTER - elseif ViewValues[1] == 'Only Inner' then - nAdvancementType = SLICE_ADV_TYPE.INNER - elseif ViewValues[1] == 'Only Infill' then - nAdvancementType = SLICE_ADV_TYPE.INFILL - end - nPercentage = tonumber( ViewValues[2]) - - -- ciclo sui pezzi - local nPartIndex = 1 - local nPartId = EgtGetFirstNameInGroup( GDB_ID.ROOT, PART .. nPartIndex) - while nPartId do - - -- eventuale calcolo dei solidi - local bHasSolids = EgtGetInfo( nPartId, KEY_HAS_SOLIDS, 'b') or false - if not bHasSolids then - EgtSetInfo( nPartId, KEY_CALC_SOLIDS, true) - CSOLIDS.Exec() - end - - local nPrintOrder = EgtGetInfo( nPartId, KEY_STRAND_ORDER, 'i') - -- ciclo sui layer per dis/attivare il resto - local nLayerIndex = 1 - local nLayerId = EgtGetFirstNameInGroup( nPartId, SLICE_LAYER .. nLayerIndex) or EgtGetFirstNameInGroup( nPartId, "__" .. SLICE_LAYER .. nLayerIndex) - while nLayerId do - local nCrvId = EgtGetFirstGroupInGroup( nLayerId) - while nCrvId do - local nSolidId = EgtGetFirstNameInGroup( nCrvId, SOLID_GRP) - local ShellList = { {}, {}, {}} - local nSurfId = EgtGetFirstInGroup( nSolidId) - local nOldType = TYPE.OUTER_SHELL - while nSurfId do - local nType = CalcType( nSurfId, nOldType) - nOldType = nType - table.insert( ShellList[nType], nSurfId) - nSurfId = EgtGetNext( nSurfId) - end - local nSegmentQty = 1 - local SegmentList - local ToHideList - if nAdvancementType == SLICE_ADV_TYPE.ALL then - nSegmentQty = #ShellList[1] + #ShellList[2] + #ShellList[3] - if nPrintOrder == PRINT_ORDER.EXT_INT then - SegmentList = ShellList[1] - for i = 1, #ShellList[2] do - SegmentList[#SegmentList + 1] = ShellList[2][i] - end - for i = 1, #ShellList[3] do - SegmentList[#SegmentList + 1] = ShellList[3][i] - end - else - SegmentList = ShellList[3] - for i = 1, #ShellList[2] do - SegmentList[#SegmentList + 1] = ShellList[2][i] - end - for i = 1, #ShellList[1] do - SegmentList[#SegmentList + 1] = ShellList[1][i] - end - end - elseif nAdvancementType == SLICE_ADV_TYPE.OUTER then - nSegmentQty = #ShellList[1] - SegmentList = ShellList[1] - ToHideList = ShellList[2] - for i = 1, #ShellList[3] do - ToHideList[#ToHideList + 1] = ShellList[3][i] - end - elseif nAdvancementType == SLICE_ADV_TYPE.INNER then - nSegmentQty = #ShellList[2] - SegmentList = ShellList[2] - ToHideList = ShellList[1] - for i = 1, #ShellList[3] do - ToHideList[#ToHideList + 1] = ShellList[3][i] - end - elseif nAdvancementType == SLICE_ADV_TYPE.INFILL then - nSegmentQty = #ShellList[3] - SegmentList = ShellList[3] - ToHideList = ShellList[1] - for i = 1, #ShellList[2] do - ToHideList[#ToHideList + 1] = ShellList[2][i] - end - end - local nLastActiveIndex = ceil( nSegmentQty * nPercentage / 100) - ManageSegmentVisibility( SegmentList, nLastActiveIndex, ToHideList) - nCrvId = EgtGetNext( nCrvId) - end - nLayerIndex = nLayerIndex + 1 - nLayerId = EgtGetFirstNameInGroup( nPartId, SLICE_LAYER .. nLayerIndex) or EgtGetFirstNameInGroup( nPartId, "__" .. SLICE_LAYER .. nLayerIndex) - end - nPartIndex = nPartIndex + 1 - nPartId = EgtGetFirstNameInGroup( GDB_ID.ROOT, PART .. nPartIndex) - end - - -- riporto impostazioni in gruppo apposito - EgtSetInfo( nViewId, KEY_SLICE_ADV_MODE, nAdvancementType) - EgtSetInfo( nViewId, KEY_SLICE_ADV_PERC, nPercentage) - - EgtDraw() - -end - ---------------------------------------------------------------------- -return RunSliceAdvancement diff --git a/LuaLibs/RunSlicePalette.lua b/LuaLibs/RunSlicePalette.lua deleted file mode 100644 index b3b2bab..0000000 --- a/LuaLibs/RunSlicePalette.lua +++ /dev/null @@ -1,113 +0,0 @@ --- RunSlicePalette.lua by Egaltech s.r.l. 2022/08/23 --- Gestione visualizzazione per Stampa 3d - --- Tabella per definizione modulo -local RunSlicePalette = {} - --- Intestazioni -require( 'EgtBase') - -EgtOutLog( ' RunSlicePalette started', 1) - --- Costanti generali -local AMD = require( 'AddManData') - --- Librerie -_G.package.loaded.RunCalcSolids = nil -local CSOLIDS = require( 'RunCalcSolids') - ---------------------------------------------------------------------- -function RunSlicePalette.UpdateColors( nPaletteType) - -- ciclo sui pezzi - local nPartIndex = 1 - local nPartId = EgtGetFirstNameInGroup( GDB_ID.ROOT, PART .. nPartIndex) - while nPartId do - -- eventuale calcolo dei solidi - local bHasSolids = EgtGetInfo( nPartId, KEY_HAS_SOLIDS, 'b') or false - if not bHasSolids then - EgtSetInfo( nPartId, KEY_CALC_SOLIDS, true) - CSOLIDS.Exec() - end - - -- ciclo sui layer per dis/attivare il resto - local nLayerIndex = 1 - local nLayerId = EgtGetFirstNameInGroup( nPartId, SLICE_LAYER .. nLayerIndex) - while nLayerId do - local nCrvId = EgtGetFirstGroupInGroup( nLayerId) - while nCrvId do - local nSolidId = EgtGetFirstNameInGroup( nCrvId, SOLID_GRP) - local nSurfId = EgtGetFirstInGroup( nSolidId) - local nOldType = 0 - while nSurfId do - local Color = EgtStdColor( 'GRAY') - if nPaletteType == PALETTE_TYPE.IN_OUT then - local nType = EgtGetInfo( nSurfId, KEY_TYPE, 'i') - if not nType or nType < TYPE.OUTER_SHELL or nType > TYPE.AUX_SOLID then nType = nOldType end - nOldType = nType - -- scelta del colore - if nType == TYPE.OUTER_SHELL or nType == TYPE.EXTRA_OUTER_SHELL then - Color = EgtStdColor( 'TEAL') - elseif nType == TYPE.INNER_SHELL or nType == TYPE.EXTRA_SHELL then - Color = EgtStdColor( 'ORANGE') - elseif nType == TYPE.INFILL then - Color = EgtStdColor( 'YELLOW') - elseif nType == TYPE.LINK then - Color = EgtStdColor( 'GRAY') - elseif nType == TYPE.COASTING then - Color = EgtStdColor( 'BLUE') - elseif nType == TYPE.WIPE then - Color = EgtStdColor( 'LIME') - elseif nType == TYPE.RIB then - Color = EgtStdColor( 'OLIVE') - elseif nType == TYPE.AUX_SOLID then - Color = EgtStdColor( 'AQUA') - end - else - local nResult = EgtGetInfo( nLayerId, KEY_RESULT, 'i') - if nResult == RESULT.OK then - Color = EgtStdColor( 'GREEN') - elseif nResult == RESULT.KO_MINUS then - Color = EgtStdColor( 'ORANGE') - elseif nResult == RESULT.KO_PLUS then - Color = EgtStdColor( 'RED') - end - end - EgtSetColor( nSurfId, Color) - nSurfId = EgtGetNext( nSurfId) - end - nCrvId = EgtGetNext( nCrvId) - end - nLayerIndex = nLayerIndex + 1 - nLayerId = EgtGetFirstNameInGroup( nPartId, SLICE_LAYER .. nLayerIndex) - end - nPartIndex = nPartIndex + 1 - nPartId = EgtGetFirstNameInGroup( GDB_ID.ROOT, PART .. nPartIndex) - end - - EgtDraw() - -end - ---------------------------------------------------------------------- -function RunSlicePalette.Exec() - - local nViewId = EgtGetFirstNameInGroup( GDB_ID.ROOT, VIEWPARAMS) or GDB_ID.NULL - - local nOldPaletteType = EgtGetInfo( nViewId, KEY_PALETTE, 'i') - local sCombo = EgtIf( not nOldPaletteType or nOldPaletteType == 1, 'CB:*In/Out,Results', 'CB:In/Out,*Results') - ViewValues = EgtDialogBox( 'Slice Palette', { 'Type', sCombo}) - if not ViewValues or #ViewValues < 1 then return end - - local nPaletteType = PALETTE_TYPE.IN_OUT -- 1 = In/Out, 2 = Results - if ViewValues[1] == 'In/Out' then - nPaletteType = PALETTE_TYPE.IN_OUT - elseif ViewValues[1] == 'Results' then - nPaletteType = PALETTE_TYPE.RESULTS - end - EgtSetInfo( nViewId, KEY_PALETTE, nPaletteType) - - RunSlicePalette.UpdateColors( nPaletteType) -end - ---------------------------------------------------------------------- -return RunSlicePalette diff --git a/LuaLibs/RunViewManager.lua b/LuaLibs/RunViewManager.lua deleted file mode 100644 index fcb3110..0000000 --- a/LuaLibs/RunViewManager.lua +++ /dev/null @@ -1,195 +0,0 @@ --- RunViewManager.lua by Egaltech s.r.l. 2022/07/03 --- Gestione visualizzazione per Stampa 3d - --- Tabella per definizione modulo -local RunViewManager = {} - --- Intestazioni -require( 'EgtBase') - -EgtOutLog( ' RunViewManager started', 1) - --- Costanti generali -local AMD = require( 'AddManData') - ---------------------------------------------------------------------- -local function CalcShow( nShellView, nType) - if nShellView == SHELL_VIEW_TYPE.OUTER then - return ( nType == TYPE.OUTER_SHELL or nType == TYPE.EXTRA_OUTER_SHELL) - elseif nShellView == SHELL_VIEW_TYPE.INNER then - return ( nType == TYPE.INNER_SHELL) - elseif nShellView == SHELL_VIEW_TYPE.INFILL then - return ( nType == TYPE.INFILL) - else --nShellView == SHELL_VIEW_TYPE.ALL - return true - end -end - ---------------------------------------------------------------------- -local function CalcType( nEntId, nOldType) - local nType = EgtGetInfo( nEntId, KEY_TYPE, 'i') - if not nType or nType == TYPE.LINK or nType == TYPE.COASTING or nType == TYPE.WIPE then - nType = nOldType - end - if nType == TYPE.RIB or nType == TYPE.AUX_SOLID then - nType = TYPE.INFILL - end - if nType == TYPE.EXTRA_SHELL then - nType = TYPE.INNER_SHELL - end - return nType -end - ---------------------------------------------------------------------- -function RunViewManager.Exec() - local nVisibilityMode = LAYER_VIEW_TYPE.ALL -- 1 = All, 2 = Till Selected, 3 = Only Selected, 4 = From Selected - local nShellType = SHELL_VIEW_TYPE.ALL -- 1 = All, 2 = Outer, 3 = Inner, 4 = infill - local nOldSelLayerId = GDB_ID.NULL - - -- leggo ultimi valori - local nViewId = EgtGetFirstNameInGroup( GDB_ID.ROOT, VIEWPARAMS) - if nViewId then - nVisibilityMode = EgtGetInfo( nViewId, KEY_LAYER_VIEW, 'i') - nShellType = EgtGetInfo( nViewId, KEY_SHELL_VIEW, 'i') - nOldSelLayerId = EgtGetInfo( nViewId, KEY_SEL_LAYER, 'i') or GDB_ID.NULL - end - local sLayerViewCombo = '' - if nVisibilityMode == LAYER_VIEW_TYPE.TILL_SEL then - sLayerViewCombo = 'CB:All,*Till Selected,Only Selected,From Selected' - elseif nVisibilityMode == LAYER_VIEW_TYPE.ONLY_SEL then - sLayerViewCombo = 'CB:All,Till Selected,*Only Selected,From Selected' - elseif nVisibilityMode == LAYER_VIEW_TYPE.FROM_SEL then - sLayerViewCombo = 'CB:All,Till Selected,Only Selected,*From Selected' - else - sLayerViewCombo = 'CB:*All,Till Selected,Only Selected,From Selected' - end - local sShellViewCombo = '' - if nShellType == SHELL_VIEW_TYPE.OUTER then - sShellViewCombo = 'CB:All,*Outer,Inner,Infill' - elseif nShellType == SHELL_VIEW_TYPE.INNER then - sShellViewCombo = 'CB:All,Outer,*Inner,Infill' - elseif nShellType == SHELL_VIEW_TYPE.INFILL then - sShellViewCombo = 'CB:All,Outer,Inner,*Infill' - else - sShellViewCombo = 'CB:*All,Outer,Inner,Infill' - end - - ViewValues = EgtDialogBox( 'Slicing visibility manager', { 'Visibility Mode', sLayerViewCombo}, - { 'Shell type', sShellViewCombo}) - if not ViewValues or #ViewValues < 2 then return end - - if ViewValues[1] == 'All' then - nVisibilityMode = LAYER_VIEW_TYPE.ALL - elseif ViewValues[1] == 'Till Selected' then - nVisibilityMode = LAYER_VIEW_TYPE.TILL_SEL - elseif ViewValues[1] == 'Only Selected' then - nVisibilityMode = LAYER_VIEW_TYPE.ONLY_SEL - elseif ViewValues[1] == 'From Selected' then - nVisibilityMode = LAYER_VIEW_TYPE.FROM_SEL - end - if ViewValues[2] == 'All' then - nShellType = SHELL_VIEW_TYPE.ALL - elseif ViewValues[2] == 'Outer' then - nShellType = SHELL_VIEW_TYPE.OUTER - elseif ViewValues[2] == 'Inner' then - nShellType = SHELL_VIEW_TYPE.INNER - elseif ViewValues[2] == 'Infill' then - nShellType = SHELL_VIEW_TYPE.INFILL - end - - -- Recupero ultimo layer selezionato - -- verifico sia un pezzo valido - local sSelLayerName = '' - local bFound = false - local nSelLayerId = EgtGetLastSelectedObj() - while nSelLayerId do - local sSelLayerName = EgtGetName( nSelLayerId) - if sSelLayerName and ( sSelLayerName:sub(1, 5) == SLICE_LAYER or sSelLayerName:sub(3, 7) == SLICE_LAYER) then - bFound = true - break - end - nSelLayerId = EgtGetParent( nSelLayerId) - end - if not bFound then - if nOldSelLayerId and nOldSelLayerId ~= GDB_ID.NULL then - nSelLayerId = nOldSelLayerId - else - if nVisibilityMode ~= LAYER_VIEW_TYPE.ALL then - EgtOutBox( 'No selected element!', 'Warning', 'WARNING') - return - else - nSelLayerId = GDB_ID.NULL - sSelLayerName = '' - end - end - end - - -- ciclo sui pezzi - local nPartIndex = 1 - local nPartId = EgtGetFirstNameInGroup( GDB_ID.ROOT, PART .. nPartIndex) - while nPartId do - -- ciclo sui layer per dis/attivare il resto - local nLayerIndex = 1 - local nLayerId = EgtGetFirstNameInGroup( nPartId, SLICE_LAYER .. nLayerIndex) or EgtGetFirstNameInGroup( nPartId, "__" .. SLICE_LAYER .. nLayerIndex) - while nLayerId do - if nVisibilityMode == LAYER_VIEW_TYPE.ALL then - EgtSetStatus( nLayerId, GDB_ST.ON) - elseif nVisibilityMode == LAYER_VIEW_TYPE.TILL_SEL then - EgtSetStatus( nLayerId, EgtIf( nLayerId <= nSelLayerId, GDB_ST.ON, GDB_ST.OFF)) - elseif nVisibilityMode == LAYER_VIEW_TYPE.ONLY_SEL then - EgtSetStatus( nLayerId, EgtIf( nLayerId == nSelLayerId, GDB_ST.ON, GDB_ST.OFF)) - elseif nVisibilityMode == LAYER_VIEW_TYPE.FROM_SEL then - EgtSetStatus( nLayerId, EgtIf( nLayerId >= nSelLayerId, GDB_ST.ON, GDB_ST.OFF)) - end - local nCrvId = EgtGetFirstGroupInGroup( nLayerId) - while nCrvId do - ---- - local nOldType = TYPE.OUTER_SHELL - local nPathId = EgtGetFirstNameInGroup( nCrvId, PATH_GRP) - local nShellId = EgtGetFirstInGroup( nPathId) - while nShellId do - local nType = CalcType( nShellId, nOldType) - nOldType = nType - EgtSetStatus( nShellId, EgtIf( CalcShow( nShellType, nType), GDB_ST.ON, GDB_ST.OFF)) - nShellId = EgtGetNext( nShellId) - end - ---- - nOldType = TYPE.OUTER_SHELL - local nSolidId = EgtGetFirstNameInGroup( nCrvId, SOLID_GRP) - local nSurfId = EgtGetFirstInGroup( nSolidId) - while nSurfId do - local nType = CalcType( nSurfId, nOldType) - nOldType = nType - EgtSetStatus( nSurfId, EgtIf( CalcShow( nShellType, nType), GDB_ST.ON, GDB_ST.OFF)) - nSurfId = EgtGetNext( nSurfId) - end - ---- - nOldType = TYPE.OUTER_SHELL - local nToolPathId = EgtGetFirstNameInGroup( nCrvId, TOOLPATH_GRP) - nShellId = EgtGetFirstInGroup( nToolPathId) - while nShellId do - local nType = CalcType( nShellId, nOldType) - nOldType = nType - EgtSetStatus( nShellId, EgtIf( CalcShow( nShellType, nType), GDB_ST.ON, GDB_ST.OFF)) - nShellId = EgtGetNext( nShellId) - end - nCrvId = EgtGetNext( nCrvId) - end - nLayerIndex = nLayerIndex + 1 - nLayerId = EgtGetFirstNameInGroup( nPartId, SLICE_LAYER .. nLayerIndex) or EgtGetFirstNameInGroup( nPartId, "__" .. SLICE_LAYER .. nLayerIndex) - end - nPartIndex = nPartIndex + 1 - nPartId = EgtGetFirstNameInGroup( GDB_ID.ROOT, PART .. nPartIndex) - end - - -- riporto impostazioni in gruppo apposito - EgtSetInfo( nViewId, KEY_LAYER_VIEW, nVisibilityMode) - EgtSetInfo( nViewId, KEY_SHELL_VIEW, nShellType) - EgtSetInfo( nViewId, KEY_SEL_LAYER, nSelLayerId) - - EgtDraw() - -end - ---------------------------------------------------------------------- -return RunViewManager diff --git a/MachiningParamCalc.lua b/MachiningParamCalc.lua deleted file mode 100644 index 42ec772..0000000 --- a/MachiningParamCalc.lua +++ /dev/null @@ -1,18 +0,0 @@ --- MachiningParamCalc.lua by Egaltech s.r.l. 2022/04/05 --- Gestione visualizzazione per Stampa 3d - --- Intestazioni -require( 'EgtBase') -_ENV = EgtProtectGlobal() -EgtEnableDebug( false) - --- Imposto direttorio libreria specializzata per Stampa 3d -local sBaseDir = EgtGetSourceDir() -EgtAddToPackagePath( sBaseDir .. 'LuaLibs\\?.lua') - --- Librerie -_G.package.loaded.RunMachiningParamCalc = nil -local RMPC = require( 'RunMachiningParamCalc') - --- Calcolo -RMPC.Exec() diff --git a/MachiningParamEdit.lua b/MachiningParamEdit.lua deleted file mode 100644 index b66dc0d..0000000 --- a/MachiningParamEdit.lua +++ /dev/null @@ -1,18 +0,0 @@ --- MachiningParamCalc.lua by Egaltech s.r.l. 2022/04/05 --- Gestione visualizzazione per Stampa 3d - --- Intestazioni -require( 'EgtBase') -_ENV = EgtProtectGlobal() -EgtEnableDebug( false) - --- Imposto direttorio libreria specializzata per Stampa 3d -local sBaseDir = EgtGetSourceDir() -EgtAddToPackagePath( sBaseDir .. 'LuaLibs\\?.lua') - --- Librerie -_G.package.loaded.RunMachiningParamEdit = nil -local RMPE = require( 'RunMachiningParamEdit') - --- Calcolo -RMPE.Exec() diff --git a/MaterialParamEdit.lua b/MaterialParamEdit.lua deleted file mode 100644 index 6c39045..0000000 --- a/MaterialParamEdit.lua +++ /dev/null @@ -1,18 +0,0 @@ --- MachiningParamCalc.lua by Egaltech s.r.l. 2022/04/09 --- Gestione edit parametri materiali per Stampa 3d - --- Intestazioni -require( 'EgtBase') -_ENV = EgtProtectGlobal() -EgtEnableDebug( false) - --- Imposto direttorio libreria specializzata per Stampa 3d -local sBaseDir = EgtGetSourceDir() -EgtAddToPackagePath( sBaseDir .. 'LuaLibs\\?.lua') - --- Librerie -_G.package.loaded.RunMaterialParamEdit = nil -local RMPE = require( 'RunMaterialParamEdit') - --- Calcolo -RMPE.Exec() diff --git a/PartPositioning.lua b/PartPositioning.lua deleted file mode 100644 index 76a378e..0000000 --- a/PartPositioning.lua +++ /dev/null @@ -1,20 +0,0 @@ --- PlacePart.lua by Egaltech s.r.l. 2022/04/11 --- Gestione calcolo disposizione e lavorazioni per stampa 3d --- 2022/03/21 Creazione file - - --- Intestazioni -require( 'EgtBase') -_ENV = EgtProtectGlobal() -EgtEnableDebug( false) - --- Imposto direttorio libreria specializzata per Stampa 3d -local sBaseDir = EgtGetSourceDir() -EgtAddToPackagePath( sBaseDir .. 'LuaLibs\\?.lua') - --- Librerie -_G.package.loaded.RunPartPositioning = nil -local RPP = require( 'RunPartPositioning') - --- Calcolo -RPP.Exec() diff --git a/ShowManager.lua b/ShowManager.lua deleted file mode 100644 index 2509cc0..0000000 --- a/ShowManager.lua +++ /dev/null @@ -1,18 +0,0 @@ --- ShowManager.lua by Egaltech s.r.l. 2022/04/05 --- Gestione visualizzazione per Stampa 3d - --- Intestazioni -require( 'EgtBase') -_ENV = EgtProtectGlobal() -EgtEnableDebug( false) - --- Imposto direttorio libreria specializzata per Stampa 3d -local sBaseDir = EgtGetSourceDir() -EgtAddToPackagePath( sBaseDir .. 'LuaLibs\\?.lua') - --- Librerie -_G.package.loaded.RunShowManager = nil -local RSM = require( 'RunShowManager') - --- Calcolo -RSM.Exec() diff --git a/SliceAdvancement.lua b/SliceAdvancement.lua deleted file mode 100644 index 54d95d1..0000000 --- a/SliceAdvancement.lua +++ /dev/null @@ -1,18 +0,0 @@ --- SliceAdvancement.lua by Egaltech s.r.l. 2022/04/05 --- Gestione visualizzazione per Stampa 3d - --- Intestazioni -require( 'EgtBase') -_ENV = EgtProtectGlobal() -EgtEnableDebug( false) - --- Imposto direttorio libreria specializzata per Stampa 3d -local sBaseDir = EgtGetSourceDir() -EgtAddToPackagePath( sBaseDir .. 'LuaLibs\\?.lua') - --- Librerie -_G.package.loaded.RunSliceAdvancement = nil -local RSA = require( 'RunSliceAdvancement') - --- Calcolo -RSA.Exec() diff --git a/SlicePalette.lua b/SlicePalette.lua deleted file mode 100644 index e47e78f..0000000 --- a/SlicePalette.lua +++ /dev/null @@ -1,18 +0,0 @@ --- SlicePalette.lua by Egaltech s.r.l. 2022/04/05 --- Gestione visualizzazione per Stampa 3d - --- Intestazioni -require( 'EgtBase') -_ENV = EgtProtectGlobal() -EgtEnableDebug( false) - --- Imposto direttorio libreria specializzata per Stampa 3d -local sBaseDir = EgtGetSourceDir() -EgtAddToPackagePath( sBaseDir .. 'LuaLibs\\?.lua') - --- Librerie -_G.package.loaded.RunSlicePalette = nil -local RSP = require( 'RunSlicePalette') - --- Calcolo -RSP.Exec() diff --git a/Slicing.lua b/Slicing.lua index 4248f09..4d1e223 100644 --- a/Slicing.lua +++ b/Slicing.lua @@ -1,4 +1,4 @@ --- Slicing.lua by Egaltech s.r.l. 2022/03/30 +-- Slicing.lua by Egaltech s.r.l. 2023/01/11 -- Calcoli prima fase per Stampa 3d -- Intestazioni @@ -7,8 +7,7 @@ _ENV = EgtProtectGlobal() EgtEnableDebug( false) -- Imposto direttorio libreria specializzata per Stampa 3d -local sBaseDir = EgtGetSourceDir() -EgtAddToPackagePath( sBaseDir .. 'LuaLibs\\?.lua') +EgtAddToPackagePath( PRINT.BASEDIR .. '\\LuaLibs\\?.lua') -- Librerie _G.package.loaded.RunSlicing = nil diff --git a/ViewManager.lua b/ViewManager.lua deleted file mode 100644 index 07d1b4b..0000000 --- a/ViewManager.lua +++ /dev/null @@ -1,18 +0,0 @@ --- ViewManager.lua by Egaltech s.r.l. 2022/04/05 --- Gestione visualizzazione per Stampa 3d - --- Intestazioni -require( 'EgtBase') -_ENV = EgtProtectGlobal() -EgtEnableDebug( false) - --- Imposto direttorio libreria specializzata per Stampa 3d -local sBaseDir = EgtGetSourceDir() -EgtAddToPackagePath( sBaseDir .. 'LuaLibs\\?.lua') - --- Librerie -_G.package.loaded.RunViewManager = nil -local RVM = require( 'RunViewManager') - --- Calcolo -RVM.Exec() diff --git a/bin/Images/.placeholder b/bin/Images/.placeholder deleted file mode 100644 index e69de29..0000000