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

3dPrinting 2.7d1 :

Browse Source 
- modifiche per nuova modalità di stampa dei primi layers nel caso a spirale.
This commit is contained in:
SaraP
2025-04-22 15:10:18 +02:00
parent 000bd0091f
commit bcaf1c56a4
6 changed files with 138 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LuaLibs/AddManData.lua
+3 -1
View File
@@ -178,6 +178,7 @@ KEY_COEFF_X = "CoeffX"
KEY_COEFF_Y = "CoeffY"
KEY_SPEED_MIN = "SpeedMin"
KEY_SPEED_MAX = "SpeedMax"
KEY_FEED_MAX = 'FeedMax'
-- Altre chiavi
KEY_MAX_H = "SlicingHeight"
@@ -207,8 +208,9 @@ KEY_LAYER_CNT = "LayerCnt"
KEY_CRV_OFFSET = "CurveOffset"
KEY_ORIG_REF = "Orig"
KEY_WIPE_ON_CRV = "WipeOnCrv"
KEY_FEED_COEFF = 'FeedCoeff'
SLICING_TYPE = {
SLICING_TYPE = {
VERTICAL = 1,
DEG45_X = 2,
DEG45_Y = 3,
LuaLibs/CalcPaths.lua
+1 -1
View File
@@ -2394,7 +2394,7 @@ local function CalcRibsPaths( nSliceGrp, nRibsGrp, LayerParams, vPtStart, bIgnor
local nSrfInt = EgtGetFirstNameInGroup( vCrvGrps[i], TOT_SHELL_TRIM_SURF) or GDB_ID.NULL
if nTotSrfInt == GDB_ID.NULL and nSrfInt ~= GDB_ID.NULL then
nTotSrfInt = EgtCopyGlob( nSrfInt, nRibsGrp)
elseif nTotSrfInt ~= GDB_ID.NULL then
elseif nTotSrfInt ~= GDB_ID.NULL and nSrfInt ~= GDB_ID.NULL then
if not EgtSurfFrAdd( nTotSrfInt, nSrfInt) then
EgtOutLog( 'Error : EgtSurfFrAdd for external ribs failed. Errors may occur with user-linked ribs (layer '.. EgtNumToString( s_nCurrIdx) ..') - CalcPaths')
end
LuaLibs/CalcToolPath.lua
+68 -15
View File
@@ -19,6 +19,7 @@ local s_dApproxTol = 0.1
local s_dHSafeWipe = 2
local s_nCurrIdx
local s_dSpiralVaseTanTol = 0.001
local s_dSpralVaseFirstDelta = 30 -- lunghezza del tratto sul primo layer che va alzato
---------------------------------------------------------------------
local function GetLayerParamsForToolPathCalc()
@@ -2004,6 +2005,7 @@ local function SpiralVase( vLayIds, LayerParams)
local nOldId, nOldPathId
local bFirst = true
local nRealLayer = 1
local nSlicingType = EgtGetInfo( s_nPartId, KEY_SLICING_TYPE, 'i')
-- copio ultimo layer
@@ -2080,15 +2082,19 @@ local function SpiralVase( vLayIds, LayerParams)
EgtSetColor( nNewEntId, EgtStdColor('GRAY'))
-- se primo layer
if bFirst then
if nRealLayer == 1 then
-- mi sposto dell'altezza layer
EgtMove( nNewEntId, LayerParams.dLayHeight * LayerParams.vtSlicing, GDB_RT.GLOB)
-- modifico altezza ultimo tratto
local dTrimPar = EgtCurveParamAtLength( nNewEntId, EgtCurveLength( nNewEntId) - s_dSpralVaseFirstDelta)
local nNewPart = EgtSplitCurveAtParam( nNewEntId, dTrimPar)
EgtSpiralizeCurveAlongExtrusion( nNewPart, 0.5 * LayerParams.dLayHeight)
-- eventuale lead in
if LayerParams.nLeadInType ~= LEAD_TYPE.NONE then
EgtTrimCurveStartAtLen( nNewEntId, LayerParams.dOffsetLP)
AddLeadIn( nNewEntId, LayerParams, nTpathGrpId)
end
bFirst = false
else
local ptOld = EgtEP( nOldId, GDB_ID.ROOT)
local ptNew = EgtSP( nNewEntId, GDB_ID.ROOT)
@@ -2112,26 +2118,73 @@ local function SpiralVase( vLayIds, LayerParams)
EgtSpiralizeCurveAlongGuide( nNewEntId, nGuideId)
EgtErase( nGuideId)
end
EgtSpiralizeCurveAlongExtrusion( nNewEntId, LayerParams.dLayHeight)
-- modifica graduale del'altezza
if nRealLayer == 2 then
-- se seconda passata la prima metà deve essere a quota costante 0.5 * dLayHeight, la seconda metà deve salire gradualmente di 0.5 * dLayHeight
EgtMove( nNewEntId, 0.5 * LayerParams.dLayHeight * LayerParams.vtSlicing, GDB_RT.GLOB)
local nNewId = EgtSplitCurve( nNewEntId, 2)
EgtSpiralizeCurveAlongExtrusion( nNewId + 1, 0.5 * LayerParams.dLayHeight)
else
EgtSpiralizeCurveAlongExtrusion( nNewEntId, LayerParams.dLayHeight)
end
end
-- approssimo la curva
if nNewEntId then
local ptS = EgtSP( nNewEntId, GDB_ID.ROOT)
EgtApproxCurve( nNewEntId, GDB_CA.ARCS, s_dApproxTol)
if EgtCurveIsClosed( nNewEntId) then
EgtChangeClosedCurveStartPoint( nNewEntId, ptS, GDB_RT.GLOB)
-- approssimo
local vTPathsCrvs = EgtGetAllInGroup( nTpathGrpId)
for i = 1, #vTPathsCrvs do
local ptS = EgtSP( vTPathsCrvs[i], GDB_ID.ROOT)
EgtApproxCurve( vTPathsCrvs[i], GDB_CA.ARCS, s_dApproxTol)
if EgtCurveIsClosed( vTPathsCrvs[i]) then
EgtChangeClosedCurveStartPoint( vTPathsCrvs[i], ptS, GDB_RT.GLOB)
end
end
nOldPathId = vEntIds[1]
nOldId = nNewEntId
nOldId = vTPathsCrvs[#vTPathsCrvs]
-- moltiplicatore per feed
if nRealLayer == 2 then
-- il primo tratto si trova a metà altezza rispetto allo strato precedente, quindi il coefficiente moltiplicativo è due
EgtSetInfo( vTPathsCrvs[1], KEY_FEED_COEFF, 2)
-- nel secondo tratto l'altezza è variabile quindi devo calcolare il coefficiente per ogni sottotratto
local ptRef = EgtEP( vEntIds[1], GDB_ID.ROOT)
local nFirst, nCnt = EgtExplodeCurveCompo( vTPathsCrvs[2])
for nId = nFirst, nFirst + nCnt - 1 do
local dZLoc
if nSlicingType == SLICING_TYPE.VERTICAL then
dZLoc = ( ( EgtEP( nId, GDB_ID.ROOT) - ptRef)) * LayerParams.vtSlicing
else
dZLoc = ( ( EgtEP( nId, GDB_ID.ROOT) - ptRef)) * LayerParams.vtSlicing - LayerParams.dLayHeight
end
local dFeedCoeff = LayerParams.dLayHeight / dZLoc
EgtSetInfo( nId, KEY_FEED_COEFF, dFeedCoeff)
end
nOldId = nFirst + nCnt - 1
elseif nRealLayer == 3 then
-- solo la prima metà si trova ad un'altezza variabile rispetto allo strato precedente
local nNewId = EgtSplitCurve( vTPathsCrvs[1], 2)
local ptRef = EgtEP( vEntIds[1], GDB_ID.ROOT)
local nFirst, nCnt = EgtExplodeCurveCompo( nNewId)
for nId = nFirst, nFirst + nCnt - 1 do
local dZLoc
if nSlicingType == SLICING_TYPE.VERTICAL then
dZLoc = ( EgtEP( nId, GDB_ID.ROOT) - ptRef) * LayerParams.vtSlicing + 0.5 * LayerParams.dLayHeight
else
dZLoc = ( EgtEP( nId, GDB_ID.ROOT) - ptRef) * LayerParams.vtSlicing - 0.5 * LayerParams.dLayHeight
end
local dFeedCoeff = LayerParams.dLayHeight / dZLoc
EgtSetInfo( nId, KEY_FEED_COEFF, dFeedCoeff)
end
nOldId = nNewId + 1
end
nRealLayer = nRealLayer + 1
-- aggiorno il box dei toolpath
local b3Box = ComputeToolPathBox( nTpathGrpId)
b3Tot:Add( b3Box)
end
-- aggiorno il box dei toolpath
local b3Box = ComputeToolPathBox( nTpathGrpId)
b3Tot:Add( b3Box)
end
if EgtProcessEvents( EgtIf( PRINT, 300, 0) + nIdx / #vLayIds * 100, 0) == 1 then
LuaLibs/RunCalcSolids.lua
+47 -13
View File
@@ -38,6 +38,14 @@ local function CalcSectionParams( dStrand, dH)
return dBevelX, dBevelY
end
----------------------------------------------------------------------
local function CreateStandardSolid( nCrvId, nSolidGrp, LayerParams, dStrand)
local dBevelX, dBevelY = CalcSectionParams( dStrand, LayerParams.dLayHeight)
local nSrfId = EgtSurfTmRectSwept( nSolidGrp, dStrand, LayerParams.dLayHeight, dBevelX, dBevelY, nCrvId, GDB_RSCT.BEVEL, s_dTol)
return nSrfId
end
---------------------------------------------------------------------
local function CreateSection( ptS, vtDir, dStrand, dH, vtSlicing, nSolidGrp)
@@ -121,6 +129,11 @@ local function CreateSpiralVaseSolid( nCrvId, nSolidGrp, LayerParams, dStrand)
local ptE = EgtEP( nCrvId, GDB_ID.ROOT)
local vtE = EgtEV( nCrvId, GDB_ID.ROOT)
local dDelta = ( ptE - ptS) * LayerParams.vtSlicing
-- se non è vero spiral vase, chiamo funzione standard
if dDelta < GEO.EPS_SMALL then
return CreateStandardSolid( nCrvId, nSolidGrp, LayerParams, dStrand)
end
-- appiattisco la curva
local nCrvCopy = EgtCopyGlob( nCrvId, nGrpTmp)
EgtModifyCurveExtrusion( nCrvCopy, LayerParams.vtSlicing, GDB_RT.GLOB)
@@ -187,14 +200,6 @@ local function CreateSpiralVaseSolid( nCrvId, nSolidGrp, LayerParams, dStrand)
return EgtSurfTmByTriangles( nSolidGrp, { nSrfId, nCap1, nCap2})
end
----------------------------------------------------------------------
local function CreateStandardSolid( nCrvId, nSolidGrp, LayerParams, dStrand)
local dBevelX, dBevelY = CalcSectionParams( dStrand, LayerParams.dLayHeight)
local nSrfId = EgtSurfTmRectSwept( nSolidGrp, dStrand, LayerParams.dLayHeight, dBevelX, dBevelY, nCrvId, GDB_RSCT.BEVEL, s_dTol)
return nSrfId
end
--------------------------------------------------------------------------------------
local function CreateSolid( nCrvId, nSolidGrp, LayerParams, dStrand)
if LayerParams.bSpiralVase then
@@ -430,12 +435,41 @@ function RunCalcSolids.Exec()
nSolidGrpId = EgtGroup( nCrvGrpId)
EgtSetName( nSolidGrpId, SOLID_GRP)
EgtSetLevel( nSolidGrpId, GDB_LV.TEMP)
-- scorro le curve del percorso utensile
local nId = EgtGetFirstInGroup( nTPathGrpId)
while nId do
local bOk = CreateSolidFromCurve( nId, nSolidGrpId, LayerParams, nLayer)
nId = EgtGetNext( nId)
-- scorro le curve del percorso utensile per creare i solidi
local vIds = EgtGetAllInGroup( nTPathGrpId)
if LayerParams.bSpiralVase and #vIds > 2 then
-- nel caso a spirale gestione speciale per unire i tratti dei primi layers che sono stati spezzati per feed variabile
local bHasDelta = EgtExistsInfo( vIds[#vIds], KEY_FEED_COEFF)
if bHasDelta then
-- prima curva è a quota costante
CreateSolidFromCurve( vIds[1], nSolidGrpId, LayerParams, nLayer)
-- le rimanenti curve possono essere unite
local vNewIds = EgtTableFill( vIds[2], #vIds-1)
local nNewCrv = EgtCurveCompo( nSolidGrpId, vNewIds, false)
local dStrand = EgtGetInfo( vIds[2], KEY_CRV_STRAND, 'd') or LayerParams.dStrand
EgtSetInfo( nNewCrv, KEY_CRV_STRAND, dStrand)
EgtSetInfo( nNewCrv, KEY_TYPE, TYPE.OUTER_SHELL)
CreateSolidFromCurve( nNewCrv, nSolidGrpId, LayerParams, nLayer)
EgtErase( nNewCrv)
else
local vNewIds = EgtTableFill( vIds[1], #vIds-1)
local nNewCrv = EgtCurveCompo( nSolidGrpId, vNewIds, false)
local dStrand = EgtGetInfo( vIds[2], KEY_CRV_STRAND, 'd') or LayerParams.dStrand
EgtSetInfo( nNewCrv, KEY_CRV_STRAND, dStrand)
EgtSetInfo( nNewCrv, KEY_TYPE, TYPE.OUTER_SHELL)
CreateSolidFromCurve( nNewCrv, nSolidGrpId, LayerParams, nLayer)
EgtErase( nNewCrv)
CreateSolidFromCurve( vIds[#vIds], nSolidGrpId, LayerParams, nLayer)
end
else
-- caso standard
for i = 1, #vIds do
CreateSolidFromCurve( vIds[i], nSolidGrpId, LayerParams, nLayer)
end
end
else
bSolidsOk = true
break
LuaLibs/RunMachParamFromSWCalc.lua
+18 -4
View File
@@ -53,6 +53,8 @@ function RunMachParamFromSWCalc.Exec()
local sMachIni = EgtGetCurrMachineDir() .. '\\' .. EgtGetCurrMachineName() .. '.ini'
local dSMin = tonumber( EgtGetStringFromIni( SEC_3DPRINTING, KEY_SPEED_MIN, 0, sMachIni))
local dSMax = tonumber( EgtGetStringFromIni( SEC_3DPRINTING, KEY_SPEED_MAX, 50000, sMachIni))
-- recupero Feed massima dalla macchina
local dFLimit = tonumber( EgtGetStringFromIni( SEC_3DPRINTING, KEY_FEED_MAX, 10000, sMachIni))
-- massa materiale utilizzato
local dPrintMass = 0
-- massimo indice di layer calcolato
@@ -219,10 +221,22 @@ function RunMachParamFromSWCalc.Exec()
local CurrWidth = LengthCrvList[nWidthIndex]
local CurrFeed = EgtIf( CurrWidth.Width > 0, dLayerFeed * dStrandMean / CurrWidth.Width, dLayerFeed)
for nCurveIdIndex = 1, #CurrWidth.IdList do
EgtSetInfo( CurrWidth.IdList[nCurveIdIndex], KEY_FEED, CurrFeed)
end
if CurrFeed > dFeedMax then
dFeedMax = CurrFeed
local dNewFeed = CurrFeed
-- verifico se coefficiente moltiplicativo per feed
local dCoeff = EgtGetInfo( CurrWidth.IdList[nCurveIdIndex], KEY_FEED_COEFF, 'd')
if dCoeff then
dNewFeed = dCoeff * CurrFeed
if dNewFeed > dFLimit then
local dNewSpeed = dSpeed * dFLimit / dNewFeed
dNewSpeed = EgtClamp( dNewSpeed, dSMin, dSMax)
dNewFeed = dFLimit
EgtSetInfo( CurrWidth.IdList[nCurveIdIndex], KEY_SPEED, dNewSpeed)
end
end
EgtSetInfo( CurrWidth.IdList[nCurveIdIndex], KEY_FEED, dNewFeed)
if dNewFeed > dFeedMax then
dFeedMax = dNewFeed
end
end
end
-- scrivo info speed in group toolpath
Version.lua
+1 -1
View File
@@ -1,4 +1,4 @@
-- Version.lua by Egaltech s.r.l. 2024/05/06
-- Gestione della versione di 3dPrinting
VERSION = '2.7a1'
VERSION = '2.7d1'