diff --git a/Saomad-KAIROS.mlde b/Saomad-KAIROS.mlde index 006fad3..fa38c4c 100644 --- a/Saomad-KAIROS.mlde +++ b/Saomad-KAIROS.mlde @@ -7,7 +7,7 @@ -- Corretto calcolo valori per feed assi require( 'EmtGenerator') -EgtEnableDebug( true) +EgtEnableDebug( false) PP_VER = '2.7l3_DEV1' MIN_MACH_VER = '2.7l2' diff --git a/Saomad-KAIROS.mlse b/Saomad-KAIROS.mlse index fa296c5..455a3bb 100644 --- a/Saomad-KAIROS.mlse +++ b/Saomad-KAIROS.mlse @@ -626,7 +626,7 @@ function SpecApplyPath( bPreSplit, bSplitting, bPreCut, bCutting, bUnload, bPreR if IsConsistentClamping( EMC.X1DELTA, dX1DeltaCurrMach) and IsConsistentClamping( EMC.X2DELTA, dX2DeltaCurrMach) then -- se entrambe le morse in presa if EMC.X1DELTA and EMC.X2DELTA then - if ( ( EMC.X1DELTA - dX1DeltaCurrMach) > 0 - 100 * GEO.EPS_SMALL and ( dX1DeltaCurrMach - EMC.X1DELTA) < 1500 or + if ( ( EMC.X1DELTA - dX1DeltaCurrMach) > 0 - 100 * GEO.EPS_SMALL and ( dX1DeltaCurrMach - EMC.X1DELTA) < 1500 and ( EMC.X2DELTA - dX2DeltaCurrMach) < 0 + 100 * GEO.EPS_SMALL and ( EMC.X2DELTA - dX2DeltaCurrMach) < 1500) and ( ( max( dX1DeltaCurrMach, EMC.X1DELTA) - min( dX2DeltaCurrMach, EMC.X2DELTA)) < 3000) then dDistFront = EMC.DISTFRONT @@ -661,10 +661,8 @@ function SpecApplyPath( bPreSplit, bSplitting, bPreCut, bCutting, bUnload, bPreR if IsConsistentClamping( dX1DeltaCurrMach, dNextNewX1Delta) and IsConsistentClamping( dX2DeltaCurrMach, dNextNewX2Delta) then -- se entrambe le morse in presa if dX1DeltaCurrMach and dX2DeltaCurrMach then - if ( ( dX1DeltaCurrMach - dNextNewX1Delta) < 0 + 100 * GEO.EPS_SMALL and ( dNextNewX1Delta - dX1DeltaCurrMach) < 1500 or - ( dX2DeltaCurrMach - dNextNewX2Delta) > 0 - 100 * GEO.EPS_SMALL and ( dX2DeltaCurrMach - dNextNewX2Delta) < 1500) - and ( ( max( dX1DeltaCurrMach, dNextNewX1Delta) - min( dX2DeltaCurrMach - dNextNewX2Delta)) < 3000) then - dDistFront = max( dDistFront, dNextDistFront) + if ( ( max( dX1DeltaCurrMach, dNextNewX1Delta) - min( dX2DeltaCurrMach, dNextNewX2Delta)) < 3000) then + dDistFront = min( dDistFront, dNextDistFront) dDistBack = min( dDistBack, dNextDistBack) bUseSameClampingConfig = true else @@ -990,9 +988,9 @@ function SpecCalcEncumbrance( vtTool, vtArm, vtAux, ptMin, ptMax, bSaw, bChain, elseif vtTool:getX() > -0.707 then dHeadBack = 350 elseif vtTool:getX() > -0.8667 then - dHeadBack = 450 + dHeadBack = 400 else - dHeadBack = 650 + dHeadBack = 480 end else dHeadBack = 50 + 0.5 * dTDiam * sqrt( 1 - vtTool:getX() * vtTool:getX()) @@ -1006,11 +1004,11 @@ function SpecCalcEncumbrance( vtTool, vtArm, vtAux, ptMin, ptMax, bSaw, bChain, elseif ( vtTool:getX() > -0.1 and vtArm:getX() > -0.95) then dHeadBack = 180 elseif ( vtTool:getX() < -0.8) then - dHeadBack = 675 + dHeadBack = 575 elseif ( vtTool:getX() < -0.75) then - dHeadBack = 650 + dHeadBack = 550 elseif ( vtTool:getX() < -0.5) then - dHeadBack = 450 + dHeadBack = 350 end if vtTool:getX() < -0.25 then dHeadBack = dHeadBack + max( dTLen - 130, 0) * abs( vtTool:getX()) @@ -1024,14 +1022,14 @@ function SpecCalcEncumbrance( vtTool, vtArm, vtAux, ptMin, ptMax, bSaw, bChain, end if abs( vtTool:getX()) < 0.5 and abs( vtTool:getZ()) > 0.259 and dZup < 0 then if vtArm:getX() < -0.259 then - dHeadBack = 510 + dHeadBack = 410 else dHeadBack = EgtIf( vtTool:getZ() > 0.966, 160, 280) end end -- per fresature longitudinali con utensile di fianco if abs( vtTool:getX()) < 0.1 and vtTool:getZ() < 0.707 and vtArm:getX() < -0.5 then - dHeadBack = 500 + dHeadBack = 400 end -- per sega a catena di fianco if bChain and vtTool:getX() < 0.5 and vtTool:getZ() < 0.5 and vtArm:getX() < -0.5 then @@ -1059,7 +1057,7 @@ function SpecCalcEncumbrance( vtTool, vtArm, vtAux, ptMin, ptMax, bSaw, bChain, dHeadFront = EgtIf( vtArm:getX() > 0, 540, 350) elseif abs( vtTool:getZ()) < 0.26 and abs( vtTool:getX()) < 0.71 then if vtArm:getX() > 0 then - dHeadFront = 450 + dHeadFront = 350 else dHeadFront = EgtIf( vtTool:getX() < 0, 50, 90) + 0.5 * dTDiam * sqrt( 1 - vtTool:getX() * vtTool:getX()) end @@ -1086,7 +1084,7 @@ function SpecCalcEncumbrance( vtTool, vtArm, vtAux, ptMin, ptMax, bSaw, bChain, elseif vtTool:getX() < 0.8667 then dHeadFront = 450 else - dHeadFront = 650 + dHeadFront = 450 end else dHeadFront = 50 + 0.5 * dTDiam * sqrt( 1 - vtTool:getX() * vtTool:getX()) @@ -1101,10 +1099,6 @@ function SpecCalcEncumbrance( vtTool, vtArm, vtAux, ptMin, ptMax, bSaw, bChain, dHeadFront = 130 elseif ( vtTool:getX() < 0.1 and vtArm:getX() < 0.95) then dHeadFront = 180 - elseif ( vtTool:getX() > 0.8) then - dHeadFront = 675 - elseif ( vtTool:getX() > 0.75) then - dHeadFront = 650 elseif ( vtTool:getX() > 0.5) then dHeadFront = 450 end @@ -1120,14 +1114,14 @@ function SpecCalcEncumbrance( vtTool, vtArm, vtAux, ptMin, ptMax, bSaw, bChain, end if abs( vtTool:getX()) < 0.5 and abs( vtTool:getZ()) > 0.259 and dZup < 0 then if vtArm:getX() > 0.259 then - dHeadFront = 510 + dHeadFront = 410 else dHeadFront = EgtIf( vtTool:getZ() > 0.966, 160, 280) end end -- per fresature longitudinali con utensile di fianco if abs( vtTool:getX()) < 0.1 and vtTool:getZ() < 0.707 and vtArm:getX() > 0.5 then - dHeadFront = 500 + dHeadFront = 400 end -- per sega a catena di fianco if bChain and vtTool:getX() > -0.5 and vtTool:getZ() < 0.5 and vtArm:getX() > 0.5 then