From 8e608bd6239ec36f07ab41d234a35ab8db7392e8 Mon Sep 17 00:00:00 2001 From: "luca.mazzoleni" Date: Mon, 17 Mar 2025 10:15:36 +0100 Subject: [PATCH] - in BeamExec aggiunto ritorno stato e messaggi a interfaccia per Double in tutti i casi --- LuaLibs/BeamExec.lua | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/LuaLibs/BeamExec.lua b/LuaLibs/BeamExec.lua index c4bc448..d2bb52c 100644 --- a/LuaLibs/BeamExec.lua +++ b/LuaLibs/BeamExec.lua @@ -1863,10 +1863,14 @@ local function VerifyDrillMirrored( Proc, vProc, b3Raw) ( BD.DOWN_HEAD and AreOppositeVectorApprox( vtExtr, Y_AX())) then Proc.Double = 2 Proc.MachDepthDouble = dMachiningDepth + Proc.MirrorCutId = ProcToDisable.CutId + Proc.MirrorTaskId = ProcToDisable.TaskId DisableOtherDrilling( ProcToDisable, vProc) elseif BD.DOWN_HEAD and AreSameVectorApprox( vtExtr, Z_AX()) then Proc.Double = 3 Proc.MachDepthDouble = dMachiningDepth + Proc.MirrorCutId = ProcToDisable.CutId + Proc.MirrorTaskId = ProcToDisable.TaskId DisableOtherDrilling( ProcToDisable, vProc) end end @@ -2173,8 +2177,14 @@ function BeamExec.ProcessFeatures() if not bOk then nTotErr = nTotErr + 1 table.insert( Stats, {Err=1, Msg=sMsg, Rot=-2, CutId=Proc.CutId, TaskId=Proc.TaskId}) + if Proc.Double == 2 or Proc.Double == 3 then + table.insert( Stats, {Err=1, Msg=sMsg, Rot=-2, CutId=Proc.MirrorCutId, TaskId=Proc.MirrorTaskId}) + end elseif sMsg and #sMsg > 0 then table.insert( Stats, {Err=-1, Msg=sMsg, Rot=-2, CutId=Proc.CutId, TaskId=Proc.TaskId}) + if Proc.Double == 2 or Proc.Double == 3 then + table.insert( Stats, {Err=-1, Msg=sMsg, Rot=-2, CutId=Proc.MirrorCutId, TaskId=Proc.MirrorTaskId}) + end else table.insert( Stats, {Err=0, Msg='', Rot=-2, CutId=Proc.CutId, TaskId=Proc.TaskId}) if Proc.Double == 2 or Proc.Double == 3 then @@ -2263,8 +2273,14 @@ function BeamExec.ProcessFeatures() if not bOk then nTotErr = nTotErr + 1 table.insert( Stats, {Err=1, Msg=sMsg, Rot=-1, CutId=Proc.CutId, TaskId=Proc.TaskId}) + if Proc.Double == 2 or Proc.Double == 3 then + table.insert( Stats, {Err=1, Msg=sMsg, Rot=-1, CutId=Proc.MirrorCutId, TaskId=Proc.MirrorTaskId}) + end elseif sMsg and #sMsg > 0 then table.insert( Stats, {Err=-1, Msg=sMsg, Rot=-1, CutId=Proc.CutId, TaskId=Proc.TaskId}) + if Proc.Double == 2 or Proc.Double == 3 then + table.insert( Stats, {Err=-1, Msg=sMsg, Rot=-1, CutId=Proc.MirrorCutId, TaskId=Proc.MirrorTaskId}) + end else table.insert( Stats, {Err=0, Msg='', Rot=-1, CutId=Proc.CutId, TaskId=Proc.TaskId}) if Proc.Double == 2 or Proc.Double == 3 then @@ -2341,8 +2357,14 @@ function BeamExec.ProcessFeatures() if not bOk then nTotErr = nTotErr + 1 table.insert( Stats, {Err=1, Msg=sMsg, Rot=0, CutId=Proc.CutId, TaskId=Proc.TaskId}) + if Proc.Double == 2 or Proc.Double == 3 then + table.insert( Stats, {Err=1, Msg=sMsg, Rot=0, CutId=Proc.MirrorCutId, TaskId=Proc.MirrorTaskId}) + end elseif sMsg and #sMsg > 0 then table.insert( Stats, {Err=-1, Msg=sMsg, Rot=0, CutId=Proc.CutId, TaskId=Proc.TaskId}) + if Proc.Double == 2 or Proc.Double == 3 then + table.insert( Stats, {Err=-1, Msg=sMsg, Rot=0, CutId=Proc.MirrorCutId, TaskId=Proc.MirrorTaskId}) + end else table.insert( Stats, {Err=0, Msg='', Rot=0, CutId=Proc.CutId, TaskId=Proc.TaskId}) if Proc.Double == 2 or Proc.Double == 3 then