Merge branch 'release/2.5d1'

Finish Release: 2.5d1

LuaLibs/WProcessDrill.lua

@@ -137,7 +137,7 @@ function WPD.RotateClassify( Proc)
    local vtExtr = EgtCurveExtrusion( AuxId, GDB_RT.GLOB)
    local ptCen = EgtCP( AuxId, GDB_RT.GLOB)
    -- se foro orizzontale con punta lunga
-   if dDiam <= WD.HOR_DRILL_DIAM + WD.DRILL_TOL and dDiam >= WD.HOR_DRILL_DIAM - WD.DRILL_TOL and vtExtr:getZ() > -0.1 and vtExtr:getZ() < 0.1 then
+   if dDiam <= ( WD.HOR_DRILL_DIAM or 35) + WD.DRILL_TOL and dDiam >= ( WD.HOR_DRILL_DIAM or 35) - WD.DRILL_TOL and vtExtr:getZ() > -0.1 and vtExtr:getZ() < 0.1 then
       -- se orientato perpendicolare ad X
       if AreSameOrOppositeVectorApprox( vtExtr, X_AX()) then
          nRot0 = 0

NestFlipAndRotate.lua

@@ -56,21 +56,22 @@ local Text = require( 'WProcessText')
 -- Carico i dati globali
 local WD = require( 'WallData')
 
+-------------------------------------------------------------------
 local function ClassifyFlip( vPartProc, b3Part)
    
    local FlipFeatureStates = {}
    local bLapJoints = false
    
    for nInd = 1, #vPartProc do
-      if LapJoint.Identify( vPartProc[nInd]) then         
+      if LapJoint.Identify( vPartProc[nInd]) then
          -- setto parametro Q 
          if vPartProc[nInd].Prc == 30 then
             EgtSetInfo( vPartProc[nInd].Id, "Q08", 1)
-            EgtSetInfo( vPartProc[nInd].Id, "Q08A", 1)           
+            EgtSetInfo( vPartProc[nInd].Id, "Q08A", 1)
          else
             EgtSetInfo( vPartProc[nInd].Id, "Q03", 1)
-            EgtSetInfo( vPartProc[nInd].Id, "Q03A", 1)   
-         end        
+            EgtSetInfo( vPartProc[nInd].Id, "Q03A", 1)
+         end
          bLapJoints = true 
          local nFlip0, nFlip1 = LapJoint.FlipClassify(vPartProc[nInd])
          if nFlip0 and nFlip1 and nFlip0 ~= nFlip1 then
@@ -80,7 +81,7 @@ local function ClassifyFlip( vPartProc, b3Part)
          local nFlip0, nFlip1 = Drill.FlipClassify(vPartProc[nInd], b3Part)
          if nFlip0 and nFlip1 and nFlip0 ~= nFlip1 then
             table.insert( FlipFeatureStates, { Flip0 = nFlip0, Flip1 = nFlip1})
-         end      
+         end
       elseif Cut.Identify( vPartProc[nInd]) then
          local nFlip0, nFlip1 = Cut.FlipClassify(vPartProc[nInd], b3Part)
          if nFlip0 and nFlip1 and nFlip0 ~= nFlip1 then
@@ -90,7 +91,7 @@ local function ClassifyFlip( vPartProc, b3Part)
          -- setto parametro Q
          if vPartProc[nInd].Prc == 12 then
             EgtSetInfo( vPartProc[nInd].Id, "Q02", 1)
-            EgtSetInfo( vPartProc[nInd].Id, "Q02A", 1)           
+            EgtSetInfo( vPartProc[nInd].Id, "Q02A", 1)
          end
          local nFlip0, nFlip1 = DoubleCut.FlipClassify(vPartProc[nInd], b3Part)
          if nFlip0 and nFlip1 and nFlip0 ~= nFlip1 then
@@ -100,7 +101,7 @@ local function ClassifyFlip( vPartProc, b3Part)
          local nFlip0, nFlip1 = SawCut.FlipClassify(vPartProc[nInd], b3Part)
          if nFlip0 and nFlip1 and nFlip0 ~= nFlip1 then
             table.insert( FlipFeatureStates, { Flip0 = nFlip0, Flip1 = nFlip1})
-         end            
+         end
       elseif FreeContour.Identify( vPartProc[nInd]) then
          local nFlip0, nFlip1 = FreeContour.FlipClassify(vPartProc[nInd], b3Part)
          if nFlip0 and nFlip1 and nFlip0 ~= nFlip1 then
@@ -120,19 +121,19 @@ local function ClassifyFlip( vPartProc, b3Part)
          local nFlip0, nFlip1 = Mark.FlipClassify(vPartProc[nInd], b3Part)
          if nFlip0 and nFlip1 and nFlip0 ~= nFlip1 then
             table.insert( FlipFeatureStates, { Flip0 = nFlip0, Flip1 = nFlip1})
-         end   
+         end
       elseif Text.Identify( vPartProc[nInd]) then
          local nFlip0, nFlip1 = Text.FlipClassify(vPartProc[nInd], b3Part)
          if nFlip0 and nFlip1 and nFlip0 ~= nFlip1 then
             table.insert( FlipFeatureStates, { Flip0 = nFlip0, Flip1 = nFlip1})
-         end               
+         end
       end
    end
-      
-   return FlipFeatureStates, bLapJoints     
+
+   return FlipFeatureStates, bLapJoints
 end
 
-
+-------------------------------------------------------------------
 local function ClassifyRotation( vPartProc)
    
    local RotateFeatureStates = {}
@@ -144,22 +145,21 @@ local function ClassifyRotation( vPartProc)
          end
        end
    end
-    
-   return RotateFeatureStates 
+   return RotateFeatureStates
 end
 
----
-   
+-------------------------------------------------------------------
+-------------------------------------------------------------------
 local vPartProc = WE.CollectFeatures( NFAR.PARTID)
 local b3Part = EgtGetBBoxGlob( NFAR.PARTID, GDB_BB.STANDARD)   
 local bManualFlip = EgtGetInfo( NFAR.PARTID, "MANUALFLIP", 'b')
 local bManualRot = EgtGetInfo( NFAR.PARTID, "MANUALROT", 'b')
-   
--- FLIP 
+
+-- FLIP
 local FlipFeatureStates, bLapJoints = ClassifyFlip( vPartProc, b3Part)
 
-if not bManualFlip then   
-   local bFlip 
+if not bManualFlip then
+   local bFlip
    -- analizzo stati flip delle feature
    local nFlip0Min = 100
    local nFlip0Cnt = 0
@@ -187,16 +187,16 @@ if not bManualFlip then
       elseif nFlip0Cnt < nFlip1Cnt then
          bFlip = false
       elseif bLapJoints then 
-         -- se equivalenti ma ci sono lap joints, fisso il flip per non avere problemi con le aree di lavorazione nel nesting  
-         bFlip = false 
+         -- se equivalenti ma ci sono lap joints, fisso il flip per non avere problemi con le aree di lavorazione nel nesting
+         bFlip = false
       end
    elseif nFlip0Min < nFlip1Min then
       bFlip = true
    else
-      bFlip = false 
+      bFlip = false
    end
    
-   if bFlip ~= nil then 
+   if bFlip ~= nil then
       -- se una posizione è più conveniente dell'altra setto info nel pezzo  
       EgtSetInfo( NFAR.PARTID, "NestAllowFlip", false)
       EgtSetInfo( NFAR.PARTID, "NestFlip", bFlip)
@@ -206,10 +206,10 @@ if not bManualFlip then
    
    if bFlip then
       -- flip pezzo
-      EgtRotate( NFAR.PARTID, b3Part:getCenter(), X_AX(), 180, GDB_RT.GLOB) 
+      EgtRotate( NFAR.PARTID, b3Part:getCenter(), X_AX(), 180, GDB_RT.GLOB)
       -- modifico le info del pezzo
       local nPartFlip = EgtGetInfo( NFAR.PARTID, "INVERTED", 'i') or 0
-      local nTotFlip = EgtIf( nPartFlip == 180, 0, 180)    
+      local nTotFlip = EgtIf( nPartFlip == 180, 0, 180)
       EgtSetInfo( NFAR.PARTID, "INVERTED", nTotFlip)
       EgtSetInfo( NFAR.PARTID, "FLIPROTMODIFIED", 1)
    end  
@@ -217,12 +217,12 @@ end
 
 -- rimuovo parametri Q
 local b3PartInside = BBox3d( b3Part)
-b3PartInside:expand( - WD.INSIDE_RAW_TOL)
-for nInd = 1, #vPartProc do   
+b3PartInside:expand( - ( WD.INSIDE_RAW_TOL or 30))
+for nInd = 1, #vPartProc do
    local Proc = vPartProc[nInd]
    
-   if LapJoint.Identify( Proc) then         
-      -- cerco la faccia rivolta verso l'alto e la faccia rivolta verso il basso       
+   if LapJoint.Identify( Proc) then
+      -- cerco la faccia rivolta verso l'alto e la faccia rivolta verso il basso
       local nFaceInd = -1
       local nFaceDownInd = -1 
       for nIdx = 0, Proc.Fct - 1 do
@@ -231,8 +231,8 @@ for nInd = 1, #vPartProc do
             nFaceInd = nIdx
          elseif vtN:getZ() < - 0.95 then
             nFaceDownInd = nIdx
-         end                  
-      end               
+         end
+      end
       -- se è lap joint dall'alto
       if nFaceInd ~= -1 and nFaceDownInd == -1 then 
          local ptCen = EgtSurfTmFacetCenter( Proc.Id, nFaceInd, GDB_ID.ROOT)
@@ -241,11 +241,11 @@ for nInd = 1, #vPartProc do
             -- resetto parametro Q
             if Proc.Prc == 30 then
                EgtRemoveInfo( Proc.Id, "Q08")
-               EgtRemoveInfo( Proc.Id, "Q08A")    
+               EgtRemoveInfo( Proc.Id, "Q08A")
             else
                EgtRemoveInfo( Proc.Id, "Q03")
-               EgtRemoveInfo( Proc.Id, "Q03A")   
-            end                 
+               EgtRemoveInfo( Proc.Id, "Q03A")
+            end
          end 
       end
       
@@ -264,21 +264,22 @@ for nInd = 1, #vPartProc do
                -- resetto parametro Q
                if Proc.Prc == 12 then
                   EgtRemoveInfo( Proc.Id, "Q02")
-                  EgtRemoveInfo( Proc.Id, "Q02A")    
+                  EgtRemoveInfo( Proc.Id, "Q02A")
                end
             end
          end
-      end  
-   end 
-end   
-   
-   
+      end
+   end
+end
+
+
 -- ROTATION
-nRotate = 0 
+nRotate = 0
+
 -- venatura
 EgtRemoveInfo( NFAR.PARTID, "HasGrainDirection")
 local bGrain = false 
-local sGrainInfo = EgtGetInfo( NFAR.PARTID, "GRAINDIRECTION", 's')   
+local sGrainInfo = EgtGetInfo( NFAR.PARTID, "GRAINDIRECTION", 's')
 if sGrainInfo then 
    local sGrainAlign = string.sub( sGrainInfo, 7)
    local sGrainDir = string.sub( sGrainInfo, 1, 5)
@@ -286,21 +287,21 @@ if sGrainInfo then
       EgtSetInfo( NFAR.PARTID, "HasGrainDirection", 1)
       bGrain = true 
       -- trovo la rotazione ( a meno di 180°) che deve avere il pezzo per essere allineato con la venatura del grezzo
-      local nGrainRot = 0 
+      local nGrainRot = 0
       if ( sGrainDir == "1,0,0" and not NFAR.RAW_GRAIN_DIR_X) or ( sGrainDir == "0,1,0" and NFAR.RAW_GRAIN_DIR_X) then
-         nGrainRot = 90 
+         nGrainRot = 90
       end  
       
       local nPartRot = EgtGetInfo( NFAR.PARTID, "ROTATED", 'i') or 0
       if ( nGrainRot == 0 and ( nPartRot == 90 or nPartRot == 270)) or ( nGrainRot == 90 and ( nPartRot == 0 or nPartRot == 180)) then
-         local b3Part = EgtGetBBoxGlob( NFAR.PARTID, GDB_BB.STANDARD) 
+         local b3Part = EgtGetBBoxGlob( NFAR.PARTID, GDB_BB.STANDARD)
          EgtRotate( NFAR.PARTID, b3Part:getCenter(), Z_AX(), 90, GDB_RT.GLOB)
          nRotate = 90
-      end        
+      end
    end
-end  
+end
 
-if not bManualRot then 
+if not bManualRot then
    
    local RotateFeatureStates = ClassifyRotation( vPartProc)
    
@@ -346,7 +347,7 @@ if not bManualRot then
                      { Rot = 90, Score = nRot90Min, ScoreCnt = nRot90Cnt},
                      { Rot = 180, Score = nRot180Min, ScoreCnt = nRot180Cnt},
                      { Rot = 270, Score = nRot270Min, ScoreCnt = nRot270Cnt}}
-   local nRotateOpt = 0 
+   local nRotateOpt = 0
    if #RotateFeatureStates > 0 then
       -- calcolo lato con punteggio minore o molteplicita' piu' alta
       local nRotMax = MinList[1].Rot
@@ -359,7 +360,7 @@ if not bManualRot then
             nScoreCnt = MinList[nInd].ScoreCnt
          elseif MinList[nInd].Score == nScoreMax then
             -- se punteggio > 0 conservo quello con molteplicità più alta, se punteggio = 0 conservo quello con molteplicità più bassa
-            if ( nScoreMax ~= 0 and MinList[nInd].ScoreCnt > nScoreCnt) or ( nScoreMax == 0 and MinList[nInd].ScoreCnt < nScoreCnt) then               
+            if ( nScoreMax ~= 0 and MinList[nInd].ScoreCnt > nScoreCnt) or ( nScoreMax == 0 and MinList[nInd].ScoreCnt < nScoreCnt) then
                nRotMax = MinList[nInd].Rot
                nScoreMax = MinList[nInd].Score
                nScoreCnt = MinList[nInd].ScoreCnt
@@ -369,7 +370,7 @@ if not bManualRot then
       nRotateOpt = nRotMax
    else
       nRotateOpt = 0
-   end      
+   end
    
    local bRotNest = false
    local nStepRotNest = 0
@@ -387,40 +388,40 @@ if not bManualRot then
       -- altrimenti permetto tutto
       bRotNest = true
       nStepRotNest = 90
-   end 
+   end
    
     -- verifico se ci sono fori lungo Y che bloccano la rotazione
-   local bDrillOnY = ( nStepRotNest == 180)  
+   local bDrillOnY = ( nStepRotNest == 180)
    
-   local b3Part = EgtGetBBoxGlob( NFAR.PARTID, GDB_BB.STANDARD) 
+   local b3Part = EgtGetBBoxGlob( NFAR.PARTID, GDB_BB.STANDARD)
     
-   if bGrain then       
-      -- se venatura eseguo rotazione solo se è di 180° 
-      if nRotateOpt == 180 then 
-         EgtRotate( NFAR.PARTID, b3Part:getCenter(), Z_AX(), nRotateOpt, GDB_RT.GLOB) 
+   if bGrain then
+      -- se venatura eseguo rotazione solo se è di 180°
+      if nRotateOpt == 180 then
+         EgtRotate( NFAR.PARTID, b3Part:getCenter(), Z_AX(), nRotateOpt, GDB_RT.GLOB)
          nRotate = nRotate + nRotateOpt
-      end  
-      nStepRotNest = 180 
+      end
+      nStepRotNest = 180
    else
       -- eseguo rotazione
       EgtRotate( NFAR.PARTID, b3Part:getCenter(), Z_AX(), nRotateOpt, GDB_RT.GLOB)
       nRotate = nRotate + nRotateOpt
    end
     
-   -- verifico se rotazione è valida ( pezzo contenuto nel grezzo) solo se no venatura  
-   if not bGrain then          
-      b3Part = EgtGetBBoxGlob( NFAR.PARTID, GDB_BB.STANDARD) 
+   -- verifico se rotazione è valida ( pezzo contenuto nel grezzo) solo se no venatura
+   if not bGrain then
+      b3Part = EgtGetBBoxGlob( NFAR.PARTID, GDB_BB.STANDARD)
       local bValidRotationForRaw = b3Part:getDimX() < WD.MAX_LENGTH and b3Part:getDimY() < WD.MAX_WIDTH
       local bRotatedIsValid = b3Part:getDimY() < WD.MAX_LENGTH and b3Part:getDimX() < WD.MAX_WIDTH
       if not bValidRotationForRaw and bRotatedIsValid then
          EgtRotate( NFAR.PARTID, b3Part:getCenter(), Z_AX(), 90, GDB_RT.GLOB)
-         nRotate = nRotate + 90 
-         nStepRotNest = 180 
+         nRotate = nRotate + 90
+         nStepRotNest = 180
       end
    end
       
    -- se no venatura e non ci sono fori verifico se il pezzo cade 
-   if not bGrain and not bDrillOnY then   
+   if not bGrain and not bDrillOnY then
       b3Part = EgtGetBBoxGlob( NFAR.PARTID, GDB_BB.STANDARD)
       local bValidRotation = b3Part:getDimX() > ( WD.INTRULLI or 1200)
       -- verifico se ruotata resta valida
@@ -428,22 +429,22 @@ if not bManualRot then
       -- se non è valida ma ruotato lo sarebbe, ruoto
       if not bValidRotation and bRotatedIsValid and nStepRotNest ~= 180 then
          EgtRotate( NFAR.PARTID, b3Part:getCenter(), Z_AX(), 90, GDB_RT.GLOB)
-         nRotate = nRotate + 90 
-         nStepRotNest = 180 
+         nRotate = nRotate + 90
+         nStepRotNest = 180
       elseif bValidRotation and not bRotatedIsValid then
          -- se fosse valida ma la sua ruotata no, allora blocco lo step nella rotazione del nesting
-         nStepRotNest = 180 
-      end  
+         nStepRotNest = 180
+      end
    end
    
-   -- setto info nel pezzo 
+   -- setto info nel pezzo
    if nRotate > 0 then
       local nPartRot = EgtGetInfo( NFAR.PARTID, "ROTATED", 'i') or 0
       local nTotRot = nPartRot - nRotate
       nTotRot = EgtIf( nTotRot < 0, nTotRot + 360, nTotRot)
-      EgtSetInfo( NFAR.PARTID, "ROTATED", nTotRot)  
+      EgtSetInfo( NFAR.PARTID, "ROTATED", nTotRot)
       EgtSetInfo( NFAR.PARTID, "FLIPROTMODIFIED", 1)
-   end   
+   end
    
    EgtSetInfo( NFAR.PARTID, "NestStepRot", nStepRotNest)
    EgtSetInfo( NFAR.PARTID, "NestRot", nRotate)
@@ -451,4 +452,4 @@ if not bManualRot then
 end
 
 
-NFAR.ERR = 0 
+NFAR.ERR = 0

Version.lua

@@ -1,6 +1,6 @@
--- Version.lua by Egalware s.r.l. 2023/03/08
+-- Version.lua by Egalware s.r.l. 2023/03/27
 -- Gestione della versione di Wall
 
 NAME = 'Wall'
-VERSION = '2.5c5'
+VERSION = '2.5d1'
 MIN_EXE = '2.5b3'