Egalware/3dprinting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

3dPrinting :

Browse Source 
- correzioni nel collegamento tra ribs che terminano esattamente sul pezzo
- migliorie varie nei ribs.
This commit is contained in:
SaraP
2023-09-01 17:03:25 +02:00
parent a595fcdb98
commit d83b571883
2 changed files with 210 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LuaLibs/CalcToolPath.lua
+90 -69
View File
@@ -1024,45 +1024,56 @@ end
--------------------------------------------------------------------
--------------------------- RIBS -----------------------------------
--------------------------------------------------------------------
local function VerifyRibsLink( nLinkId, nCurr, nNext, nGrpTmp, dStrand, bCheckLinked)
local function VerifyRibsLink( nLinkId, nCurr, nNext, nGrpTmp, dStrand)
local dOverlap1 = EgtGetInfo( nCurr, KEY_RIBS_OVERLAP, 'd')
local dOverlap2 = EgtGetInfo( nNext, KEY_RIBS_OVERLAP, 'd')
local dOverlap = max( dOverlap1, dOverlap2)
local dLen = EgtCurveLength( nLinkId)
-- verifico che non entri nella tavola
-- 1) verifico che non entri nella tavola
local b3Box = EgtGetBBoxGlob( nLinkId, GDB_BB.STANDARD)
if b3Box:getMin():getZ() < - GEO.EPS_SMALL then
return false
end
-- eventuale verifica con setti coinvolti dal link
-- verifico non passi per estremo errato
-- 2) verifica con setti coinvolti dal link
if nCurr ~= nNext then
-- verifico non passi per estremo errato
local dParTest1 = EgtCurveParamAtPoint( nLinkId, EgtSP( nCurr, GDB_ID.ROOT), 100 * GEO.EPS_SMALL, GDB_RT.GLOB)
local dParTest2 = EgtCurveParamAtPoint( nLinkId, EgtEP( nNext, GDB_ID.ROOT), 100 * GEO.EPS_SMALL, GDB_RT.GLOB)
if dParTest1 or dParTest2 then
return false
end
end
if bCheckLinked and dLen > 3 * dStrand then
-- regione occupata dai setti
local nSrfRibs = EgtSurfFrFatCurve( nGrpTmp, nCurr, dStrand, false) or GDB_ID.NULL
local nSrfRibs2 = EgtSurfFrFatCurve( nGrpTmp, nNext, dStrand, false) or GDB_ID.NULL
EgtSurfFrAdd( nSrfRibs, nSrfRibs2)
-- verifico che i tratti fuori abbiano lunghezza maggiore di quelli dentro
-- verifico non intersechi i setti in altri punti oltre agli estremi
local nCurrLoc = EgtCopyGlob( nCurr, nGrpTmp)
local nNextLoc = EgtCopyGlob( nNext, nGrpTmp)
local nLinkLoc = EgtCopyGlob( nLinkId, nGrpTmp)
local nRes, nCnt = EgtTrimCurveWithRegion( nLinkLoc, nSrfRibs, false, false)
if nCnt == 0 then return false end
local dResLen = EgtCurveLength( nRes)
if dResLen < ( dLen - dResLen) - GEO.EPS_SMALL then
EgtTrimCurveEndAtLen( nLinkLoc, EgtCurveLength( nLinkLoc) - 100 * GEO.EPS_SMALL)
EgtTrimCurveStartAtLen( nLinkLoc, 100 * GEO.EPS_SMALL)
if EgtIP( nLinkLoc, nCurrLoc, ORIG()) or EgtIP( nLinkLoc, nNextLoc, ORIG()) then
return false
end
-- se collegamento non ottimale verifico che abbia una parte esterna alla regione occupata dai setti abbsatanza lunga ( > 20% della lunghezza totale)
if dist( EgtEP( nCurr, GDB_ID.ROOT), EgtSP( nNext, GDB_ID.ROOT)) > dist( EgtEP( nCurr, GDB_ID.ROOT), EgtEP( nNext, GDB_ID.ROOT)) + GEO.EPS_SMALL then
local nSrfRibs = EgtSurfFrFatCurve( nGrpTmp, nCurr, dStrand, false) or GDB_ID.NULL
local nSrfRibs2 = EgtSurfFrFatCurve( nGrpTmp, nNext, dStrand, false) or GDB_ID.NULL
EgtSurfFrAdd( nSrfRibs, nSrfRibs2)
-- EgtSetStatus( nSrfRibs, GDB_ST.OFF)
-- EgtSetStatus( nSrfRibs2, GDB_ST.OFF)
local nLinkLoc = EgtCopyGlob( nLinkId, nGrpTmp)
local nRes, nCnt = EgtTrimCurveWithRegion( nLinkLoc, nSrfRibs, false, false)
if nCnt == 0 then return false end
local dResLen = EgtCurveLength( nRes)
if dResLen < 0.2 * dLen - GEO.EPS_SMALL then
return false
end
end
end
-- verifico se interseca altri setti ( considerando anche le tipologie del PathGrp non ancora realizzate)
-- 3) verifiche con altri setti ( considerando anche le tipologie del PathGrp non ancora realizzate)
local nLinkLoc = EgtCopyGlob( nLinkId, nGrpTmp)
local nOrigCurr = EgtGetInfo( nCurr, KEY_ORIGINAL_RIB, 'i')
local nOrigNext = EgtGetInfo( nNext, KEY_ORIGINAL_RIB, 'i')
@@ -1079,39 +1090,39 @@ local function VerifyRibsLink( nLinkId, nCurr, nNext, nGrpTmp, dStrand, bCheckLi
for i = 1, #vRibsIds do
if vRibsIds[i] ~= nCurr and vRibsIds[i] ~= nNext then
-- verifico se sovrapposizione tra le passate
local dCurrStrand = EgtGetInfo( vRibsIds[i], KEY_RIBS_STRAND, 'd')
local nOrigId = EgtGetInfo( vRibsIds[i], KEY_ORIGINAL_RIB, 'i')
local dOffs
if nOrigId == nOrigCurr or nOrigId == nOrigNext then
-- se passate relative ad un setto coinvolto verifico se sovrapposizione con la curva
local ptS = EgtSP( vRibsIds[i], GDB_ID.ROOT)
local dParS = EgtCurveParamAtPoint( nLinkLoc, ptS, dCurrStrand * 0.5, GDB_RT.GLOB)
if dParS then return false end
local ptE = EgtEP( vRibsIds[i], GDB_ID.ROOT)
local dParE = EgtCurveParamAtPoint( nLinkLoc, ptE, dCurrStrand * 0.5, GDB_RT.GLOB)
if dParE then return false end
-- se passata relativa ad un setto coinvolto nel link verifico soltanto che il percorso del link non entri nella regione occupata dal setto
dOffs = dCurrStrand * 0.5
else
-- verifico se sovrapposizione con la passata
local dOffs = dCurrStrand * 0.5 + ( 0.5 - dOverlap / 100) * dStrand - 10 * GEO.EPS_SMALL
if dOffs > GEO.EPS_SMALL then
local nSrfCurr = EgtSurfFrFatCurve( nGrpTmp, vRibsIds[i], dOffs, false)
if nSrfCurr then
local nRes = EgtCurveWithRegionClassify( nLinkLoc, nSrfCurr)
if nRes ~= GDB_CRC.OUT then
return false
end
-- altrimenti verifico che le regioni del link e del setto non si sovrappongono ( a meno dell'overlap fissato)
dOffs = dCurrStrand * 0.5 + ( 0.5 - dOverlap / 100) * dStrand - 10 * GEO.EPS_SMALL
end
if dOffs > GEO.EPS_SMALL then
local nSrfCurr = EgtSurfFrFatCurve( nGrpTmp, vRibsIds[i], dOffs, false)
if nSrfCurr then
-- EgtSetStatus( nSrfCurr, GDB_ST.OFF)
local nRes = EgtCurveWithRegionClassify( nLinkLoc, nSrfCurr)
if nRes ~= GDB_CRC.OUT then
return false
end
end
end
end
end
-- verifico se si trova almeno in una regione ammissibile ( per caso ForcedLink)
-- 4) verifico se si trova in almeno una regione ammissibile ( per caso ForcedLink)
local nType = EgtGetInfo( nCurr, KEY_RIBS_TYPE, 'i')
local nOut = 0
for i = 1, 2 do
local nSurfId = EgtGetInfo( EgtIf( i == 1, nCurr, nNext), KEY_ASSOCIATED_SURF, 'i')
if nSurfId and nSurfId ~= -1 then
local nSrfLoc = EgtCopyGlob( nSurfId, nGrpTmp)
-- EgtSetStatus( nSrfLoc, GDB_ST.OFF)
local nRes = EgtCurveWithRegionClassify( nLinkId, nSrfLoc)
if ( ( nType == RIB_TYPE.INTERNAL or nType == RIB_TYPE.SUPPORT) and ( nRes == GDB_CRC.OUT or nRes == GDB_CRC.INTERS)) or
( nType == RIB_TYPE.EXTERNAL and ( nRes == GDB_CRC.IN or nRes == GDB_CRC.INTERS)) then
@@ -1133,31 +1144,37 @@ local function VerifyRibsLink( nLinkId, nCurr, nNext, nGrpTmp, dStrand, bCheckLi
end
--------------------------------------------------------------------
local function ComputeRibsLinkOnSameCrv( nCrvId, dParS, dParE, nCurr, nNext, nGrpTmp, dStrand, bCheckLinked)
local function ComputeRibsLinkOnSameCrv( nCrvId, dParS, dParE, nCurr, nNext, nGrpTmp, dStrand)
local nParentId = EgtGetParent( nCrvId)
local nShortest = EgtCopyGlob( nCrvId, nParentId, GDB_IN.AFTER)
local nLongest = EgtCopyGlob( nCrvId, nParentId, GDB_IN.AFTER)
EgtTrimCurveStartEndAtParam( nShortest, dParS, dParE)
EgtTrimCurveStartEndAtParam( nLongest, dParE, dParS)
EgtInvertCurve( nLongest)
if EgtCurveLength( nShortest) > EgtCurveLength( nLongest) + GEO.EPS_SMALL then
nShortest, nLongest = nLongest, nShortest
end
-- verifico il percorso dParS->dParE
local nCopyId = EgtCopyGlob( nCrvId, nParentId, GDB_IN.AFTER)
EgtTrimCurveStartEndAtParam( nCopyId, dParS, dParE)
if VerifyRibsLink( nCopyId, nCurr, nNext, nGrpTmp, dStrand, bCheckLinked) then
return nCopyId
-- verifico il percorso più corto
if VerifyRibsLink( nShortest, nCurr, nNext, nGrpTmp, dStrand) then
EgtErase( nLongest)
return nShortest
else
-- se non valido tento con il percorso dParE->dParS
EgtErase( nCopyId)
nCopyId = EgtCopyGlob( nCrvId, nParentId, GDB_IN.AFTER)
EgtTrimCurveStartEndAtParam( nCopyId, dParE, dParS)
EgtInvertCurve( nCopyId)
if VerifyRibsLink( nCopyId, nCurr, nNext, nGrpTmp, dStrand, bCheckLinked) then
return nCopyId
-- se non valido tento con il percorso più lungo
EgtErase( nShortest)
if VerifyRibsLink( nLongest, nCurr, nNext, nGrpTmp, dStrand) then
return nLongest
else
EgtErase( nLongest)
return
end
end
end
--------------------------------------------------------------------
local function ComputeRibsLinkOnDiffCrvs( nCrvS, nCrvE, dParS, dParE, nCurr, nNext, nGrpTmp, dStrand, bCheckLinked)
local function ComputeRibsLinkOnDiffCrvs( nCrvS, nCrvE, dParS, dParE, nCurr, nNext, nGrpTmp, dStrand)
local nParentId = EgtGetParent( nCrvS)
@@ -1175,7 +1192,7 @@ local function ComputeRibsLinkOnDiffCrvs( nCrvS, nCrvE, dParS, dParE, nCurr, nNe
EgtSpiralizeCurveAlongGuide( nCrv2, nCrv1)
EgtErase( nCrv1)
-- verifico se valida
if VerifyRibsLink( nCrv2, nCurr, nNext, nGrpTmp, dStrand, bCheckLinked) then
if VerifyRibsLink( nCrv2, nCurr, nNext, nGrpTmp, dStrand) then
return nCrv2
else
@@ -1189,7 +1206,7 @@ local function ComputeRibsLinkOnDiffCrvs( nCrvS, nCrvE, dParS, dParE, nCurr, nNe
EgtInvertCurve( nCrv2)
EgtSpiralizeCurveAlongGuide( nCrv2, nCrv1) -- transizione uniforme da nCrv1
EgtErase( nCrv1)
if VerifyRibsLink( nCrv2, nCurr, nNext, nGrpTmp, dStrand, bCheckLinked) then
if VerifyRibsLink( nCrv2, nCurr, nNext, nGrpTmp, dStrand) then
return nCrv2
else
EgtErase( nCrv2)
@@ -1199,7 +1216,7 @@ local function ComputeRibsLinkOnDiffCrvs( nCrvS, nCrvE, dParS, dParE, nCurr, nNe
end
--------------------------------------------------------------------
local function CalcRibsLink( nCurr, nNext, nLoopGrp, bForceLink, bCheckLinked, vtSlicing, nGrpTmp)
local function CalcRibsLink( nCurr, nNext, nLoopGrp, bForceLink, vtSlicing, nGrpTmp)
local ptS = EgtEP( nCurr)
local ptE = EgtSP( nNext)
@@ -1232,10 +1249,10 @@ local function CalcRibsLink( nCurr, nNext, nLoopGrp, bForceLink, bCheckLinked, v
local nLinkId
if vIdsS[i] == vIdsE[j] then
-- link su una sola curva
nLinkId = ComputeRibsLinkOnSameCrv( vCrvIds[vIdsS[i]], vParS[i], vParE[j], nCurr, nNext, nGrpTmp, dStrand, bCheckLinked)
nLinkId = ComputeRibsLinkOnSameCrv( vCrvIds[vIdsS[i]], vParS[i], vParE[j], nCurr, nNext, nGrpTmp, dStrand)
else
-- link tra due curve distinte
nLinkId = ComputeRibsLinkOnDiffCrvs( vCrvIds[vIdsS[i]], vCrvIds[vIdsE[j]], vParS[i], vParE[j], nCurr, nNext, nGrpTmp, dStrand, bCheckLinked)
nLinkId = ComputeRibsLinkOnDiffCrvs( vCrvIds[vIdsS[i]], vCrvIds[vIdsE[j]], vParS[i], vParE[j], nCurr, nNext, nGrpTmp, dStrand)
end
if nLinkId then
@@ -1257,7 +1274,7 @@ local function CalcRibsLink( nCurr, nNext, nLoopGrp, bForceLink, bCheckLinked, v
EgtModifyCurveExtrusion( nLinkId, vtSlicing, GDB_RT.GLOB)
EgtRelocateGlob( nLinkId, nCurr, GDB_IN.AFTER)
EgtSetInfo( nLinkId, KEY_CRV_STRAND, dStrand)
local bValid = VerifyRibsLink( nLinkId, nCurr, nNext, nGrpTmp, dStrand, bCheckLinked)
local bValid = VerifyRibsLink( nLinkId, nCurr, nNext, nGrpTmp, dStrand)
if bValid then
return nLinkId
else
@@ -1290,7 +1307,7 @@ local function CalcLoopRibLink( nCurr, nNext, nLoopGrp, vtSlicing, nGrpTmp)
EgtSetName( nLinkId, LINK_CRV)
EgtModifyCurveExtrusion( nLinkId, vtSlicing, GDB_RT.GLOB)
EgtSetInfo( nLinkId, KEY_CRV_STRAND, dStrand)
if VerifyRibsLink( nLinkId, nCurr, nNext, nGrpTmp, dStrand, false) then
if VerifyRibsLink( nLinkId, nCurr, nNext, nGrpTmp, dStrand) then
return nLinkId
else
EgtErase( nLinkId)
@@ -1328,17 +1345,18 @@ local function VerifyRibsLead( nId, nRibId, bInVsOut, nGrpTmp)
end
end
-- verifico se interseca altri setti, lead in, lead out o collegamenti
-- 1) verifico se interseca altri setti, lead in, lead out o collegamenti
-- recupero gli id degli elementi da controllare
local vCheckIds = {}
local nCurrId = EgtGetFirstNameInGroup( EgtGetParent( nRibId), RIBS_CRV .. '*')
-- verifico se il primo setto ha lead in da controllare
local nPrevId = EgtGetPrev( nCurrId)
if nPrevId and EgtGetName( nPrevId) == LEAD_IN_CRV then nCurrId = nPrevId end
local nCurrId = EgtGetFirstInGroup( EgtGetParent( nRibId))
while nCurrId do
-- salto i i wipe ( non sono materiale depositato) e i tratti relativi al setto corrente
if not EgtStartsWith( EgtGetName( nCurrId), WIPE_CRV) and nCurrId ~= nCurrLI and nCurrId ~= nRibId and nCurrId ~= nId and nCurrId ~= nCurrLink then
table.insert( vCheckIds, nCurrId)
-- considero solo i setti e gli elementi a loro associati ( tranne i wipe perchè non corrispondono a materiale depositato)
local nType = EgtGetInfo( nCurrId, KEY_TYPE, 'i')
if nType == TYPE.RIB or ( nType == TYPE.COASTING and EgtGetInfo( EgtGetPrev( nCurrId), KEY_TYPE, 'i') == TYPE.RIB) then
-- verifico non sia un tratto relativo al setto corrente
if nCurrId ~= nCurrLI and nCurrId ~= nRibId and nCurrId ~= nId and nCurrId ~= nCurrLink then
table.insert( vCheckIds, nCurrId)
end
end
nCurrId = EgtGetNext( nCurrId)
end
@@ -1359,6 +1377,7 @@ local function VerifyRibsLead( nId, nRibId, bInVsOut, nGrpTmp)
if dCurrOffs > GEO.EPS_SMALL then
local nSrfCurr = EgtSurfFrFatCurve( nGrpTmp, vCheckIds[i], dCurrOffs, false)
if nSrfCurr then
-- EgtSetStatus( nSrfCurr, GDB_ST.OFF)
local nRes = EgtCurveWithRegionClassify( nLeadLoc, nSrfCurr)
if nRes ~= GDB_CRC.OUT then
return false
@@ -1367,7 +1386,7 @@ local function VerifyRibsLead( nId, nRibId, bInVsOut, nGrpTmp)
end
end
-- verifiche con il setto corrente
-- 2) verifiche con il setto corrente
-- verifico non passi da altro estremo
local dParTest = EgtCurveParamAtPoint( nLeadLoc, EgtIf( bInVsOut, EgtEP( nRibId, GDB_ID.ROOT), EgtSP( nRibId, GDB_ID.ROOT)), 100 * GEO.EPS_SMALL, GDB_RT.GLOB)
if dParTest then
@@ -1392,7 +1411,7 @@ local function VerifyRibsLead( nId, nRibId, bInVsOut, nGrpTmp)
end
end
-- verifiche con eventuale lead in
-- 3) verifiche con eventuale lead in
if nCurrLI then
local nLeadInLoc = EgtCopyGlob( nCurrLI, nGrpTmp)
-- verifico se intersezione fra curve
@@ -1404,6 +1423,7 @@ local function VerifyRibsLead( nId, nRibId, bInVsOut, nGrpTmp)
if dLeadInLen > dStrand + GEO.EPS_SMALL then
local nSrfLeadIn = EgtSurfFrFatCurve( nGrpTmp, nId, dStrand * ( 1 - dOverlap / 100), false)
if nSrfLeadIn then
-- EgtSetStatus( nSrfLeadIn, GDB_ST.OFF)
-- verifico di avere un solo tratto esterno di lunghezza sufficiente
local nRes, nCnt = EgtTrimCurveWithRegion( nLeadInLoc, nSrfLeadIn, false, false)
if nCnt ~= 1 then
@@ -1701,16 +1721,17 @@ local function CalcRibsToolPath( vEntIds, nRibsGrp, nTpathGrpId, LayerParams)
local bLoopRib = EgtGetInfo( tabRibs[i][1], KEY_LOOP_RIB, 'b') or false
for j = 1, #tabRibs[i] - 1 do
local bUserLink = ( EgtGetInfo( tabRibs[i][j], KEY_RIBS_USER_LINK, 'b') or false) and ( EgtGetInfo( tabRibs[i][j+1], KEY_RIBS_USER_LINK, 'b') or false)
local bSplitAfterTrim = EgtGetInfo( tabRibs[i][1], KEY_SPLIT_AFTER_TRIM, 'b') or false
local nOrig1 = EgtGetInfo( tabRibs[i][j], KEY_ORIGINAL_RIB, 'i') or 0
local nOrig2 = EgtGetInfo( tabRibs[i][j + 1], KEY_ORIGINAL_RIB, 'i') or 0
local nSplitId1 = EgtGetInfo( tabRibs[i][j], KEY_SPLIT_ID, 'i') or 0
local nSplitId2 = EgtGetInfo( tabRibs[i][j + 1], KEY_SPLIT_ID, 'i') or 0
local bForceLink = ( nOrig1 == nOrig2 and nSplitId1 == nSplitId2)
local bCheckLinkedRibs = not bForceLink and not bUserLink
if ( nOrig1 ~= nOrig2 and bUserLink) or ( nSplitId1 == nSplitId2 and nOrig1 == nOrig2) then
-- creo collegamento se userlink, passate dello stesso setto o passate divise dopo trim
if ( nOrig1 ~= nOrig2 and bUserLink) or ( nSplitId1 == nSplitId2 and nOrig1 == nOrig2) or ( nOrig1 == nOrig2 and bSplitAfterTrim) then
if not bLoopRib then
CalcRibsLink( tabRibs[i][j], tabRibs[i][j + 1], nLoopGrp, bForceLink, bCheckLinkedRibs, LayerParams.vtSlicing, nGrpTmp)
CalcRibsLink( tabRibs[i][j], tabRibs[i][j + 1], nLoopGrp, bForceLink, LayerParams.vtSlicing, nGrpTmp)
else
local nLinkId = CalcLoopRibLink( tabRibs[i][j], tabRibs[i][j + 1], nLoopGrp, LayerParams.vtSlicing, nGrpTmp)
-- se collegamento congiungo i setti in unico percorso
@@ -1761,7 +1782,7 @@ local function CalcRibsToolPath( vEntIds, nRibsGrp, nTpathGrpId, LayerParams)
local bLoop2 = EgtGetInfo( tabRibs[i + 1][1], KEY_LOOP_RIB, 'b') or false
if bLink1 and bLink2 and not bLoop1 and not bLoop2 then
local nCnt = #tabRibs[i]
CalcRibsLink( tabRibs[i][nCnt], tabRibs[i + 1][1], nLoopGrp, false, true, LayerParams.vtSlicing, nGrpTmp)
CalcRibsLink( tabRibs[i][nCnt], tabRibs[i + 1][1], nLoopGrp, false, LayerParams.vtSlicing, nGrpTmp)
end
end