From 335b0658ddbe79a3d415ef9e35297e6c0f3544cf Mon Sep 17 00:00:00 2001 From: Riccardo Elitropi Date: Tue, 20 Jan 2026 17:33:57 +0100 Subject: [PATCH] Trimming 3.1a2 : - modificata la gestione dei Part e dei Layer - memorizzazione dei parametri durante i dialoghi con l'utente - migliorata la visualizzazione delle curve di bordo - creazioni di funzioni ausiliarie per semplificazione del codice - correzioni varie. --- CalcBezier.lua | 2 +- EditSyncLines.lua | 4 ++-- EndEditSyncLines.lua | 4 ++-- ResetSyncLines.lua | 2 +- TrimmingLib.lua | 4 +++- Version.lua | 4 ++-- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/CalcBezier.lua b/CalcBezier.lua index ad2f464..d3cd15a 100644 --- a/CalcBezier.lua +++ b/CalcBezier.lua @@ -2,7 +2,7 @@ require( 'EgtBase') _ENV = EgtProtectGlobal() -EgtEnableDebug( true) +EgtEnableDebug( false) -- Carico le costanti di Trimming EgtAddToPackagePath( EgtGetSourceDir() .. '?.lua') diff --git a/EditSyncLines.lua b/EditSyncLines.lua index 339a7c3..a476a66 100644 --- a/EditSyncLines.lua +++ b/EditSyncLines.lua @@ -53,12 +53,12 @@ while nId do nId = EgtGetNext( nId) end --- Se Esiste il Layer di Sistema con le Curve di Sincronizzazione già salvate, allora le Copio da quest'Ultimo +-- Se Esiste il Layer di Sistema con le Curve di Sincronizzazione già salvate, allora le rialloco local nLayerSaveSyncId = GlobVar.GetCurrentStoredCurvesLayer( nCurrPartId) if nLayerSaveSyncId and nLayerSaveSyncId ~= GDB_ID.NULL then local nId = EgtGetFirstInGroup( nLayerSaveSyncId) while nId do - EgtCopyGlob( nId, nLayerEditSyncId) + EgtRelocateGlob( nId, nLayerEditSyncId) nId = EgtGetNext( nId) end -- In Caso contrario Le Calcolo diff --git a/EndEditSyncLines.lua b/EndEditSyncLines.lua index 20dbb35..bd72015 100644 --- a/EndEditSyncLines.lua +++ b/EndEditSyncLines.lua @@ -14,13 +14,13 @@ local ERROR_EDIT_SYNC_CURVES = 'Error in Edit Sync Curves : ' local nCurrPartId = EgtGetCurrPart() local nCurrLayerId = GlobVar.GetTrimmingLayerRefId( EgtGetCurrLayer()) if not GlobVar.IsTrimmingLayer( nCurrLayerId) then - EgtOutBox( ERROR_EDIT_CURVE .. 'Not a valid Trimming Layer', 'Error', 'ERROR', 'OK') + EgtOutBox( ERROR_EDIT_SYNC_CURVES .. 'Not a valid Trimming Layer', 'Error', 'ERROR', 'OK') return end -- Recupero il Layer di Edit delle curve di Sincronizzazione, se non esiste, errore local nLayerEditSyncId = GlobVar.GetCurrentEditSyncCurvesLayer( nCurrPartId) -if not nLayerEditSyncId then +if not nLayerEditSyncId or nLayerEditSyncId == GDB_ID.NULL then EgtOutBox( ERROR_EDIT_SYNC_CURVES .. 'No Edit Layer created', 'Error', 'ERROR', 'OK') return end diff --git a/ResetSyncLines.lua b/ResetSyncLines.lua index f817362..91039ea 100644 --- a/ResetSyncLines.lua +++ b/ResetSyncLines.lua @@ -2,7 +2,7 @@ require( 'EgtBase') _ENV = EgtProtectGlobal() -EgtEnableDebug( true) +EgtEnableDebug( false) -- Carico le costanti di Trimming EgtAddToPackagePath( EgtGetSourceDir() .. '?.lua') diff --git a/TrimmingLib.lua b/TrimmingLib.lua index bf2d3dc..7d29312 100644 --- a/TrimmingLib.lua +++ b/TrimmingLib.lua @@ -154,7 +154,8 @@ function TrimmingVar.CreateEditSyncCurvesLayer( nCurrPartId, nCurrLayerId) if bOk then bOk = ( EgtSetName( nEditSyncLayerId, LAYER_NAME_SYNC_CURVES) and EgtSetInfo( nEditSyncLayerId, KEY_LAYER_TYPE, KEY_LAYER_SYNC_CURVES) and - EgtSetInfo( nEditSyncLayerId, KEY_REF_TRIMMING_LAYER, nCurrLayerId)) + EgtSetInfo( nEditSyncLayerId, KEY_REF_TRIMMING_LAYER, nCurrLayerId) and + EgtSetColor( nEditSyncLayerId, SYNC_LINE_COLOR)) end if not bOk then EgtErase( nEditSyncLayerId) @@ -193,6 +194,7 @@ function TrimmingVar.CreateSyncStoredCurvesLayer( nCurrPartId, nCurrLayerId) bOk = ( EgtSetName( nEditSyncStoredLayerId, LAYER_NAME_SYNC_STORED_CURVES) and EgtSetInfo( nEditSyncStoredLayerId, KEY_LAYER_TYPE, KEY_LAYER_SYNC_STORE_CURVES) and EgtSetInfo( nEditSyncStoredLayerId, KEY_REF_TRIMMING_LAYER, nCurrLayerId) and + EgtSetColor( nEditSyncStoredLayerId, SYNC_LINE_COLOR) and EgtSetLevel( nEditSyncStoredLayerId, GDB_LV.SYSTEM)) end if not bOk then diff --git a/Version.lua b/Version.lua index 212f2ea..66189f1 100644 --- a/Version.lua +++ b/Version.lua @@ -2,5 +2,5 @@ -- Gestione della versione di Trimming dei Termoformati NAME = 'Trimming' -VERSION = '3.1a1' -MIN_EXE = '3.1a1' +VERSION = '3.1a2' +MIN_EXE = '3.1a2'