- in FaceData si usa la funzione GetAdjacentIndices dove possibile

- in FaceData si accettano, solo per le groove-3, i MainEdges per LongFaces a 5 lati
- in FACEBYCHAINSAW modifiche per rispecchiare la direzione utensile calcolata dal Cam5 e MaxElev impostata di conseguenza; invece di usare formule si provano sempre entrambe le soluzioni BlockedAxis, per contemplare tutti i casi

LuaLibs/FaceData.lua

@@ -116,14 +116,8 @@ function FaceData.GetEdgesInfo( ProcOrId, idFace )
    local nFaceType, EdgesEgt = EgtSurfTmGetFacetOutlineInfo( Proc.id, idFace, GDB_ID.ROOT)
 
    for i = 1, #EdgesEgt do
-      local nPreviousEdgeIndex = i - 1
-      if i == 1 then
-         nPreviousEdgeIndex = #EdgesEgt
-      end
-      local nNextEdgeIndex = i + 1
-      if i == #EdgesEgt then
-         nNextEdgeIndex = 1
-      end
+
+      local nPreviousEdgeIndex, nNextEdgeIndex = BeamLib.GetAdjacentIndices( i, #EdgesEgt)
 
       -- l'elevazione si tiene sempre positiva e la normale sempre diretta verso l'interno della faccia
       -- per sapere se il lato è aperto c'è la proprietà apposita bIsOpen
@@ -143,6 +137,8 @@ function FaceData.GetEdgesInfo( ProcOrId, idFace )
       CurrentEdge.vtEdge = CurrentEdge.ptEnd - CurrentEdge.ptStart ; CurrentEdge.vtEdge:normalize()
       CurrentEdge.sType = 'Standard'
       CurrentEdge.id = i - 1
+      CurrentEdge.nPreviousEdgeIndex = nPreviousEdgeIndex
+      CurrentEdge.nNextEdgeIndex = nNextEdgeIndex
 
       -- se nella Proc ci sono le adiacenze e il lato ha adiacenza, si salva l'angolo con la faccia adiacente
       if Proc.AdjacencyMatrix then
@@ -451,14 +447,7 @@ local function GetBottomFaces( Proc)
    end
 
    for i = 1, #BottomFaces[1].Edges do
-      local nPreviousEdgeIndex = i - 1
-      if i == 1 then
-         nPreviousEdgeIndex = #BottomFaces[1].Edges
-      end
-      local nNextEdgeIndex = i + 1
-      if i == #BottomFaces[1].Edges then
-         nNextEdgeIndex = 1
-      end
+      local nPreviousEdgeIndex, nNextEdgeIndex = BeamLib.GetAdjacentIndices( i, #BottomFaces[1].Edges)
 
       local CurrentEdge = {}
       CurrentEdge.idAdjacentFace = BottomFaces[1].Edges[i].idAdjacentFace
@@ -472,6 +461,8 @@ local function GetBottomFaces( Proc)
       CurrentEdge.ptEnd = BottomFaces[1].Edges[i].ptEnd
       CurrentEdge.vtEdge = BottomFaces[1].Edges[i].vtEdge
       CurrentEdge.id = BottomFaces[1].Edges[i].id
+      CurrentEdge.nPreviousEdgeIndex = BottomFaces[1].Edges[i].nPreviousEdgeIndex
+      CurrentEdge.nNextEdgeIndex = BottomFaces[1].Edges[i].nNextEdgeIndex
 
       if nFirstLongEdgeIndex then
          if i == nFirstLongEdgeIndex then
@@ -540,8 +531,8 @@ local function GetLongFaces( Proc, MainFaces)
    for i = 1, #LongFaces do
       LongFaces[i].sType = 'Long'
 
-      -- calcolo MainEdges possibile solo se 4 lati esatti
-      if #LongFaces[i].Edges ~= 4 then
+      -- calcolo MainEdges possibile solo se 4 lati esatti e caso speciale lato opposto groove tagliato
+      if #LongFaces[i].Edges ~= 4 and not ( #LongFaces[i].Edges == 5 and Proc.Topology.sName == 'Groove-3-Through') then
          break
       end
 
@@ -550,14 +541,7 @@ local function GetLongFaces( Proc, MainFaces)
       LongFaces[i].MainEdges.OppositeEdges = {}
 
       for j = 1, #LongFaces[i].Edges do
-         local nPreviousEdgeIndex = j - 1
-         if j == 1 then
-            nPreviousEdgeIndex = #LongFaces[1].Edges
-         end
-         local nNextEdgeIndex = j + 1
-         if j == #LongFaces[i].Edges then
-            nNextEdgeIndex = 1
-         end
+         local nPreviousEdgeIndex, nNextEdgeIndex = BeamLib.GetAdjacentIndices( j, #LongFaces[i].Edges)
 
          local CurrentEdge = {}
          CurrentEdge.idAdjacentFace = LongFaces[i].Edges[j].idAdjacentFace
@@ -571,6 +555,8 @@ local function GetLongFaces( Proc, MainFaces)
          CurrentEdge.ptEnd = LongFaces[i].Edges[j].ptEnd
          CurrentEdge.vtEdge = LongFaces[i].Edges[j].vtEdge
          CurrentEdge.id = LongFaces[i].Edges[j].id
+         CurrentEdge.nPreviousEdgeIndex = LongFaces[i].Edges[j].nPreviousEdgeIndex
+         CurrentEdge.nNextEdgeIndex = LongFaces[i].Edges[j].nNextEdgeIndex
 
          if Proc.Topology.sFamily == 'Tunnel' then
             if CurrentEdge.idAdjacentFace > -1 then
@@ -596,6 +582,12 @@ local function GetLongFaces( Proc, MainFaces)
             end
          end
       end
+      -- il primo OppositeEdge deve essere sempre il più lungo, se più di uno
+      if #LongFaces[i].MainEdges.OppositeEdges > 1 then
+         if LongFaces[i].MainEdges.OppositeEdges[1].dLength < LongFaces[i].MainEdges.OppositeEdges[2].dLength - 10 * GEO.EPS_SMALL then
+            LongFaces[i].MainEdges.OppositeEdges[1], LongFaces[i].MainEdges.OppositeEdges[2] = LongFaces[i].MainEdges.OppositeEdges[2], LongFaces[i].MainEdges.OppositeEdges[1]
+         end
+      end
    end
 
    return LongFaces
@@ -650,14 +642,7 @@ local function GetSideFaces( Proc, MainFaces)
       SideFaces[i].MainEdges.OppositeEdges = {}
 
       for j = 1, #SideFaces[i].Edges do
-         local nPreviousEdgeIndex = j - 1
-         if j == 1 then
-            nPreviousEdgeIndex = #SideFaces[1].Edges
-         end
-         local nNextEdgeIndex = j + 1
-         if j == #SideFaces[i].Edges then
-            nNextEdgeIndex = 1
-         end
+         local nPreviousEdgeIndex, nNextEdgeIndex = BeamLib.GetAdjacentIndices( j, #SideFaces[i].Edges)
 
          local CurrentEdge = {}
          CurrentEdge.idAdjacentFace = SideFaces[i].Edges[j].idAdjacentFace
@@ -671,6 +656,8 @@ local function GetSideFaces( Proc, MainFaces)
          CurrentEdge.ptEnd = SideFaces[i].Edges[j].ptEnd
          CurrentEdge.vtEdge = SideFaces[i].Edges[j].vtEdge
          CurrentEdge.id = SideFaces[i].Edges[j].id
+         CurrentEdge.nPreviousEdgeIndex = SideFaces[i].Edges[j].nPreviousEdgeIndex
+         CurrentEdge.nNextEdgeIndex = SideFaces[i].Edges[j].nNextEdgeIndex
 
          if Proc.Topology.sFamily == 'Tunnel' then
             if CurrentEdge.idAdjacentFace > -1 then