From 3df067059be774959e11fb0fd8db25582084b40f Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Tue, 7 Jan 2025 09:52:18 +0100 Subject: [PATCH] EgtMachKernel : - correzione per consentire verifica aree protette anche in Disposizione per movimento pezzi (marmo). --- MachineCalc.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MachineCalc.cpp b/MachineCalc.cpp index 305e9ea..d5f2791 100644 --- a/MachineCalc.cpp +++ b/MachineCalc.cpp @@ -1755,13 +1755,13 @@ Machine::VerifyProtectedAreas( double dX, double dY, double dZ, const DBLVECTOR& int nErr = 99 ; // salvo eventuale variabile EMC_VAR già presente bool bOldEMC = LuaChangeNameGlobVar( EMC_VAR, EMC_VAR_BACKUP) ; - // definisco variabili + // definisco variabili (nelle disposizioni l'utensile non è definito e non ha nome) string sTool, sHead ; int nExit ; bOk = bOk && LuaCreateGlobTable( EMC_VAR) ; bOk = bOk && LuaSetGlobVar( EMC_VAR + EVAR_VER, GetEMkVer()) ; bOk = bOk && GetCurrHead( sHead) && LuaSetGlobVar( EMC_VAR + EVAR_HEAD, sHead) ; bOk = bOk && GetCurrExit( nExit) && LuaSetGlobVar( EMC_VAR + EVAR_EXIT, nExit) ; - bOk = bOk && GetCurrTool( sTool) && LuaSetGlobVar( EMC_VAR + EVAR_TOOL, sTool) ; + bOk = bOk && ( GetCurrTool( sTool) || true) && LuaSetGlobVar( EMC_VAR + EVAR_TOOL, sTool) ; bOk = bOk && LuaSetGlobVar( EMC_VAR + EVAR_L1, dX) ; bOk = bOk && LuaSetGlobVar( EMC_VAR + EVAR_L2, dY) ; bOk = bOk && LuaSetGlobVar( EMC_VAR + EVAR_L3, dZ) ;