DataBeam :

- migliorato ordinamento fori
- riunite FindMilling, .... in una unica libreria
- altre piccole migliorie.

LuaLibs/ProcessFreeContour.lua

@@ -12,8 +12,7 @@ EgtOutLog( ' ProcessFreeContour started', 1)
 
 -- Dati
 local BD = require( 'BeamData')
-local Millings = require( 'MillingData')
-local Pocketings = require( 'PocketingData')
+local ML = require( 'MachiningLib')
 
 ---------------------------------------------------------------------
 -- Riconoscimento della feature
@@ -77,17 +76,6 @@ function ProcessFreeContour.Classify( Proc)
    return true, bDown
 end
 
----------------------------------------------------------------------
-local function FindMilling( sType)
-   for i = 1, #Millings do
-      local Milling = Millings[i]
-      if Milling.Type == sType then
-         return i, Milling.Name
-      end   
-   end
-   return 0
-end
-
 ---------------------------------------------------------------------
 local function MakeByMill( Proc, nPhase, nRawId, nPartId, dOvmHead)
    -- recupero l'ingombro del grezzo di appartenenza
@@ -105,7 +93,7 @@ local function MakeByMill( Proc, nPhase, nRawId, nPartId, dOvmHead)
    local vtExtr = EgtCurveExtrusion( AuxId, GDB_RT.GLOB)
    local bToolInv = ( vtExtr:getZ() < -0.1)
       -- recupero la lavorazione
-   local nMill, sMilling = FindMilling( 'FreeContour')
+   local sMilling = ML.FindMilling( 'FreeContour')
    if not sMilling then
       local sErr = 'Error on process ' .. tostring( Proc.Id) .. ' milling not found in library'
       EgtOutLog( sErr)
@@ -214,17 +202,6 @@ local function MakeByMill( Proc, nPhase, nRawId, nPartId, dOvmHead)
    return true
 end
 
----------------------------------------------------------------------
-local function FindPocketing( sType)
-   for i = 1, #Pocketings do
-      local Pocketing = Pocketings[i]
-      if Pocketing.Type == sType then
-         return i, Pocketing.Name
-      end   
-   end
-   return 0
-end
-
 ---------------------------------------------------------------------
 local function MakeByPocket( Proc, nPhase, nRawId, nPartId, dOvmHead)
    -- recupero e verifico l'entità curva
@@ -240,7 +217,7 @@ local function MakeByPocket( Proc, nPhase, nRawId, nPartId, dOvmHead)
    local vtExtr = EgtCurveExtrusion( AuxId, GDB_RT.GLOB)
    --local bToolInv = ( vtExtr:getZ() < -0.1)
    -- recupero la lavorazione
-   local nMill, sPocketing = FindPocketing( 'Mortise')
+   local sPocketing = ML.FindPocketing( 'Mortise')
    if not sPocketing then
       local sErr = 'Error on process ' .. tostring( Proc.Id) .. ' pocketing not found in library'
       EgtOutLog( sErr)