modifiche a WallExec, WallLib, FeatureTopology per allineamento Topology con Beam

LuaLibs/WFeatureTopology.lua

@@ -1,5 +1,6 @@
 -- WFeatureTopology.lua by Egaltech s.r.l. 2023/06/23
 -- Libreria per classificazione topologica feature pareti
+-- 2023/12/11 Modifiche varie per allineamento con Beam.
 
 -- Tabella per definizione modulo
 local WFeatureTopology = {}
@@ -104,11 +105,11 @@ end
 
 ---------------------------------------------------------------------
 -- restituisce un vettore contenente gli indici delle facce di Proc parallele ad una delle direzioni principali; il check varia in base alla famiglia topologica
-local function GetFacesParallelToPart( Proc, sFamily)
+local function GetFacesParallelToPart( Proc, sFamily, bIsThrough)
    local vFacesParallelToPart = {}
    for i = 0, Proc.Fct - 1 do
       local vtN = EgtSurfTmFacetNormVersor( Proc.Id, i, GDB_ID.ROOT)
-      if sFamily == 'Bevel' or sFamily == 'DoubleBevel' then
+      if sFamily == 'Rabbet' or sFamily == 'Bevel' or sFamily == 'DoubleBevel' or sFamily == 'Strip' or sFamily == 'Tunnel' or ( sFamily == 'Groove' and bIsThrough) then
          local vTriangularFaces = GetTriangularFaces( Proc)
          local bIsTriangularFace = false
          -- verifico se la faccia è triangolare
@@ -158,7 +159,13 @@ end
 
 ---------------------------------------------------------------------
 -- riconosce se Proc è una delle topologie standard e, in caso positivo, ne scrive le caratteristiche in campi specifici della Proc stessa restituendo true
-function WFeatureTopology.Classify( Proc)
+function WFeatureTopology.Classify( Proc, b3Raw)
+
+   if not Proc.AffectedFaces then Proc.AffectedFaces = WL.GetProcessAffectedFaces( Proc) end
+   if not Proc.Box or Proc.Box:isEmpty() then
+      return false
+   end
+
    local bRecognized = false
    local sFamily
    local bIsThrough
@@ -172,23 +179,31 @@ function WFeatureTopology.Classify( Proc)
    bAllAnglesConcave, bAllRightAngles = AreAllAnglesConcaveOrRight( Proc)
    local vTriangularFaces = GetTriangularFaces( Proc)
    local bIsAnyDimensionLongAsPart = IsAnyDimensionLongAsPart( Proc)
+   local vFacesWithOneAdj = WFeatureTopology.GetFacesWithGivenAdjacencyNumber( Proc, 1)
    local vFacesWithTwoAdj = WFeatureTopology.GetFacesWithGivenAdjacencyNumber( Proc, 2)
    local vFacesWithThreeAdj = WFeatureTopology.GetFacesWithGivenAdjacencyNumber( Proc, 3)
    local vFacesWithFourAdj = WFeatureTopology.GetFacesWithGivenAdjacencyNumber( Proc, 4)
+   local dRawW, dRawH, dRawL = b3Raw:getDimY(), b3Raw:getDimZ(), b3Raw:getDimX()
+   local bIsFeatureCuttingEntireSection = WL.IsFeatureCuttingEntireSection( Proc.Box, dRawW, dRawH, dRawL)
 
    if Proc.IsOutline then
       sFamily = 'OUTLINE'
    elseif Proc.Prc == 40 then
       sFamily = 'DRILLING'
+   elseif Proc.Fct == 1 and bIsAnyDimensionLongAsPart and bIsFeatureCuttingEntireSection then
+      sFamily = 'Cut'
    elseif Proc.Fct == 1 and bIsAnyDimensionLongAsPart then
       sFamily = 'Bevel'
       bIsThrough = true
    elseif Proc.Fct == 2 and bAllAnglesConcave and #vTriangularFaces == 1 then
       sFamily = 'Bevel'
       bIsThrough = false
-   elseif Proc.Fct == 2 and bAllAnglesConcave then
+   elseif Proc.Fct == 2 and bAllAnglesConcave and ( Proc.AffectedFaces.Left or Proc.AffectedFaces.Right) and ( Proc.AffectedFaces.Front or Proc.AffectedFaces.Back) then
       sFamily = 'Rabbet'
       bIsThrough = true
+   elseif Proc.Fct == 2 and bAllAnglesConcave then
+      sFamily = 'Groove'
+      bIsThrough = true
    elseif Proc.Fct == 2 and not bAllAnglesConcave and bIsAnyDimensionLongAsPart then
       sFamily = 'DoubleBevel'
       bIsThrough = true
@@ -207,11 +222,14 @@ function WFeatureTopology.Classify( Proc)
    elseif Proc.Fct == 4 and bAllAnglesConcave and #vFacesWithTwoAdj == 4 and bIsAnyDimensionLongAsPart then
       sFamily = 'Tunnel'
       bIsThrough = true
+   elseif Proc.Fct >= 4 and #vFacesWithOneAdj == 2 and bIsAnyDimensionLongAsPart then
+      sFamily = 'Strip'
+      bIsThrough = true
    elseif Proc.Fct == 5 and bAllAnglesConcave and #vFacesWithFourAdj == 1 then
       sFamily = 'Pocket'
       bIsThrough = false
    end
-   local vFacesParallelToPart = GetFacesParallelToPart( Proc, sFamily)
+   local vFacesParallelToPart = GetFacesParallelToPart( Proc, sFamily, bIsThrough)
    bIsParallel = ( #vFacesParallelToPart == Proc.Fct)
 
    if sFamily == 'OUTLINE' or sFamily == 'DRILLING' then