DataWall :

- modifiche per Tool_ID anche su lame
- correzioni su chiodature in doppio.
This commit is contained in:
DarioS
2021-10-24 22:45:05 +02:00
parent 0d2be74bff
commit f1f8f071f2
2 changed files with 18 additions and 10 deletions
+5 -3
View File
@@ -1,4 +1,4 @@
-- MachiningLib.lua by Egaltech s.r.l. 2021/10/18
-- MachiningLib.lua by Egaltech s.r.l. 2021/10/24
-- Libreria ricerca lavorazioni per Pareti
-- Tabella per definizione modulo
@@ -32,7 +32,7 @@ local function SetCurrMachiningAndTool( sMachName)
end
---------------------------------------------------------------------
function WMachiningLib.FindCutting( sType, dDepth)
function WMachiningLib.FindCutting( sType, dDepth, nTool_ID)
for i = 1, #Cuttings do
local Cutting = Cuttings[i]
if Cutting.On and Cutting.Type == sType and SetCurrMachiningAndTool( Cutting.Name) then
@@ -40,8 +40,10 @@ function WMachiningLib.FindCutting( sType, dDepth)
local dSawDiam = EgtTdbGetCurrToolParam( MCH_TP.DIAM) or 0
local dSawThick = EgtTdbGetCurrToolParam( MCH_TP.THICK) or 0
local dSawMaxDepth = EgtTdbGetCurrToolMaxDepth() or 0
local nMyTool_ID = EgtTdbGetCurrToolValInNotes( MCH_TP.USERNOTES, 'Tool_ID', 'i')
if nMchType == MCH_MY.SAWING and
not dDepth or dSawMaxDepth > dDepth - 10 * GEO.EPS_SMALL then
( not dDepth or dSawMaxDepth > dDepth - 10 * GEO.EPS_SMALL) and
( not nTool_ID or nTool_ID == 0 or nTool_ID == nMyTool_ID) then
return Cutting.Name, dSawDiam, dSawThick, dSawMaxDepth
end
end