Merge branch 'develop' of https://gitlab.steamware.net/egalware-cadcam/lua/databeamnew into develop

LuaLibs/MachiningLib.lua

@@ -10,6 +10,7 @@ require( 'EgtBase')
 
 -- Carico i dati globali
 local BeamData = require( 'BeamData')
+local BeamLib = require( 'BeamLib')
 
 EgtOutLog( ' MachiningLib started', 1)
 
@@ -83,7 +84,14 @@ function MachiningLib.FindMill( Proc, ToolSearchParameters)
    for i = 1, #TOOLS do
       -- prima verifico che utensile sia compatibile
       local bIsToolCompatible = true
-      if TOOLS[i].dDiameter > ToolSearchParameters.dMaxToolDiameter then
+      -- se viene passato il nome, tutti gli altri sono incompatibili
+      if ToolSearchParameters.sName and ToolSearchParameters.sName ~= TOOLS[i].sName then
+         bIsToolCompatible = false
+      -- si cercano solo frese standard. Se utensile disegnato manualmente, si setta subito che è incompatibile
+      elseif TOOLS[i].bIsProfiledTool then
+         bIsToolCompatible = false
+      -- controlli standard
+      elseif TOOLS[i].dDiameter > ToolSearchParameters.dMaxToolDiameter then
          bIsToolCompatible = false
       elseif TOOLS[i].SetupInfo.bIsTopHead  and  ToolSearchParameters.vtToolDirection:getZ() < TOOLS[i].SetupInfo.dMaxNegativeAngle then
          bIsToolCompatible = false
@@ -199,8 +207,14 @@ function MachiningLib.FindBlade( Proc, ToolSearchParameters)
       end
 
       if bIsToolCompatible then
-         nBestToolIndex = i
-         break
+         if not nBestToolIndex then
+            nBestToolIndex = i
+         else
+            -- prediligo utensile per tagli lunghi, se richiesto
+            if ToolSearchParameters.bForceLongcutBlade and not TOOLS[nBestToolIndex].bIsUsedForLongCut and TOOLS[i].bIsUsedForLongCut then
+               nBestToolIndex = i
+            end
+         end
       end
    end
 
@@ -300,27 +314,27 @@ function MachiningLib.AddNewMachining( ProcToAdd, MachiningToAdd, AuxiliaryDataT
       return false
    end
 
-   -- Drilling
-   if MachiningToAdd.nType == MCH_MY.DRILLING then
-      MachiningToAdd.sTypeName = 'Drill_'
-   -- Milling
-   elseif MachiningToAdd.nType == MCH_MY.MILLING then
-      -- se utensile lama
-      if TOOLS[MachiningToAdd.nToolIndex].sFamily == 'SAWBLADE' then
-         MachiningToAdd.sTypeName = 'Cut_'
-      else
-         MachiningToAdd.sTypeName = 'Mill_'
-      end
-   -- Pocketing
-   elseif MachiningToAdd.nType == MCH_MY.POCKETING then
-      MachiningToAdd.sTypeName = 'Pocket_'
-   -- Mortising
-   elseif MachiningToAdd.nType == MCH_MY.MORTISING then
-      MachiningToAdd.sTypeName = 'ChSaw_'
-   end
    -- se nome non definito, assegno alla lavorazioen un nome standard
    if not MachiningToAdd.sOperationName then
-      MachiningToAdd.sOperationName = MachiningToAdd.sTypeName .. ( EgtGetName( ProcToAdd.id) or tostring( ProcToAdd.id)) .. '_' .. tostring( MachiningToAdd.Geometry[1][2])
+      -- Drilling
+      if MachiningToAdd.nType == MCH_MY.DRILLING then
+         MachiningToAdd.sTypeName = 'Drill_'
+      -- Milling
+      elseif MachiningToAdd.nType == MCH_MY.MILLING then
+         -- se utensile lama
+         if TOOLS[MachiningToAdd.nToolIndex].sFamily == 'SAWBLADE' then
+            MachiningToAdd.sTypeName = 'Cut_'
+         else
+            MachiningToAdd.sTypeName = 'Mill_'
+         end
+      -- Pocketing
+      elseif MachiningToAdd.nType == MCH_MY.POCKETING then
+         MachiningToAdd.sTypeName = 'Pocket_'
+      -- Mortising
+      elseif MachiningToAdd.nType == MCH_MY.MORTISING then
+         MachiningToAdd.sTypeName = 'ChSaw_'
+      end
+      MachiningToAdd.sOperationName = MachiningToAdd.sTypeName .. ( EgtGetName( ProcToAdd.id) or tostring( ProcToAdd.id)) --  .. '_' .. tostring( MachiningToAdd.Geometry)
    end
    if not MachiningToAdd.sToolName then
       MachiningToAdd.sToolName = TOOLS[MachiningToAdd.nToolIndex].sName
@@ -394,7 +408,13 @@ function MachiningLib.AddOperations( vProc, Part)
 
    -- parametri da scrivere nelle note utente
    local UserNotes = {
-      { sName = 'dMaxElev',                  sMchParam = 'MaxElev'}
+      { sName = 'dMaxElev',                   sMchParam = 'MaxElev'},
+      { sName = 'dOpenMinSafe',               sMchParam = 'OpenMinSafe'},
+      { sName = 'nVMRS',                      sMchParam = 'VMRS'},
+      { sName = 'dStartZmax',                 sMchParam = 'StartZmax'},
+      { sName = 'nOutRaw',                    sMchParam = 'OutRaw'},
+      { sName = 'nOpenOutRaw',                sMchParam = 'OpenOutRaw'},
+      { sName = 'nPlunge',                    sMchParam = 'Plunge'}
    }
 
    -- parametri da scrivere nelle note di sistema
@@ -506,6 +526,23 @@ function MachiningLib.AddOperations( vProc, Part)
                nErr, sErr = EgtGetLastMachMgrError()
                EgtSetOperationMode( nOperationId, false)
             end
+
+            
+            -- TODO è giusto inserire queste info alla fine della lavorazione? oppure conviene creare un record in MACHININGS apposito per la disposizione?
+            -- se era taglio di separazione, aggiungo nuova fase
+            if MACHININGS[i].AuxiliaryData.bAddNewPhase then
+               BeamLib.AddPhaseWithRawParts( MACHININGS[i].Proc.idRaw, BeamData.ptOriXR, BeamData.dPosXR, BeamData.RAW_OFFSET)
+               -- se grezzo successivo senza pezzi e finale, va tolto
+               local nNextRawId = EgtGetNextRawPart( MACHININGS[i].Proc.idRaw)
+               if nNextRawId  and  EgtGetPartInRawPartCount( nNextRawId) == 0  and  EgtGetRawPartBBox( nNextRawId):getDimX() < BeamData.dMinRaw then
+                  EgtRemoveRawPartFromCurrPhase( nNextRawId)
+               end
+               local nPhase = EgtGetCurrPhase()
+               local nDispId = EgtGetPhaseDisposition( nPhase)
+               EgtSetInfo( nDispId, 'TYPE', 'END')
+               EgtSetInfo( nDispId, 'ORD', MACHININGS[i].Proc.nIndexPartInParts)
+            end
+
          else
             return false, 'UNEXPECTED ERROR: Error on creating machining'
          end