From 12b5794e496ec4d54eb653bf6ea02f720a4a320e Mon Sep 17 00:00:00 2001 From: Annamaria Sassi Date: Thu, 12 Feb 2026 18:34:41 +0100 Subject: [PATCH] - Aggiunto caricamento librerie in CreateMachGroups - Piccola correzione in WinLib --- CAMAuto/CreateMachGroups.lua | 9 ++++++++- CAMAuto/LuaLibs/WinLib.lua | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CAMAuto/CreateMachGroups.lua b/CAMAuto/CreateMachGroups.lua index 848a706..343a0ca 100644 --- a/CAMAuto/CreateMachGroups.lua +++ b/CAMAuto/CreateMachGroups.lua @@ -10,6 +10,10 @@ _ENV = EgtProtectGlobal() EgtEnableDebug( false) +--Libero eventuali librerie rimaste caricate +_G.package.loaded.WinData = nil +_G.package.loaded.WinLib = nil + -- Verifico che la macchina corrente sia abilitata per la lavorazione delle Travi local sMachDir = EgtGetCurrMachineDir() if not sMachDir then @@ -29,6 +33,8 @@ EgtAddToPackagePath( sMachDir .. '\\Window\\?.lua') EgtOutLog( '*** Window Process Start ***', 1) -- Carico le librerie +EgtAddToPackagePath( EgtGetSourceDir() .. 'LuaLibs\\?.lua') +local WinLib = require( 'WinLib') -- Carico i dati globali local WinData = require( 'WinData') @@ -42,7 +48,8 @@ local ColA = Color3d( 255, 165, 0, 30) -- TODO DA RIMUOVERE, il parametro deve essere passato local WIN = {} -WIN.OPT_TYPE = 'PIECE' +--WIN.OPT_TYPE = 'PIECE' +WIN.OPT_TYPE = 'WINDOW' ------------------------------------------------------------------------------------------------------------- -- *** Recupero offset applicato al profilo *** diff --git a/CAMAuto/LuaLibs/WinLib.lua b/CAMAuto/LuaLibs/WinLib.lua index 7990c5c..c91523e 100644 --- a/CAMAuto/LuaLibs/WinLib.lua +++ b/CAMAuto/LuaLibs/WinLib.lua @@ -162,7 +162,7 @@ function WinLib.TableCopyDeep( OriginalTable) elseif isVector3d( value) then CopiedTable[ key] = Vector3d( value) else - CopiedTable[ key] = BeamLib.TableCopyDeep( value) + CopiedTable[ key] = WinLib.TableCopyDeep( value) end else CopiedTable[ key] = value