Merge branch 'master' of https://gitlab.steamware.net/egalware-machines/essetre/Essetre-FAST

Beam/BeamData.lua

@@ -176,10 +176,10 @@ BeamData.GetBlockedAxis = GetBlockedAxis
 
 ---------------------------------------------------------------------
 local function GetChainSawInitAngs( vtN, vtO, nInd)
-   if vtN:getY() > 0 and vtO:getX() > 0 then
-      return 'C=0'
-   else
+   if nInd == 1 then
       return ''
+   else
+      return EgtIf( vtN:getY() > 0, 'C=180', 'C=-180')
    end
 end
 BeamData.GetChainSawInitAngs = GetChainSawInitAngs
@@ -189,31 +189,31 @@ local function GetSetupInfo( sHead)
    local SetupInfo = {}
 
    -- dati comuni
-   SetupInfo.bIsCSymmetric = false
+   SetupInfo.bIsCSymmetrical = false
    SetupInfo.dCAxisEncumbrance = 180
    SetupInfo.bToolOnAggregate = false
 
    -- testa 5 assi da sopra
    if sHead == 'H1' then
-      SetupInfo.bIsTopHead = true
-      SetupInfo.bIsBottomHead = not SetupInfo.bIsTopHead
-      SetupInfo.dMaxNegativeAngle = sin( -45)
+      SetupInfo.HeadType = { bTop = true, bBottom = false}
+      SetupInfo.PreferredSide = {}
+      SetupInfo.dMinNz = sin( -45)
    -- lama su testa 5 assi da sopra
    elseif sHead == 'H2' then
-      SetupInfo.bIsTopHead = true
-      SetupInfo.bIsBottomHead = not SetupInfo.bIsTopHead
-      SetupInfo.dMaxNegativeAngle = sin( -45)
+      SetupInfo.HeadType = { bTop = true, bBottom = false}
+      SetupInfo.PreferredSide = {}
+      SetupInfo.dMinNz = sin( -45)
    -- motosega
    elseif sHead == 'H3' then
-      SetupInfo.bIsTopHead = true
-      SetupInfo.bIsBottomHead = not SetupInfo.bIsTopHead
-      SetupInfo.dMaxNegativeAngle = 0
+      SetupInfo.HeadType = { bTop = true, bBottom = false}
+      SetupInfo.PreferredSide = {}
+      SetupInfo.dMinNz = 0
    -- rinvio angolare 90° (considerato come fosse una testa da sotto)
    elseif sHead == 'H5' then
       SetupInfo.bToolOnAggregate = true
-      SetupInfo.bIsBottomHead = true
-      SetupInfo.bIsTopHead = not SetupInfo.bIsBottomHead
-      SetupInfo.dMaxPositiveAngle = 0
+      SetupInfo.HeadType = { bTop = false, bBottom = true}
+      SetupInfo.PreferredSide = {}
+      SetupInfo.dMaxNz = 0
    end
 
    return SetupInfo

Essetre-FAST.mlde

@@ -24,8 +24,8 @@
 require( 'EmtGenerator')
 EgtEnableDebug( false)
 
-PP_VER = '2.7b1'
-PP_NVER = '2.7.2.1'
+PP_VER = '2.7c1'
+PP_NVER = '2.7.3.1'
 MIN_MACH_VER = '2.5k1'
 MACH_NAME = 'Essetre-FAST'