diff --git a/LuaLibs/BeamLib.lua b/LuaLibs/BeamLib.lua index 0db287b..ff23201 100644 --- a/LuaLibs/BeamLib.lua +++ b/LuaLibs/BeamLib.lua @@ -249,7 +249,7 @@ function BeamLib.CreateOrEmptyAddGroup( PartId) -- assegno nome, flag di layer per gruppo di lavoro e colore EgtSetName( AddGrpId, sMchGrp) EgtSetInfo( AddGrpId, GDB_SI.MGRPONLY, EgtGetCurrMachGroup()) - EgtSetColor( AddGrpId, Color3d( 80, 160, 160, 50)) + EgtSetColor( AddGrpId, Color3d( 80, 160, 160, 25)) return true end diff --git a/LuaLibs/DiceCut.lua b/LuaLibs/DiceCut.lua index bc44324..1d4f298 100644 --- a/LuaLibs/DiceCut.lua +++ b/LuaLibs/DiceCut.lua @@ -72,7 +72,7 @@ local function GetParallelPlanes( nAddGrpId, b3BoxDicing, ptC, vtN, nCopyPlane, end if nFacet > 0 and EgtSurfArea(SurfId) > AreaMin then table.insert( TabellaTmSurfParallel, SurfId) - EgtSetColor( SurfId, Color) + --EgtSetColor( SurfId, Color) else EgtErase( SurfId) end @@ -297,7 +297,7 @@ local function VerifyFirstOrthoCut( CutTable, dOffsetParallel, b3BoxDicing, dMin if dLongSize <= dOffsetParallel + 1.0 and vtN1:getZ() > dMinNzDownUp then local nAddGrpId = EgtGetParent( Cut1Id) local SurfId = EgtSurfTmBySewing( nAddGrpId, { Cut1Id, Cut2Id}) - EgtSetColor( SurfId, Color3d( FUCHSIA(), 60)) + --EgtSetColor( SurfId, Color3d( FUCHSIA(), 60)) EgtErase( CutOId) table.remove( CutTable[1], 1) table.remove( CutTable[2], 1) diff --git a/Strategies/Standard/TAILCUT/TAILCUT.lua b/Strategies/Standard/TAILCUT/TAILCUT.lua index f1776d4..963ae8c 100644 --- a/Strategies/Standard/TAILCUT/TAILCUT.lua +++ b/Strategies/Standard/TAILCUT/TAILCUT.lua @@ -86,11 +86,13 @@ function TAILCUT.Make( bAddMachining, Proc, Part, CustomParameters) if not bExecutePrecutOnly then local OptionalParameters = {} - -- definizione box da cubettare + + -- eventuale grezzo custom per dicing (grezzo attuale + grezzo di coda) local nNextRawId = EgtGetNextRawPart( Part.idRaw) - -- cerco grezzo successivo che sia nella fase if nNextRawId then - OptionalParameters.b3BoxDicing = EgtGetRawPartBBox( nNextRawId) + local b3BoxDicing = EgtGetRawPartBBox( nNextRawId) + b3BoxDicing:Add( Part.b3Raw) + OptionalParameters.b3BoxDicing = b3BoxDicing end OptionalParameters.dMaxWasteVolume = Strategy.Parameters.dMaxWasteVolume diff --git a/StrategyLibs/FACEBYBLADE.lua b/StrategyLibs/FACEBYBLADE.lua index d4e7f99..fba2585 100644 --- a/StrategyLibs/FACEBYBLADE.lua +++ b/StrategyLibs/FACEBYBLADE.lua @@ -21,7 +21,7 @@ local function GetLeadInOutType( Machining) if TOOLS[Machining.nToolIndex].SetupInfo.HeadType.bTop then if abs( Machining.vtToolDirection:getX()) < 0.7 then if Machining.vtToolDirection:getZ() > -0.087 - or abs( Machining.vtToolDirection:getX()) < 0.34202 then + or ( abs( Machining.vtToolDirection:getX()) < 0.34202 and abs( Machining.vtToolDirection:getZ()) < 0.7) then sLeadInOutType = 'Perpendicular' else sLeadInOutType = 'Tangent' @@ -36,7 +36,7 @@ local function GetLeadInOutType( Machining) elseif TOOLS[Machining.nToolIndex].SetupInfo.HeadType.bBottom then if abs( Machining.vtToolDirection:getX()) < 0.7 then if Machining.vtToolDirection:getZ() < -GEO.EPS_SMALL - or abs( Machining.vtToolDirection:getX()) < 0.34202 then + or ( abs( Machining.vtToolDirection:getX()) < 0.34202 and abs( Machining.vtToolDirection:getZ()) < 0.7) then sLeadInOutType = 'Perpendicular' else sLeadInOutType = 'Tangent'