Egalware/databeamnew
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modifica nomi variabili secondo nuovo standard

Browse Source
This commit is contained in:
andrea.villa
2024-05-14 11:47:53 +02:00
parent 59bbf159e4
commit 30fa7c8cbd
11 changed files with 499 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LuaLibs/FaceData.lua
+42 -42
View File
@@ -15,9 +15,9 @@ function FaceData.GetAdjacencyMatrix( Proc)
local vAdj = {}
-- essendo la matrice simmetrica a diagonale nulla, ne calcolo solo la metà superiore
for i = 1, Proc.Fct do
for i = 1, Proc.nFct do
vAdj[i] = {}
for j = i + 1, Proc.Fct do
for j = i + 1, Proc.nFct do
_, _, _, vAdj[i][j] = EgtSurfTmFacetsContact( Proc.Id, i - 1, j - 1, GDB_ID.ROOT)
if not vAdj[i][j] then
vAdj[i][j] = 0
@@ -26,9 +26,9 @@ function FaceData.GetAdjacencyMatrix( Proc)
end
-- riempio di conseguenza il resto della matrice
for i = 1, Proc.Fct do
for i = 1, Proc.nFct do
vAdj[i][i] = 0
for j = i + 1, Proc.Fct do
for j = i + 1, Proc.nFct do
vAdj[j][i] = vAdj[i][j]
end
@@ -40,13 +40,13 @@ end
-- restituisce un vettore con gli indici (0 based) delle facce triangolari (o quasi) di Proc
function FaceData.GetTriangularFaces( Proc)
-- se la feature ha una sola faccia, esco subito
if Proc.Fct <= 1 then
if Proc.nFct <= 1 then
return
end
local vTriangularFaces = {}
for i = 1, Proc.Fct do
for i = 1, Proc.nFct do
if BeamLib.Is3EdgesApprox( Proc, i - 1) then
table.insert( vTriangularFaces, i - 1)
end
@@ -59,7 +59,7 @@ end
local function GetNotAdjacentFaces( Proc, idFace)
local NotAdjacentFaces = {}
for i = 1, Proc.Fct do
for i = 1, Proc.nFct do
if Proc.Faces[i].Id ~= idFace then
local bIsAdjacent = false
for j = 1, #Proc.Faces[idFace + 1].Adjacencies do
@@ -94,7 +94,7 @@ end
-- restituisce una tabella che correla numero di adiacenze e id delle facce con quello stesso numero di adiacenze
function FaceData.GetFacesByAdjacencyNumber( Proc)
-- se la feature ha una sola faccia, esco subito
if Proc.Fct <= 1 then
if Proc.nFct <= 1 then
return
end
@@ -103,7 +103,7 @@ function FaceData.GetFacesByAdjacencyNumber( Proc)
for i = 1, 10 do
FacesByAdjacencyNumber[i] = {}
end
for i = 1, Proc.Fct do
for i = 1, Proc.nFct do
table.insert( FacesByAdjacencyNumber[#Proc.Faces[i].Adjacencies], Proc.Faces[i])
end
@@ -115,7 +115,7 @@ function FaceData.GetFacesInfo( Proc, Part)
EgtOutLog( '---Faces START---')
local Faces = {}
local b3Solid = EgtGetBBoxGlob( EgtGetFirstNameInGroup( Proc.PartId, 'Box') or GDB_ID.NULL, GDB_BB.STANDARD)
local b3Solid = EgtGetBBoxGlob( EgtGetFirstNameInGroup( Proc.idPart, 'Box') or GDB_ID.NULL, GDB_BB.STANDARD)
local vAdj
if Proc.AdjacencyMatrix then
vAdj = Proc.AdjacencyMatrix
@@ -123,32 +123,32 @@ function FaceData.GetFacesInfo( Proc, Part)
vAdj = FaceData.GetAdjacencyMatrix( Proc)
end
for i = 1, Proc.Fct do
for i = 1, Proc.nFct do
-- reset colore faccia
EgtSurfTmSetFaceColor( Proc.Id, i - 1, 0)
Faces[i] = {}
Faces[i].Id = i - 1
Faces[i].PtCenter, Faces[i].VtN = EgtSurfTmFacetCenter( Proc.Id, i - 1, GDB_ID.ROOT)
if Proc.Fct < 6 then
Faces[i].ptCenter, Faces[i].vtN = EgtSurfTmFacetCenter( Proc.Id, i - 1, GDB_ID.ROOT)
if Proc.nFct < 6 then
local frHV, dFaceWidth, dFaceHeight = BeamLib.GetFaceHvRefDim( Proc.Id, i - 1, Part)
-- frame OCS faccia
Faces[i].FrameHV = frHV
Faces[i].vtFrameHV = frHV
-- larghezza OCS faccia
Faces[i].Width = dFaceWidth
Faces[i].dWidth = dFaceWidth
-- altezza OCS faccia
Faces[i].Height = dFaceHeight
Faces[i].dHeight = dFaceHeight
-- elevazione calcolata rispetto al box della parte
Faces[i].Elevation = EgtSurfTmFacetElevationInBBox( Proc.Id, i - 1, b3Solid, true, GDB_ID.ROOT)
Faces[i].dElevation = EgtSurfTmFacetElevationInBBox( Proc.Id, i - 1, b3Solid, true, GDB_ID.ROOT)
-- TODO valutare se fare un output unico alla fine o gestire log in altro modo
EgtOutLog( 'Facet ' .. Faces[i].Id .. ' of ' .. Proc.Fct - 1)
EgtOutLog( ' VtN: ' .. tostring( Faces[i].VtN))
EgtOutLog( 'Facet ' .. Faces[i].Id .. ' of ' .. Proc.nFct - 1)
EgtOutLog( ' vtN: ' .. tostring( Faces[i].vtN))
-- adiacenze della faccia
-- TODO chiamarle in modo che si capisca che sono solo gli id e non l'intero oggetto faccia
Faces[i].Adjacencies = {}
for j = 1, Proc.Fct do
for j = 1, Proc.nFct do
if vAdj[i][j] and vAdj[i][j] ~= 0 and ( i ~= j) then
table.insert( Faces[i].Adjacencies, j - 1)
if EgtGetDebugLevel() >= 3 then
@@ -170,23 +170,23 @@ local function GetTunnelFaces( Proc)
local TunnelAddedFaces = {}
-- TODO scrivere il box della parte nella Proc o fare funzione per recuperarlo
local b3Part = EgtGetBBoxGlob( EgtGetFirstNameInGroup( Proc.PartId, 'Box') or GDB_ID.NULL, GDB_BB.STANDARD)
local b3Part = EgtGetBBoxGlob( EgtGetFirstNameInGroup( Proc.idPart, 'Box') or GDB_ID.NULL, GDB_BB.STANDARD)
if not ( Proc.Topology.IsThrough and Proc.Topology.AllRightAngles and Proc.Fct < 5) then
if not ( Proc.Topology.bIsThrough and Proc.Topology.bAllRightAngles and Proc.nFct < 5) then
error( 'GetTunnelFaces : Topology not implemented')
end
-- direzione del tunnel
local vtTunnelDirection = Proc.Faces[1].VtN ^ Proc.Faces[ Proc.Faces[1].Adjacencies[1] + 1].VtN
local vtTunnelDirection = Proc.Faces[1].vtN ^ Proc.Faces[ Proc.Faces[1].Adjacencies[1] + 1].vtN
-- centro del tunnel
local frTunnel = Frame3d( Proc.Faces[1].PtCenter, vtTunnelDirection)
local frTunnel = Frame3d( Proc.Faces[1].ptCenter, vtTunnelDirection)
local b3Tunnel = EgtGetBBoxRef( Proc.Id, GDB_BB.STANDARD, frTunnel)
local ptTunnelCenter = b3Tunnel:getCenter()
ptTunnelCenter:toGlob( frTunnel)
-- recupero gruppo per geometria addizionale
local nAddGrpId = BeamLib.GetAddGroup( Proc.PartId)
local nAddGrpId = BeamLib.GetAddGroup( Proc.idPart)
if not nAddGrpId then
-- TODO gestire meglio questo errore. Non conviene creare e verificare all'inizio se il gruppo esiste?
EgtOutLog( 'Error : missing AddGroup')
@@ -197,8 +197,8 @@ local function GetTunnelFaces( Proc)
TunnelAddedFaces.MiddleFaceTm = {}
TunnelAddedFaces.MiddleFaceTm.Id = EgtSurfTmPlaneInBBox( nAddGrpId, ptTunnelCenter, vtTunnelDirection, b3Part, GDB_ID.ROOT)
-- TODO se non si riesce a costruire la faccia bisogna dare errore o semplicemente non ritornarla??
for i = 1, Proc.Fct do
EgtCutSurfTmPlane( TunnelAddedFaces.MiddleFaceTm.Id, Proc.Faces[i].PtCenter, -Proc.Faces[i].VtN, false, GDB_ID.ROOT)
for i = 1, Proc.nFct do
EgtCutSurfTmPlane( TunnelAddedFaces.MiddleFaceTm.Id, Proc.Faces[i].ptCenter, -Proc.Faces[i].vtN, false, GDB_ID.ROOT)
end
return TunnelAddedFaces
@@ -208,21 +208,21 @@ end
local function GetBottomFace( Proc)
local BottomFace = {}
if Proc.Topology.Family == 'Tunnel' then
if Proc.Topology.sFamily == 'Tunnel' then
return nil
elseif not ( Proc.Topology.Family == 'Rabbet' or Proc.Topology.Family == 'VGroove' or Proc.Topology.Family == 'Groove' or Proc.Topology.Family == 'Pocket') then
elseif not ( Proc.Topology.sFamily == 'Rabbet' or Proc.Topology.sFamily == 'VGroove' or Proc.Topology.sFamily == 'Groove' or Proc.Topology.sFamily == 'Pocket') then
error( 'GetBottomFace : Topology not implemented')
end
-- la faccia di fondo ha sempre Fct - 1 adiacenze. Se si trovano più facce di fondo si sceglie quella con minor elevazione
local FacesByAdjacencyNumber = FaceData.GetFacesByAdjacencyNumber( Proc)
if FacesByAdjacencyNumber then
local BottomFaces = FacesByAdjacencyNumber[ Proc.Fct - 1]
local BottomFaces = FacesByAdjacencyNumber[ Proc.nFct - 1]
if #BottomFaces > 1 then
local dMinElevation = GEO.INFINITO
for i = 1, #BottomFaces do
if Proc.Faces[BottomFaces[i].Id + 1].Elevation < dMinElevation then
dMinElevation = Proc.Faces[BottomFaces[i].Id + 1].Elevation
if Proc.Faces[BottomFaces[i].Id + 1].dElevation < dMinElevation then
dMinElevation = Proc.Faces[BottomFaces[i].Id + 1].dElevation
BottomFace = Proc.Faces[BottomFaces[i].Id + 1]
end
end
@@ -237,13 +237,13 @@ end
local function GetLongFaces( Proc, MainFaces)
local LongFaces = {}
if Proc.Fct > 5 then
if Proc.nFct > 5 then
error( 'GetLongFaces : Topology not implemented')
end
local idBottomFace = GDB_ID.NULL
local idTunnelMiddleFace = GDB_ID.NULL
if Proc.Topology.Family == 'Tunnel' then
if Proc.Topology.sFamily == 'Tunnel' then
if MainFaces.TunnelAddedFaces then
idTunnelMiddleFace = MainFaces.TunnelAddedFaces.MiddleFaceTm.Id
else
@@ -260,10 +260,10 @@ local function GetLongFaces( Proc, MainFaces)
end
local FacesToAnalyze = {}
for i = 1, Proc.Fct do
for i = 1, Proc.nFct do
if Proc.Faces[i].Id ~= idBottomFace then
table.insert( FacesToAnalyze, Proc.Faces[i])
if Proc.Topology.Family == 'Tunnel' then
if Proc.Topology.sFamily == 'Tunnel' then
-- TODO questo non funziona nei tunnel, da modificare
FacesToAnalyze[#FacesToAnalyze].LengthOnMainFace = GetFacesContactLength( Proc, idTunnelMiddleFace, Proc.Faces[i].Id)
else
@@ -276,7 +276,7 @@ local function GetLongFaces( Proc, MainFaces)
-- la prima faccia lunga è sempre la prima della lista
LongFaces[1] = FacesToAnalyze[1]
-- si cerca l'eventuale seconda faccia lunga, ossia quella non adiacente alla prima
if Proc.Fct > 3 then
if Proc.nFct > 3 then
local NotAdjacentFaces = GetNotAdjacentFaces(Proc, LongFaces[1].Id)
if #NotAdjacentFaces > 0 then
LongFaces[2] = NotAdjacentFaces[1]
@@ -290,12 +290,12 @@ end
local function GetSideFaces( Proc, MainFaces)
local SideFaces = {}
if Proc.Fct > 5 then
if Proc.nFct > 5 then
error( 'GetSideFaces : Topology not implemented')
end
local idBottomFace = GDB_ID.NULL
if Proc.Topology.Family ~= 'Tunnel' then
if Proc.Topology.sFamily ~= 'Tunnel' then
if MainFaces.BottomFace then
idBottomFace = MainFaces.BottomFace.Id
else
@@ -312,7 +312,7 @@ local function GetSideFaces( Proc, MainFaces)
end
for i = 1, Proc.Fct do
for i = 1, Proc.nFct do
if not idBottomFace or i ~= ( idBottomFace + 1) then
local bIsSideFace = true
for j = 1, #LongFaces do
@@ -338,9 +338,9 @@ function FaceData.GetMainFaces( Proc)
local MainFaces = {}
-- CASO 1 : Feature tipo LapJoint
if Proc.Topology.Family == 'Rabbet' or Proc.Topology.Family == 'VGroove' or Proc.Topology.Family == 'Groove' or Proc.Topology.Family == 'Pocket' or Proc.Topology.Family == 'Tunnel' then
if Proc.Topology.sFamily == 'Rabbet' or Proc.Topology.sFamily == 'VGroove' or Proc.Topology.sFamily == 'Groove' or Proc.Topology.sFamily == 'Pocket' or Proc.Topology.sFamily == 'Tunnel' then
if Proc.Topology.IsThrough and Proc.Topology.AllRightAngles and Proc.Fct < 5 then
if Proc.Topology.bIsThrough and Proc.Topology.bAllRightAngles and Proc.nFct < 5 then
MainFaces.TunnelAddedFaces = GetTunnelFaces( Proc)
end