Merge branch 'develop'

LuaLibs/BeamExec.lua

@@ -2653,43 +2653,17 @@ function BeamExec.ProcessAlternatives( PARTS)
    end
 
    -- passaggio info a interfaccia da scrivere sul pezzo
-   local function IsStateInAlternativesNest2D( sState)
-      for _, v in ipairs( AlternativesNest2D) do
-         if v == sState then
-            return true
-         end
-      end
-      return false
-   end
    BEAM.INFONGEPART = {}
-   local States = {
-      "1000",
-      "0100",
-      "0010",
-      "0001",
-      "1000_INV",
-      "0100_INV",
-      "0010_INV",
-      "0001_INV",
-   }
-   for i = 1, #States do
-      local sState = States[i]
-      if IsStateInAlternativesNest2D( sState) then
-         if PARTS[nPart].HeadcutInfo then
-            local HeadcutInfo = PARTS[nPart].HeadcutInfo[sState]
-            local sOffsetX = table.concat( HeadcutInfo.OffsetX, ',')
-            local sVtN = ( tostring( HeadcutInfo.vtN)):gsub("^%(", ""):gsub("%)$", "")
-            table.insert( BEAM.INFONGEPART, 'ALT' .. sState.. '_H' .. '=' .. sOffsetX .. ';' .. sVtN )
-         end
-         if PARTS[nPart].TailcutInfo then
-            local TailCutInfo = PARTS[nPart].TailcutInfo[sState]
-            local sOffsetX = table.concat( TailCutInfo.OffsetX, ',')
-            local sVtN = ( tostring( TailCutInfo.vtN)):gsub("^%(", ""):gsub("%)$", "")
-            table.insert( BEAM.INFONGEPART, 'ALT' .. sState .. '_T' .. '=' .. sOffsetX .. ';' .. sVtN)
-         end
-      else
-         table.insert( BEAM.INFONGEPART, 'ALT' .. sState.. '_H' .. '= ')
-         table.insert( BEAM.INFONGEPART, 'ALT' .. sState.. '_T' .. '= ')
+   for i = 1, #AlternativesNest2D do
+      if PARTS[nPart].HeadcutInfo then
+         local sOffsetX = table.concat( PARTS[nPart].HeadcutInfo[AlternativesNest2D[i]].OffsetX, ',')
+         local sVtN = ( tostring( PARTS[nPart].HeadcutInfo[AlternativesNest2D[i]].vtN)):gsub("^%(", ""):gsub("%)$", "")
+         table.insert( BEAM.INFONGEPART, 'ALT' .. AlternativesNest2D[i].. '_H' .. '=' .. sOffsetX .. ';' .. sVtN )
+      end
+      if PARTS[nPart].TailcutInfo then
+         local sOffsetX = table.concat( PARTS[nPart].TailcutInfo[AlternativesNest2D[i]].OffsetX, ',')
+         local sVtN = ( tostring( PARTS[nPart].TailcutInfo[AlternativesNest2D[i]].vtN)):gsub("^%(", ""):gsub("%)$", "")
+         table.insert( BEAM.INFONGEPART, 'ALT' .. AlternativesNest2D[i] .. '_T' .. '=' .. sOffsetX .. ';' .. sVtN)
       end
    end
 

LuaLibs/PreSimulationLib.lua

@@ -356,11 +356,11 @@ local function CheckCollisionPoint( sAxis, ptOnToolTipCenter, vtHead, vtAux, Par
       end
    end
 
-      -- se trovata collisione con pezzo è inutile procedere con il grezzo
-      if bCollisionFoundPiece then
+   -- se trovata collisione con pezzo è inutile procedere con il grezzo
+   if bCollisionFoundPiece then
 
-         return true
-      end
+      return true
+   end
 
    -- check collisione con grezzo restante, se con il pezzo non c'è collisione e non è un taglio di testa o coda
    local bCollisionFoundRestLength = false
@@ -443,6 +443,7 @@ local function CheckCollisionWithAxis( sAxis, MachiningParameters, OptionalParam
          idAddedCollisionSurfTm = EgtSurfTmByRegionExtrusion( Part.idTempGroup, idFlangeCurve, vtExtrusion, 0.05, GDB_RT.GLOB)
       end
 
+      -- TODO raggruppare parametri opzionali!
       local bCollisionFoundPiece, bCollisionFoundRestLength = CheckCollisionPoint( sAxis, PointsOnToolTipCenter[i], vtHead, vtAux, Part, bCannotSplitRestLength, sRestLengthSideForPreSimulation, idCheckCollisionTm, idAddedCollisionSurfTm)
 
       -- se trovata collisione con pezzo è inutile controllare gli altri punti

Strategies/Standard/STR0015/STR0015.lua

@@ -858,24 +858,38 @@ function STR0015.Make( bAddMachining, Proc, Part, CustomParameters)
             CurrentMachining.LeadInForSplit.nType = MCH_MILL_LI.LINEAR
             CurrentMachining.LeadOutForSplit.nType = MCH_MILL_LI.LINEAR
             CurrentMachining.LeadInForSplit.dTangentDistance = 0
-            CurrentMachining.LeadInForSplit.dPerpDistance = TOOLS[CurrentMachining.ToolInfo.nToolIndex].dDiameter / 2 + BeamData.COLL_SIC
             CurrentMachining.LeadOutForSplit.dTangentDistance = 0
-            CurrentMachining.LeadOutForSplit.dPerpDistance = TOOLS[CurrentMachining.ToolInfo.nToolIndex].dDiameter / 2 + BeamData.COLL_SIC
+            if not ID.IsFreeContour( Proc) then
+               CurrentMachining.LeadInForSplit.dPerpDistance = TOOLS[CurrentMachining.ToolInfo.nToolIndex].dDiameter / 2 + BeamData.COLL_SIC
+               CurrentMachining.LeadOutForSplit.dPerpDistance = TOOLS[CurrentMachining.ToolInfo.nToolIndex].dDiameter / 2 + BeamData.COLL_SIC
+            end
 
-            -- sistemo il lato e la direzione di lavoro
-            if CurrentMachining.bOtherDirection then
-               CurrentMachining.bToolInvert = true
-               CurrentMachining.bInvert = EgtIf( TOOLS[CurrentMachining.ToolInfo.nToolIndex].bIsCCW, true, false)
-               CurrentMachining.nWorkside = EgtIf( TOOLS[CurrentMachining.ToolInfo.nToolIndex].bIsCCW, MCH_MILL_WS.RIGHT, MCH_MILL_WS.LEFT)
+            -- sistemo il lato e la direzione di lavoro; se FreeContour il lato è determinato dalla Feature, altrimenti dalla concordanza
+            if ID.IsFreeContour( Proc) then
+               CurrentMachining.bInvert = false
+               if Proc.nGrp == 0 then
+                  CurrentMachining.nWorkside = MCH_MILL_WS.CENTER
+               elseif Proc.nGrp == 3 then
+                  CurrentMachining.nWorkside = MCH_MILL_WS.LEFT
+               elseif Proc.nGrp == 4 then
+                  CurrentMachining.nWorkside = MCH_MILL_WS.RIGHT
+               end
             else
-               CurrentMachining.bInvert = EgtIf( TOOLS[CurrentMachining.ToolInfo.nToolIndex].bIsCCW, false, true)
-               CurrentMachining.nWorkside = EgtIf( TOOLS[CurrentMachining.ToolInfo.nToolIndex].bIsCCW, MCH_MILL_WS.RIGHT, MCH_MILL_WS.LEFT)
+               if CurrentMachining.bOtherDirection then
+                  CurrentMachining.bToolInvert = true
+                  CurrentMachining.bInvert = EgtIf( TOOLS[CurrentMachining.ToolInfo.nToolIndex].bIsCCW, true, false)
+                  CurrentMachining.nWorkside = EgtIf( TOOLS[CurrentMachining.ToolInfo.nToolIndex].bIsCCW, MCH_MILL_WS.RIGHT, MCH_MILL_WS.LEFT)
+               else
+                  CurrentMachining.bInvert = EgtIf( TOOLS[CurrentMachining.ToolInfo.nToolIndex].bIsCCW, false, true)
+                  CurrentMachining.nWorkside = EgtIf( TOOLS[CurrentMachining.ToolInfo.nToolIndex].bIsCCW, MCH_MILL_WS.RIGHT, MCH_MILL_WS.LEFT)
+               end
             end
             CurrentMachining.ptEdge1 = EgtSP( Proc.idAddAuxGeom, GDB_ID.ROOT)
             CurrentMachining.ptEdge2 = EgtEP( Proc.idAddAuxGeom, GDB_ID.ROOT)
             CurrentMachining.dEdgeLength = EgtCurveLength( Proc.idAddAuxGeom)
             CurrentMachining.vtEdgeDirection = EgtSV( Proc.idAddAuxGeom, GDB_ID.ROOT) + EgtMV( Proc.idAddAuxGeom, GDB_ID.ROOT) + EgtEV( Proc.idAddAuxGeom, GDB_ID.ROOT)
             CurrentMachining.dLengthOnX = Proc.b3Box:getDimX()
+            CurrentMachining.vtHead = CurrentMachining.vtToolDirection
 
             local MachiningToSplit = {}
             table.insert( MachiningToSplit, CurrentMachining)

StrategyLibs/BLADETOWASTE.lua

@@ -782,6 +782,8 @@ local function CutWholeWaste( Proc, Part, OptionalParameters)
 end
 
 
+-- TODO da rivedere!! Si devono creare trimesh estruse nelle direzioni normali alle due facce, unirle e poi sottrarle al solido
+-- nel modo attuale funziona solo se i cubetti sono orientati come le direzioni principali
 local function UpdateDiceRaw( idRaw, idParallelTm, idPerpendicularTm, Part, MainFace, OtherFace)
 
    -- frame solidale alla feature

Version.lua

@@ -2,5 +2,5 @@
 -- Gestione della versione di BeamNT
 
 NAME = 'BeamNT'
-VERSION = '3.1g1'
-MIN_EXE = '3.1g1'
+VERSION = '3.1g3'
+MIN_EXE = '3.1g3'