diff --git a/LuaLibs/MachiningLib.lua b/LuaLibs/MachiningLib.lua index a53f3a8..8880959 100644 --- a/LuaLibs/MachiningLib.lua +++ b/LuaLibs/MachiningLib.lua @@ -330,8 +330,11 @@ local function TestEngagement( sBladeEngagement, Parameters, OptionalParameters) return false end - -- check attacchi + -- calcolo e check attacchi + local LeadInOut = {} + local bNeedTangentLeadInOut = false + LeadInOut.Perpendicular = PreSimulationLib.CalculateLeadInOut local bOutOfStrokePerpendicular = PreSimulationLib.CheckOutOfStroke() -- TODO passare punti custom attacco perpendicolare -- attacco perpendicolare oltre le corse: si prova attacco tangenziale @@ -381,7 +384,8 @@ function MachiningLib.GetBladeEngagement( Parameters, OptionalParameters) Engagement = { sBladeEngagement = 'Standard', bMoveAfterSplit = bMoveAfterSplit, - bNeedTangentLeadInOut = bNeedTangentLeadInOut + bNeedTangentLeadInOut = bNeedTangentLeadInOut, + LeadInOut = LeadInOut } return true, Engagement end @@ -394,7 +398,8 @@ function MachiningLib.GetBladeEngagement( Parameters, OptionalParameters) Engagement = { sBladeEngagement = 'DownUp', bMoveAfterSplit = bMoveAfterSplit, - bNeedTangentLeadInOut = bNeedTangentLeadInOut + bNeedTangentLeadInOut = bNeedTangentLeadInOut, + LeadInOut = LeadInOut } return true, Engagement end diff --git a/LuaLibs/PreSimulationLib.lua b/LuaLibs/PreSimulationLib.lua index 4216b6f..a3b376d 100644 --- a/LuaLibs/PreSimulationLib.lua +++ b/LuaLibs/PreSimulationLib.lua @@ -75,6 +75,7 @@ local function GetMachiningPoints( Edge, dDepthToMachine) end ------------------------------------------------------------------------------------------------------------- +-- TODO da fare function PreSimulationLib.CheckOutOfStroke() return false diff --git a/Process.lua b/Process.lua index 448d9fc..60c7c2e 100644 --- a/Process.lua +++ b/Process.lua @@ -7,7 +7,7 @@ -- Intestazioni require( 'EgtBase') _ENV = EgtProtectGlobal() -EgtEnableDebug( false) +EgtEnableDebug( true) -- Imposto direttorio libreria specializzata per Travi EgtAddToPackagePath( BEAM.BASEDIR .. '\\LuaLibs\\?.lua') @@ -350,7 +350,7 @@ local function MyProcessFeatures() -- cancello gruppo temporaneo local idTempGroup = BeamLib.GetTempGroup() - EgtErase( idTempGroup) + --EgtErase( idTempGroup) if #sOutput > 0 then EgtOutLog( sOutput) end if nErrCnt > 0 then diff --git a/StrategyLibs/FACEBYBLADE.lua b/StrategyLibs/FACEBYBLADE.lua index 8f9e14d..4fcbbd1 100644 --- a/StrategyLibs/FACEBYBLADE.lua +++ b/StrategyLibs/FACEBYBLADE.lua @@ -81,9 +81,12 @@ local function CalculateLeadInOut( Machining, EdgeToMachine, bIsSplitFeature) local LeadIn = {} local LeadOut = {} - Machining.sLeadInOutType = '' LeadIn.dStartAddLength = 0 LeadOut.dEndAddLength = 0 + + + -- TODO questa parte va letta da Engagement + Machining.sLeadInOutType = '' LeadIn.nType = MCH_MILL_LI.LINEAR LeadOut.nType = MCH_MILL_LI.LINEAR LeadIn.dPerpDistance = 0 @@ -120,6 +123,10 @@ local function CalculateLeadInOut( Machining, EdgeToMachine, bIsSplitFeature) LeadOut.dElevation = 0 LeadIn.dCompLength = 0 LeadOut.dCompLength = 0 + + -- TODO fine parte letta da Engagement + + if Machining.bIsStartClosed and Machining.bIsEndClosed then LeadIn.dStartAddLength = -dToolMarkLength LeadOut.dEndAddLength = -dToolMarkLength