diff --git a/LuaLibs/AddManData.lua b/LuaLibs/AddManData.lua index 66889c5..438c9a7 100644 --- a/LuaLibs/AddManData.lua +++ b/LuaLibs/AddManData.lua @@ -68,7 +68,9 @@ KEY_LEAD_OUT_TANG_DIST= "LeadOutTangDist" KEY_LEAD_OUT_ORTHO_DIST= "LeadOutOrthoDist" KEY_OFFSET_LEAD_POINT = "OffsetLeadPoint" KEY_COASTING_LEN = "CoastingLen" +KEY_COASTING_FEED = "CoastingFeed" KEY_WIPE_LEN = "WipeLen" +KEY_WIPE_FEEDPU = "WipeFeedPu" KEY_TOOL_DIAM = "ToolDiam" TYPE = { diff --git a/LuaLibs/CalcSlices.lua b/LuaLibs/CalcSlices.lua index 3b3ac15..fa9d0a2 100644 --- a/LuaLibs/CalcSlices.lua +++ b/LuaLibs/CalcSlices.lua @@ -211,7 +211,7 @@ function CalcSlices.Exec( nPartId, nStmId, HMax) EgtSetColor( vClosedId or {}, 'TEAL') EgtSetColor( vOpenId or {}, 'RED') - -- creo flat region a partire dalle curve chiuse ottenute con lo slicing + -- creo flat region a partire dalle curve chiuse ottenute con lo slicing local nGrp = EgtGroup( nLayId, frSlicing) for i = 1, #vClosedId do EgtRelocateGlob( vClosedId[i], nGrp) diff --git a/LuaLibs/CalcSolids.lua b/LuaLibs/CalcSolids.lua index 217dabb..f8b5f34 100644 --- a/LuaLibs/CalcSolids.lua +++ b/LuaLibs/CalcSolids.lua @@ -141,7 +141,7 @@ local function CreateSolidFromCurve( nCrvId, nSolidGrp, LayerParams) for nInd = 0, nParts - 1 do local nGuideId = nId + nInd local nSrfId = CreateSolid( nGuideId, nSolidGrp, LayerParams.dStrand, LayerParams.dLayHeight, LayerParams.vtSlicing) - + if not nSrfId then -- ritento con sezione leggermente modificata nSrfId = CreateSolid( nGuideId, nSolidGrp, LayerParams.dStrand - 100 * GEO.EPS_SMALL, LayerParams.dLayHeight, LayerParams.vtSlicing) diff --git a/LuaLibs/RunSlicing.lua b/LuaLibs/RunSlicing.lua index 33650e5..7191006 100644 --- a/LuaLibs/RunSlicing.lua +++ b/LuaLibs/RunSlicing.lua @@ -1,4 +1,4 @@ --- RunSlicing.lua by Egaltech s.r.l. 2022/04/12 +-- RunSlicing.lua by Egaltech s.r.l. 2022/06/13 -- Calcoli prima fase per Stampa 3d -- Tabella per definizione modulo @@ -109,8 +109,10 @@ local function LoadParams( sFile, nPartId) SetParamInfo( sFile, nParamsGrp, DEFAULT_SECTION, KEY_LEAD_OUT_ORTHO_DIST, '0.0') SetParamInfo( sFile, nParamsGrp, DEFAULT_SECTION, KEY_OFFSET_LEAD_POINT, '0.0') - SetParamInfo( sFile, nParamsGrp, DEFAULT_SECTION, KEY_COASTING_LEN, '0.0') - SetParamInfo( sFile, nParamsGrp, DEFAULT_SECTION, KEY_WIPE_LEN, '0.0') + SetParamInfo( sFile, nParamsGrp, DEFAULT_SECTION, KEY_COASTING_LEN, '0.0') + SetParamInfo( sFile, nParamsGrp, DEFAULT_SECTION, KEY_COASTING_FEED, '20000.0') + SetParamInfo( sFile, nParamsGrp, DEFAULT_SECTION, KEY_WIPE_LEN, '0.0') + SetParamInfo( sFile, nParamsGrp, DEFAULT_SECTION, KEY_WIPE_FEEDPU, '0.9') -- recupero il punto iniziale e lo salvo tra i parametri local ptStart = Point3d( 0, 0, 0)