Merge branch 'develop'

Beam/BeamData.lua

@@ -161,14 +161,32 @@ end
 BeamData.GetMinUnloadableRaw = GetMinUnloadableRaw
 
 ---------------------------------------------------------------------
-local function GetChainSawBlockedAxis( nInd)
-   if nInd == 1 then
-      return 'A=-90'
+local function GetBlockedAxis( sHead, nToolType, sBlockedAxis)
+   -- lama
+   if nToolType == MCH_TY.SAW_STD or nToolType == MCH_TY.SAW_FLAT then
+      return ''
+   -- sega a catena
+   elseif nToolType == MCH_TY.MORTISE_STD then
+      if sHead == 'H13' or sHead == 'H15' then
+         if sBlockedAxis == 'parallel' then
+            return 'A=0'
+         elseif sBlockedAxis == 'perpendicular' then
+            return 'A=-90'
+         end
+      else
+         return ''
+      end
+   -- fresa
+   elseif nToolType == MCH_TY.MILL_STD or nToolType == MCH_TY.MILL_NOTIP then
+      return ''
+   -- punta
+   elseif nToolType == MCH_TY.DRILL_STD or nToolType == MCH_TY.DRILL_LONG then
+      return ''
    else
-      return 'A=0'
+      return ''
    end
 end
-BeamData.GetChainSawBlockedAxis = GetChainSawBlockedAxis
+BeamData.GetBlockedAxis = GetBlockedAxis
 
 ---------------------------------------------------------------------
 local function GetChainSawInitAngs( vtN, vtO, nInd)

Essetre-ONE.mlde

@@ -40,12 +40,13 @@
 -- 2024/01/23 ver 2.6a3 Allineamento con Common ver. 2.6a3
 -- 2024/01/23 ver 2.6a4 Allineamento con Common ver. 2.6a5
 -- 2024/02/07 ver 2.6a5 Allineamento con Common ver. 2.6a6
+-- 2024/02/19 ver 2.6b1 In BeamData aggiunta funzione GetBlockedAxis che sostituisce la GetChainSawBlockedAxis.
 
 -- Intestazioni
 require( 'EmtGenerator')
 EgtEnableDebug( false)
 
-PP_VER = '2.6a5'
+PP_VER = '2.6b1'
 MIN_MACH_VER = '2.5k1'
 
 local sBaseDir = EgtGetSourceDir()