Compare commits

...

9 Commits

Author SHA1 Message Date
luca.mazzoleni dcd600af01 - in LapJoint correzioni varie 2024-11-29 17:21:17 +01:00
luca.mazzoleni 854fafddf2 Merge tag '2.6k3' into develop
2.6k3
2024-11-27 17:45:13 +01:00
luca.mazzoleni ef6cbc35df Merge branch 'hotfix/2.6k3' 2024-11-27 17:44:49 +01:00
luca.mazzoleni 2887591da4 update version e log 2024-11-27 17:44:41 +01:00
luca.mazzoleni 3d75344652 Merge branch 'develop' into hotfix/2.6k2 2024-11-27 17:42:25 +01:00
luca.mazzoleni 1952c937b0 - in LapJoint -> MakeSideGrooveByMill corretto e modificato calcolo leadin/out perpendicolare 2024-11-27 17:41:23 +01:00
luca.mazzoleni 99baaa6320 Merge tag 'NestingSilhouetteTolerance' into develop
2.6k2
2024-11-19 12:20:13 +01:00
luca.mazzoleni 1bf70aaf27 Merge branch 'master' into develop 2024-11-15 18:12:01 +01:00
luca.mazzoleni b726fbc2cc Merge tag '2.6k1' into develop
2.6k1
2024-11-14 15:22:29 +01:00
3 changed files with 19 additions and 14 deletions
+15 -13
View File
@@ -2015,6 +2015,10 @@ local function MakeSideGrooveByMill( Proc, nFacet, nRawId, b3Raw, sCustomMach, d
local nStep = ceil( ( dThick - dMaxMat) / dStep)
dStep = max( ( dThick - dMaxMat) / max( nStep, 1), 0)
local dMaxElev = max( ( nStep + 1) * dStep - GEO.EPS_SMALL, 0)
-- tasca aperta sopra non necessita di MaxElev
if Proc.Fct == 2 and Proc.AffectedFaces.Top then
dMaxElev = nil
end
if nSinglePass and nSinglePass > 0 then
dStep = 0
if nSinglePass == 1 then
@@ -2028,7 +2032,9 @@ local function MakeSideGrooveByMill( Proc, nFacet, nRawId, b3Raw, sCustomMach, d
-- leggo eventuali note esistenti della lavorazione
local sUserNotes = EgtGetMachiningParam( MCH_MP.USERNOTES)
-- aggiungo alle note massima elevazione
sUserNotes = EgtSetValInNotes( sUserNotes, 'MaxElev', EgtNumToString( dMaxElev, 3))
if dMaxElev then
sUserNotes = EgtSetValInNotes( sUserNotes, 'MaxElev', EgtNumToString( dMaxElev, 3))
end
-- se lavorazione in doppio aggiungo le rispettive note
if Proc.Double and Proc.Double == 2 then
sUserNotes = EgtSetValInNotes( sUserNotes, 'DOUBLE', Proc.Double)
@@ -2102,15 +2108,9 @@ local function MakeSideGrooveByMill( Proc, nFacet, nRawId, b3Raw, sCustomMach, d
-- setto allungamenti iniziali e finali
EgtSetMachiningParam( MCH_MP.STARTADDLEN, dExtraLongIni)
EgtSetMachiningParam( MCH_MP.ENDADDLEN, dExtraLongEnd)
-- se ho passate orizzontali riduco l'eventuale allungamento settato dall'utente
local dLiPerp = EgtGetMachiningParam( MCH_MP.LIPERP)
local dLoPerp = EgtGetMachiningParam( MCH_MP.LOPERP)
if dLiPerp > 0 then
dLiPerp = dLiPerp - dRadialOffset
end
if dLoPerp > 0 then
dLoPerp = dLoPerp - dRadialOffset
end
-- tutte le passate partono dalla stessa distanza
local dLiPerp = dElev + WD.CUT_SIC - dRadialOffset
local dLoPerp = dElev + WD.CUT_SIC - dRadialOffset
EgtSetMachiningParam( MCH_MP.LIPERP, dLiPerp)
EgtSetMachiningParam( MCH_MP.LOPERP, dLoPerp)
-- se richiesto, setto la nota per spostare la lavorazione alla fine
@@ -2886,13 +2886,15 @@ local function MakeMoreFaces( Proc, nRawId, b3Raw)
-- se ho abilitata lavorazione di fresa di fianco
if Proc.Fct >= 3 and sMillOnSide and nUseMillOnSide >= 1 and not bIsSmallSlot then
-- cerco nei parametri utensili la nota di affondamento di fianco SIDEDEPTH
local dMaxDepthOnSide = 0
local dMaxDepthOnSide = 999
local dMillDiam = 0
local dMillDiamTh = EgtTdbGetCurrToolThDiam() or 60
if EgtMdbSetCurrMachining( sMillOnSide) then
local sTuuid = EgtMdbGetCurrMachiningParam( MCH_MP.TUUID)
if EgtTdbSetCurrTool( EgtTdbGetToolFromUUID( sTuuid) or '') then
dMillDiam = EgtTdbGetCurrToolParam( MCH_TP.DIAM) or dMillDiam
dMaxDepthOnSide = EgtTdbGetCurrToolValInNotes( MCH_TP.USERNOTES, 'SIDEDEPTH', 'd') or dMaxDepthOnSide
dMillDiamTh = EgtTdbGetCurrToolThDiam() or dMillDiamTh
dMaxDepthOnSide = min( EgtTdbGetCurrToolValInNotes( MCH_TP.USERNOTES, 'SIDEDEPTH', 'd') or dMaxDepthOnSide, 0.5 * ( dMillDiam - dMillDiamTh))
end
end
local bMakeFirstGroove
@@ -2981,7 +2983,7 @@ local function MakeMoreFaces( Proc, nRawId, b3Raw)
else
local sErr = 'Side milling not possible'
EgtOutLog( sErr)
return true, sErr
return false, sErr
end
-- fessura verticale
elseif Proc.Stype == 3 then
+3
View File
@@ -1,5 +1,8 @@
==== Wall Update Log ====
Versione 2.6k3 (27/11/2024)
- Modif : migliorato calcolo approccio e retrazione in Sidemill/Sidegroove
Versione 2.6k2 (19/11/2024)
- Modif : in Nesting riportata allo stato precedente la tolleranza posizionamento pannelli sul bordo
+1 -1
View File
@@ -2,5 +2,5 @@
-- Gestione della versione di Wall
NAME = 'Wall'
VERSION = '2.6k2'
VERSION = '2.6k3'
MIN_EXE = '2.6k1'