DataBeam :
- in ProcessCut si torna alla vecchia versione per scegliere se fare i cubetti (è più sicura).
This commit is contained in:
+9
-10
@@ -320,9 +320,7 @@ local function MakeFromTop( sCutting, Proc, nPhase, nRawId, nPartId, dOvmHead, b
|
||||
-- verifico se necessari tagli supplementari
|
||||
EgtOutLog( string.format( 'MaxDepth=%.1f MaxVertDepth=%.1f CutH=%.1f CutV=%.1f', dMaxDepth, dMaxVertDepth, dCutH, dCutV), 3)
|
||||
local vCuts = {}
|
||||
if not Proc.AdvTail and
|
||||
( ( dCutH > dMaxDepth - BD.CUT_EXTRA - 3 * BD.COLL_SIC or dCutV > BD.MAX_LEN_DICE) and
|
||||
( dCutV > dMaxVertDepth - BD.CUT_EXTRA - 3 * BD.COLL_SIC or bDownCut or dCutH > BD.MAX_LEN_DICE)) then
|
||||
if not Proc.AdvTail and ( dCutH > dMaxDepth - BD.CUT_EXTRA - 3 * BD.COLL_SIC or dCutV > dMaxVertDepth - BD.CUT_EXTRA - 3 * BD.COLL_SIC) then
|
||||
local ptExtra, vtExtra
|
||||
local bAutoCalcSurf = true
|
||||
if bFillAreaPiece or bFillTail then
|
||||
@@ -456,6 +454,13 @@ local function MakeFromTop( sCutting, Proc, nPhase, nRawId, nPartId, dOvmHead, b
|
||||
end
|
||||
-- altrimenti tagli diretti della faccia
|
||||
else
|
||||
-- impostazioni
|
||||
local dVzLimDwnUp = dNzLimDwnUp
|
||||
local dCutExtra = BD.CUT_EXTRA
|
||||
if Proc.AdvTail then
|
||||
if bHorizCut then dVzLimDwnUp = 0 end
|
||||
dCutExtra = -BD.ADVANCE_TAIL_OFFS
|
||||
end
|
||||
-- lavoro la faccia
|
||||
local vtOrthoO
|
||||
if bFromBottom and dCutV < dMaxVertDepth - BD.CUT_EXTRA and vtN:getZ() > 0 then
|
||||
@@ -469,7 +474,7 @@ local function MakeFromTop( sCutting, Proc, nPhase, nRawId, nPartId, dOvmHead, b
|
||||
else
|
||||
vtOrthoO = -X_AX()
|
||||
end
|
||||
elseif vtN:getZ() < dNzLimDwnUp and abs( vtN:getY()) > 0.259 and abs( vtN:getY()) > abs( vtN:getZ()) and dCutH < dMaxDepth + 10 * GEO.EPS_SMALL then
|
||||
elseif vtN:getZ() < dVzLimDwnUp and abs( vtN:getY()) > 0.259 and abs( vtN:getY()) > abs( vtN:getZ()) and dCutH < dMaxDepth + 10 * GEO.EPS_SMALL then
|
||||
if Proc.Head then
|
||||
vtOrthoO = X_AX()
|
||||
else
|
||||
@@ -481,12 +486,6 @@ local function MakeFromTop( sCutting, Proc, nPhase, nRawId, nPartId, dOvmHead, b
|
||||
vtOrthoO = EgtIf( vtN:getY() > 0.02, Y_AX(), -Y_AX())
|
||||
end
|
||||
-- taglio
|
||||
local dVzLimDwnUp = dNzLimDwnUp
|
||||
local dCutExtra = BD.CUT_EXTRA
|
||||
if Proc.AdvTail then
|
||||
if bHorizCut then dVzLimDwnUp = 0 end
|
||||
dCutExtra = -BD.ADVANCE_TAIL_OFFS
|
||||
end
|
||||
local bOk, sErr = Fbs.MakeOne( Proc.Id, 0, sCutting, dSawDiam, vtOrthoO, dVzLimDwnUp, dCutExtra, BD.CUT_SIC, 0, 0, 0, nil, b3Raw)
|
||||
if not bOk then
|
||||
return bOk, sErr
|
||||
|
||||
Reference in New Issue
Block a user