From b150c75e968db87fb891da0403e5b3f498e6b6d3 Mon Sep 17 00:00:00 2001 From: "luca.mazzoleni" Date: Wed, 15 May 2024 17:08:50 +0200 Subject: [PATCH] =?UTF-8?q?-=20in=20MachiningLib=20->=20FindMachining=20si?= =?UTF-8?q?=20considera=20ottimizzazione=20teste=20solo=20per=20macchine?= =?UTF-8?q?=20tipo=20PF=20e=20non=20pi=C3=B9=20per=20macchine=20tipo=20PF1?= =?UTF-8?q?250=20-=20in=20SawPlusChain=20varie=20migliorie?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LuaLibs/MachiningLib.lua | 8 ++--- LuaLibs/ProcessLapJoint.lua | 70 +++++++++++++++++++++++++++++++++---- 2 files changed, 68 insertions(+), 10 deletions(-) diff --git a/LuaLibs/MachiningLib.lua b/LuaLibs/MachiningLib.lua index f013fe2..ed176f6 100644 --- a/LuaLibs/MachiningLib.lua +++ b/LuaLibs/MachiningLib.lua @@ -356,16 +356,16 @@ local function FindMachining( MachiningType, sType, Params, bTopHead, bDownHead, end if ( BEAM and BEAM.BW) or MachineHeadType == ONE_HEAD or MachineHeadType == TWO_EQUAL_HEADS or ( MachineHeadType == TWO_UP_DOWN_HEADS and not bDownHead) then _, sType = EgtEndsWith( sType, '_H2') - elseif ( not BEAM or not BEAM.BW) and MachineHeadType == TWO_UP_DOWN_HEADS and bDownHead then + elseif not ( BEAM and BEAM.BW) and MachineHeadType == TWO_UP_DOWN_HEADS and bDownHead then if not EgtEndsWith( sType, '_H2') then sType = sType .. '_H2' end end local MachineHeadUse = MachineHeadType - if not BEAM or not BEAM.BW then + if not ( BEAM and BEAM.BW) and MachineHeadUse == TWO_EQUAL_HEADS then MachineHeadUse = ONE_HEAD end - if BEAM and BEAM.BW and MachineHeadUse == TWO_UP_DOWN_HEADS and bTopHead and bDownHead then + if MachineHeadUse == TWO_UP_DOWN_HEADS and bTopHead and bDownHead then -- se posso usare entrambe le teste, la gestisco come una macchina a due teste da sopra MachineHeadUse = TWO_EQUAL_HEADS end @@ -374,7 +374,7 @@ local function FindMachining( MachiningType, sType, Params, bTopHead, bDownHead, for i = ForStart, ForEnd, ForStep do local Machining = Machinings[i] local sMachiningType = Machining.Type - if BEAM and BEAM.BW then + if ( BEAM and BEAM.BW) or MachineHeadUse == TWO_EQUAL_HEADS then _, sMachiningType = EgtEndsWith( Machining.Type, '_H2') end -- recupero dati utensile diff --git a/LuaLibs/ProcessLapJoint.lua b/LuaLibs/ProcessLapJoint.lua index 482050e..ec55bd7 100644 --- a/LuaLibs/ProcessLapJoint.lua +++ b/LuaLibs/ProcessLapJoint.lua @@ -4681,6 +4681,7 @@ function SawPlusChain.GetTunnelFaces( Proc) if TunnelAddedFaces.MiddleFaceTm.Height > TunnelAddedFaces.MiddleFaceTm.Width then TunnelAddedFaces.MiddleFaceTm.Height, TunnelAddedFaces.MiddleFaceTm.Width = TunnelAddedFaces.MiddleFaceTm.Width, TunnelAddedFaces.MiddleFaceTm.Height end + TunnelAddedFaces.MiddleFaceTm.Type = 'Tunnel' return TunnelAddedFaces end @@ -4712,6 +4713,7 @@ function SawPlusChain.GetBottomFace( Proc) end BottomFace.Id = nBottomFace + BottomFace.Type = 'Bottom' BottomFace.Width = Proc.Face[nBottomFace + 1].Width BottomFace.Height = Proc.Face[nBottomFace + 1].Height BottomFace.Elevation = Proc.Face[nBottomFace + 1].Elevation @@ -4725,6 +4727,7 @@ end function SawPlusChain.GetLongFace( Proc) + local LongFace = {} if not Proc.MainFaces.BottomFace or not Proc.MainFaces.BottomFace.Id then Proc.MainFaces.BottomFace = SawPlusChain.GetBottomFace( Proc) end @@ -4746,10 +4749,10 @@ function SawPlusChain.GetLongFace( Proc) end -- si sceglie la più grande (tunnel) o quella adiacente sul lato lungo - local LongFace = {} LongFace.Id = FacesToAnalyze[1].Id for i = 1, Proc.Fct do if LongFace.Id == Proc.Face[i].Id then + LongFace.Type = 'Long' LongFace.Width = Proc.Face[i].Width LongFace.Height = Proc.Face[i].Height LongFace.Elevation = Proc.Face[i].Elevation @@ -4760,8 +4763,6 @@ function SawPlusChain.GetLongFace( Proc) end end - LongFace.Edges = SawPlusChain.GetLongFaceEdges( Proc, LongFace) - return LongFace end @@ -4799,6 +4800,7 @@ function SawPlusChain.GetSideFaces( Proc) ( bIsLongFaceTheLargest and i > 2) then table.insert( SideFaces, FacesToAnalyze[i]) SideFaces[#SideFaces].Id = FacesToAnalyze[i].Id + SideFaces[#SideFaces].Type = 'Side' SideFaces[#SideFaces].Width = Proc.Face[FacesToAnalyze[i].Id + 1].Width SideFaces[#SideFaces].Height = Proc.Face[FacesToAnalyze[i].Id + 1].Height SideFaces[#SideFaces].Elevation = Proc.Face[FacesToAnalyze[i].Id + 1].Elevation @@ -4813,6 +4815,51 @@ function SawPlusChain.GetSideFaces( Proc) end +function SawPlusChain.GetBottomFaceEdges( Proc, Face) + local Edges = {} + Edges.SideEdges = {} + Edges.LongEdges = {} + + local nFaceType, vEdges = EgtSurfTmGetFacetOutlineInfo( Proc.Id, Face.Id, GDB_ID.ROOT) + if nFaceType < 1 then + for j = 1, #vEdges do + local nPreviousEdgeIndex = j - 1 + if j == 1 then + nPreviousEdgeIndex = #vEdges + end + local nNextEdgeIndex = j + 1 + if j == #vEdges then + nNextEdgeIndex = 1 + end + + local CurrentEdge = {} + CurrentEdge.AdjacentFaceId = vEdges[j].Adj + CurrentEdge.ToolDirection = Vector3d( vEdges[j].Norm) + CurrentEdge.Length = vEdges[j].Len + CurrentEdge.Elevation = vEdges[j].Elev + CurrentEdge.IsOpen = vEdges[j].Open + CurrentEdge.IsStartOpen = ( vEdges[nPreviousEdgeIndex].Open) + CurrentEdge.IsEndOpen = ( vEdges[nNextEdgeIndex].Open) + + if CurrentEdge.AdjacentFaceId == Proc.MainFaces.LongFace.Id then + table.insert( Edges.LongEdges, CurrentEdge) + Edges.LongEdges[#Edges.LongEdges].Type = 'Long' + elseif vEdges[nNextEdgeIndex].Adj == Proc.MainFaces.LongFace.Id or vEdges[nPreviousEdgeIndex].Adj == Proc.MainFaces.LongFace.Id then + table.insert( Edges.SideEdges, CurrentEdge) + Edges.SideEdges[#Edges.SideEdges].Type = 'Side' + else + table.insert( Edges.LongEdges, CurrentEdge) + Edges.LongEdges[#Edges.LongEdges].Type = 'Long' + end + end + else + error( 'Face with closed hole') + end + + return Edges +end + + function SawPlusChain.GetLongFaceEdges( Proc, Face) local Edges = {} Edges.SideEdges = {} @@ -4857,6 +4904,7 @@ function SawPlusChain.GetLongFaceEdges( Proc, Face) Edges.SideEdges.EndEdge.Type = 'Side' else table.insert( Edges.OppositeEdges, CurrentEdge) + Edges.OppositeEdges[#Edges.OppositeEdges].Type = 'Opposite' end end end @@ -5084,7 +5132,11 @@ function SawPlusChain.Saw.CalculateMachiningParameters( Proc, FaceToMachine, Edg if Proc.Topology == 'Tunnel' then dPocketHeight = Proc.MainFaces.TunnelAddedFaces.MiddleFaceTm.Height else - dPocketHeight = Proc.MainFaces.BottomFace.Height + if FaceToMachine.Type == 'Long' then + dPocketHeight = Proc.MainFaces.BottomFace.Edges.SideEdges[1].Length + elseif FaceToMachine.Type == 'Side' then + dPocketHeight = Proc.MainFaces.BottomFace.Edges.LongEdges[1].Length + end end -- ricerca lavorazione @@ -5254,8 +5306,11 @@ function SawPlusChain.Chainsaw.CalculateMachiningParameters( Proc, FaceToMachine if Proc.Topology == 'Tunnel' then dPocketHeight = Proc.MainFaces.TunnelAddedFaces.MiddleFaceTm.Height else - -- TODO qui non va bene, sostituire con la lunghezza del lato della BottomFace corrispondente alla faccia lavorata - dPocketHeight = Proc.MainFaces.BottomFace.Height + if FaceToMachine.Type == 'Long' then + dPocketHeight = Proc.MainFaces.BottomFace.Edges.SideEdges[1].Length + elseif FaceToMachine.Type == 'Side' then + dPocketHeight = Proc.MainFaces.BottomFace.Edges.LongEdges[1].Length + end end -- ricerca lavorazione @@ -5447,7 +5502,10 @@ function SawPlusChain.Make( bOnlySaw, Proc, nRawId) Proc.MainFaces.SideFaces = SawPlusChain.GetSideFaces( Proc) if Proc.Topology == 'Tunnel' then Proc.MainFaces.TunnelAddedFaces = SawPlusChain.GetTunnelFaces( Proc) + else + Proc.MainFaces.BottomFace.Edges = SawPlusChain.GetBottomFaceEdges( Proc, Proc.MainFaces.BottomFace) end + Proc.MainFaces.LongFace.Edges = SawPlusChain.GetLongFaceEdges( Proc, Proc.MainFaces.LongFace) -- lama -- lavorazione di lama - fondo della tasca o fino a massimo materiale se tunnel