diff --git a/LuaLibs/ProcessHeadCut.lua b/LuaLibs/ProcessHeadCut.lua index a17856f..40e204a 100644 --- a/LuaLibs/ProcessHeadCut.lua +++ b/LuaLibs/ProcessHeadCut.lua @@ -188,7 +188,7 @@ end --------------------------------------------------------------------- -- tagli standard local function MakeStandardCuts( Proc, b3Raw, nCuts, dOffsetBetweenCuts, HeadCutType, Cutting1Data, Cutting2Data, dStartOffset, dOvmHead) - local PrecutType = { bBigSectionCut = HeadCutType.bBigSectionCut, bHorizCut = HeadCutType.bHorizCut, bDoubleHorizCut = HeadCutType.bDoubleHorizCut, bDoubleCut = HeadCutType.bDoubleCut, bNeedVerticalAddedCuts = false, bNeedHorizontalAddedCuts = false} + local PrecutType = { bBigSectionCut = HeadCutType.bBigSectionCut, bHorizCut = HeadCutType.bHorizCut, bDoubleHorizCut = HeadCutType.bDoubleHorizCut, bDoubleCut = HeadCutType.bDoubleCut, sType = 'Precut', bNeedVerticalAddedCuts = false, bNeedHorizontalAddedCuts = false} if not HeadCutType.bDoubleHorizCut then -- flag di lavorazione faccia local nOrthoOpposite = EgtIf( HeadCutType.bHorizCut, MCH_MILL_FU.ORTHO_DOWN, MCH_MILL_FU.ORTHO_FRONT) @@ -272,7 +272,7 @@ local function MakeStandardCuts( Proc, b3Raw, nCuts, dOffsetBetweenCuts, HeadCut local dAccStartDoubleCut, dAccEndDoubleCut = dAccEnd, dAccStart for i = nCuts, 1, -1 do local dCutOffset = ( i - 1) * dOffsetBetweenCuts - if i == 1 and dStartOffset then + if i == 1 and HeadCutType.sType =='Precut' then dCutOffset = dStartOffset end local bOk, sErr = Fbs.MakeOne( Proc.Id, 0, Cutting1Data.sCutting, Cutting1Data.dSawDiam, MCH_MILL_FU.ORTHO_BACK, nil, dCutExtra, BD.CUT_SIC, dCutOffset, dAccStartDoubleCut, dAccEndDoubleCut, '', b3Raw, true) @@ -287,7 +287,7 @@ local function MakeStandardCuts( Proc, b3Raw, nCuts, dOffsetBetweenCuts, HeadCut local bOk, sErr = AddVerticalPreCuts( Proc, Cutting1Data.sCutting, dCutOffset, b3Raw) if not bOk then return bOk, sErr end end - if i == 1 and dStartOffset then + if i == 1 and HeadCutType.sType =='Precut' then dCutOffset = dStartOffset end local bOk, sErr = Fbs.MakeOne( Proc.Id, 0, Cutting1Data.sCutting, Cutting1Data.dSawDiam, nOrthoOpposite, nil, dCutExtra, BD.CUT_SIC, dCutOffset, dAccStart, dAccEnd, '', b3Raw) @@ -326,7 +326,7 @@ local function MakeStandardCuts( Proc, b3Raw, nCuts, dOffsetBetweenCuts, HeadCut -- eseguo i tagli da sotto necessari for i = nCuts, 1, -1 do local dCutOffset = ( i - 1) * dOffsetBetweenCuts - if i == 1 and dStartOffset then + if i == 1 and HeadCutType.sType =='Precut' then dCutOffset = dStartOffset end local bOk, sErr = Fbs.MakeOne( Proc.Id, 0, Cutting2Data.sCutting, Cutting2Data.dSawDiam, MCH_MILL_FU.ORTHO_TOP, dVzLimDwnUp, dCutExtra2, BD.CUT_SIC, dCutOffset, dAccStart, 0, '', b3Raw, nil, true) @@ -335,7 +335,7 @@ local function MakeStandardCuts( Proc, b3Raw, nCuts, dOffsetBetweenCuts, HeadCut -- eseguo i tagli da sopra necessari for i = nCuts, 1, -1 do local dCutOffset = ( i - 1) * dOffsetBetweenCuts - if i == 1 and dStartOffset then + if i == 1 and HeadCutType.sType =='Precut' then dCutOffset = dStartOffset end -- se trave larga effettuo tagli verticali aggiuntivi diff --git a/LuaLibs/ProcessSplit.lua b/LuaLibs/ProcessSplit.lua index 634418a..cd62b83 100644 --- a/LuaLibs/ProcessSplit.lua +++ b/LuaLibs/ProcessSplit.lua @@ -458,7 +458,7 @@ local function MakeStandardCuts( Proc, b3Raw, nCuts, dOffsetBetweenCuts, TailCut local dAccStartDoubleCut, dAccEndDoubleCut = dAccEnd, dAccStart for i = nCuts, 1, -1 do local dCutOffset = ( i - 1) * dOffsetBetweenCuts - if i == 1 and dStartOffset then + if i == 1 and TailCutType.sType =='Precut' then dCutOffset = dStartOffset end local sNotes = EgtIf( TailCutType.bSplit, 'Presplit;', 'Precut;') @@ -475,7 +475,7 @@ local function MakeStandardCuts( Proc, b3Raw, nCuts, dOffsetBetweenCuts, TailCut local bOk, sErr = AddVerticalPreCuts( Proc, Cutting1Data.sCutting, dCutOffset, b3Raw, sSpecNotes) if not bOk then return bOk, sErr end end - if i == 1 and dStartOffset then + if i == 1 and TailCutType.sType =='Precut' then dCutOffset = dStartOffset end local sNotes @@ -525,7 +525,7 @@ local function MakeStandardCuts( Proc, b3Raw, nCuts, dOffsetBetweenCuts, TailCut -- eseguo i tagli da sotto necessari for i = nCuts, 1, -1 do local dCutOffset = ( i - 1) * dOffsetBetweenCuts - if i == 1 and dStartOffset then + if i == 1 and TailCutType.sType =='Precut' then dCutOffset = dStartOffset end local sNotes = EgtIf( TailCutType.bSplit, 'Presplit;', 'Precut;') @@ -535,7 +535,7 @@ local function MakeStandardCuts( Proc, b3Raw, nCuts, dOffsetBetweenCuts, TailCut -- eseguo i tagli da sopra necessari for i = nCuts, 1, -1 do local dCutOffset = ( i - 1) * dOffsetBetweenCuts - if i == 1 and dStartOffset then + if i == 1 and TailCutType.sType =='Precut' then dCutOffset = dStartOffset end -- se trave larga effettuo tagli verticali aggiuntivi