diff --git a/CAMAuto/LuaLibs/WinConst.lua b/CAMAuto/LuaLibs/WinCAMConst.lua similarity index 80% rename from CAMAuto/LuaLibs/WinConst.lua rename to CAMAuto/LuaLibs/WinCAMConst.lua index 5bdc751..feacb37 100644 --- a/CAMAuto/LuaLibs/WinConst.lua +++ b/CAMAuto/LuaLibs/WinCAMConst.lua @@ -1,9 +1,9 @@ --- WinConst.lua libreria di costanti EgalWare per progetto serramenti 2024/10/07 +-- WinCAMConst.lua libreria di costanti EgalWare per progetto serramenti 2024/10/07 -- Tavola per definizione modulo (serve ma non usata) -local WinConst = {} +local WinCAMConst = {} -EgtOutLog( 'WinConst started', 1) +EgtOutLog( 'WinCAMConst started', 1) -- Funzione per rendere non modificabili le costanti local protect = function(tbl) @@ -31,4 +31,4 @@ MACH_GROUP = { } MACH_GROUP = protect( MACH_GROUP) -return WinConst \ No newline at end of file +return WinCAMConst \ No newline at end of file diff --git a/Designing/Main.lua b/Designing/Main.lua index ce75fcd..c6c3d6d 100644 --- a/Designing/Main.lua +++ b/Designing/Main.lua @@ -15,7 +15,7 @@ require( 'EgtBase') _ENV = EgtProtectGlobal() -EgtEnableDebug( true) +EgtEnableDebug( false) -- Imposto direttorio per librerie local sBaseDir = EgtGetSourceDir() @@ -24,13 +24,18 @@ EgtAddToPackagePath( sBaseDir .. '?.lua') EgtAddToPackagePath( sBaseDir .. 'WinLib\\' .. '?.lua') _G.package.loaded.WinConst = nil -require( 'WinConst') +_G.package.loaded.WinJWDConst = nil _G.package.loaded.WinCreate = nil -local WinCreate = require( 'WinCreate') _G.package.loaded.WinCalculate = nil -local WinCalculate = require( 'WinCalculate') _G.package.loaded.WinManageProject = nil -local WinManageProject = require( 'WinManageProject') +_G.package.loaded.JSON = nil +_G.package.loaded.xml2lua = nil +_G.package.loaded.xml2lua_tree = nil + +require( 'WinConst') +local WinCreate = require( 'WinCreate') +local WinCalculate = require( 'WinCalculate') + ------------------------------------------- PARAMETERS ------------------------------------------- local WindowWidth = 1500 diff --git a/Designing/WinLib/WinCalculate.lua b/Designing/WinLib/WinCalculate.lua index d1e370f..70259f8 100644 --- a/Designing/WinLib/WinCalculate.lua +++ b/Designing/WinLib/WinCalculate.lua @@ -17,14 +17,8 @@ local WinCalculate = {} -- Include -require( 'EgtBase') -require( 'WinConst') - -_G.package.loaded.JSON = nil local JSON = require( 'JSON') -_G.package.loaded.XML = nil local XML = require( 'xml2lua') -_G.package.loaded.XMLHandler = nil local XMLHandler = require( 'xml2lua_tree') local s_nRedisConnectionId = 0 -- 0 connessione non definita, > 0 connessione definita diff --git a/Designing/WinLib/WinCreate.lua b/Designing/WinLib/WinCreate.lua index 47260f5..0705164 100644 --- a/Designing/WinLib/WinCreate.lua +++ b/Designing/WinLib/WinCreate.lua @@ -16,10 +16,6 @@ -- Tabella per definizione modulo local WinCreate = {} --- Include -require( 'EgtBase') -require( 'WinConst') - -- funzioni ---------------------------------------------------------------------------------- local function AddInfo( nId, sInfo, nVal) diff --git a/Designing/WinLib/WinManageProject.lua b/Designing/WinLib/WinManageProject.lua index beda01d..186e583 100644 --- a/Designing/WinLib/WinManageProject.lua +++ b/Designing/WinLib/WinManageProject.lua @@ -17,14 +17,8 @@ local WinManageProject = {} -- Include -require( 'EgtBase') -_G.package.loaded.WinConst = nil -require( 'WinConst') -_G.package.loaded.WinJWDConst = nil require( 'WinJWDConst') -_G.package.loaded.WinCreate = nil local WinCreate = require( 'WinCreate') -_G.package.loaded.JSON = nil local JSON = require( 'JSON') --------------------------------------------------------------------- diff --git a/Designing/WinOpenProjectFile.lua b/Designing/WinOpenProjectFile.lua index 8b8c8d6..14b201e 100644 --- a/Designing/WinOpenProjectFile.lua +++ b/Designing/WinOpenProjectFile.lua @@ -23,10 +23,19 @@ EgtOutLog("BaseDir=" .. sBaseDir) EgtAddToPackagePath( sBaseDir .. '?.lua') EgtAddToPackagePath( sBaseDir .. 'WinLib\\' .. '?.lua') +_G.package.loaded.WinConst = nil +_G.package.loaded.WinJWDConst = nil +_G.package.loaded.WinCreate = nil _G.package.loaded.WinCalculate = nil -local WinCalculate = require( 'WinCalculate') _G.package.loaded.WinManageProject = nil +_G.package.loaded.JSON = nil +_G.package.loaded.xml2lua = nil +_G.package.loaded.xml2lua_tree = nil + +require( 'WinConst') local WinManageProject = require( 'WinManageProject') +local WinCalculate = require( 'WinCalculate') + local sOpenFilePath = '' -- verifico se lanciato file in batch per test diff --git a/Designing/WinProject.lua b/Designing/WinProject.lua index 542bea3..8ef7deb 100644 --- a/Designing/WinProject.lua +++ b/Designing/WinProject.lua @@ -24,13 +24,19 @@ EgtAddToPackagePath( sBaseDir .. '?.lua') EgtAddToPackagePath( sBaseDir .. 'WinLib\\' .. '?.lua') _G.package.loaded.WinConst = nil -require( 'WinConst') +_G.package.loaded.WinJWDConst = nil _G.package.loaded.WinCreate = nil -local WinCreate = require( 'WinCreate') _G.package.loaded.WinCalculate = nil -local WinCalculate = require( 'WinCalculate') _G.package.loaded.WinManageProject = nil +_G.package.loaded.JSON = nil +_G.package.loaded.xml2lua = nil +_G.package.loaded.xml2lua_tree = nil + +require( 'WinConst') +local WinCreate = require( 'WinCreate') local WinManageProject = require( 'WinManageProject') +local WinCalculate = require( 'WinCalculate') + -- WDG