Merge branch 'master' into ExtDimension_angular

- aggiunte funzioni Exe e Lua SurfFrOffsetAdv per calcolare offset di una flat region creando una nuova superficie senza modificare quella di partenza.

DllExch3dm.cpp

@@ -0,0 +1,181 @@
+//----------------------------------------------------------------------------
+//  EgalTech 2023-2023
+//----------------------------------------------------------------------------
+// File : DllExch3dm.cpp       Data : 14.11.23        Versione : 2.5k2
+// Contenuto : Funzioni di gestione della libreria opzionale EgtExch3dme.
+//
+//
+//
+// Modifiche : 14.11.23 DS Creazione modulo.
+//
+//
+//
+//----------------------------------------------------------------------------
+
+//--------------------------- Include ----------------------------------------
+#include "stdafx.h"
+#include "EXE.h"
+#include "DllExch3dm.h"
+#include "/EgtDev/Include/EE3DllMain.h"
+#define NOMINMAX
+#include <windows.h>
+
+using namespace std ;
+
+//-----------------------------------------------------------------------------
+// Nome della libreria
+#if defined( _WIN64) &&  defined( _DEBUG)
+   static const wchar_t* EE3_NAME = L"EgtExch3dmD64.dll" ;
+#elif defined( _WIN64)
+   static const wchar_t* EE3_NAME = L"EgtExch3dmR64.dll" ;
+#elif defined( _WIN32) &&  defined( _DEBUG)
+   static const wchar_t* EE3_NAME = L"EgtExch3dmD32.dll" ;
+#else
+   static const wchar_t* EE3_NAME = L"EgtExch3dmR32.dll" ;
+#endif
+// Nome delle funzioni caricate
+static const char* EE3_SETEE3LOGGER = "SetEE3Logger" ;
+static const char* EE3_GETEE3VERSION = "GetEE3Version" ;
+static const char* EE3_SETEE3KEY = "SetEE3Key" ;
+static const char* EE3_SETEE3NETHWKEY = "SetEE3NetHwKey" ;
+static const char* EE3_CREATEIMPORT3DM = "CreateImport3dm" ;
+static const char* EE3_CREATEEXPORT3DM = "CreateExport3dm" ;
+
+
+//-----------------------------------------------------------------------------
+HMODULE s_hEE3 = nullptr ;
+
+//-----------------------------------------------------------------------------
+bool
+LoadExch3dmDll( ILogger* pLogger, const string& sKey, bool bNetHwKey)
+{
+  // verifico la chiave
+   if ( ! TestKeyForEE3( sKey, 0, pLogger)) {
+      FreeExch3dmDll() ;
+      return false ;
+   }
+  // se già caricata
+   if ( s_hEE3 != nullptr)
+      return true ;
+  // carico la libreria EgtExch3dm
+   s_hEE3 = LoadLibrary( EE3_NAME) ;
+   if ( s_hEE3 == nullptr)
+      return false ;
+  // imposto logger
+   MySetEE3Logger( pLogger) ;
+  // imposto i codici della chiave
+   MySetEE3Key( sKey) ;
+  // imposto eventuale chiave di rete
+   MySetEE3NetHwKey( bNetHwKey) ;
+   return true ;
+}
+
+//-----------------------------------------------------------------------------
+bool
+FreeExch3dmDll( void)
+{
+  // se non è già caricata
+   if ( s_hEE3 == nullptr)
+      return true ;
+  // libero la libreria EgtExch3dm
+   FreeLibrary( s_hEE3) ;
+   s_hEE3 = nullptr ;
+   return true ;
+}
+
+//-----------------------------------------------------------------------------
+bool
+IsLoadedExch3dmDll( void)
+{
+   return ( s_hEE3 != nullptr) ;
+}
+
+//-----------------------------------------------------------------------------
+void
+MySetEE3Logger( ILogger* pLogger)
+{
+  // verifico caricamento libreria EgtExch3dm
+   if ( s_hEE3 == nullptr)
+      return ;
+  // recupero funzione che imposta il logger
+   typedef void (* PF_SetEE3Logger) ( ILogger* pLogger) ;
+   PF_SetEE3Logger pFun = (PF_SetEE3Logger)GetProcAddress( s_hEE3, EE3_SETEE3LOGGER) ;
+   if ( pFun == nullptr)
+      return ;
+   pFun( pLogger) ;
+}
+
+//-----------------------------------------------------------------------------
+const char*
+MyGetEE3Version( void)
+{
+  // verifico caricamento libreria EgtExch3dm
+   if ( s_hEE3 == nullptr)
+      return "" ;
+  // recupero funzione che restituisce la versione della libreria
+   typedef const char* (* PF_GetEE3Version) ( void) ;
+   PF_GetEE3Version pFun = (PF_GetEE3Version)GetProcAddress( s_hEE3, EE3_GETEE3VERSION) ;
+   if ( pFun == nullptr)
+      return "" ;
+   return pFun() ;
+}
+
+//-----------------------------------------------------------------------------
+void
+MySetEE3Key( const string& sKey)
+{
+  // verifico caricamento libreria EgtExch3dm
+   if ( s_hEE3 == nullptr)
+      return ;
+  // recupero funzione che imposta i codici di protezione
+   typedef void (* PF_SetEE3Key) ( const string& sKey) ;
+   PF_SetEE3Key pFun = (PF_SetEE3Key)GetProcAddress( s_hEE3, EE3_SETEE3KEY) ;
+   if ( pFun == nullptr)
+      return ;
+   pFun( sKey) ;
+}
+
+//-----------------------------------------------------------------------------
+void
+MySetEE3NetHwKey( bool bNetHwKey)
+{
+  // verifico caricamento libreria EgtExch3dm
+   if ( s_hEE3 == nullptr)
+      return ;
+  // recupero funzione che imposta il flag per chiave di rete
+   typedef void (* PF_SetEE3NetHwKey) ( bool bNetHwKey) ;
+   PF_SetEE3NetHwKey pFun = (PF_SetEE3NetHwKey)GetProcAddress( s_hEE3, EE3_SETEE3NETHWKEY) ;
+   if ( pFun == nullptr)
+      return ;
+   pFun( bNetHwKey) ;
+}
+
+//-----------------------------------------------------------------------------
+IImport3dm*
+MyCreateImport3dm( void)
+{
+  // verifico caricamento libreria EgtExch3dm
+   if ( s_hEE3 == nullptr)
+      return nullptr ;
+  // recupero funzione creazione oggetto
+   typedef IImport3dm* (* PF_CreateImport3dm) ( void) ;
+   PF_CreateImport3dm pFun = (PF_CreateImport3dm)GetProcAddress( s_hEE3, EE3_CREATEIMPORT3DM) ;
+   if ( pFun == nullptr)
+      return nullptr ;
+   return pFun() ;
+}
+
+//-----------------------------------------------------------------------------
+IExport3dm*
+MyCreateExport3dm( void)
+{
+  // verifico caricamento libreria EgtExch3dm
+   if ( s_hEE3 == nullptr)
+      return nullptr ;
+  // recupero funzione creazione oggetto
+   typedef IExport3dm* (* PF_CreateExport3dm) ( void) ;
+   PF_CreateExport3dm pFun = (PF_CreateExport3dm)GetProcAddress( s_hEE3, EE3_CREATEEXPORT3DM) ;
+   if ( pFun == nullptr)
+      return nullptr ;
+   return pFun() ;
+}

DllExch3dm.h

@@ -0,0 +1,31 @@
+//----------------------------------------------------------------------------
+//  EgalTech 2023-2023
+//----------------------------------------------------------------------------
+// File : DllExch3dm.h         Data : 14.11.23        Versione : 2.5k3
+// Contenuto : Dichiarazioni funzioni per libreria opzionale EgtExchange.
+//
+//
+//
+// Modifiche : 14.11.23 DS Creazione modulo.
+//
+//
+//----------------------------------------------------------------------------
+
+#pragma once
+
+#include <string>
+
+class ILogger ;
+class IImport3dm ;
+class IExport3dm ;
+
+//----------------------------------------------------------------------------
+bool LoadExch3dmDll( ILogger* pLogger, const std::string& sKey, bool bNetHwKey) ;
+bool FreeExch3dmDll( void) ;
+bool IsLoadedExch3dmDll( void) ;
+void MySetEE3Logger( ILogger* pLogger) ;
+void MySetEE3Key( const std::string& sKey) ;
+void MySetEE3NetHwKey( bool bNetHwKey) ;
+const char* MyGetEE3Version( void) ;
+IImport3dm* MyCreateImport3dm( void) ;
+IExport3dm* MyCreateExport3dm( void) ;

DllExchange.cpp

@@ -10,6 +10,8 @@
 //             03.07.18 DS Aggiunto ImportPnt.
 //             15.09.19 DS Aggiunto ExportSvg.
 //             14.12.20 DS Aggiunto ImportBtlx.
+//             23.10.23 DB Aggiunto Export3dm.
+//             07.11.23 DB Aggiunto Import3dm.
 //
 //----------------------------------------------------------------------------
 
@@ -40,7 +42,6 @@ static const char* EEX_GETEEXVERSION = "GetEExVersion" ;
 static const char* EEX_SETEEXKEY = "SetEExKey" ;
 static const char* EEX_SETEEXNETHWKEY = "SetEExNetHwKey" ;
 static const char* EEX_SETBTLAUXDIR = "SetBtlAuxDir" ;
-static const char* EEX_SETTHREEJSAUXDIR = "SetThreeJSAuxDir" ;
 static const char* EEX_CREATEBEAMMGR = "CreateBeamMgr" ;
 static const char* EEX_CREATEIMPORTBTL = "CreateImportBtl" ;
 static const char* EEX_CREATEIMPORTBTLX = "CreateImportBtlx" ;
@@ -53,8 +54,9 @@ static const char* EEX_CREATEIMPORT3MF = "CreateImport3MF" ;
 static const char* EEX_CREATEEXPORTDXF = "CreateExportDxf" ;
 static const char* EEX_CREATEEXPORTSTL = "CreateExportStl" ;
 static const char* EEX_CREATEEXPORT3MF = "CreateExport3MF" ;
-static const char* EEX_CREATEEXPORTTHREEJS = "CreateExportThreeJS" ;
 static const char* EEX_CREATEEXPORTSVG = "CreateExportSvg" ;
+static const char* EEX_SETTHREEJSLIBDIR = "SetThreeJSLibDir" ;
+static const char* EEX_CREATEEXPORTTHREEJS = "CreateExportThreeJS" ;
 static const char* EEX_CREATEEEXEXECUTOR = "CreateExcExecutor" ;
 
 
@@ -70,7 +72,7 @@ LoadExchangeDll( ILogger* pLogger, const string& sKey, bool bNetHwKey)
       FreeExchangeDll() ;
       return false ;
    }
-  // se già caricata
+  // se già caricata
    if ( s_hEEx != nullptr)
       return true ;
   // carico la libreria EgtExchange
@@ -90,7 +92,7 @@ LoadExchangeDll( ILogger* pLogger, const string& sKey, bool bNetHwKey)
 bool
 FreeExchangeDll( void)
 {
-  // se non è già caricata
+  // se non è già caricata
    if ( s_hEEx == nullptr)
       return true ;
   // libero la libreria EgtExchange
@@ -181,22 +183,6 @@ MySetBtlAuxDir( const string& sBtlAuxDir)
    return pFun( sBtlAuxDir) ;
 }
 
-//-----------------------------------------------------------------------------
-bool
-MySetThreeJSAuxDir( const string& sThreeJSAuxDir )
-{
-  // verifico caricamento libreria EgtExchange
-   if ( s_hEEx == nullptr)
-      return false ;
-  // recupero funzione creazione oggetto
-   typedef bool ( *PF_SetThreeJSAuxDir)( const string& sThreeJSAuxDir) ;
-   PF_SetThreeJSAuxDir pFun = ( PF_SetThreeJSAuxDir) GetProcAddress( s_hEEx, EEX_SETTHREEJSAUXDIR) ;
-   if ( pFun == nullptr)
-      return false ;
-   return pFun( sThreeJSAuxDir) ;
-}
-
-
 //-----------------------------------------------------------------------------
 IBeamMgr*
 MyCreateBeamMgr( void)
@@ -377,21 +363,6 @@ MyCreateExport3MF( void)
    return pFun() ;
 }
 
-//-----------------------------------------------------------------------------
-IExportThreeJS*
-MyCreateExportThreeJS( void)
-{
-   // verifico caricamento libreria EgtExchange
-   if ( s_hEEx == nullptr)
-      return nullptr ;
-   // recupero funzione creazione oggetto
-   typedef IExportThreeJS* (* PF_CreateExportThreeJS) ( void) ;
-   PF_CreateExportThreeJS pFun = (PF_CreateExportThreeJS)GetProcAddress( s_hEEx, EEX_CREATEEXPORTTHREEJS) ;
-   if ( pFun == nullptr)
-      return nullptr ;
-   return pFun() ;
-}
-
 //-----------------------------------------------------------------------------
 IExportSvg*
 MyCreateExportSvg( void)
@@ -407,6 +378,36 @@ MyCreateExportSvg( void)
    return pFun() ;
 }
 
+//-----------------------------------------------------------------------------
+bool
+MySetThreeJSLibDir( const string& sThreeJSLibDir)
+{
+  // verifico caricamento libreria EgtExchange
+   if ( s_hEEx == nullptr)
+      return false ;
+  // recupero funzione creazione oggetto
+   typedef bool ( *PF_SetThreeJSLibDir)( const string& sThreeJSLibDir) ;
+   PF_SetThreeJSLibDir pFun = ( PF_SetThreeJSLibDir) GetProcAddress( s_hEEx, EEX_SETTHREEJSLIBDIR) ;
+   if ( pFun == nullptr)
+      return false ;
+   return pFun( sThreeJSLibDir) ;
+}
+
+//-----------------------------------------------------------------------------
+IExportThreeJS*
+MyCreateExportThreeJS( void)
+{
+   // verifico caricamento libreria EgtExchange
+   if ( s_hEEx == nullptr)
+      return nullptr ;
+   // recupero funzione creazione oggetto
+   typedef IExportThreeJS* (* PF_CreateExportThreeJS) ( void) ;
+   PF_CreateExportThreeJS pFun = (PF_CreateExportThreeJS)GetProcAddress( s_hEEx, EEX_CREATEEXPORTTHREEJS) ;
+   if ( pFun == nullptr)
+      return nullptr ;
+   return pFun() ;
+}
+
 //-----------------------------------------------------------------------------
 IExcExecutor*
 MyCreateExcExecutor( void)

DllExchange.h

@@ -41,7 +41,6 @@ void MySetEExKey( const std::string& sKey) ;
 void MySetEExNetHwKey( bool bNetHwKey) ;
 const char* MyGetEExVersion( void) ;
 bool MySetBtlAuxDir( const std::string& sBtlAuxDir) ;
-bool MySetThreeJSAuxDir( const std::string& sThreeJSAuxDir) ;
 IBeamMgr* MyCreateBeamMgr( void) ;
 IImportBtl* MyCreateImportBtl( void) ;
 IImportBtlx* MyCreateImportBtlx( void) ;
@@ -54,6 +53,7 @@ IImport3MF* MyCreateImport3MF( void) ;
 IExportDxf* MyCreateExportDxf( void) ;
 IExportStl* MyCreateExportStl( void) ;
 IExport3MF* MyCreateExport3MF( void) ;
+bool MySetThreeJSLibDir( const std::string& sThreeJSLibDir) ;
 IExportThreeJS* MyCreateExportThreeJS( void) ;
 IExportSvg* MyCreateExportSvg( void) ;
 IExcExecutor* MyCreateExcExecutor(void) ;

DllNesting.cpp

@@ -45,8 +45,15 @@ HMODULE s_hENs = nullptr ;
 
 //-----------------------------------------------------------------------------
 bool
-LoadNestingDll( ILogger* pLogger, const string& sKey, const string& sKey2)
+LoadNestingDll( ILogger* pLogger, const string& sKey, const string& sKey2, bool bNetHwKey)
 {
+  // non ammessa con chiave di rete
+   if ( bNetHwKey) {
+      std::string sErr = "Warning on Key (ENS/NET)" ;
+      LOG_ERROR( pLogger, sErr.c_str()) ;
+      FreeNestingDll() ;
+      return false ;
+   }
   // verifico la chiave
    if ( ! TestKeyForENs( sKey, 0, pLogger)) {
       FreeNestingDll() ;

DllNesting.h

@@ -19,7 +19,7 @@ class ILogger ;
 class IAutoNester ;
 
 //----------------------------------------------------------------------------
-bool LoadNestingDll( ILogger* pLogger, const std::string& sKey, const std::string& sKey2) ;
+bool LoadNestingDll( ILogger* pLogger, const std::string& sKey, const std::string& sKey2, bool bNetHwKey) ;
 bool FreeNestingDll( void) ;
 bool IsLoadedNestingDll( void) ;
 void MySetENsLogger( ILogger* pLogger) ;

EXE.h

@@ -1,7 +1,7 @@
 //----------------------------------------------------------------------------
-//  EgalTech 2014-2015
+//  EgalTech 2014-2023
 //----------------------------------------------------------------------------
-// File : EXE.h             Data : 05.05.15        Versione : 1.6e2
+// File : EXE.h             Data : 05.02.23        Versione : 2.5a6
 // Contenuto : Dichiarazioni locali per moduli EXE.
 //
 //
@@ -25,6 +25,7 @@ const std::string& ExeGetIniFile( void) ;
 //----------------------------------------------------------------------------
 const std::string& ExeGetKey( void) ;
 const std::string& ExeGetNestKey( void) ;
+const std::string& ExeGetLockId( void) ;
 
 //----------------------------------------------------------------------------
 ILogger* GetLogger( void) ;
@@ -38,3 +39,7 @@ bool ExeInsertMachMgr( int nInsGrp) ;
 //----------------------------------------------------------------------------
 bool ExeIsDuploBase( IGeomDB* pGeomDB, int nId) ;
 bool ExeInsertDuplo( int nInsGrp) ;
+
+//----------------------------------------------------------------------------
+bool ExeCreateMutex( const std::string& sMutexName) ;
+bool ExeReleaseMutex( void) ;

EXE_BeamMgr.cpp

@@ -148,6 +148,26 @@ ExeBeamGetSideData( int nSide, Frame3d& frRef, double& dLength, double& dWidth,
    return pBeamMgr->GetSideData( nSide, frRef, dLength, dWidth, dHeight) ;
 }
 
+//-----------------------------------------------------------------------------
+bool
+ExeBeamShowFacesName( bool bShow)
+{
+   IBeamMgr* pBeamMgr = GetCurrBeamMgr() ;
+   VERIFY_BEAMMGR( pBeamMgr, false)
+  // imposto la visualizzazione delle facce sul pezzo corrente
+   return pBeamMgr->ShowFacesName( bShow) ;
+}
+
+//-----------------------------------------------------------------------------
+bool
+ExeBeamShowLoadingSide( bool bShow, bool bFromLeft)
+{
+   IBeamMgr* pBeamMgr = GetCurrBeamMgr() ;
+   VERIFY_BEAMMGR( pBeamMgr, false)
+  // imposto la visualizzazione del lato di carico sotto il pezzo corrente
+   return pBeamMgr->ShowLoadingSide( bShow, bFromLeft) ;
+}
+
 //-----------------------------------------------------------------------------
 int
 ExeBeamAddProcess( int nGroup, int nProc, int nSide, const string& sDes, int nProcId,

EXE_CAvTool.cpp

@@ -22,6 +22,7 @@
 #include "/EgtDev/Include/EXeConst.h"
 #include "/EgtDev/Include/EGkCurve.h"
 #include "/EgtDev/Include/EGkCurveComposite.h"
+#include "/EgtDev/Include/EGkStmStandard.h"
 #include "/EgtDev/Include/EGkCAvToolSurfTm.h"
 #include "/EgtDev/Include/EgtNumUtils.h"
 #include "/EgtDev/Include/EgtPointerOwner.h"
@@ -98,6 +99,28 @@ ExeCAvGetToolOutline( int nDestGrpId, bool bApprox)
    return nId ;
 }
 
+//----------------------------------------------------------------------------
+double
+ExeCAvToolPosBox( const Point3d& ptP, const Vector3d& vtAx, const BBox3d& b3Box, const Vector3d& vtMove)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, false)
+  // creo la superficie TriMesh
+   PtrOwner<ISurfTriMesh> pStm( GetSurfTriMeshBox( b3Box.GetDimX(), b3Box.GetDimY(), b3Box.GetDimZ())) ;
+   if ( IsNull( pStm))
+      return -1 ;
+   pStm->Translate( b3Box.GetMin() - ORIG) ;
+  // verifico oggetto per evitare collisioni
+   if ( IsNull( s_pCAvTlStm))
+      return -1 ;
+  // imposto dati
+   s_pCAvTlStm->SetSurfTm( *pStm) ;
+   double dMove ;
+   if ( ! s_pCAvTlStm->TestPosition( ptP, vtAx, vtMove, dMove))
+      return -1 ;
+   return dMove ;
+}
+
 //----------------------------------------------------------------------------
 double
 ExeCAvToolPosStm( const Point3d& ptP, const Vector3d& vtAx, int nSurfTmId, const Vector3d& vtMove, int nRefType)

EXE_CDeObjSolid.cpp

@@ -25,7 +25,9 @@
 #include "/EgtDev/Include/EGkCDeCylClosedSurfTm.h"
 #include "/EgtDev/Include/EGkCDeConeFrustumClosedSurfTm.h"
 #include "/EgtDev/Include/EGkCDeSpheClosedSurfTm.h"
+#include "/EgtDev/Include/EGkCDeClosedSurfTmClosedSurfTm.h"
 #include "/EgtDev/Include/EGkVolZmap.h"
+#include "/EgtDev/Include/EGkSurfLocal.h"
 #include "/EgtDev/Include/EGkStringUtils3d.h"
 
 using namespace std ;
@@ -67,7 +69,7 @@ MyCDeBoxVolZmap( const Frame3d& frBox, const Vector3d& vtDiag, int nZmapId, doub
   // porto in locale il riferimento (il vettore è già in locale a questo stesso riferimento)
    Frame3d frBoxL = GetFrameLocal( pGeomDB, frBox, nRefType, frLoc) ;
   // verifico la collisione
-   return ( pVZM->AvoidBox( frBoxL, vtDiag, dSafeDist) ? 0 : 1) ;
+   return ( pVZM->AvoidBox( frBoxL, vtDiag, dSafeDist, false) ? 0 : 1) ;
 }
 
 //----------------------------------------------------------------------------
@@ -138,7 +140,7 @@ MyCDeRectPrismoidVolZmap( const Frame3d& frPrismoid, double dBaseLenX, double dB
   // porto in locale il riferimento (il vettore è già in locale a questo stesso riferimento)
    Frame3d frPrismoidL = GetFrameLocal( pGeomDB, frPrismoid, nRefType, frLoc) ;
   // verifico la collisione
-   return ( pVZM->AvoidRectPrismoid( frPrismoidL, dBaseLenX, dBaseLenY, dTopLenX, dTopLenY, dHeight, dSafeDist) ? 0 : 1) ;
+   return ( pVZM->AvoidRectPrismoid( frPrismoidL, dBaseLenX, dBaseLenY, dTopLenX, dTopLenY, dHeight, dSafeDist, false) ? 0 : 1) ;
 }
 
 //----------------------------------------------------------------------------
@@ -211,7 +213,7 @@ MyCDeCylVolZmap( const Frame3d& frCyl, double dR, double dH, int nZmapId, double
   // porto in locale il riferimento
    Frame3d frCylL = GetFrameLocal( pGeomDB, frCyl, nRefType, frLoc) ;
   // verifico la collisione
-   return ( pVZM->AvoidCylinder( frCylL, dR, dH, dSafeDist) ? 0 : 1) ;
+   return ( pVZM->AvoidCylinder( frCylL, dR, dH, dSafeDist, false) ? 0 : 1) ;
 }
 
 //----------------------------------------------------------------------------
@@ -279,7 +281,7 @@ MyCDeConeVolZmap( const Frame3d& frCone, double dR1, double dR2, double dH, int
   // porto in locale il riferimento
    Frame3d frConeL = GetFrameLocal( pGeomDB, frCone, nRefType, frLoc) ;
   // verifico la collisione
-   return ( pVZM->AvoidConeFrustum( frConeL, dR1, dR2, dH, dSafeDist) ? 0 : 1) ;
+   return ( pVZM->AvoidConeFrustum( frConeL, dR1, dR2, dH, dSafeDist, false) ? 0 : 1) ;
 }
 
 //----------------------------------------------------------------------------
@@ -348,7 +350,7 @@ MyCDeSpheVolZmap( const Point3d& ptCen, double dRad, int nZmapId, double dSafeDi
   // porto in locale il centro della sfera
    Point3d ptCenL = GetPointLocal( pGeomDB, ptCen, nRefType, frLoc) ;
   // verifico la collisione
-   return ( pVZM->AvoidSphere( ptCenL, dRad, dSafeDist) ? 0 : 1) ;
+   return ( pVZM->AvoidSphere( ptCenL, dRad, dSafeDist, false) ? 0 : 1) ;
 }
 
 //----------------------------------------------------------------------------
@@ -374,3 +376,71 @@ ExeCDeSpheSolid( const Point3d& ptCen, double dR, int nSolidId, double dSafeDist
   // restituisco risultato
    return nRes ;
 }
+
+//----------------------------------------------------------------------------
+static int
+MyCDeClosedSurfTmClosedSurfTm( int nSurfTm1Id, int nSurfTm2Id, double dSafeDist)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, -1)
+  // recupero il riferimento della seconda superficie
+   Frame3d frSurf2 ;
+   if ( ! pGeomDB->GetGlobFrame( nSurfTm2Id, frSurf2))
+      return -1 ;
+  // recupero la prima superficie in locale alla seconda
+   SurfLocal Surf1Loc( pGeomDB, nSurfTm1Id, frSurf2) ;
+   const ISurfTriMesh* pStm1 = GetSurfTriMesh( Surf1Loc) ;
+   if ( pStm1 == nullptr)
+      return -1 ;
+  // recupero la seconda superficie TriMesh
+   const ISurfTriMesh* pStm2 = GetSurfTriMesh( pGeomDB->GetGeoObj( nSurfTm2Id)) ;
+   if ( pStm2 == nullptr)
+      return -1 ;
+  // verifico la collisione
+   return ( CDeClosedSurfTmClosedSurfTm( *pStm1, *pStm2, dSafeDist) ? 1 : 0) ;
+}
+
+//----------------------------------------------------------------------------
+static int
+MyCDeClosedSurfTmVolZmap( int nSurfTmId, int nZmapId, double dSafeDist)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, -1)
+  // recupero il riferimento dello Zmap
+   Frame3d frZmap ;
+   if ( ! pGeomDB->GetGlobFrame( nZmapId, frZmap))
+      return -1 ;
+  // recupero la superficie in locale allo Zmap
+   SurfLocal SurfLoc( pGeomDB, nSurfTmId, frZmap) ;
+   const ISurfTriMesh* pStm = GetSurfTriMesh( SurfLoc) ;
+   if ( pStm == nullptr)
+      return -1 ;
+  // recupero lo Zmap
+   const IVolZmap* pVZM = GetVolZmap( pGeomDB->GetGeoObj( nZmapId)) ;
+   if ( pVZM == nullptr)
+      return -1 ;
+  // verifico la collisione
+   return ( pVZM->AvoidSurfTm( *pStm, dSafeDist, false) ? 0 : 1) ;
+}
+
+//----------------------------------------------------------------------------
+int
+ExeCDeSolidSolid( int nSolid1Id, int nSolid2Id, double dSafeDist)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   int nRes = -1 ;
+   if ( pGeomDB != nullptr  &&  pGeomDB->GetGeoType( nSolid1Id) == SRF_TRIMESH  &&  pGeomDB->GetGeoType( nSolid2Id) == SRF_TRIMESH)
+      nRes = MyCDeClosedSurfTmClosedSurfTm( nSolid1Id, nSolid2Id, dSafeDist) ;
+   else if ( pGeomDB != nullptr  &&  pGeomDB->GetGeoType( nSolid1Id) == SRF_TRIMESH  &&  pGeomDB->GetGeoType( nSolid2Id) == VOL_ZMAP)
+      nRes = MyCDeClosedSurfTmVolZmap( nSolid1Id, nSolid2Id, dSafeDist) ;
+  // se richiesto, salvo il comando Lua equivalente
+   if ( IsCmdLog()) {
+      string sLua = "EgtCDeSolidSolid({" + IdToString( nSolid1Id) + "," +
+                                           IdToString( nSolid2Id) + "," +
+                                           ToString( dSafeDist) + ")" +
+                    " -- Res=" + ToString( nRes) ;
+      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
+   }
+  // restituisco risultato
+   return nRes ;
+}

EXE_Const.h

@@ -18,6 +18,7 @@
 //----------------------------------------------------------------------------
 // Costanti per tolleranze di appossimazione
 const double LIN_TOL_STD = 0.1 ;
+const double LIN_TOL_SRF = 0.05 ;
 const double LIN_TOL_FINE = 0.01 ;
 const double LIN_FEA_STD = 20 ;
 const double LIN_FEA_MAX = 400 ;

EXE_Exchange.cpp

@@ -17,13 +17,13 @@
 #include "EXE_Macro.h"
 #include "AuxTools.h"
 #include "DllExchange.h"
+#include "DllExch3dm.h"
 #include "/EgtDev/Include/EXeExecutor.h"
 #include "/EgtDev/Include/EXeConst.h"
 #include "/EgtDev/Include/EXeCmdLogOff.h"
 #include "/EgtDev/Include/EExImportDxf.h"
 #include "/EgtDev/Include/EExImportStl.h"
 #include "/EgtDev/Include/EExImport3MF.h"
-#include "/EgtDev/Include/EExExportThreeJS.h"
 #include "/EgtDev/Include/EExImportCnc.h"
 #include "/EgtDev/Include/EExImportCsf.h"
 #include "/EgtDev/Include/EExImportPnt.h"
@@ -33,6 +33,9 @@
 #include "/EgtDev/Include/EExExportStl.h"
 #include "/EgtDev/Include/EExExport3MF.h"
 #include "/EgtDev/Include/EExExportSvg.h"
+#include "/EgtDev/Include/EExExportThreeJS.h"
+#include "/EgtDev/Include/EE3Import3dm.h"
+#include "/EgtDev/Include/EE3Export3dm.h"
 #include "/EgtDev/Include/EGnStringUtils.h"
 #include "/EgtDev/Include/EGnFileUtils.h"
 #include "/EgtDev/Include/EgtStringConverter.h"
@@ -60,7 +63,7 @@ ExeGetFileType( const string& sFilePath)
    SplitLast( sFileName, ".", sFileTitle, sFileExt) ;
    ToUpper( sFileExt) ;
 
-   if ( sFileExt == "NGE"  ||  sFileExt == "VME"  ||  sFileExt == "NHE"  ||  sFileExt == "BWE")
+   if ( sFileExt == "NGE"  ||  sFileExt == "VME"  ||  sFileExt == "NHE"  ||  sFileExt == "BWE"  ||  sFileExt == "ICRS")
       return FT_NGE ;
    else if ( sFileExt == "NFE")
       return FT_NFE ;
@@ -70,6 +73,8 @@ ExeGetFileType( const string& sFilePath)
       return FT_STL ;
    else if ( sFileExt == "3MF")
       return FT_3MF ;
+   else if ( sFileExt == "3DM")
+      return FT_3DM ;
    else if ( sFileExt == "OBJ")
       return FT_OBJ ;
    else if ( sFileExt == "CNC"  ||  sFileExt == "XPI"  ||  sFileExt == "MPF"  ||  sFileExt == "ISO"  ||  sFileExt == "EIA")
@@ -80,6 +85,8 @@ ExeGetFileType( const string& sFilePath)
       return FT_BTL ;
    else if ( sFileExt == "BTLX")
       return FT_BTLX ;
+   else if ( sFileExt == "3DM")
+      return FT_3DM ;
    else if ( sFileExt == "PNG"  ||  sFileExt == "JPG"  ||  sFileExt == "JPEG"  ||  sFileExt == "BMP")
       return FT_IMG ;
    else if ( sFileExt == "PNT"  ||  sFileExt == "XYZ")
@@ -100,6 +107,8 @@ ExeGetFileType( const string& sFilePath)
       return FT_VRML ;
    else if ( sFileExt == "C3D")
       return FT_C3D ;
+   else if ( sFileExt == "HTML")
+      return FT_HTML ;
    else if ( sFileExt == "TSC")
       return FT_TSC ;
    else if ( sFileExt == "LUA")
@@ -119,14 +128,6 @@ ExeSetBtlAuxDir( const string& sBtlAuxDir)
    return MySetBtlAuxDir( sBtlAuxDir) ;
 }
 
-//-----------------------------------------------------------------------------
-bool
-ExeSetThreeJSAuxDir( const string & sThreeJSAuxDir )
-{
-   return MySetThreeJSAuxDir( sThreeJSAuxDir) ;
-}
-
-
 //-----------------------------------------------------------------------------
 bool
 ExeImportBtl( const string& sFilePath, int nFlag)
@@ -151,6 +152,11 @@ ExeImportBtl( const string& sFilePath, int nFlag)
                     " -- Ok=" + ToString( bOk) ;
       LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
    }
+  // scrivo il log
+   if ( ! IsNull( pImpBtl)) {
+      string sLog = "Import File " + sFilePath ;
+      LOG_INFO( GetLogger(), sLog.c_str()) ;
+   }
   // restituisco il risultato
    return bOk ;
 }
@@ -179,6 +185,11 @@ ExeImportBtlx( const string& sFilePath, int nFlag)
                     " -- Ok=" + ToString( bOk) ;
       LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
    }
+  // scrivo il log
+   if ( ! IsNull( pImpBtlx)) {
+      string sLog = "Import File " + sFilePath ;
+      LOG_INFO( GetLogger(), sLog.c_str()) ;
+   }
   // restituisco il risultato
    return bOk ;
 }
@@ -209,6 +220,11 @@ ExeImportCnc( const string& sFilePath, int nFlag)
                     " -- Ok=" + ToString( bOk) ;
       LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
    }
+  // scrivo il log
+   if ( ! IsNull( pImpCnc)) {
+      string sLog = "Import File " + sFilePath ;
+      LOG_INFO( GetLogger(), sLog.c_str()) ;
+   }
   // restituisco il risultato
    return bOk ;
 }
@@ -236,6 +252,11 @@ ExeImportCsf( const string& sFilePath)
                     " -- Ok=" + ToString( bOk) ;
       LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
    }
+  // scrivo il log
+   if ( ! IsNull( pImpCsf)) {
+      string sLog = "Import File " + sFilePath ;
+      LOG_INFO( GetLogger(), sLog.c_str()) ;
+   }
   // restituisco il risultato
    return bOk ;
 }
@@ -266,6 +287,11 @@ ExeImportDxf( const string& sFilePath, double dScaleFactor)
                     " -- Ok=" + ToString( bOk) ;
       LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
    }
+  // scrivo il log
+   if ( ! IsNull( pImpDxf)) {
+      string sLog = "Import File " + sFilePath ;
+      LOG_INFO( GetLogger(), sLog.c_str()) ;
+   }
   // restituisco il risultato
    return bOk ;
 }
@@ -296,6 +322,11 @@ ExeImportPnt( const string& sFilePath, int nFlag)
                     " -- Ok=" + ToString( bOk) ;
       LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
    }
+  // scrivo il log
+   if ( ! IsNull( pImpPnt)) {
+      string sLog = "Import File " + sFilePath ;
+      LOG_INFO( GetLogger(), sLog.c_str()) ;
+   }
   // restituisco il risultato
    return bOk ;
 }
@@ -311,10 +342,10 @@ ExeImportStl( const string& sFilePath, double dScaleFactor)
    // aggiungo un gruppo pezzo e un gruppo layer
    int nPartId = pGseCtx->m_pGeomDB->AddGroup( GDB_ID_NULL, GDB_ID_ROOT, Frame3d()) ;
    int nLayerId = pGseCtx->m_pGeomDB->AddGroup( GDB_ID_NULL, nPartId, Frame3d()) ;
-   // preparo l'importatore
+  // preparo l'importatore
    PtrOwner<IImportStl> pImpStl( MyCreateImportStl()) ;
    bOk = bOk && ! IsNull( pImpStl) ;
-   // eseguo l'importazione
+  // eseguo l'importazione
    bOk = bOk && pImpStl->Import( sFilePath, pGseCtx->m_pGeomDB, nLayerId, dScaleFactor) ;
   // aggiorno stato file corrente
    if ( pGseCtx->m_sFilePath.empty())
@@ -327,6 +358,11 @@ ExeImportStl( const string& sFilePath, double dScaleFactor)
                     " -- Ok=" + ToString( bOk) ;
       LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
    }
+  // scrivo il log
+   if ( ! IsNull( pImpStl)) {
+      string sLog = "Import File " + sFilePath ;
+      LOG_INFO( GetLogger(), sLog.c_str()) ;
+   }
   // restituisco il risultato
    return bOk ;
 }
@@ -339,13 +375,13 @@ ExeImport3MF( const string& sFilePath)
    VERIFY_CTX_GEOMDB( pGseCtx, false)
    bool bOk = true ;
   // importo il file 3MF
-   // aggiungo un gruppo pezzo e un gruppo layer
+  // aggiungo un gruppo pezzo e un gruppo layer
    int nPartId = pGseCtx->m_pGeomDB->AddGroup( GDB_ID_NULL, GDB_ID_ROOT, Frame3d()) ;
    int nLayerId = pGseCtx->m_pGeomDB->AddGroup( GDB_ID_NULL, nPartId, Frame3d()) ;
-   // preparo l'importatore
+  // preparo l'importatore
    PtrOwner<IImport3MF> pImp3MF( MyCreateImport3MF()) ;
    bOk = bOk && ! IsNull( pImp3MF) ;
-   // eseguo l'importazione
+  // eseguo l'importazione
    bOk = bOk && pImp3MF->Import( sFilePath, pGseCtx->m_pGeomDB, nLayerId) ;
   // aggiorno stato file corrente
    if ( pGseCtx->m_sFilePath.empty())
@@ -357,6 +393,54 @@ ExeImport3MF( const string& sFilePath)
                     " -- Ok=" + ToString( bOk) ;
       LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
    }
+  // scrivo il log
+   if ( ! IsNull( pImp3MF)) {
+      string sLog = "Import File " + sFilePath ;
+      LOG_INFO( GetLogger(), sLog.c_str()) ;
+   }
+  // restituisco il risultato
+   return bOk ;
+}
+
+//-----------------------------------------------------------------------------
+bool
+ExeImport3dm( const string& sFilePath)
+{
+   GseContext* pGseCtx = GetCurrGseContext() ;
+   VERIFY_CTX_GEOMDB( pGseCtx, false)
+   bool bOk = true ;
+  // importo il file 3dm
+  // aggiungo un gruppo pezzo e un gruppo layer
+   int nPartId = pGseCtx->m_pGeomDB->AddGroup( GDB_ID_NULL, GDB_ID_ROOT, Frame3d()) ;
+  // preparo l'importatore
+   PtrOwner<IImport3dm> pImp3dm( MyCreateImport3dm()) ;
+   bOk = bOk && ! IsNull( pImp3dm) ;
+  // eseguo l'importazione
+   const DimensionStyle& DimSt = pGseCtx->m_dsCurr ;
+   double dExtLine = DimSt.dExtLineLen ;
+   double dArrLen = DimSt.dArrowLen ;
+   double dTextDist = DimSt.dTextDist ;
+   bool bLenIsMM = ( DimSt.nLenIsMM == 2 ? ExeUiUnitsAreMM() : ( DimSt.nLenIsMM != 0 )) ;
+   int nDecDig = DimSt.nDecDigit ;
+   string  sFont = DimSt.sFont ;
+   double dTextHeight = DimSt.dTextHeight ;
+   bOk = bOk && pImp3dm->Import( sFilePath, pGseCtx->m_pGeomDB, nPartId,
+                                 dTextHeight, dExtLine, dArrLen, dTextDist, bLenIsMM, nDecDig, sFont) ;
+  // aggiorno stato file corrente
+   if ( pGseCtx->m_sFilePath.empty())
+      pGseCtx->m_sFilePath = sFilePath ;
+   ExeSetModified() ;
+  // se richiesto, salvo il comando Lua equivalente
+   if ( IsCmdLog()) {
+      string sLua = "EgtImport3dm('" + StringToLuaString( sFilePath) + "')" +
+                    " -- Ok=" + ToString( bOk) ;
+      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
+   }
+  // scrivo il log
+   if ( ! IsNull( pImp3dm)) {
+      string sLog = "Import File " + sFilePath ;
+      LOG_INFO( GetLogger(), sLog.c_str()) ;
+   }
   // restituisco il risultato
    return bOk ;
 }
@@ -419,7 +503,8 @@ ExeAdvancedImport( const string& sFilePath, double dToler)
       sExec = "EgtConverterR32.exe" ;
    #endif
    string sCmdLine = "\"" + sExec + "\" \"" + sFilePath + "\" \"" + sFileOut + "\" \"" +
-                     ToString( dToler, 3) + "\" \"" +  ToString( ExeGetDebugLevel()) +"\" \"" + ExeGetKey() + "\""  ;
+                     ToString( dToler, 3) + "\" \"" +  ToString( ExeGetDebugLevel()) + "\" \"" +
+                     ExeGetKey() + "\" \"" + ExeGetLockId() + "\""   ;
    STARTUPINFO si ;
    PROCESS_INFORMATION pi ;
    ZeroMemory( &si, sizeof( si)) ;
@@ -453,7 +538,8 @@ ExeAdvancedImport( const string& sFilePath, double dToler)
    if ( ExeGetDebugLevel() < 5)
       EraseFile( sFileOut) ;
   // aggiorno stato file corrente
-   pGseCtx->m_sFilePath = sFilePath ;
+   if ( pGseCtx->m_sFilePath.empty())
+      pGseCtx->m_sFilePath = sFilePath ;
    ExeSetModified() ;
   // se richiesto, salvo il comando Lua equivalente
    if ( IsCmdLog()) {
@@ -462,23 +548,28 @@ ExeAdvancedImport( const string& sFilePath, double dToler)
                     " -- Ok=" + ToString( bOk) ;
       LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
    }
+  // scrivo il log
+   {
+      string sLog = "Advanced Import File " + sFilePath ;
+      LOG_INFO( GetLogger(), sLog.c_str()) ;
+   }
   // restituisco il risultato
    return bOk ;
 }
 
 //-----------------------------------------------------------------------------
 bool
-ExeExportDxf( int nId, const string& sFilePath, int nFlag)
+ExeExportDxf( int nId, const string& sFilePath, int nFlag, int nFilter)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
    VERIFY_GEOMDB( pGeomDB, false)
    bool bOk = true ;
   // esporto il file DXF
-   // preparo l'esportatore
+  // preparo l'esportatore
    PtrOwner<IExportDxf> pExpDxf( MyCreateExportDxf()) ;
    bOk = bOk && ! IsNull( pExpDxf) ;
    // eseguo l'esportazione
-   pExpDxf->SetOptions( EEXFLT_DEFAULT, nFlag) ;
+   bOk = bOk && pExpDxf->SetOptions( nFilter, nFlag) ;
    bOk = bOk && pExpDxf->Export( pGeomDB, nId, sFilePath) ;
   // se richiesto, salvo il comando Lua equivalente
    if ( IsCmdLog()) {
@@ -494,16 +585,17 @@ ExeExportDxf( int nId, const string& sFilePath, int nFlag)
 
 //-----------------------------------------------------------------------------
 bool
-ExeExportStl( int nId, const string& sFilePath)
+ExeExportStl( int nId, const string& sFilePath, int nFilter)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
    VERIFY_GEOMDB( pGeomDB, false)
    bool bOk = true ;
   // esporto il file STL
-   // preparo l'esportatore
+  // preparo l'esportatore
    PtrOwner<IExportStl> pExpStl( MyCreateExportStl()) ;
    bOk = bOk && ! IsNull( pExpStl) ;
    // eseguo l'esportazione
+   bOk = bOk && pExpStl->SetOptions( nFilter) ;
    bOk = bOk && pExpStl->Export( pGeomDB, nId, sFilePath) ;
   // se richiesto, salvo il comando Lua equivalente
    if ( IsCmdLog()) {
@@ -518,16 +610,17 @@ ExeExportStl( int nId, const string& sFilePath)
 
 //-----------------------------------------------------------------------------
 bool
-ExeExport3MF( int nId, const string& sFilePath)
+ExeExport3MF( int nId, const string& sFilePath, int nFilter)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
    VERIFY_GEOMDB( pGeomDB, false)
    bool bOk = true ;
-  // esporto il file STL
-   // preparo l'esportatore
+  // esporto il file 3MF
+  // preparo l'esportatore
    PtrOwner<IExport3MF> pExp3MF( MyCreateExport3MF()) ;
    bOk = bOk && ! IsNull( pExp3MF) ;
-   // eseguo l'esportazione
+  // eseguo l'esportazione
+   bOk = bOk && pExp3MF->SetOptions( nFilter) ;
    bOk = bOk && pExp3MF->Export( pGeomDB, nId, sFilePath) ;
   // se richiesto, salvo il comando Lua equivalente
    if ( IsCmdLog()) {
@@ -540,6 +633,31 @@ ExeExport3MF( int nId, const string& sFilePath)
    return bOk ;
 }
 
+//-----------------------------------------------------------------------------
+bool
+ExeExport3dm( int nId, const string& sFilePath, int nFilter)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, false)
+   bool bOk = true ;
+  // esporto il file 3dm
+  // preparo l'esportatore
+   PtrOwner<IExport3dm> pExp3dm( MyCreateExport3dm()) ;
+   bOk = bOk && ! IsNull( pExp3dm) ;
+  // eseguo l'esportazione
+   bOk = bOk && pExp3dm->SetOptions( nFilter) ;
+   bOk = bOk && pExp3dm->Export( pGeomDB, nId, sFilePath) ;
+  // se richiesto, salvo il comando Lua equivalente
+   if ( IsCmdLog()) {
+      string sLua = "EgtExport3dm(" + ToString( nId) + ",'" +
+                                      StringToLuaString( sFilePath) + "')" +
+                    " -- Ok=" + ToString( bOk) ;
+      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
+   }
+  // restituisco il risultato
+   return bOk ;
+}
+
 //-----------------------------------------------------------------------------
 bool
 ExeExportSvg( int nId, const string& sFilePath, int nFilter)
@@ -547,12 +665,12 @@ ExeExportSvg( int nId, const string& sFilePath, int nFilter)
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
    VERIFY_GEOMDB( pGeomDB, false)
    bool bOk = true ;
-   // esporto il file SVG
-   // preparo l'esportatore
+  // esporto il file SVG
+  // preparo l'esportatore
    PtrOwner<IExportSvg> pExpSvg( MyCreateExportSvg()) ;
    bOk = bOk && ! IsNull( pExpSvg) ;
-   // eseguo l'esportazione
-   pExpSvg->SetOptions( nFilter) ;
+  // eseguo l'esportazione
+   bOk = bOk && pExpSvg->SetOptions( nFilter) ;
    bOk = bOk && pExpSvg->Export( pGeomDB, nId, sFilePath) ;
   // se richiesto, salvo il comando Lua equivalente
    if ( IsCmdLog()) {
@@ -566,6 +684,13 @@ ExeExportSvg( int nId, const string& sFilePath, int nFilter)
    return bOk ;
 }
 
+//-----------------------------------------------------------------------------
+bool
+ExeSetThreeJSLibDir( const string& sThreeJSLibDir)
+{
+   return MySetThreeJSLibDir( sThreeJSLibDir) ;
+}
+
 //-----------------------------------------------------------------------------
 bool
 ExeExportThreeJS( int nId, const string& sFilePath, int nFilter)
@@ -582,12 +707,13 @@ ExeExportThreeJS( int nId, const string& sFilePath, int nFilter)
 
   // eseguo l'esportazione
    bOk = bOk && pExpThreeJS->SetOptions( nFilter) ;
-   bOk = bOk && pExpThreeJS->Export( pGeomDB, nId, sFilePath, pScene, ExeUiUnitsAreMM()) ;
+   bOk = bOk && pExpThreeJS->Export( pGeomDB, nId, pScene, ExeUiUnitsAreMM(), sFilePath) ;
   // se richiesto, salvo il comando Lua equivalente
    if ( IsCmdLog()) {
       string sLua = "EgtExportThreeJS(" + ToString( nId) + ",'" +
-         StringToLuaString( sFilePath) + "')" +
-         " -- Ok=" + ToString( bOk) ;
+                                          StringToLuaString( sFilePath) + "'," +
+                                          ToString( nFilter) + ")" +
+                    " -- Ok=" + ToString( bOk) ;
       LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
    }
   // restituisco il risultato

EXE_GdbCreate.cpp

@@ -26,6 +26,11 @@
 #include "/EgtDev/Include/EGkStringUtils3d.h"
 #include "/EgtDev/Include/EgtStringConverter.h"
 #include "/EgtDev/Include/EgtPointerOwner.h"
+#include "/EgtDev/Include/EGkIntersCurves.h"
+#include "/EgtDev/Include/EGkCurveLine.h"
+#include "/EgtDev/Include/EGkCurveArc.h"
+#include "/EgtDev/Include/EGkDistPointCurve.h"
+#include "/EgtDev/Include/EGkCurveComposite.h"
 
 using namespace std ;
 
@@ -35,11 +40,11 @@ ExeCreateGroup( int nParentId, const Frame3d& frFrame, int nRefType)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
    VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
-   nParentId = AdjustId( nParentId) ;
+      nParentId = AdjustId( nParentId) ;
    bool bOk = true ;
-  // recupero il riferimento locale
+ // recupero il riferimento locale
    Frame3d frLoc ;
-   bOk = bOk && pGeomDB->GetGroupGlobFrame( nParentId, frLoc) ;
+   bOk = bOk && pGeomDB->GetGroupGlobFrame( nParentId, frLoc ) ;
   // porto in locale l'origine e i versori
    Point3d ptOrigL = GetPointLocal( pGeomDB, frFrame.Orig(), nRefType, frLoc) ;
    Vector3d vtXL = GetVectorLocal( pGeomDB, frFrame.VersX(), nRefType, frLoc) ;
@@ -73,7 +78,7 @@ ExeCreateGroup( int nParentId, const Frame3d& frFrame, int nRefType)
                 " -- Id=" + ToString( nId) ;
       LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
    }
-  // restituisco l'identificativo del nuovo gruppo
+   // restituisco l'identificativo del nuovo gruppo
    return nId ;
 }
 
@@ -83,7 +88,7 @@ ExeCreateGeoPoint( int nParentId, const Point3d& ptP, int nRefType)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
    VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
-   nParentId = AdjustId( nParentId) ;
+      nParentId = AdjustId( nParentId) ;
    bool bOk = true ;
   // recupero il riferimento locale
    Frame3d frLoc ;
@@ -92,9 +97,9 @@ ExeCreateGeoPoint( int nParentId, const Point3d& ptP, int nRefType)
    Point3d ptPL = GetPointLocal( pGeomDB, ptP, nRefType, frLoc) ;
   // creo il punto
    PtrOwner<IGeoPoint3d> pGeoPnt( CreateGeoPoint3d()) ;
-   bOk = bOk && ! IsNull( pGeoPnt) ;
+   bOk = bOk && !IsNull( pGeoPnt) ;
   // setto il punto
-   bOk = bOk && pGeoPnt->Set(  ptPL) ;
+   bOk = bOk && pGeoPnt->Set( ptPL) ;
   // inserisco il punto nel DB
    int nId = ( bOk ? pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, Release( pGeoPnt)) : GDB_ID_NULL) ;
    ExeSetModified() ;
@@ -106,7 +111,7 @@ ExeCreateGeoPoint( int nParentId, const Point3d& ptP, int nRefType)
                     " -- Id=" + ToString( nId) ;
       LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
    }
-  // restituisco l'identificativo della nuova entità
+  // restituisco l'identificativo della nuova entit�
    return nId ;
 }
 
@@ -116,7 +121,7 @@ ExeCreateGeoVector( int nParentId, const Vector3d& vtV, const Point3d& ptB, int
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
    VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
-   nParentId = AdjustId( nParentId) ;
+      nParentId = AdjustId( nParentId) ;
    bool bOk = true ;
   // recupero il riferimento locale
    Frame3d frLoc ;
@@ -128,7 +133,7 @@ ExeCreateGeoVector( int nParentId, const Vector3d& vtV, const Point3d& ptB, int
    PtrOwner<IGeoVector3d> pGeoVct( CreateGeoVector3d()) ;
    bOk = bOk && ! IsNull( pGeoVct) ;
   // setto il vettore (con il punto base)
-   bOk = bOk &&  pGeoVct->Set( vtVL, ptBL) ;
+   bOk = bOk && pGeoVct->Set( vtVL, ptBL) ;
   // inserisco il vettore nel DB
    int nId = ( bOk ? pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, Release( pGeoVct)) : GDB_ID_NULL) ;
    ExeSetModified() ;
@@ -148,7 +153,7 @@ ExeCreateGeoVector( int nParentId, const Vector3d& vtV, const Point3d& ptB, int
                 " -- Id=" + ToString( nId) ;
       LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
    }
-  // restituisco l'identificativo della nuova entità
+  // restituisco l'identificativo della nuova entit�
    return nId ;
 }
 
@@ -158,11 +163,11 @@ ExeCreateGeoFrame( int nParentId, const Frame3d& frFrame, int nRefType)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
    VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
-   nParentId = AdjustId( nParentId) ;
+      nParentId = AdjustId( nParentId) ;
    bool bOk = true ;
   // recupero il riferimento locale
    Frame3d frLoc ;
-   bOk = bOk && pGeomDB->GetGroupGlobFrame( nParentId, frLoc) ;
+   bOk = bOk && pGeomDB->GetGroupGlobFrame( nParentId, frLoc ) ;
   // porto in locale l'origine e i versori
    Point3d ptOrigL = GetPointLocal( pGeomDB, frFrame.Orig(), nRefType, frLoc) ;
    Vector3d vtXL = GetVectorLocal( pGeomDB, frFrame.VersX(), nRefType, frLoc) ;
@@ -170,8 +175,8 @@ ExeCreateGeoFrame( int nParentId, const Frame3d& frFrame, int nRefType)
    Vector3d vtZL = GetVectorLocal( pGeomDB, frFrame.VersZ(), nRefType, frLoc) ;
   // creo e setto il riferimento
    PtrOwner<IGeoFrame3d> pGeoFrm( CreateGeoFrame3d()) ;
-   bOk = bOk && ! IsNull( pGeoFrm) ;
-   bOk = bOk && pGeoFrm->Set( ptOrigL, vtXL, vtYL, vtZL) ; 
+   bOk = bOk && !IsNull( pGeoFrm) ;
+   bOk = bOk && pGeoFrm->Set( ptOrigL, vtXL, vtYL, vtZL) ;
   // inserisco il riferimento nel DB
    int nId = ( bOk ? pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, Release( pGeoFrm)) : GDB_ID_NULL) ;
    ExeSetModified() ;
@@ -183,7 +188,7 @@ ExeCreateGeoFrame( int nParentId, const Frame3d& frFrame, int nRefType)
                                   ToString( frFrame.VersY()) + "},{" +
                                   ToString( frFrame.VersZ()) + "}}," +
                                   RefTypeToString( nRefType) + ")" +
-                    " -- Id=" + ToString( nId) ;
+                     " -- Id=" + ToString( nId) ;
       LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
    }
   // restituisco l'identificativo del nuovo gruppo
@@ -197,7 +202,7 @@ ExeCreateText( int nParentId, const Point3d& ptP,
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
    VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
-   nParentId = AdjustId( nParentId) ;
+      nParentId = AdjustId( nParentId) ;
    bool bOk = true ;
   // recupero il riferimento locale
    Frame3d frLoc ;
@@ -208,7 +213,7 @@ ExeCreateText( int nParentId, const Point3d& ptP,
    Vector3d vtDL = GetVectorLocal( pGeomDB, X_AX, nRefType, frLoc) ;
   // creo il testo e lo riempio
    PtrOwner<IExtText> pTXT( CreateExtText()) ;
-   bOk = bOk && ! IsNull( pTXT) ;
+   bOk = bOk && !IsNull( pTXT) ;
    bOk = bOk && pTXT->Set( ptPL, vtNL, vtDL, sText, "", false, dH) ;
   // inserisco il testo nel DB
    int nId = ( bOk ? pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, Release( pTXT)) : GDB_ID_NULL) ;
@@ -234,7 +239,7 @@ ExeCreateTextEx( int nParentId, const Point3d& ptP, double dAngRotDeg,
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
    VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
-   nParentId = AdjustId( nParentId) ;
+      nParentId = AdjustId( nParentId) ;
    bool bOk = true ;
   // recupero il riferimento locale
    Frame3d frLoc ;
@@ -242,10 +247,10 @@ ExeCreateTextEx( int nParentId, const Point3d& ptP, double dAngRotDeg,
   // porto in locale l'origine e i versori
    Point3d ptPL = GetPointLocal( pGeomDB, ptP, nRefType, frLoc) ;
    Vector3d vtNL = GetVectorLocal( pGeomDB, Z_AX, nRefType, frLoc) ;
-   Vector3d vtDL = GetVectorLocal( pGeomDB, FromPolar(1, dAngRotDeg), nRefType, frLoc) ;
+   Vector3d vtDL = GetVectorLocal( pGeomDB, FromPolar( 1, dAngRotDeg), nRefType, frLoc) ;
   // creo il testo e lo riempio
    PtrOwner<IExtText> pTXT( CreateExtText()) ;
-   bOk = bOk && ! IsNull( pTXT) ;
+   bOk = bOk && !IsNull( pTXT) ;
    bOk = bOk && pTXT->Set( ptPL, vtNL, vtDL, sText, sFont, bItalic, dH) ;
   // inserisco il testo nel DB
    int nId = ( bOk ? pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, Release( pTXT)) : GDB_ID_NULL) ;
@@ -263,7 +268,7 @@ ExeCreateTextEx( int nParentId, const Point3d& ptP, double dAngRotDeg,
                     " -- Id=" + ToString( nId) ;
       LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
    }
-  // restituisco l'identificativo del oggetto
+   // restituisco l'identificativo del oggetto
    return nId ;
 }
 
@@ -275,7 +280,7 @@ ExeCreateTextAdv( int nParentId, const Point3d& ptP, double dAngRotDeg,
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
    VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
-   nParentId = AdjustId( nParentId) ;
+      nParentId = AdjustId( nParentId) ;
    bool bOk = true ;
   // recupero il riferimento locale
    Frame3d frLoc ;
@@ -283,10 +288,10 @@ ExeCreateTextAdv( int nParentId, const Point3d& ptP, double dAngRotDeg,
   // porto in locale l'origine e i versori
    Point3d ptPL = GetPointLocal( pGeomDB, ptP, nRefType, frLoc) ;
    Vector3d vtNL = GetVectorLocal( pGeomDB, Z_AX, nRefType, frLoc) ;
-   Vector3d vtDL = GetVectorLocal( pGeomDB, FromPolar(1, dAngRotDeg), nRefType, frLoc) ;
+   Vector3d vtDL = GetVectorLocal( pGeomDB, FromPolar( 1, dAngRotDeg), nRefType, frLoc) ;
   // creo il testo e lo imposto
    PtrOwner<IExtText> pTXT( CreateExtText()) ;
-   bOk = bOk && ! IsNull( pTXT) ;
+   bOk = bOk && !IsNull( pTXT) ;
    bOk = bOk && pTXT->Set( ptPL, vtNL, vtDL, sText, sFont, nW, bItalic, dH, dRat, dAddAdv, nInsPos) ;
   // inserisco il testo nel DB
    int nId = ( bOk ? pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, Release( pTXT)) : GDB_ID_NULL) ;
@@ -315,12 +320,12 @@ ExeCreateTextAdv( int nParentId, const Point3d& ptP, double dAngRotDeg,
 //-------------------------------------------------------------------------------
 bool
 ExeSetCurrDimensionStyle( double dExtLineLen, double dArrowLen, double dTextDist,
-                          int nLenIsMM, int nDecDigit, const string& sFont, double dTextHeight)
+   int nLenIsMM, int nDecDigit, const string& sFont, double dTextHeight)
 {
    GseContext* pGseCtx = GetCurrGseContext() ;
    VERIFY_CTX( pGseCtx, false)
-  // aggiorno lo stile di quotatura corrente
-   pGseCtx->m_dsCurr.Set( dExtLineLen, dArrowLen, dTextDist, nLenIsMM, nDecDigit, sFont, dTextHeight) ;
+     // aggiorno lo stile di quotatura corrente
+      pGseCtx->m_dsCurr.Set( dExtLineLen, dArrowLen, dTextDist, nLenIsMM, nDecDigit, sFont, dTextHeight) ;
    return true ;
 }
 
@@ -330,8 +335,8 @@ ExeResetCurrDimensionStyle( void)
 {
    GseContext* pGseCtx = GetCurrGseContext() ;
    VERIFY_CTX( pGseCtx, false)
-  // aggiorno lo stile di quotatura corrente
-   pGseCtx->m_dsCurr.Reset() ;
+     // aggiorno lo stile di quotatura corrente
+      pGseCtx->m_dsCurr.Reset() ;
    return true ;
 }
 
@@ -341,16 +346,16 @@ MySetDimensionStyle( IExtDimension* pDim)
 {
    GseContext* pGseCtx = GetCurrGseContext() ;
    VERIFY_CTX( pGseCtx, false)
-  // verifico validità quotatura
-   if ( pDim == nullptr)
-      return false ;
+     // verifico validit� quotatura
+      if ( pDim == nullptr)
+         return false ;
   // recupero lo stile di quotatura
    const DimensionStyle& DimSt = pGseCtx->m_dsCurr ;
-  // recupero l'unità di misura lineare per la quotatura
-   bool bLenIsMM = ( DimSt.nLenIsMM == 2 ? ExeUiUnitsAreMM() : ( DimSt.nLenIsMM != 0)) ;
+  // recupero l'unit� di misura lineare per la quotatura
+   bool bLenIsMM = ( DimSt.nLenIsMM == 2 ? ExeUiUnitsAreMM() : ( DimSt.nLenIsMM != 0 )) ;
   // imposto lo stile
    return pDim->SetStyle( DimSt.dExtLineLen, DimSt.dArrowLen, DimSt.dTextDist,
-                          bLenIsMM, DimSt.nDecDigit, DimSt.sFont, DimSt.dTextHeight) ;
+      bLenIsMM, DimSt.nDecDigit, DimSt.sFont, DimSt.dTextHeight) ;
 }
 
 //-------------------------------------------------------------------------------
@@ -360,10 +365,10 @@ MyCreateLinearDimension( int nParentId, const Point3d& ptP1, const Point3d& ptP2
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
    VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
-   nParentId = AdjustId( nParentId) ;
+      nParentId = AdjustId( nParentId) ;
   // recupero il riferimento locale
    Frame3d frLoc ;
-   if ( ! pGeomDB->GetGroupGlobFrame( nParentId, frLoc))
+   if ( ! pGeomDB->GetGroupGlobFrame( nParentId, frLoc ))
       return GDB_ID_NULL ;
   // porto in locale i punti e assegno i versori
    Point3d ptP1L = GetPointLocal( pGeomDB, ptP1, nRefType, frLoc) ;
@@ -373,9 +378,9 @@ MyCreateLinearDimension( int nParentId, const Point3d& ptP1, const Point3d& ptP2
    Vector3d vtDL = GetVectorLocal( pGeomDB, vtDir, nRefType, frLoc) ;
   // creo la quota
    PtrOwner<IExtDimension> pDim( CreateExtDimension()) ;
-   if ( IsNull( pDim)  ||
-        ! MySetDimensionStyle( pDim)  ||
-        ! pDim->SetLinear( ptP1L, ptP2L, ptDimL, vtNL, vtDL, sText))
+   if ( IsNull( pDim )  ||
+        ! MySetDimensionStyle( pDim )  ||
+        ! pDim->SetLinear( ptP1L, ptP2L, ptDimL, vtNL, vtDL, sText ))
       return GDB_ID_NULL ;
   // inserisco la quota nel DB
    return pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, Release( pDim)) ;
@@ -414,7 +419,7 @@ ExeCreateVerticalDimension( int nParentId, const Point3d& ptP1, const Point3d& p
    ExeSetModified() ;
   // se richiesto, salvo il comando Lua equivalente
    if ( IsCmdLog()) {
-      string sLua = "EgtVerticalDimension(" + IdToString( nParentId) + ",{" +
+      string sLua = "EgtVerticalDimension(" + IdToString( nParentId ) + ",{" +
                                               ToString( ptP1) + "},{" +
                                               ToString( ptP2) + "},{" +
                                               ToString( ptDim) + "},'" +
@@ -449,3 +454,430 @@ ExeCreateAlignedDimension( int nParentId, const Point3d& ptP1, const Point3d& pt
   // restituisco l'identificativo del oggetto
    return nId ;
 }
+
+//-------------------------------------------------------------------------------
+static int
+MyCreateRadialDimension( int nParentId, int nCrvId, const Point3d& ptDim,
+                         const string& sText, int nRefType)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
+   nParentId = AdjustId( nParentId) ;
+  // recupero il riferimento locale
+   Frame3d frLoc ;
+   if ( ! pGeomDB->GetGroupGlobFrame( nParentId, frLoc))
+      return GDB_ID_NULL ;
+  // recupero l'arco di circonferenza e il suo frame
+   ICurveArc* pArc = GetCurveArc( pGeomDB->GetGeoObj( nCrvId)) ;
+   if ( pArc == nullptr)
+      return GDB_ID_NULL ;
+   Frame3d frArc ;
+   if ( ! pGeomDB->GetGlobFrame( nCrvId, frArc))
+      return GDB_ID_NULL ;
+  // porto il punto nel riferimento locale
+   Point3d ptDimL = GetPointLocal( pGeomDB, ptDim, nRefType, frLoc) ;
+  // recupero il centro e la normale e li porto nel riferimento locale
+   Point3d ptCenL = pArc->GetCenter() ;
+   ptCenL.LocToLoc( frArc, frLoc) ;
+   Vector3d vtNL = pArc->GetNormVersor() ;
+   vtNL.LocToLoc( frArc, frLoc) ;
+  // porto ptDimL sulla circonferenza cui appartiene l'arco
+   Vector3d vtDir = ptDimL - ptCenL ;
+   if ( ! vtDir.Normalize())
+      return GDB_ID_NULL ;
+   ptDimL = ptCenL + pArc->GetRadius() * vtDir ;
+  // creo la quota
+   PtrOwner<IExtDimension> pDim( CreateExtDimension()) ;
+   if ( IsNull( pDim)  ||
+        ! MySetDimensionStyle( pDim)  ||
+        ! pDim->SetRadial( ptCenL, ptDimL, vtNL, sText))
+      return GDB_ID_NULL ;
+  // inserisco la quota nel DB
+   return pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, Release( pDim)) ;
+}
+
+//-------------------------------------------------------------------------------
+int
+ExeCreateRadialDimension( int nParentId, int nCrvId, const Point3d& ptDim,
+                          const string& sText, int nRefType)
+{
+  // eseguo
+   int nId = MyCreateRadialDimension( nParentId, nCrvId, ptDim, sText, nRefType) ;
+   ExeSetModified() ;
+  // se richiesto, salvo il comando Lua equivalente
+   if ( IsCmdLog()) {
+      string sLua = "EgtRadialDimension(" + IdToString( nParentId) + "," +
+                                            IdToString( nCrvId) + ",{" +
+                                            ToString( ptDim) + "},'" +
+                                            StringToLuaString( sText) + "'," +
+                                            RefTypeToString( nRefType) + ")" +
+                    " -- Id=" + ToString( nId) ;
+      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
+   }
+  // restituisco l'identificativo del oggetto
+   return nId ;
+}
+
+//-------------------------------------------------------------------------------
+static int
+MyCreateDiametralDimension( int nParentId, int nCrvId, const Point3d& ptDim,
+                            const string& sText, int nRefType)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
+   nParentId = AdjustId( nParentId) ;
+  // recupero il riferimento locale
+   Frame3d frLoc ;
+   if ( ! pGeomDB->GetGroupGlobFrame( nParentId, frLoc))
+      return GDB_ID_NULL ;
+  // recupero l'arco e il suo frame
+   ICurveArc* pArc = GetCurveArc( pGeomDB->GetGeoObj( nCrvId)) ;
+   if ( pArc == nullptr)
+      return GDB_ID_NULL ;
+   Frame3d frArc ;
+   if ( ! pGeomDB->GetGlobFrame( nCrvId, frArc))
+      return GDB_ID_NULL ;
+  // porto il punto nel riferimento locale
+   Point3d ptDimL = GetPointLocal( pGeomDB, ptDim, nRefType, frLoc) ;
+  // recupero il centro e la normale e li porto nel riferimento locale
+   Point3d ptCenL = pArc->GetCenter() ;
+   ptCenL.LocToLoc( frArc, frLoc) ;
+   Vector3d vtNL = pArc->GetNormVersor() ;
+   vtNL.LocToLoc( frArc, frLoc) ;
+  // porto ptDimL sulla circonferenza
+   Vector3d vtDir = ptDimL - ptCenL ;
+   if ( ! vtDir.Normalize())
+      return GDB_ID_NULL ;
+   ptDimL = ptCenL + pArc->GetRadius() * vtDir ;
+  // creo la quota
+   PtrOwner<IExtDimension> pDim( CreateExtDimension()) ;
+   if ( IsNull( pDim)  ||
+        ! MySetDimensionStyle( pDim)  ||
+        ! pDim->SetDiametral( ptCenL, ptDimL, vtNL, sText))
+      return GDB_ID_NULL ;
+  // inserisco la quota nel DB
+   return pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, Release( pDim)) ;
+}
+
+//-------------------------------------------------------------------------------
+int
+ExeCreateDiametralDimension( int nParentId, int nCrvId, const Point3d& ptDim,
+                             const string& sText, int nRefType)
+{
+  // eseguo
+   int nId = MyCreateDiametralDimension( nParentId, nCrvId, ptDim, sText, nRefType) ;
+   ExeSetModified() ;
+  // se richiesto, salvo il comando Lua equivalente
+   if ( IsCmdLog()) {
+      string sLua = "EgtDiametralDimension(" + IdToString( nParentId) + "," +
+                                               IdToString( nCrvId) + ",{" +
+                                               ToString( ptDim) + "},'" +
+                                               StringToLuaString( sText) + "'," +
+                                               RefTypeToString( nRefType) + ")" +
+                    " -- Id=" + ToString( nId) ;
+      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
+   }
+  // restituisco l'identificativo del oggetto
+   return nId ;
+}
+
+//-------------------------------------------------------------------------------
+static int
+MyCreateAngularDimension( int nParentId, const Point3d& ptP1, const Point3d& ptV, const Point3d& ptP2,
+                          const Point3d& ptDim, const string& sText, int nRefType)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
+      nParentId = AdjustId( nParentId) ;
+  // recupero il riferimento locale
+   Frame3d frLoc ;
+   if ( ! pGeomDB->GetGroupGlobFrame( nParentId, frLoc))
+      return GDB_ID_NULL ;
+  // porto in locale i punti e assegno i versori
+   Point3d ptVL = GetPointLocal( pGeomDB, ptV, nRefType, frLoc) ;
+   Point3d ptP1L = GetPointLocal( pGeomDB, ptP1, nRefType, frLoc) ;
+   Point3d ptP2L = GetPointLocal( pGeomDB, ptP2, nRefType, frLoc) ;
+   Point3d ptDimL = GetPointLocal( pGeomDB, ptDim, nRefType, frLoc) ;
+   Vector3d vtNL = GetVectorLocal( pGeomDB, Z_AX, nRefType, frLoc) ;
+  // creo la quota
+   PtrOwner<IExtDimension> pDim( CreateExtDimension()) ;
+   if ( IsNull( pDim)  ||
+        ! MySetDimensionStyle( pDim )  ||
+        ! pDim->SetAngular( ptP1L, ptVL, ptP2L, ptDimL, vtNL, sText))
+      return GDB_ID_NULL ;
+  // inserisco la quota nel DB
+   return pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, Release( pDim)) ;
+}
+
+//-------------------------------------------------------------------------------
+int
+ExeCreateAngularDimension( int nParentId, const Point3d& ptP1, const Point3d& ptV, const Point3d& ptP2,
+                           const Point3d& ptDim, const string& sText, int nRefType)
+{
+  // eseguo
+   int nId = MyCreateAngularDimension( nParentId, ptP1, ptV, ptP2, ptDim, sText, nRefType) ;
+   ExeSetModified() ;
+  // se richiesto, salvo il comando Lua equivalente
+   if ( IsCmdLog()) {
+      string sLua = "EgtAngularDimension(" + IdToString( nParentId) + ",{" +
+                                             ToString( ptV) + "},{" +
+                                             ToString( ptP1) + "},{" +
+                                             ToString( ptP2) + "},{" +
+                                             ToString( ptDim) + "},'" +
+                                             StringToLuaString( sText) + "'," +
+                                             RefTypeToString( nRefType) + ")" +
+                    " -- Id=" + ToString( nId) ;
+      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
+   }
+  // restituisco l'identificativo del oggetto
+   return nId ;
+}
+
+//-------------------------------------------------------------------------------
+static int
+MyCreateAngularDimensionFromLines( int nParentId, INTVECTOR vLineIds, const Point3d& ptDim,
+                                   const string& sText, int nRefType)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
+      nParentId = AdjustId( nParentId) ;
+  // recupero il riferimento locale
+   Frame3d frLoc ;
+   if ( ! pGeomDB->GetGroupGlobFrame( nParentId, frLoc))
+      return GDB_ID_NULL ;
+  // recupero le linee
+   ICurveLine* pCrv1 = GetCurveLine( pGeomDB->GetGeoObj( vLineIds[0])) ;
+   ICurveLine* pCrv2 = GetCurveLine( pGeomDB->GetGeoObj( vLineIds[1])) ;
+   if ( pCrv1 == nullptr  ||  pCrv2 == nullptr)
+      return GDB_ID_NULL ;
+   PtrOwner<ICurveLine> pL1( pCrv1->Clone()) ;
+   PtrOwner<ICurveLine> pL2( pCrv2->Clone()) ;
+   if ( IsNull( pL1 )  ||  ! pL1->IsValid()  ||  IsNull( pL2)  ||  ! pL2->IsValid())
+      return GDB_ID_NULL ;
+  // porto tutto nel frLoc
+   Frame3d frL1, frL2 ;
+   if ( ! pGeomDB->GetGlobFrame( vLineIds[0], frL1)  ||  ! pGeomDB->GetGlobFrame( vLineIds[1], frL2))
+      return GDB_ID_NULL ;
+   pL1->LocToLoc( frL1, frLoc) ;
+   pL2->LocToLoc( frL2, frLoc) ;
+  // recupero il punto lo porto nel riferimento locale
+   Point3d ptDimL = GetPointLocal( pGeomDB, ptDim, nRefType, frLoc) ;
+  // recupero i punti e le direzioni
+   Point3d ptP1L, ptP2L, ptP3L, ptP4L ;
+   Vector3d vtL1, vtL2 ;
+   pL1->GetStartPoint( ptP1L) ;
+   pL1->GetEndPoint( ptP2L) ;
+   pL2->GetStartPoint( ptP3L) ;
+   pL2->GetEndPoint( ptP4L) ;
+   pL1->GetStartDir( vtL1) ;
+   pL2->GetStartDir( vtL2) ;
+  // controllo se le rette sono coincidenti o parallele
+   if ( AreSameOrOppositeVectorApprox( vtL1, vtL2))
+      return GDB_ID_NULL ;
+  // verifico se le rette si intersecano già
+   Point3d ptCenL ;
+   IntersCurveCurve pInters( *pL1, *pL2) ;
+   int nNumeroInters = pInters.GetIntersCount() ;
+  // se non ho intersezioni estendo
+   if ( nNumeroInters == 0) {
+      double dLen = pow( 10, 5) ;
+      pL1->ExtendStartByLen( dLen) ;
+      pL2->ExtendStartByLen( dLen) ;
+      pL1->ExtendEndByLen( dLen) ;
+      pL2->ExtendEndByLen( dLen) ;
+     // faccio intersezione
+      IntersCurveCurve pIntersExt( *pL1, *pL2) ;
+      nNumeroInters = pIntersExt.GetIntersCount() ;
+     // le linee estese non si intersecano, quindi vuol dire che sono quasi parallele e lontanissime
+      if ( nNumeroInters == 0 )
+         return GDB_ID_NULL ;
+      else {
+         IntCrvCrvInfo Info ;
+         pIntersExt.GetIntCrvCrvInfo( 0, Info) ;
+        // controllo che non siano coincidenti
+         if ( Info.bOverlap)
+            return false ;
+         else
+            ptCenL = Info.IciA->ptI ;
+      }
+     // seleziono i punti necessari
+     // se ptDimL è più vicino a ptCenL rispetto agli estremi esterni delle linee, allora tengo gli estremi interni
+      double dP1Cen = ( ptP1L - ptCenL).Len() ;
+      double dP2Cen = ( ptP2L - ptCenL).Len() ;
+      double dDimCen = ( ptDimL - ptCenL).Len() ;
+      if ( ( dDimCen < dP1Cen  ||  dDimCen < dP2Cen))
+        // se uno dei due punti è più vicino a ptCenL rispetto a ptDimL, allora tengo il punto più vicino a ptDimL
+         ptP1L = ( ( ptDimL - ptP1L ).Len() < ( ptDimL - ptP2L ).Len() ? ptP1L : ptP2L) ;
+      else
+         ptP1L = ( dP1Cen < dP2Cen ? ptP2L : ptP1L ) ;
+     // rifaccio anche per l'altro lato
+      double dP3Cen = ( ptP3L - ptCenL).Len() ;
+      double dP4Cen = ( ptP4L - ptCenL).Len() ;
+      if ( dDimCen < dP3Cen  ||  dDimCen < dP4Cen)
+         ptP3L = ( ( ptDimL - ptP3L).Len() < ( ptDimL - ptP4L).Len() ? ptP3L : ptP4L) ;
+      else
+         ptP3L = ( dP3Cen < dP4Cen ? ptP4L : ptP3L) ;
+   }
+  // se ho già intesezioni devo capire in quale quadrante si trova ptDim
+   else {
+     // recupero l'intersezione
+      IntCrvCrvInfo Info ;
+      pInters.GetIntCrvCrvInfo( 0, Info) ;
+     // controllo che non siano coincidenti
+      if ( Info.bOverlap)
+         return false ;
+     // se non coincidono restituisco l'intersezione
+      else
+         ptCenL = Info.IciA->ptI ;
+     // se le due linee hanno un estremo in comune, estendo le linee da quel lato
+      if ( ( AreSamePointApprox( ptCenL, ptP1L)  ||  AreSamePointApprox( ptCenL, ptP2L))  &&  
+         ( AreSamePointApprox( ptCenL, ptP3L)  ||  AreSamePointApprox( ptCenL, ptP4L))) {
+         if ( AreSamePointApprox( ptCenL, ptP1L)) {
+            pL1->ExtendStartByLen(Dist( ptP1L, ptP2L) / 2) ;
+            pL1->GetStartPoint( ptP1L) ;
+         }
+         else {
+            pL1->ExtendEndByLen(Dist( ptP1L, ptP2L) / 2) ;
+            pL1->GetEndPoint( ptP2L) ;
+         }
+         if ( AreSamePointApprox( ptCenL, ptP3L)) {
+            pL2->ExtendStartByLen( Dist( ptP3L, ptP4L) / 2);
+            pL2->GetStartPoint( ptP3L) ;
+         }
+         else {
+            pL2->ExtendEndByLen(Dist( ptP3L, ptP4L) / 2);
+            pL2->GetEndPoint( ptP4L) ;
+         }
+      }
+     // seleziono i punti necessari
+     // proietto pdDim su vtLine1 e su vtLine2
+      Point3d ptDim1, ptDim2 ;
+      DistPointCurve distPL1( ptDimL, *pL1, true) ;
+      DistPointCurve distPL2( ptDimL, *pL2, true) ;
+      int nFlag1, nFlag2 ;
+      if ( ! distPL1.GetMinDistPoint( 0, ptDim1, nFlag1)  ||  ! distPL2.GetMinDistPoint( 0, ptDim2, nFlag2) )
+         return false ;
+      if ( abs(( ptDim1 - ptP1L).Len() + ( ptCenL - ptDim1).Len() - ( ptCenL - ptP1L).Len()) < EPS_SMALL  ||
+           abs(( ptDim1 - ptP1L).Len() + ( ptCenL - ptP1L ).Len() - ( ptDim1 - ptCenL).Len()) < EPS_SMALL)
+           // ptDim è dal lato di ptP1L, quindi tengo ptP1L
+         ;
+      else
+        // ptDim è dal lato di ptP2L
+         ptP1L = ptP2L ;
+      if ( abs(( ptDim2 - ptP3L).Len() + ( ptCenL - ptDim2).Len() - ( ptCenL - ptP3L).Len()) < EPS_SMALL  ||
+           abs(( ptDim2 - ptP3L).Len() + ( ptCenL - ptP3L).Len() - ( ptDim2 - ptCenL).Len()) < EPS_SMALL)
+        // ptDim è dal lato di ptP1L
+        ;
+      else
+        // ptDim è dal lato di ptP2L
+         ptP3L = ptP4L ;
+   }
+  // recupero la normale al piano dell'angolo da quotare
+   Frame3d frArc;
+   frArc.Set(ptCenL, ptP1L, ptP3L);
+   Vector3d vtNL = frArc.VersZ() ;
+   if ( vtNL * Z_AX < - EPS_SMALL) {
+      frArc.Set(ptCenL, ptP3L, ptP1L);
+      vtNL = frArc.VersZ() ;
+   }
+  // creo la quota
+   PtrOwner<IExtDimension> pDim( CreateExtDimension()) ;
+   if ( IsNull( pDim )  ||
+        ! MySetDimensionStyle( pDim )  ||
+        ! pDim->SetAngular( ptP1L, ptCenL, ptP3L, ptDimL, vtNL, sText))
+      return GDB_ID_NULL ;
+  // inserisco la quota nel DB
+   return pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, Release( pDim)) ;
+}
+
+//-------------------------------------------------------------------------------
+int
+ExeCreateAngularDimensionFromLines( int nParentId, const INTVECTOR vLineIds, const Point3d& ptDim,
+                                    const string& sText, int nRefType)
+{
+  // eseguo
+   int nId = MyCreateAngularDimensionFromLines( nParentId, vLineIds, ptDim, sText, nRefType) ;
+   ExeSetModified() ;
+  // se richiesto, salvo il comando Lua equivalente
+   if ( IsCmdLog()) {
+      string sLua = "EgtAngularDimensionFromLines(" + IdToString( nParentId) + "," +
+                                                      ToString( vLineIds[0]) + "," +
+                                                      ToString( vLineIds[1]) + ",{" +
+                                                      ToString( ptDim) + "},'" +
+                                                      StringToLuaString( sText) + "'," +
+                                                      RefTypeToString( nRefType) + ")" +
+                    " -- Id=" + ToString( nId) ;
+      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
+   }
+   // restituisco l'identificativo del oggetto
+   return nId ;
+}
+
+//-------------------------------------------------------------------------------
+static int
+MyCreateAngularDimensionFromArc( int nParentId, int nCrvId, const Point3d& ptDim,
+                                 const string& sText, int nRefType)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
+   nParentId = AdjustId( nParentId) ;
+  // recupero il riferimento locale
+   Frame3d frLoc ;
+   if ( ! pGeomDB->GetGroupGlobFrame( nParentId, frLoc))
+      return GDB_ID_NULL ;
+  // recupero l'arco e il suo frame
+   ICurveArc* pArc = GetCurveArc( pGeomDB->GetGeoObj( nCrvId)) ;
+   if ( pArc == nullptr)
+      return GDB_ID_NULL ;
+   Frame3d frArc ;
+   if ( ! pGeomDB->GetGlobFrame( nCrvId, frArc))
+      return GDB_ID_NULL ;
+  // recupero i punti e la normale e li porto nel frame locale
+   Point3d ptDimL = GetPointLocal( pGeomDB, ptDim, nRefType, frLoc) ;
+   Vector3d vtNL = pArc->GetNormVersor() ;
+   vtNL.LocToLoc( frArc, frLoc) ;
+   Point3d ptCenL, ptP1L, ptP2L ;
+   pArc->GetStartPoint( ptP1L) ;
+   ptP1L.LocToLoc( frArc, frLoc) ;
+   pArc->GetEndPoint( ptP2L) ;
+   ptP2L.LocToLoc( frArc, frLoc) ;
+   pArc->GetCenterPoint( ptCenL) ;
+   ptCenL.LocToLoc( frArc, frLoc) ;
+  // porto ptDimL nell'area di influenza dell'arco
+   Point3d ptMid ;
+   pArc->GetMidPoint( ptMid) ;
+   Vector3d vtDir = ( ptMid - ptCenL) ;
+   if ( ! vtDir.Normalize())
+      return GDB_ID_NULL ;
+   ptDimL = ptCenL + Dist( ptDimL, ptCenL) * vtDir ;
+  // creo la quota
+   PtrOwner<IExtDimension> pDim( CreateExtDimension()) ;
+   if ( IsNull( pDim )  ||
+        ! MySetDimensionStyle( pDim)  ||
+        ! pDim->SetAngular( ptP1L, ptCenL, ptP2L, ptDimL, vtNL, sText))
+      return GDB_ID_NULL ;
+  // inserisco la quota nel DB
+   return pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, Release( pDim)) ;
+}
+
+//-------------------------------------------------------------------------------
+int
+ExeCreateAngularDimensionFromArc( int nParentId, int nCrvId, const Point3d& ptDim,
+                                  const string& sText, int nRefType)
+{
+  // eseguo
+   int nId = MyCreateAngularDimensionFromArc( nParentId, nCrvId, ptDim, sText, nRefType) ;
+   ExeSetModified() ;
+  // se richiesto, salvo il comando Lua equivalente
+   if ( IsCmdLog()) {
+      string sLua = "EgtAngularDimensionFromArc(" + IdToString( nParentId) + "," +
+                                                    IdToString( nCrvId) + ",{" +
+                                                    ToString( ptDim) + "},'" +
+                                                    StringToLuaString( sText) + "'," +
+                                                    RefTypeToString( nRefType) + ")" +
+                    " -- Id=" + ToString( nId) ;
+      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
+   }
+  // restituisco l'identificativo del oggetto
+   return nId ;
+}

EXE_GdbCreateCurve.cpp

@@ -362,16 +362,13 @@ CreateLineTgTwoCurves( IGeomDB* pGeomDB, int nParentId,
    if ( pCrv2 == nullptr)
       return nullptr ;
   // porto la seconda curva nel riferimento della prima
-   PtrOwner<ICurve> pCrv2Loc( pCrv2->Clone()) ;
-   if ( IsNull( pCrv2Loc))
-      return nullptr ;
-   pCrv2Loc->LocToLoc( frCrv2, frCrv1) ;
+   CurveLocal Crv2Loc( pGeomDB, nIdF, frCrv1) ;
   // porto il punto vicino al finale nel riferimento della prima curva
    Point3d ptN2loc( ptFin) ;
    ptN2loc.LocToLoc( frDest, frCrv1) ;
   // calcolo la retta tangente alle due curve
    PtrOwner<ICurveLine> pCrvLine ;
-   pCrvLine.Set( GetLineTgTwoCurves( *pCrv1, ptN1loc, *pCrv2Loc, ptN2loc)) ;
+   pCrvLine.Set( GetLineTgTwoCurves( *pCrv1, ptN1loc, *Crv2Loc, ptN2loc)) ;
    if ( IsNull( pCrvLine))
       return nullptr ;
    // porto la linea nel riferimento del gruppo destinazione
@@ -1091,6 +1088,44 @@ ExeCreateArc3P( int nParentId, const Point3d& ptP1,
    return nId ;
 }
 
+//-------------------------------------------------------------------------------
+int
+ExeCreateArc2PB( int nParentId, const Point3d& ptStart, const Point3d& ptEnd,
+                 double dBulge, int nRefType)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
+   nParentId = AdjustId( nParentId) ;
+  // recupero il riferimento locale
+   Frame3d frLoc ;
+   bool bOk = pGeomDB->GetGroupGlobFrame( nParentId, frLoc) ;
+  // porto in locale i punti, il versore normale e quelloe estrusione
+   Point3d ptStartL = GetPointLocal( pGeomDB, ptStart, nRefType, frLoc) ;
+   Point3d ptEndL = GetPointLocal( pGeomDB, ptEnd, nRefType, frLoc) ;
+   Vector3d vtNormL = GetVectorLocal( pGeomDB, Z_AX, nRefType, frLoc) ;
+   Vector3d vtExtrL = GetVectorLocal( pGeomDB, Z_AX, nRefType, frLoc) ;
+  // creo l'arco (in casi particolari retta)
+   PtrOwner<ICurve> pCrv( bOk ? GetArc2PNB( ptStartL, ptEndL, vtNormL, dBulge) : nullptr) ;
+   bOk = bOk && ! IsNull( pCrv) ;
+  // assegno il versore estrusione
+   bOk = bOk && pCrv->SetExtrusion( vtExtrL) ;
+  // inserisco l'arco nel DB
+   int nId = ( bOk ? pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, Release( pCrv)) : GDB_ID_NULL) ;
+   ExeSetModified() ;
+  // se richiesto, salvo il comando Lua equivalente
+   if ( IsCmdLog()) {
+      string sLua = "EgtArc2PB(" + IdToString( nParentId) + ",{" +
+                                   ToString( ptStart) + "},{" +
+                                   ToString( ptEnd) + "}," +
+                                   ToString( dBulge) + "," +
+                                   RefTypeToString( nRefType) + ")" +
+                    " -- Id=" + ToString( nId) ;
+      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
+   }
+  // restituisco l'identificativo della nuova entità
+   return nId ;
+}
+
 //-------------------------------------------------------------------------------
 int
 ExeCreateArc2PD( int nParentId, const Point3d& ptStart, const Point3d& ptEnd,
@@ -1099,20 +1134,17 @@ ExeCreateArc2PD( int nParentId, const Point3d& ptStart, const Point3d& ptEnd,
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
    VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
    nParentId = AdjustId( nParentId) ;
-  // creo l'arco (in casi particolari retta)
-   PtrOwner<ICurve> pCrv ;
-   bool bOk = true ;
   // recupero il riferimento locale
    Frame3d frLoc ;
-   bOk = bOk && pGeomDB->GetGroupGlobFrame( nParentId, frLoc) ;
+   bool bOk = pGeomDB->GetGroupGlobFrame( nParentId, frLoc) ;
   // porto in locale i punti, il versore iniziale, quello normale e il versore estrusione
    Point3d ptStartL = GetPointLocal( pGeomDB, ptStart, nRefType, frLoc) ;
    Point3d ptEndL = GetPointLocal( pGeomDB, ptEnd, nRefType, frLoc) ;
    Vector3d vtDirSL = GetVectorLocal( pGeomDB, FromPolar( 1, dDirSDeg), nRefType, frLoc) ;
    Vector3d vtNormL = GetVectorLocal( pGeomDB, Z_AX, nRefType, frLoc) ;
    Vector3d vtExtrL = GetVectorLocal( pGeomDB, Z_AX, nRefType, frLoc) ;
-  // setto l'arco
-   pCrv.Set( GetArc2PVN( ptStartL, ptEndL, vtDirSL, vtNormL)) ;
+  // creo l'arco (in casi particolari retta)
+   PtrOwner<ICurve> pCrv( bOk ? GetArc2PVN( ptStartL, ptEndL, vtDirSL, vtNormL) : nullptr) ;
    bOk = bOk && ! IsNull( pCrv) ;
   // assegno il versore estrusione
    bOk = bOk && pCrv->SetExtrusion( vtExtrL) ;
@@ -1948,7 +1980,7 @@ ExeCreateCurveCompoByInterpolation( int nParentId, const PolyLine& PL, int nType
          bFound ;
          bFound = PL.GetNextPoint( ptP))
       crvByInterp.AddPoint( ptP) ;
-   PtrOwner<ICurve> pCrvCompo( crvByInterp.GetCurve( nMethod, nType)) ;
+   PtrOwner<ICurve> pCrvCompo( crvByInterp.GetCurve( nMethod, nCrvType)) ;
    bOk = bOk && ! IsNull( pCrvCompo) ;
   // assegno il versore estrusione
    bOk = bOk && pCrvCompo->SetExtrusion( Z_AX) ;

EXE_GdbCreateSurf.cpp

@@ -32,7 +32,7 @@
 #include "/EgtDev/Include/EGkGeoPoint3d.h"
 #include "/EgtDev/Include/EGkCurveLocal.h"
 #include "/EgtDev/Include/EgtPointerOwner.h"
-
+#include "/EgtDev/Include/EGkExtText.h"
 using namespace std ;
 
 //-------------------------------------------------------------------------------
@@ -56,8 +56,7 @@ ExeCreateSurfFrRectangle( int nParentId, const Point3d& ptIni, const Point3d& pt
    if ( ( frEnt.VersZ() * vtZL) < 0)
       frEnt.PseudoMirror( frEnt.Orig(), frEnt.VersZ()) ;
   // ricavo le dimensioni della base
-   Point3d ptCrossI = ptCrossL ;
-   ptCrossI.ToLoc( frEnt) ;
+   Point3d ptCrossI = GetToLoc( ptCrossL, frEnt) ;
    double dWidth = ptCrossI.x ;
    double dLen = ptCrossI.y ;
   // creo il rettangolo nel suo riferimento intrinseco
@@ -223,7 +222,7 @@ ExeCreateSurfFrDisk( int nParentId, const Point3d& ptOrig, double dRad, int nRef
 
 //-------------------------------------------------------------------------------
 int
-ExeCreateSurfFrFatCurve( int nParentId, int nCrvId, double dRad, bool bSquared)
+ExeCreateSurfFrFatCurve( int nParentId, int nCrvId, double dRad, bool bSquaredEnds, bool bSquaredMids, double dLinTol)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
    VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
@@ -246,7 +245,7 @@ ExeCreateSurfFrFatCurve( int nParentId, int nCrvId, double dRad, bool bSquared)
   // eseguo la trasformazione (viene eseguita solo se i riferimenti sono diversi
    pCopCrv->LocToLoc( frCrv, frLoc) ;
   // creo la regione
-   PtrOwner<ISurfFlatRegion> pSfr( GetSurfFlatRegionFromFatCurve( Release( pCopCrv), dRad, bSquared, bSquared)) ;
+   PtrOwner<ISurfFlatRegion> pSfr( GetSurfFlatRegionFromFatCurve( Release( pCopCrv), dRad, bSquaredEnds, bSquaredMids, dLinTol)) ;
    bOk = bOk && ! IsNull( pSfr) ;
   // inserisco la superficie nel DB
    int nNewId = ( bOk ? pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, Release( pSfr)) : GDB_ID_NULL) ;
@@ -256,7 +255,8 @@ ExeCreateSurfFrFatCurve( int nParentId, int nCrvId, double dRad, bool bSquared)
       string sLua = "EgtSurfFrFatCurve(" + IdToString( nParentId) + "," +
                                            ToString( nCrvId) + "," +
                                            ToString( dRad) + "," +
-                                           ToString( bSquared) + ")" +
+                                           ToString( bSquaredEnds) + "," +
+                                           ToString( bSquaredMids) + ")" +
                     " -- Id=" + ToString( nNewId) ;
       LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
    }
@@ -863,6 +863,97 @@ ExeCreateSurfTmSphere( int nParentId, const Point3d& ptOrig,
    return nNewId ;
 }
 
+//-------------------------------------------------------------------------------
+int
+ExeCreateSurfTmTriangle( int nParentId, const Point3d& ptP1, const Point3d& ptP2, const Point3d& ptP3, int nRefType)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
+   nParentId = AdjustId( nParentId) ;
+  // recupero il riferimento locale
+   Frame3d frLoc ;
+   bool bOk = pGeomDB->GetGroupGlobFrame( nParentId, frLoc) ;
+  // porto in  locale i punti
+   Point3d ptP1L = GetPointLocal( pGeomDB, ptP1, nRefType, frLoc) ;
+   Point3d ptP2L = GetPointLocal( pGeomDB, ptP2, nRefType, frLoc) ;
+   Point3d ptP3L = GetPointLocal( pGeomDB, ptP3, nRefType, frLoc) ;
+  // creo la superficie trimesh
+   PtrOwner<ISurfTriMesh> pStm( CreateSurfTriMesh()) ;
+   bOk = bOk && ! IsNull( pStm) ;
+  // assegno il triangolo
+   if ( bOk) {
+      pStm->Init( 3, 1, 1) ;
+      int vV[3]{ pStm->AddVertex( ptP1L),
+                 pStm->AddVertex( ptP2L),
+                 pStm->AddVertex( ptP3L)} ;
+      bOk = ( pStm->AddTriangle( vV) != SVT_NULL) && pStm->AdjustTopology() ;
+   }
+  // inserisco la superficie nel DB
+   int nNewId = ( bOk ? pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, Release( pStm)) : GDB_ID_NULL) ;
+   ExeSetModified() ;
+  // se richiesto, salvo il comando Lua equivalente
+   if ( IsCmdLog()) {
+      string sLua = "EgtSurfTmTriangle(" + IdToString( nParentId) + ",{" +
+                                           ToString( ptP1) + "},{" +
+                                           ToString( ptP2) + "},{" +
+                                           ToString( ptP3) + "}," +
+                                           RefTypeToString( nRefType) + ")" +
+                    " -- Id=" + ToString( nNewId) ;
+      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
+   }
+  // restituisco l'identificativo della nuova entità
+   return nNewId ;
+}
+
+//-------------------------------------------------------------------------------
+int
+ExeCreateSurfTmRectangle( int nParentId, const Point3d& ptO, const Point3d& ptL, const Point3d& ptT, int nRefType)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
+   nParentId = AdjustId( nParentId) ;
+  // recupero il riferimento locale
+   Frame3d frLoc ;
+   bool bOk = pGeomDB->GetGroupGlobFrame( nParentId, frLoc) ;
+  // porto in  locale i punti
+   Point3d ptOL = GetPointLocal( pGeomDB, ptO, nRefType, frLoc) ;
+   Point3d ptLL = GetPointLocal( pGeomDB, ptL, nRefType, frLoc) ;
+   Point3d ptTL = GetPointLocal( pGeomDB, ptT, nRefType, frLoc) ;
+  // modifico il punto trasversale per metterlo perpendicolare al lato Lungo
+   ptTL -= ParallCompo( ptTL - ptOL, ptLL - ptOL) ;
+  // calcolo il quarto punto
+   Point3d ptVL = ptTL + ( ptLL - ptOL) ;
+  // creo la superficie trimesh
+   PtrOwner<ISurfTriMesh> pStm( CreateSurfTriMesh()) ;
+   bOk = bOk && ! IsNull( pStm) ;
+  // assegno il triangolo
+   if ( bOk) {
+      pStm->Init( 4, 2, 1) ;
+      int vV[4]{ pStm->AddVertex( ptOL),
+                 pStm->AddVertex( ptLL),
+                 pStm->AddVertex( ptTL),
+                 pStm->AddVertex( ptVL)} ;
+      int vV1[3]{ vV[0], vV[1], vV[2] } ;
+      int vV2[3]{ vV[2], vV[1], vV[3] } ;
+      bOk = ( pStm->AddTriangle( vV1) != SVT_NULL) && ( pStm->AddTriangle( vV2) != SVT_NULL) && pStm->AdjustTopology() ;
+   }
+  // inserisco la superficie nel DB
+   int nNewId = ( bOk ? pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, Release( pStm)) : GDB_ID_NULL) ;
+   ExeSetModified() ;
+  // se richiesto, salvo il comando Lua equivalente
+   if ( IsCmdLog()) {
+      string sLua = "EgtSurfTmRectangle(" + IdToString( nParentId) + ",{" +
+                                            ToString( ptO) + "},{" +
+                                            ToString( ptL) + "},{" +
+                                            ToString( ptT) + "}," +
+                                            RefTypeToString( nRefType) + ")" +
+                    " -- Id=" + ToString( nNewId) ;
+      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
+   }
+  // restituisco l'identificativo della nuova entità
+   return nNewId ;
+}
+
 //-------------------------------------------------------------------------------
 int
 ExeCreateSurfTmByFlatContour( int nParentId, int nCrvId, double dLinTol)
@@ -1121,6 +1212,43 @@ ExeCreateSurfTmByScrewing( int nParentId, int nCrvId,
    return nNewId ;
 }
 
+//-------------------------------------------------------------------------------
+int
+ExeCreateSurfTmRectSwept( int nParentId, double dDimH, double dDimV, double dBevelH, double dBevelV, int nGuideId, int nCapType, double dLinTol)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
+   nParentId = AdjustId( nParentId) ;
+   bool bOk = true ;
+  // recupero il riferimento locale
+   Frame3d frLoc ;
+   bOk = bOk && pGeomDB->GetGroupGlobFrame( nParentId, frLoc) ;
+  // recupero la guida in locale
+   CurveLocal CrvGuide( pGeomDB, nGuideId, frLoc) ;
+   bOk = bOk && ( CrvGuide.Get() != nullptr) ;
+  // creo la superficie trimesh
+   ISurfTriMesh* pSTM = nullptr ;
+   pSTM = ( bOk ? GetSurfTriMeshRectSwept( dDimH, dDimV, dBevelH, dBevelV, CrvGuide, nCapType, dLinTol) : nullptr) ;
+  // inserisco la superficie trimesh nel DB
+   int nNewId = ( bOk ? pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, pSTM) : GDB_ID_NULL) ;
+   ExeSetModified() ;
+  // se richiesto, salvo il comando Lua equivalente
+   if ( IsCmdLog()) {
+      string sLua = "EgtSurfTmRectSwept(" + IdToString( nParentId) + "," +
+                                            ToString( dDimH) + "," +
+                                            ToString( dDimV) + "," +
+                                            ToString( dBevelH) + "," +
+                                            ToString( dBevelV) + "," +
+                                            ToString( nGuideId) + "," +
+                                            ToString( nCapType) + "," +
+                                            ToString( dLinTol) + ")" +
+                    " -- Id=" + ToString( nNewId) ;
+      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
+   }
+  // restituisco l'identificativo della nuova entità
+   return nNewId ;
+}
+
 //-------------------------------------------------------------------------------
 int
 ExeCreateSurfTmSwept( int nParentId, int nSectId, int nGuideId, bool bCapEnds, double dLinTol)
@@ -1586,3 +1714,71 @@ ExeCreateSurfBezierRational( int nParentId, int nDegU, int nDegV, int nSpanU, in
   // restituisco l'identificativo della nuova entità
    return nId ;
 }
+
+//-------------------------------------------------------------------------------
+int
+ExeCreateSurfBezierLeaves( int nParentId, int nSurfBzId, int nTextHeight, bool bShowTrim, int* pnCount)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
+   nParentId = AdjustId( nParentId) ;
+  // recupero la superficie
+   const ISurfBezier* pSurfBez = GetSurfBezier( pGeomDB->GetGeoObj( nSurfBzId)) ;
+   if ( pSurfBez == nullptr)
+      return GDB_ID_NULL ;
+  // disegno le foglie
+   vector<tuple<int,Point3d,Point3d>> vLeaves ;
+   pSurfBez->GetLeaves( vLeaves) ;
+   double dFactor = 1 ;
+   int nFirstId = GDB_ID_NULL ;
+   int nCount = 0 ;
+   for ( int k = 0 ; k < (int)vLeaves.size() ; ++ k) {
+      Point3d ptBL = get<1>( vLeaves[k]) * dFactor ;
+      Point3d ptTR = get<2>( vLeaves[k]) * dFactor ;
+      Point3d ptBR( ptTR.x, ptBL.y) ;
+      Point3d ptTL( ptBL.x, ptTR.y) ;
+      PolyLine PL ;
+      PL.AddUPoint( 0, ptBL) ;
+      PL.AddUPoint( 1, ptBR) ;
+      PL.AddUPoint( 2, ptTR) ;
+      PL.AddUPoint( 3, ptTL) ;
+      PL.Close() ;
+     // creo la curva e la inserisco nel GDB
+      PtrOwner<ICurveComposite> pCrvCompo( CreateCurveComposite()) ;
+      if ( IsNull( pCrvCompo)  ||  ! pCrvCompo->FromPolyLine( PL)  ||  ! pCrvCompo->SetExtrusion( Z_AX))
+         return GDB_ID_NULL ;
+     // inserisco la curva composita nel DB
+      int nCrvId = pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, Release( pCrvCompo)) ;
+      if ( nCrvId == GDB_ID_NULL)
+         return GDB_ID_NULL ;
+      ++ nCount ;
+      if ( nFirstId == GDB_ID_NULL)
+         nFirstId = nCrvId ;
+     // creo il testo e lo riempio
+      string sText = ToString( get<0>( vLeaves[k])) ;
+      Point3d ptCenter( ( ptBL + ptTR) / 2) ;
+      PtrOwner<IExtText> pTXT( CreateExtText()) ;
+      if ( IsNull( pTXT)  ||  ! pTXT->Set( ptCenter, Z_AX, X_AX, sText, "", false, nTextHeight))
+         return GDB_ID_NULL ;
+     // inserisco il testo nel DB
+      int nTxtId = pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, Release( pTXT)) ;
+      if ( nTxtId == GDB_ID_NULL)
+         return GDB_ID_NULL ;
+      ++ nCount ;
+   }
+  // se richiesto disegno la regione di trim
+   const ISurfFlatRegion* pSfr = pSurfBez->GetTrimRegion() ;
+   if ( bShowTrim  &&  pSfr != nullptr) {
+      PtrOwner<ISurfFlatRegion> pTrimReg( pSfr->Clone()) ;
+      if ( ! IsNull( pTrimReg)) {
+         int nTrimId = pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, Release( pTrimReg)) ;
+         if ( nTrimId == GDB_ID_NULL)
+            return GDB_ID_NULL ;
+         ++ nCount ;
+      }
+   }
+  // restituisco i risultati
+   if ( pnCount != nullptr)
+      *pnCount = nCount ;
+   return nFirstId ;
+}

EXE_GdbGetCurve.cpp

@@ -23,6 +23,7 @@
 #include "/EgtDev/Include/EGkCurveArc.h"
 #include "/EgtDev/Include/EGkCurveBezier.h"
 #include "/EgtDev/Include/EGkCurveComposite.h"
+#include "/EgtDev/Include/EGkCurveAux.h"
 #include "/EgtDev/Include/EGkDistPointCurve.h"
 #include "/EgtDev/Include/EGkIntersCurves.h"
 #include "/EgtDev/Include/EGkSurfFlatRegion.h"
@@ -188,6 +189,8 @@ ExeCurveIsACircle( int nId, Point3d& ptCen, Vector3d& vtN, double& dRad, bool& b
             bCCW = ( pArc->GetAngCenter() > 0) ;
             return true ;
          }
+         else
+            return false ;
       }
    case CRV_COMPO :
       { ICurveComposite* pCompo = GetCurveComposite( pGObj) ;
@@ -548,6 +551,24 @@ ExeArcNormVersor( int nId, int nRefId, Vector3d& vtNorm)
    return TransformVector( pGeomDB, nId, nRefId, vtNorm) ;
 }
 
+//----------------------------------------------------------------------------
+bool
+ExeCurveCompoLength( int nId, int nSimpCrv, double& dLen)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, false)
+  // recupero la curva composita
+   const ICurveComposite* pCompoCrv = GetCurveComposite( pGeomDB->GetGeoObj( nId)) ;
+   if ( pCompoCrv == nullptr)
+      return false ;
+  // recupero la curva semplice di indice richiesto
+   const ICurve* pSimpCrv = pCompoCrv->GetCurve( nSimpCrv) ;
+   if ( pSimpCrv == nullptr)
+      return false ;
+  // recupero la sua lunghezza
+   return pSimpCrv->GetLength( dLen) ;
+}
+
 //----------------------------------------------------------------------------
 bool
 ExeCurveCompoCenter( int nId, int nSimpCrv, int nRefId, Point3d& ptCen)

EXE_GdbGetPocketing.cpp

@@ -0,0 +1,150 @@
+//----------------------------------------------------------------------------
+//  EgalTech 2023-2023
+//----------------------------------------------------------------------------
+// File : Exe_GdbGetPocketing.cpp       Data : 28.11.23        Versione : 2.5k6
+// Contenuto : Funzioni di interrogazione di regioni piane del DBG per EXE.
+//
+//
+//
+// Modifiche : 29.11.23 RE Creazione modulo.
+//
+//
+//----------------------------------------------------------------------------
+
+//--------------------------- Include ----------------------------------------
+#include "stdafx.h"
+#include "EXE.h"
+#include "EXE_Macro.h"
+#include "/EgtDev/Include/EXeExecutor.h"
+#include "/EgtDev/Include/EGkCalcPocketing.h"
+
+using namespace std ;
+
+//----------------------------------------------------------------------------
+bool
+ExePocketing( const int nId, double dRad, double dStep, double dAngle, int nType, bool bSmooth, int nDestGrpId,
+              int& nFirstId, int& nCrvCount)
+{
+  // databse geometrico
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, false) ;
+
+  // recupero la FlatRegion per i percorsi
+   const ISurfFlatRegion* pSfr = GetSurfFlatRegion( pGeomDB->GetGeoObj( nId)) ;
+   if ( pSfr == nullptr)
+      return false ;
+
+  // recupero il suo frame
+   Frame3d frSfr ;
+   if ( ! pGeomDB->GetGlobFrame( nId, frSfr))
+      return false ;
+
+  // recupero il riferimento del gruppo di destinazione
+   Frame3d frDest ;
+   if ( ! pGeomDB->GetGroupGlobFrame( nDestGrpId, frDest))
+      return false ;
+
+  // costruzione vettori di curve per Pocketing
+   ICRVCOMPOPOVECTOR vCrvCompoRes ;
+
+  // eseguo Pocketing
+   bool bOk = CalcPocketing( pSfr, dRad, dStep, dAngle, nType, bSmooth, vCrvCompoRes) ;
+   nFirstId = GDB_ID_NULL ; // primo Id da restituire
+   nCrvCount = int( vCrvCompoRes.size()) ;
+   if ( bOk  &&  int( vCrvCompoRes.size()) > 0) {
+     // scorro le curve di Pocketing ottenute
+      for ( int u = 0 ; u < int( vCrvCompoRes.size()) ; ++ u) {
+         vCrvCompoRes[u]->LocToLoc( frSfr, frDest) ;
+        // inserisco la curva nel DB Geometrico
+         int nCurrId = pGeomDB->AddGeoObj( GDB_ID_NULL, nDestGrpId, Release( vCrvCompoRes[u])) ;
+         if ( nCurrId == GDB_ID_NULL)
+            return false ;
+         if ( u == 0)
+            nFirstId = nCurrId ; // memorizzo il primo Id da restituire
+      }
+      ExeSetModified() ;
+   }
+
+   if ( IsCmdLog()) {
+      string sLua = "EgtPocketing(" + ToString( nId) + "," +
+                                      ToString( dRad) + "," +
+                                      ToString( dStep) + "," +
+                                      ToString( dAngle) + "," +
+                                      ToString( nType) + "," +
+                                      ToString( bSmooth) + "," +
+                                      ToString( nDestGrpId) + ")" +
+                    " -- Ok=" + ToString( bOk) + " FirstId=" + ToString( nFirstId) + " CurveCount=" + ToString( nCrvCount) ;
+      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
+   }
+   return bOk ;
+}
+
+//----------------------------------------------------------------------------
+int
+ExeSurfFrGetZigZagInfill( int nId, int nDestGrpId, double dStep, double dAng, bool bSmooth, bool bRemoveOverlapLink,
+                          int* pnCount)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
+
+  // recupero la superficie FlatRegion
+   ISurfFlatRegion* pOrigSrf = GetSurfFlatRegion( pGeomDB->GetGeoObj( nId)) ;
+   if ( pOrigSrf == nullptr)
+      return GDB_ID_NULL ;
+   PtrOwner<ISurfFlatRegion> pSfr( pOrigSrf->Clone()) ;
+   bool bOk = ( ! IsNull( pSfr)) ;
+
+  // recupero il riferimento della superficie
+   Frame3d frSurf ;
+   bOk = bOk && pGeomDB->GetGlobFrame( nId, frSurf) ;
+  // recupero il riferimento di destinazione
+   Frame3d frDest ;
+   bOk = bOk && pGeomDB->GetGroupGlobFrame( nDestGrpId, frDest) ;
+
+  // creo il riferimento per il calcolo del percorso a zigzag
+   Vector3d vtN ;
+   if ( bOk) 
+      vtN = pSfr->GetNormVersor() ;
+   bOk = bOk && vtN.ToGlob( frSurf) ;
+   Frame3d frRef ; 
+   bOk = bOk && frRef.Set( ORIG, vtN) ;
+   bOk = bOk && frRef.Rotate( ORIG, vtN, dAng) ;
+
+  // calcolo il percorso a zigzag
+   bOk = bOk && pSfr->LocToLoc( frSurf, frRef) ;
+   ICRVCOMPOPOVECTOR vpCrvs ;
+   bOk = bOk  &&  CalcZigZagInfill( pSfr, dStep, bSmooth, bRemoveOverlapLink, vpCrvs) ;
+
+  // inserisco le curve risultanti nel DB
+   int nFirstId = GDB_ID_NULL ;
+   int nCount = 0 ;
+   for ( int i = 0 ; bOk  &&  i < ( int) vpCrvs.size() ; i ++) {
+     // porto la curva nel riferimento di destinazione
+      bOk = bOk  &&  vpCrvs[i]->LocToLoc( frRef, frDest) ;
+     // la inserisco nel DB geometrico
+      int nNewId = ( bOk ? pGeomDB->AddGeoObj( GDB_ID_NULL, nDestGrpId, Release( vpCrvs[i])) : GDB_ID_NULL) ;
+      bOk = bOk && ( nNewId != GDB_ID_NULL) ;
+     // aggiorno contatori
+      if ( bOk  &&  nFirstId == GDB_ID_NULL)
+         nFirstId = nNewId ;
+      if ( bOk)
+         ++ nCount ;
+   } 
+   ExeSetModified() ;
+
+  // restituisco risultati
+   if ( pnCount != nullptr)
+      *pnCount = nCount ;
+
+   if ( IsCmdLog()) {
+      string sLua = "EgtGetSurfFrZigZagInfill(" + ToString( nId) + "," +
+                                                  ToString( dStep) + "," +
+                                                  ToString( dAng) + "," +
+                                                  ToString( bSmooth) + "," +
+                                                  ToString( bRemoveOverlapLink) + "," +
+                    " -- Ok=" + ToString( bOk) + " FirstId=" + ToString( nFirstId) + " CurveCount=" + ToString( nCount) ;
+      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
+   }
+
+   return nFirstId ;
+}

EXE_GdbGetSurf.cpp

@@ -21,6 +21,7 @@
 #include "/EgtDev/Include/EXeExecutor.h"
 #include "/EgtDev/Include/EXeConst.h"
 #include "/EgtDev/Include/EGkGeoPoint3d.h"
+#include "/EgtDev/Include/EGkCurveLine.h"
 #include "/EgtDev/Include/EGkCurveBezier.h"
 #include "/EgtDev/Include/EGkCurveComposite.h"
 #include "/EgtDev/Include/EGkCurveLocal.h"
@@ -28,6 +29,12 @@
 #include "/EgtDev/Include/EGkSurfFlatRegion.h"
 #include "/EgtDev/Include/EGkSurfTriMesh.h"
 #include "/EgtDev/Include/EGkSurfBezier.h"
+#include "/EgtDev/Include/EGkDistPointSurfTm.h"
+#include "/EgtDev/Include/EGkIntersCurves.h"
+#include "/EgtDev/Include/EGkIntersLineBox.h"
+#include "/EgtDev/Include/EGkIntersLineSurfTm.h"
+#include "/EgtDev/Include/EGkCalcPocketing.h"
+#include "/EgtDev/Include/EGkPolygonElevation.h"
 #include "/EgtDev/Include/EGkSurfLocal.h"
 #include "/EgtDev/Include/EGkStringUtils3d.h"
 
@@ -48,6 +55,18 @@ ExeSurfArea( int nId, double& dArea)
    return ( pSurf != nullptr  &&  pSurf->GetArea( dArea)) ;
 }
 
+//----------------------------------------------------------------------------
+bool
+ExeSurfIsClosed( int nId)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, false)
+  // recupero la superficie
+   ISurf* pSurf = GetSurf( pGeomDB->GetGeoObj( nId)) ;
+  // verifico se è superficie chiusa
+   return ( pSurf != nullptr  &&  pSurf->IsClosed()) ;
+}
+
 //----------------------------------------------------------------------------
 bool
 ExeSurfVolume( int nId, double& dVol)
@@ -294,63 +313,16 @@ ExeExtractSurfFrChunkLoops( int nId, int nChunk, int nDestGrpId, int* pnCount)
 
 //----------------------------------------------------------------------------
 int
-ExeSurfFrGetZigZagInfill( int nId, int nDestGrpId, double dStep, double dAng, bool bStepCorrection, bool bInvert, int* pnCount)
+ExeSurfTmVertexCount( int nId)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
-   VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
-
-  // recupero la superficie FlatRegion
-   ISurfFlatRegion * pOrigSrf = GetSurfFlatRegion( pGeomDB->GetGeoObj( nId)) ;
-   if ( pOrigSrf == nullptr)
-      return GDB_ID_NULL ;
-   PtrOwner<ISurfFlatRegion> pSfr( pOrigSrf->Clone()) ;
-   bool bOk = ( ! IsNull( pSfr)) ;
-
-  // recupero il riferimento della superficie
-   Frame3d frSurf ;
-   bOk = bOk && pGeomDB->GetGlobFrame( nId, frSurf) ;
-  // recupero il riferimento di destinazione
-   Frame3d frDest ;
-   bOk = bOk && pGeomDB->GetGroupGlobFrame( nDestGrpId, frDest) ; 
-
-  // creo il riferimento per il calcolo del percorso a zigzag 
-   Vector3d vtN ;
-   if ( bOk) 
-      vtN = pSfr->GetNormVersor() ;   
-   bOk = bOk && vtN.ToGlob( frSurf) ;
-   Frame3d frRef ; 
-   bOk = bOk && frRef.Set( ORIG, vtN) ;
-   bOk = bOk && frRef.Rotate( ORIG, vtN, dAng) ;
-
-  // calcolo il percorso a zigzag 
-   bOk = bOk && pSfr->LocToLoc( frSurf, frRef) ;
-   ICRVCOMPOPOVECTOR vpCrvs ;
-   bOk = bOk && pSfr->GetZigZagInfill( dStep, bStepCorrection, bInvert, vpCrvs) ;
-
-  // inserisco le curve risultanti nel DB
-   int nFirstId = GDB_ID_NULL ;
-   int nCount = 0 ;
-   for ( int i = 0 ; bOk && i < ( int) vpCrvs.size() ; i ++) {
-     // porto la curva nel riferimento di destinazione
-      bOk = bOk && vpCrvs[i]->LocToLoc( frRef, frDest) ;
-     // la inserisco nel DB geometrico
-      int nNewId = ( bOk ? pGeomDB->AddGeoObj( GDB_ID_NULL, nDestGrpId, Release( vpCrvs[i])) : GDB_ID_NULL) ;
-      bOk = bOk && ( nNewId != GDB_ID_NULL) ;
-     // copio il materiale
-      if ( ! pGeomDB->CopyMaterial( nId, nNewId))
-         return GDB_ID_NULL ;
-     // aggiorno contatori
-      if ( bOk  &&  nFirstId == GDB_ID_NULL)
-         nFirstId = nNewId ;
-      if ( bOk)
-         ++ nCount ;  
-   } 
-   ExeSetModified() ;
-
-  // restituisco risultati
-   if ( pnCount != nullptr)
-      *pnCount = nCount ;
-   return nFirstId ;
+   VERIFY_GEOMDB( pGeomDB, 0)
+  // recupero la superficie trimesh
+   const ISurfTriMesh* pStm = GetSurfTriMesh( pGeomDB->GetGeoObj( nId)) ;
+   if ( pStm == nullptr)
+      return 0 ;
+  // recupero il numero di vertici
+   return pStm->GetVertexCount() ;
 }
 
 //----------------------------------------------------------------------------
@@ -367,6 +339,59 @@ ExeSurfTmFacetCount( int nId)
    return pStm->GetFacetCount() ;
 }
 
+//----------------------------------------------------------------------------
+int
+ExeSurfTmPartCount( int nId)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, -1)
+  // recupero la superficie trimesh
+   const ISurfTriMesh* pStm = GetSurfTriMesh( pGeomDB->GetGeoObj( nId)) ;
+   if ( pStm == nullptr)
+      return -1 ;
+  // recupero il numero di parti
+   return pStm->GetPartCount() ;
+}
+
+//-----------------------------------------------------------------------------
+bool
+ExeSurfTmGetVertex( int nId, int nVert, int nRefId, Point3d& ptVert)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, false)
+  // recupero la superficie trimesh
+   const ISurfTriMesh* pStm = GetSurfTriMesh( pGeomDB->GetGeoObj( nId)) ;
+   if ( pStm == nullptr)
+      return false ;
+  // recupero il vertice di indice dato
+   if ( ! pStm->GetVertex( nVert, ptVert))
+      return false ;
+  // gestione trasformazioni ( eventuali)
+   return TransformPoint( pGeomDB, nId, nRefId, ptVert) ;
+}
+
+//-----------------------------------------------------------------------------
+bool
+ExeSurfTmGetNearestVertex( int nId, const Point3d& ptNear, int nRefId, int& nVert, Point3d& ptVert)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, false)
+  // recupero la superficie trimesh
+   const ISurfTriMesh* pStm = GetSurfTriMesh( pGeomDB->GetGeoObj( nId)) ;
+   if ( pStm == nullptr)
+      return false ;
+  // porto il punto Near nel riferimento dell'entità
+   Point3d ptNearL = ptNear ;
+   if ( ! InvTransformPoint( pGeomDB, nId, nRefId, ptNearL))
+      return false ;
+  // recupero il vertice più vicino della superficie
+   nVert = GetSurfTmNearestVertex( ptNearL, *pStm) ;
+   if ( ! pStm->GetVertex( nVert, ptVert))
+      return false ;
+  // gestione trasformazioni ( eventuali)
+   return TransformPoint( pGeomDB, nId, nRefId, ptVert) ;
+}
+
 //----------------------------------------------------------------------------
 int
 ExeSurfTmFacetFromTria( int nId, int nT)
@@ -507,6 +532,83 @@ ExeSurfTmFacetMinAreaRectangle( int nId, int nFacet, int nRefId, Frame3d& frRect
    return TransformFrame( pGeomDB, nId, nRefId, frRect) ;
 }
 
+//----------------------------------------------------------------------------
+bool
+ExeSurfTmFacetElevationInBBox( int nId, int nFacet, const BBox3d& b3Box, bool bAcceptOutFacet, int nRefId, double& dElev)
+{
+  // La faccia deve essere tutta contenuta nel Box
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, false)
+  // recupero la superficie trimesh e il suo riferimento
+   const ISurfTriMesh* pStm = GetSurfTriMesh( pGeomDB->GetGeoObj( nId)) ;
+   if ( pStm == nullptr)
+      return false ;
+   Frame3d frStm ;
+   if ( ! pGeomDB->GetGlobFrame( nId, frStm))
+      return false ;
+  // verifico il box e ne recupero il riferimento
+   if ( b3Box.IsEmpty())
+      return false ;
+   Frame3d frBox ;
+   if ( nRefId == GDB_ID_ROOT)
+      frBox = GLOB_FRM ;
+   else if ( nRefId == GDB_ID_GRID)
+      frBox = pGeomDB->GetGridFrame() ;
+   else {
+     // nRefId può essere un gruppo o una entità
+      if ( ! pGeomDB->GetGroupGlobFrame( nRefId, frBox)  &&
+           ! pGeomDB->GetGlobFrame( nRefId, frBox))
+         return false ;
+   }
+  // recupero il contorno esterno della faccia e lo porto nel riferimento del box
+   POLYLINEVECTOR vPL ;
+   pStm->GetFacetLoops( nFacet, vPL) ;
+   if ( vPL.empty())
+      return false ;
+   vPL[0].LocToLoc( frStm, frBox) ;
+  // ne derivo il poligono
+   Polygon3d pgFacet ;
+   if ( ! pgFacet.FromPolyLine( vPL[0]))
+      return false ;
+  // calcolo l'elevazione
+   return PolygonElevationInBBox( pgFacet, b3Box, bAcceptOutFacet, dElev) ;
+}
+
+//----------------------------------------------------------------------------
+bool
+ExeSurfTmFacetElevationInClosedSurfTm( int nFacetStmId, int nFacet, int nClosedStmId, bool bAcceptOutFacet, double& dElev)
+{
+  // La faccia deve essere tutta contenuta nel Box
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, false)
+  // recupero la superficie trimesh della faccia e il suo riferimento
+   const ISurfTriMesh* pFacStm = GetSurfTriMesh( pGeomDB->GetGeoObj( nFacetStmId)) ;
+   if ( pFacStm == nullptr)
+      return false ;
+   Frame3d frFacStm ;
+   if ( ! pGeomDB->GetGlobFrame( nFacetStmId, frFacStm))
+      return false ;
+  // recupero la superficie trimesh chiusa (volume)
+   const ISurfTriMesh* pCldStm = GetSurfTriMesh( pGeomDB->GetGeoObj( nClosedStmId)) ;
+   if ( pCldStm == nullptr)
+      return false ;
+   Frame3d frCldStm ;
+   if ( ! pGeomDB->GetGlobFrame( nClosedStmId, frCldStm))
+      return false ;
+  // recupero il contorno esterno della faccia e lo porto nel riferimento della superficie chiusa
+   POLYLINEVECTOR vPL ;
+   pFacStm->GetFacetLoops( nFacet, vPL) ;
+   if ( vPL.empty())
+      return false ;
+   vPL[0].LocToLoc( frFacStm, frCldStm) ;
+  // ne derivo il poligono
+   Polygon3d pgFacet ;
+   if ( ! pgFacet.FromPolyLine( vPL[0]))
+      return false ;
+  // calcolo l'elevazione
+   return PolygonElevationInClosedSurfTm( pgFacet, *pCldStm, bAcceptOutFacet, dElev) ;
+}
+
 //----------------------------------------------------------------------------
 bool
 ExeSurfTmFacetOppositeSide( int nId, int nFacet, const Vector3d& vtDir, int nRefId,
@@ -754,7 +856,8 @@ ExeExtractSurfTmLoops( int nId, int nDestGrpId, int* pnCount)
 
 //----------------------------------------------------------------------------
 int
-ExeGetSurfTmSilhouette( int nId, const Vector3d& vtDir, double dToler, int nDestGrpId, int nRefType, int* pnCount)
+ExeGetSurfTmSilhouette( int nId, const Vector3d& vtDir, double dToler, int nDestGrpId, int nRefType,
+                        int* pnCount, bool bAllTria)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
    VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
@@ -771,7 +874,7 @@ ExeGetSurfTmSilhouette( int nId, const Vector3d& vtDir, double dToler, int nDest
    Vector3d vtDirL = GetVectorLocal( pGeomDB, vtDir, nRefType, frSurf) ;
   // recupero i loop come polilinee
    POLYLINEVECTOR vPL ;
-   bOk = bOk && pStm->GetSilhouette( vtDirL, dToler, vPL) ;
+   bOk = bOk && pStm->GetSilhouette( vtDirL, dToler, vPL, bAllTria) ;
   // dalle polilinee creo le curve e le inserisco nel DB
    int nFirstId = GDB_ID_NULL ;
    int nCount = 0 ;
@@ -799,7 +902,8 @@ ExeGetSurfTmSilhouette( int nId, const Vector3d& vtDir, double dToler, int nDest
       string sLua = "EgtGetSurfTmSilhouette(" + ToString( nId) + ",{" +
                                                 ToString( vtDir) + "}," +
                                                 ToString( nDestGrpId) + "," +
-                                                RefTypeToString( nRefType) + ")" +
+                                                RefTypeToString( nRefType) + "," +
+                                                ToString( bAllTria) + ")" +
                     " -- Id1=" + ToString( nFirstId) + ",Nbr=" + ToString( nCount) ;
       LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
    }
@@ -910,6 +1014,20 @@ ExeCopySurfTmFacet( int nId, int nFacet, int nDestGrpId)
    return nFacId ;
 }
 
+//-----------------------------------------------------------------------------
+bool
+ExeSurfTmGetAllVertInFacet( int nId, int nFacet, INTVECTOR& vVert)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, false)
+  // recupero la superficie TriMesh
+   const ISurfTriMesh* pStm = GetSurfTriMesh( pGeomDB->GetGeoObj( nId)) ;
+   if ( pStm == nullptr)
+      return false ;
+  // recupero l'elenco dei vertici nella faccia
+   return pStm->GetAllVertInFacet( nFacet, vVert) ;
+}
+
 //-----------------------------------------------------------------------------
 bool
 ExeSurfTmGetFacetBBox( int nId, int nFacet, int nFlag, BBox3d& b3Box)
@@ -936,7 +1054,7 @@ ExeSurfTmGetFacetBBoxGlob( int nId, int nFacet, int nFlag, BBox3d& b3Box)
       return false ;
   // recupero il riferimento globale del gruppo cui appartiene
    Frame3d frGlob ;
-   if ( nId != GDB_ID_ROOT  &&  ! pGeomDB->GetGroupGlobFrame( pGeomDB->GetParentId( nId), frGlob))
+   if ( ! pGeomDB->GetGlobFrame( nId, frGlob))
       return false ;
   // recupero il bounding box della faccia dell'oggetto in globale
    return pStm->GetFacetBBox( nFacet, frGlob, b3Box, nFlag) ;
@@ -954,7 +1072,7 @@ ExeSurfTmGetFacetBBoxRef( int nId, int nFacet, int nFlag, const Frame3d& frRef,
       return false ;
   // recupero il riferimento globale del gruppo cui appartiene
    Frame3d frGlob ;
-   if ( nId != GDB_ID_ROOT  &&  ! pGeomDB->GetGroupGlobFrame( pGeomDB->GetParentId( nId), frGlob))
+   if ( ! pGeomDB->GetGlobFrame( nId, frGlob))
       return false ;
   // porto il riferimento di espressione in quello della superficie
    Frame3d frGlobL = frGlob ;
@@ -963,6 +1081,63 @@ ExeSurfTmGetFacetBBoxRef( int nId, int nFacet, int nFlag, const Frame3d& frRef,
    return pStm->GetFacetBBox( nFacet, frGlobL, b3Box, nFlag) ;
 }
 
+//----------------------------------------------------------------------------
+int
+ExeSurfTmGetEdges( int nId, int nDestGrpId, bool bSmoothAng, int* pnCount)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
+  // recupero la superficie TriMesh
+   const ISurfTriMesh* pStm = GetSurfTriMesh( pGeomDB->GetGeoObj( nId)) ;
+   bool bOk = ( pStm != nullptr) ;
+  // recupero il riferimento globale del gruppo cui appartiene
+   Frame3d frSurf ;
+   bOk = bOk && pGeomDB->GetGlobFrame( nId, frSurf) ;
+  // recupero il riferimento di destinazione
+   Frame3d frDest ;
+   bOk = bOk && pGeomDB->GetGroupGlobFrame( nDestGrpId, frDest) ;
+  // ne determino gli spigoli
+   ICURVEPOVECTOR vpCurve ;
+   bOk = bOk  &&  pStm->GetEdges( vpCurve) ;
+  // inserisco gli spigoli come curve nel DB
+   int nFirstId = GDB_ID_NULL ;
+   int nCount = 0 ;
+   for ( int i = 0 ; i < int( vpCurve.size()) ; ++ i) {
+     // se richiesto, verifico l'angolo tra le facce adiacenti (0=allineate)
+      if ( bSmoothAng) {
+         double dAngInt = vpCurve[i]->GetTempParam() ;
+         if ( abs( dAngInt) < pStm->GetSmoothAngle())
+            continue ;
+      }
+     // lo porto nel riferimento destinazione
+      bOk = bOk && vpCurve[i]->LocToLoc( frSurf, frDest) ;
+     // lo inserisco nel DB geometrico
+      int nNewId = ( bOk ? pGeomDB->AddGeoObj( GDB_ID_NULL, nDestGrpId, Release( vpCurve[i])) : GDB_ID_NULL) ;
+      bOk = bOk && ( nNewId != GDB_ID_NULL) ;
+     // copio il materiale
+      bOk = bOk && pGeomDB->CopyMaterial( nId, nNewId) ;
+     // aggiorno contatori
+      if ( bOk  &&  nFirstId == GDB_ID_NULL)
+         nFirstId = nNewId ;
+      if ( bOk)
+         ++ nCount ;
+   }
+   if ( ! bOk)
+      nCount = -1 ;
+   ExeSetModified() ;
+  // se richiesto, salvo il comando Lua equivalente
+   if ( IsCmdLog()) {
+      string sLua = "EgtSurfTmGetEdges(" + ToString( nId) + ",{" +
+                                           ToString( nDestGrpId) + ")" +
+                    " -- Id1=" + ToString( nFirstId) + ",Nbr=" + ToString( nCount) ;
+      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
+   }
+  // restituisco risultati
+   if ( pnCount != nullptr)
+      *pnCount = nCount ;
+   return nFirstId ;
+}
+
 //----------------------------------------------------------------------------
 bool
 ExeSurfBezierGetPoint( int nSurfId, double dU, double dV, int nRefId, Point3d& ptP)
@@ -1318,4 +1493,4 @@ ExeExtractSurfBezierLoops( int nId, int nDestGrpId, int* pnCount)
    if ( pnCount != nullptr)
       *pnCount = nCount ;
    return nFirstId ;
-}
+}

EXE_GdbGetVol.cpp

@@ -250,8 +250,8 @@ ExeVolZmapGetEdges( int nId, int nDestGrpId, int* pnCount)
    ExeSetModified() ;
   // se richiesto, salvo il comando Lua equivalente
    if ( IsCmdLog()) {
-      string sLua = "EgtGetSurfTmSilhouette(" + ToString( nId) + ",{" +
-                                                ToString( nDestGrpId) + ")" +
+      string sLua = "EgtVolZmapGetEdges(" + ToString( nId) + ",{" +
+                                            ToString( nDestGrpId) + ")" +
                     " -- Id1=" + ToString( nFirstId) + ",Nbr=" + ToString( nCount) ;
       LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
    }

EXE_GdbModifyCurve.cpp

@@ -31,15 +31,20 @@
 #include "/EgtDev/Include/EGkOffsetCurve.h"
 #include "/EgtDev/Include/EGkMedialAxis.h"
 #include "/EgtDev/Include/EGkChainCurves.h"
+#include "/EgtDev/Include/EGkProjectCurveSurfTm.h"
 #include "/EgtDev/Include/EGkSurfFlatRegion.h"
 #include "/EgtDev/Include/EGkExtTExt.h"
 #include "/EgtDev/Include/EGkGdbIterator.h"
 #include "/EgtDev/Include/EGkStringUtils3d.h"
 #include "/EgtDev/Include/EGkIntervals.h"
 #include "/EgtDev/Include/EGkPolygon3d.h"
+#include "/EgtDev/Include/EGkGeoVector3d.h"
 #include "/EgtDev/Include/EgtPointerOwner.h"
+#include "/EgtDev/Include/EGkCalcPocketing.h"
+#include <EgtDev/Include/EGkSfrCreate.h>
 #include <functional>
 
+
 using namespace std ;
 
 //----------------------------------------------------------------------------
@@ -97,14 +102,14 @@ ExeOffsetCurve( int nId, double dDist, int nType)
 
 //----------------------------------------------------------------------------
 int
-ExeOffsetCurveAdv( int nId, double dDist, int nType, int* pnCount)
+ExeOffsetCurveAdv( int nId, double dDist, int nType, int* pnCount, double dLinTol)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
    VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
   // recupero la curva
    const ICurve* pCurve = GetCurve( pGeomDB->GetGeoObj( nId)) ;
   // eseguo l'offset
-   OffsetCurve OffsCrv ;
+   OffsetCurve OffsCrv( dLinTol) ;
    bool bOk = OffsCrv.Make( pCurve, dDist, nType) ;
   // salvo le curve di offset
    int nRefId = nId ;
@@ -186,7 +191,7 @@ ExeApproxCurve( int nId, int nApprType, double dLinTol)
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
    VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
   // recupero la curva
-   ICurve* pCurve = GetCurve( pGeomDB->GetGeoObj( nId)) ;
+   const ICurve* pCurve = GetCurve( pGeomDB->GetGeoObj( nId)) ;
    bool bOk = ( pCurve != nullptr) ;
   // eseguo l'approssimazione
    PtrOwner<ICurveComposite> pCC( CreateCurveComposite()) ;
@@ -196,6 +201,8 @@ ExeApproxCurve( int nId, int nApprType, double dLinTol)
         nApprType == APP_RIGHT_LINES  ||  nApprType == APP_RIGHT_CONVEX_LINES) {
       PolyLine PL ;
       bOk = bOk && pCurve->ApproxWithLines( dLinTol, ANG_TOL_MAX_DEG, nApprType, PL) && pCC->FromPolyLine( PL) ;
+     // eliminazione di small Z
+      bOk = bOk && pCC->RemoveSmallDefects( 0.5 * dLinTol, ANG_TOL_STD_DEG) ;
    }
    else {       // con bi-archi
       PolyArc PA ;
@@ -207,8 +214,10 @@ ExeApproxCurve( int nId, int nApprType, double dLinTol)
          dAngTol = min( ANG_TOL_STD_DEG + 0.2 * dCoeff * ANG_TOL_STD_DEG, ANG_TOL_MAX_DEG) ;
       }
       bOk = bOk && pCurve->ApproxWithArcsEx( dLinTol, dAngTol, dLinFea, PA) && pCC->FromPolyArc( PA) ;
+     // eliminazione di small Z
+      bOk = bOk && pCC->RemoveSmallDefects( 0.5 * dLinTol, ANG_TOL_STD_DEG) ;
      // merge di archi identici di biarchi
-      bOk = bOk && pCC->MergeCurves( 0.5 * dLinTol, dAngTol) ;
+      bOk = bOk && pCC->MergeCurves( 0.5 * dLinTol, ANG_TOL_STD_DEG) ;
    }
   // copio estrusione e spessore
    Vector3d vtExtr ;
@@ -288,9 +297,9 @@ ExeChangeClosedCurveStart( int nId, double dU)
    bOk = bOk && ( pCurve != nullptr) ;
   // cambio il punto iniziale
    if ( bOk  &&  pCurve->GetType() == CRV_ARC)
-      bOk = bOk && dynamic_cast<ICurveArc*>(pCurve)->ChangeStartPoint(dU) ;
+      bOk = bOk && GetCurveArc( pCurve)->ChangeStartPoint(dU) ;
    else if ( bOk  &&  pCurve->GetType() == CRV_COMPO)
-      bOk = bOk && dynamic_cast<ICurveComposite*>(pCurve)->ChangeStartPoint(dU) ;
+      bOk = bOk && GetCurveComposite( pCurve)->ChangeStartPoint(dU) ;
    else
       bOk = false ;
    ExeSetModified() ;
@@ -327,9 +336,9 @@ ExeChangeClosedCurveStartPoint( int nId, const Point3d& ptP, int nRefType)
    bOk = bOk && distPC.GetParamAtMinDistPoint( 0, dPar, nFlag) ;
   // cambio il punto iniziale
    if ( bOk  &&  pCurve->GetType() == CRV_ARC)
-      bOk = bOk && dynamic_cast<ICurveArc*>(pCurve)->ChangeStartPoint(dPar) ;
+      bOk = bOk && GetCurveArc(pCurve)->ChangeStartPoint(dPar) ;
    else if ( bOk  &&  pCurve->GetType() == CRV_COMPO)
-      bOk = bOk && dynamic_cast<ICurveComposite*>(pCurve)->ChangeStartPoint(dPar) ;
+      bOk = bOk && GetCurveComposite( pCurve)->ChangeStartPoint(dPar) ;
    else
       bOk = false ;
    ExeSetModified() ;
@@ -405,6 +414,142 @@ ExeModifyCurveEndPoint( int nId, const Point3d& ptP, int nRefType)
    return bOk ;
 }
 
+//----------------------------------------------------------------------------
+bool
+ExeSpiralizeCurveAlongExtrusion( int nId, double dDelta)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, false)
+   bool bOk = true ;
+  // recupero la curva
+   ICurve* pCurve = GetCurve( pGeomDB->GetGeoObj( nId)) ;
+   bOk = bOk && ( pCurve != nullptr) ;
+
+   Vector3d vtExtr ;
+   bOk = bOk && pCurve->GetExtrusion( vtExtr) ;  
+   Point3d ptEnd ;
+   bOk = bOk && pCurve->GetEndPoint( ptEnd) ;
+
+  // se linea o arco
+   if ( bOk && ( pCurve->GetType() == CRV_LINE || pCurve->GetType() == CRV_ARC))
+      bOk = bOk && pCurve->ModifyEnd( ptEnd + dDelta * vtExtr) ;
+  // se composita il delta va ripartito su tutte le sottocurve
+   else if ( bOk && pCurve->GetType() == CRV_COMPO) {
+
+      ICurveComposite* pCompo = GetCurveComposite( pCurve) ;
+      double dLen ;
+      bOk = bOk && pCompo->GetLength( dLen) ;
+
+     // calcolo il delta di ogni sottocurva
+      DBLVECTOR vdDelta( pCompo->GetCurveCount() - 1) ;
+      for ( int i = 1 ; bOk && i < pCompo->GetCurveCount() ; i ++) {
+         double dLenU ;
+         pCompo->GetLengthAtParam( i, dLenU) ;
+         vdDelta[i-1] = dDelta * dLenU / dLen ;
+      }
+
+      for ( int i = 1 ; bOk && i < pCompo->GetCurveCount() ; i ++) {
+         Point3d ptJoint ;
+         pCompo->GetPointD1D2( i, ICurve::FROM_MINUS, ptJoint) ;
+         ptJoint += vtExtr * vdDelta[i-1] ;
+         pCompo->ModifyJoint( i, ptJoint) ; 
+      }
+     // ultimo punto
+      bOk = bOk && pCompo->ModifyEnd( ptEnd + dDelta * vtExtr) ;
+   }
+
+   ExeSetModified() ;   
+  
+  // restituisco il risultato
+   return bOk ;
+}
+
+//----------------------------------------------------------------------------
+bool
+ExeSpiralizeCurveAlongGuide( int nCrvId, int nGuideId, double dLinTol)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, false)
+   bool bOk = true ;
+
+  // recupero la curva e il suo riferimento
+   ICurve* pCrv = GetCurve( pGeomDB->GetGeoObj( nCrvId)) ;
+   bOk = bOk && ( pCrv != nullptr) ;
+   Frame3d frCrv ;
+   bOk = bOk && pGeomDB->GetGlobFrame( nCrvId, frCrv) ;
+
+  // recupero la curva guida e il suo riferimento
+   const ICurve * pCrvGuide = GetCurve( pGeomDB->GetGeoObj( nGuideId)) ;
+   bOk = bOk && ( pCrvGuide != nullptr) ;
+   Frame3d frGuide ;
+   bOk = bOk && pGeomDB->GetGlobFrame( nGuideId, frGuide) ;
+
+  // approssimo le curve con polylines
+   PolyLine PL1, PL2 ;
+   bOk = bOk && pCrv->ApproxWithLines( dLinTol, ANG_TOL_STD_DEG, APP_SPECIAL_LINES, PL1) ;
+   bOk = bOk && pCrvGuide->ApproxWithLines( dLinTol, ANG_TOL_STD_DEG, APP_SPECIAL_LINES, PL2) ;
+  // porto la polyline della curva guida nel riferimento locale
+   bOk = bOk && PL2.LocToLoc( frGuide, frCrv) ;
+
+  // modifico PL2 per gestire eventuali punti di intersezione
+   PtrOwner<ICurveComposite> pCompoGuide( CreateCurveComposite()) ;
+   bOk = bOk && ( ! IsNull( pCompoGuide)) ;
+   bOk = bOk && pCompoGuide->FromPolyLine( PL2) ;
+   Point3d ptP1 ;
+   bool bFound = bOk && PL1.GetFirstPoint( ptP1) ;
+   while ( bOk && bFound) {
+      double dAddPar ;
+      if ( bOk && pCompoGuide->GetParamAtPoint( ptP1, dAddPar, 100 * EPS_SMALL)) 
+         bOk = bOk && pCompoGuide->AddJoint( dAddPar) ;
+      bFound = PL1.GetNextPoint( ptP1) ;
+   }
+   bOk = bOk && pCompoGuide->ApproxWithLines( dLinTol, ANG_TOL_STD_DEG, APP_SPECIAL_LINES, PL2) ;
+   
+  // associo i punti a minima distanza delle polylines
+   PNTIVECTOR vPnt1, vPnt2 ;
+   bool bTmp ;
+   bOk = bOk && AssociatePolyLinesMinDistPoints( PL1, PL2, vPnt1, vPnt2, bTmp) ;
+
+   PtrOwner<ICurveComposite> pCompo( CreateCurveComposite()) ;
+   bOk = bOk && ! IsNull( pCompo) ;
+   
+   double dLenTot ; 
+   Point3d ptOld ;
+   if ( bOk)
+      ptOld = vPnt2[0].first ;    
+   bOk = bOk && pCrv->GetLength( dLenTot) ;   
+   bOk = bOk && pCompo->AddPoint( vPnt2[0].first) ;
+   for ( int i = 1 ; bOk && i < ( int)vPnt1.size() - 1 ; i++) {
+      double dPar ; 
+      bOk = bOk && pCrv->GetParamAtPoint( vPnt1[i].first, dPar) ;
+      double dLen = 0 ; 
+      bOk = bOk && pCrv-> GetLengthAtParam( dPar, dLen) ;
+     // calcolo il nuovo punto per la curva 
+      Point3d ptNew = Media( vPnt2[ vPnt1[i].second].first, vPnt1[i].first, dLen / dLenTot) ;
+      if ( ! AreSamePointApprox( ptOld, ptNew)) {
+         bOk = bOk && pCompo->AddLine( ptNew) ;
+         ptOld = ptNew ;
+      }         
+   }
+   if ( bOk && ! AreSamePointApprox( ptOld, vPnt1.back().first))
+      bOk = bOk && pCompo->AddLine( vPnt1.back().first) ;
+
+  // copio estrusione e spessore
+   Vector3d vtExtr ;
+   if ( bOk  &&  pCrv->GetExtrusion( vtExtr))
+      pCompo->SetExtrusion( vtExtr) ;
+   double dThick ;
+   if ( bOk  &&  pCrv->GetThickness( dThick))
+      pCompo->SetThickness(dThick) ;
+  // sostituisco la vecchia curva con la nuova
+   bOk = bOk && pGeomDB->ReplaceGeoObj( nCrvId, Release( pCompo)) ;
+
+   ExeSetModified() ;   
+
+  // restituisco il risultato
+   return bOk ;
+}
+
 //----------------------------------------------------------------------------
 static bool
 ModifyOneCurveExtrusion( IGeomDB* pGeomDB, int nId, const Vector3d& vtExtr, int nRefType)
@@ -1995,7 +2140,7 @@ bool
 ExeMergeCurvesInCurveCompo( int nId, double dLinTol, bool bStartEnd)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
-   VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
+   VERIFY_GEOMDB( pGeomDB, false)
   // recupero la curva composita
    ICurveComposite* pCompo = GetCurveComposite( pGeomDB->GetGeoObj( nId)) ;
    bool bOk = ( pCompo != nullptr) ;
@@ -2018,7 +2163,7 @@ bool
 ExeRemoveCurveCompoUndercutOnY( int nId, double dLinTol)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
-   VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
+   VERIFY_GEOMDB( pGeomDB, false)
   // recupero la curva composita
    ICurveComposite* pCompo = GetCurveComposite( pGeomDB->GetGeoObj( nId)) ;
    bool bOk = ( pCompo != nullptr) ;
@@ -2040,7 +2185,7 @@ static bool
 MyChainCurvesInGroup( int nGroupId, const Point3d& ptNear, bool bAllowInvert, int nRefType)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
-   VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
+   VERIFY_GEOMDB( pGeomDB, false)
    nGroupId = AdjustId( nGroupId) ;
   // recupero il riferimento del gruppo
    Frame3d frGrp ;
@@ -2093,11 +2238,11 @@ MyChainCurvesInGroup( int nGroupId, const Point3d& ptNear, bool bAllowInvert, in
 bool
 ExeChainCurvesInGroup( int nGroupId, const Point3d& ptNear, int nRefType)
 {
-   bool bOk = MyChainCurvesInGroup(nGroupId, ptNear, true, nRefType) ;
+   bool bOk = MyChainCurvesInGroup( nGroupId, ptNear, true, nRefType) ;
    ExeSetModified() ;
   // se richiesto, salvo il comando Lua equivalente
    if ( IsCmdLog()) {
-      string sLua = "EgtChainCurvesInGroup(" + ToString( nGroupId) + "," +
+      string sLua = "EgtChainCurvesInGroup(" + ToString( nGroupId) + ",{" +
                                                ToString( ptNear) + "}," +
                                                RefTypeToString( nRefType) + ")" +
                     " -- Ok=" + ToString( bOk) ;
@@ -2110,11 +2255,11 @@ ExeChainCurvesInGroup( int nGroupId, const Point3d& ptNear, int nRefType)
 bool
 ExeReorderCurvesInGroup( int nGroupId, const Point3d& ptNear, int nRefType)
 {
-   bool bOk = MyChainCurvesInGroup(nGroupId, ptNear, false, nRefType) ;
+   bool bOk = MyChainCurvesInGroup( nGroupId, ptNear, false, nRefType) ;
    ExeSetModified() ;
   // se richiesto, salvo il comando Lua equivalente
    if ( IsCmdLog()) {
-      string sLua = "EgtReorderCurvesInGroup(" + ToString( nGroupId) + "," +
+      string sLua = "EgtReorderCurvesInGroup(" + ToString( nGroupId) + ",{" +
                                                  ToString( ptNear) + "}," +
                                                  RefTypeToString( nRefType) + ")" +
                     " -- Ok=" + ToString( bOk) ;
@@ -2122,3 +2267,243 @@ ExeReorderCurvesInGroup( int nGroupId, const Point3d& ptNear, int nRefType)
    }
    return bOk ;
 }
+
+//-------------------------------------------------------------------------------
+static bool
+MyProjectCurveOnSurfTm( int nCurveId, int nSurfTmId, const Vector3d& vtDir, int nDestGrpId, double dLinTol, int nRefType)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, false)
+  // recupero la curva e il suo riferimento
+   const ICurve* pCrv = GetCurve( pGeomDB->GetGeoObj( nCurveId)) ;
+   if ( pCrv == nullptr)
+      return false ;
+   Frame3d frCrv ;
+   if ( ! pGeomDB->GetGlobFrame( nCurveId, frCrv))
+      return false ;
+  // recupero la superficie trimesh e il suo riferimento
+   const ISurfTriMesh* pStm = GetSurfTriMesh( pGeomDB->GetGeoObj( nSurfTmId)) ;
+   if ( pStm == nullptr)
+      return false ;
+   Frame3d frStm ;
+   if ( ! pGeomDB->GetGlobFrame( nSurfTmId, frStm))
+      return false ;
+  // recupero il riferimento del gruppo di destinazione
+   nDestGrpId = AdjustId( nDestGrpId) ;
+   Frame3d frDest ;
+   if ( ! pGeomDB->GetGroupGlobFrame( nDestGrpId, frDest))
+      return false ;
+  // porto la curva e il vettore nel riferimento della superficie
+   CurveLocal CrvLoc( pCrv, frCrv, frStm) ;
+   if ( CrvLoc.Get() == nullptr)
+      return false ;
+   Vector3d vtDirL = GetVectorLocal( pGeomDB, vtDir, nRefType, frCrv) ;
+   vtDirL.LocToLoc( frCrv, frStm) ;
+  // eseguo la proiezione
+   PNT5AXVECTOR vPt5ax ;
+   if ( ! ProjectCurveOnSurfTm( *CrvLoc.Get(), *pStm, vtDirL, dLinTol, vPt5ax))
+      return false ;
+  // inserisco la composita nel gruppo destinazione
+   PtrOwner<ICurveComposite> pCompo ;
+   for ( const auto& Pt5ax : vPt5ax) {
+      if ( IsNull( pCompo)) {
+         pCompo.Set( CreateCurveComposite()) ;
+         if ( IsNull( pCompo))
+            return false ;
+         pCompo->AddPoint( GetLocToLoc( Pt5ax.ptP, frStm, frDest)) ;
+      }
+      else
+         pCompo->AddLine( GetLocToLoc( Pt5ax.ptP, frStm, frDest)) ;
+   }
+   int nCompoId = pGeomDB->AddGeoObj( GDB_ID_NULL, nDestGrpId, Release( pCompo)) ;
+   if ( nCompoId == GDB_ID_NULL)
+      return false ;
+  // aggiungo i versori nel gruppo destinazione
+   int nInd = 0 ;
+   for ( const auto& Pt5ax : vPt5ax) {
+      PtrOwner<IGeoVector3d> pGeoVct( CreateGeoVector3d()) ;
+      if ( IsNull( pGeoVct))
+         return false ;
+      pGeoVct->Set( 10 * GetLocToLoc( Pt5ax.vtDir, frStm, frDest), GetLocToLoc( Pt5ax.ptP, frStm, frDest)) ;
+      int nNewId = pGeomDB->AddGeoObj( GDB_ID_NULL, nDestGrpId, Release( pGeoVct)) ;
+      if ( nNewId == GDB_ID_NULL)
+         return false ;
+      pGeomDB->SetInfo( nNewId, "Ind", nInd ++) ;
+      pGeomDB->SetInfo( nNewId, "Par", Pt5ax.dPar) ;
+      pGeomDB->SetInfo( nNewId, "Flag", Pt5ax.nFlag) ;
+   }
+
+   return true ;
+}
+
+//-------------------------------------------------------------------------------
+bool
+ExeProjectCurveOnSurfTm( int nCurveId, int nSurfTmId, const Vector3d& vtDir, int nDestGrpId, double dLinTol, int nRefType)
+{
+   bool bOk = MyProjectCurveOnSurfTm( nCurveId, nSurfTmId, vtDir, nDestGrpId, dLinTol, nRefType) ;
+   ExeSetModified() ;
+  // se richiesto, salvo il comando Lua equivalente
+   if ( IsCmdLog()) {
+      string sLua = "EgtProjectCurveOnSurfTm(" + ToString( nCurveId) + "," +
+                                                 ToString( nSurfTmId) + ",{" +
+                                                 ToString( vtDir) + "}," +
+                                                 ToString( nDestGrpId) + "," +
+                                                 ToString( dLinTol) + "," +
+                                                 RefTypeToString( nRefType) + ")" +
+                    " -- Ok=" + ToString( bOk) ;
+      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
+   }
+   return bOk ;
+
+}
+
+//----------------------------------------------------------------------------
+int
+ExeCurveGetVoronoi( int nId, int nDestGrpId, int nBound, int* pnCount) 
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
+  // recupero la curva
+   const ICurve* pCrv = GetCurve( pGeomDB->GetGeoObj( nId)) ;
+   if ( pCrv == nullptr)
+      return GDB_ID_NULL ;
+  // recupero il riferimento della curva
+   Frame3d frCrv ;
+   if ( ! pGeomDB->GetGlobFrame( nId, frCrv))
+      return GDB_ID_NULL ;
+  // recupero il riferimento di destinazione
+   Frame3d frDest ;
+   if ( ! pGeomDB->GetGroupGlobFrame( nDestGrpId, frDest))
+      return GDB_ID_NULL ;
+
+  // Calcolo diagramma di Voronoi
+   ICURVEPOVECTOR vCrv ;
+   CalcCurveVoronoiDiagram( *pCrv, vCrv, nBound) ;
+
+  // inserisco i risultati nel DB geometrico
+   int nFirstId = GDB_ID_NULL ;
+   int nCount = 0 ;
+   for ( int i = 0 ; i < int( vCrv.size()) ; i++) {
+      vCrv[i]->LocToLoc( frCrv, frDest) ;
+      int nId = pGeomDB->AddGeoObj( GDB_ID_NULL, nDestGrpId, Release( vCrv[i])) ;
+      if ( nId != GDB_ID_NULL) {
+        nCount ++ ;
+        if ( nFirstId == GDB_ID_NULL)
+           nFirstId = nId ;      
+      }  
+   }
+   ExeSetModified() ;
+
+   if ( IsCmdLog()) {
+      string sLua = "EgtCurveGetVoronoi(" + ToString( nId) + "," +
+                                            ToString( nDestGrpId) + ")" +
+                    " FirstId=" + ToString( nFirstId) + " nCurveCount=" + ToString( nCount) ;
+      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
+   }
+
+  // restituisco risultati
+   if ( pnCount != nullptr)
+      *pnCount = nCount ;
+   return nFirstId ;
+}
+
+//----------------------------------------------------------------------------
+int
+ExeCurveGetMedialAxis( int nId, int nDestGrpId, int nSide, int* pnCount) 
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
+  // recupero la curva
+   const ICurve* pCrv = GetCurve( pGeomDB->GetGeoObj( nId)) ;
+   if ( pCrv == nullptr)
+      return GDB_ID_NULL ;
+  // recupero il riferimento della curva
+   Frame3d frCrv ;
+   if ( ! pGeomDB->GetGlobFrame( nId, frCrv))
+      return GDB_ID_NULL ;
+  // recupero il riferimento di destinazione
+   Frame3d frDest ;
+   if ( ! pGeomDB->GetGroupGlobFrame( nDestGrpId, frDest))
+      return GDB_ID_NULL ;
+
+  // Calcolo il Medial Axis
+   ICURVEPOVECTOR vCrv ;
+   CalcCurveMedialAxis( *pCrv, vCrv, nSide) ;
+
+  // inserisco i risultati nel DB geometrico
+   int nFirstId = GDB_ID_NULL ;
+   int nCount = 0 ;
+   for ( int i = 0 ; i < int( vCrv.size()) ; i++) {
+      vCrv[i]->LocToLoc( frCrv, frDest) ;
+      int nId = pGeomDB->AddGeoObj( GDB_ID_NULL, nDestGrpId, Release( vCrv[i])) ;
+      if ( nId != GDB_ID_NULL) {
+        nCount ++ ;
+        if ( nFirstId == GDB_ID_NULL)
+           nFirstId = nId ;      
+      }  
+   }
+   ExeSetModified() ;
+
+   if ( IsCmdLog()) {
+      string sLua = "EgtCurveMedialAxisAdv(" + ToString( nId) + "," +
+                                               ToString( nSide) + "," +
+                                               ToString( nDestGrpId) + ")" +
+                    " FirstId=" + ToString( nFirstId) + " nCurveCount=" + ToString( nCount) ;
+      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
+   }
+
+  // restituisco risultati
+   if ( pnCount != nullptr)
+      *pnCount = nCount ;
+   return nFirstId ;
+}
+
+//----------------------------------------------------------------------------
+int
+ExeCurveGetFatCurve( int nId, int nDestGrpId, double dRad, bool bSquareEnds, bool bSquareMids, int* pnCount) 
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
+  // recupero la curva
+   const ICurve* pCrv = GetCurve( pGeomDB->GetGeoObj( nId)) ;
+   if ( pCrv == nullptr)
+      return GDB_ID_NULL ;
+  // recupero il riferimento della curva
+   Frame3d frCrv ;
+   if ( ! pGeomDB->GetGlobFrame( nId, frCrv))
+      return GDB_ID_NULL ;
+  // recupero il riferimento di destinazione
+   Frame3d frDest ;
+   if ( ! pGeomDB->GetGroupGlobFrame( nDestGrpId, frDest))
+      return GDB_ID_NULL ;
+
+  // Calcolo la curva ingrossata
+   ICURVEPOVECTOR vCrv ;
+   CalcCurveFatCurve( *pCrv, vCrv, dRad, bSquareEnds, bSquareMids) ;
+
+  // inserisco i risultati nel DB geometrico
+   int nFirstId = GDB_ID_NULL ;
+   int nCount = 0 ;
+   for ( int i = 0 ; i < int( vCrv.size()) ; i++) {     
+      vCrv[i]->LocToLoc( frCrv, frDest) ;
+      int nId = pGeomDB->AddGeoObj( GDB_ID_NULL, nDestGrpId, Release( vCrv[i])) ;
+      if ( nId != GDB_ID_NULL) {
+         nCount ++ ;
+         if ( nFirstId == GDB_ID_NULL)
+            nFirstId = nId ;      
+      }  
+   }
+   ExeSetModified() ;
+
+   if ( IsCmdLog()) {
+      string sLua = "EgtCurveGetFatCurve(" + ToString( nId) + "," +
+                                             ToString( nDestGrpId) + ")" +
+                    " FirstId=" + ToString( nFirstId) + " nCurveCount=" + ToString( nCount) ;
+      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
+   }
+
+  // restituisco risultati
+   if ( pnCount != nullptr)
+      *pnCount = nCount ;
+   return nFirstId ;
+}

EXE_GdbModifySurf.cpp

@@ -24,12 +24,15 @@
 #include "/EgtDev/Include/EGkCurveLocal.h"
 #include "/EgtDev/Include/EGkSurfFlatRegion.h"
 #include "/EgtDev/Include/EGkSurfTriMesh.h"
+#include "/EgtDev/Include/EGkSurfBezier.h"
 #include "/EgtDev/Include/EGkSurfLocal.h"
 #include "/EgtDev/Include/EGkStmFromTriangleSoup.h"
 #include "/EgtDev/Include/EGkCAvSimpleSurfFrMove.h"
 #include "/EgtDev/Include/EGkStringUtils3d.h"
+#include "/EgtDev/Include/EGkSubtractProjectedFacesOnStmFace.h"
 #include "/EgtDev/Include/EgtPointerOwner.h"
 
+
 using namespace std ;
 
 //----------------------------------------------------------------------------
@@ -74,7 +77,7 @@ MyExplodeSurfTriMesh( int nId, int& nCount)
       return GDB_ID_NULL ;
   // recupero il numero di componenti connesse
    int nParts = pStm->GetPartCount() ;
-  // se ci sono più parti, separo queste
+  // se ci sono pi� parti, separo queste
    if ( nParts > 1) {
       int nFirstId = GDB_ID_NULL ;
       nCount = 0 ;
@@ -101,7 +104,7 @@ MyExplodeSurfTriMesh( int nId, int& nCount)
    }
   // recupero il numero di facce
    int nFacets = pStm->GetFacetCount() ;
-  // se ci sono più facce, separo queste
+  // se ci sono pi� facce, separo queste
    if ( nFacets > 1) {
      // copio tutte le facce
       int nFirstId = GDB_ID_NULL ;
@@ -127,7 +130,7 @@ MyExplodeSurfTriMesh( int nId, int& nCount)
      // restituisco risultati
       return nFirstId ;
    }
-  // non devo fare alcunché
+  // non devo fare alcunch�
    nCount = 1 ;
    return nId ;
 }
@@ -144,7 +147,7 @@ MyExplodeSurfFlatRegion( int nId, int& nCount)
       return GDB_ID_NULL ;
   // recupero il numero di componenti connessi (chunk)
    int nChunk = pSfr->GetChunkCount() ;
-  // se c'è un solo componente, non devo fare alcunché
+  // se c'� un solo componente, non devo fare alcunch�
    if ( nChunk == 1) {
       nCount = 1 ;
       return nId ;
@@ -204,12 +207,54 @@ ExeExplodeSurface( int nId, int* pnCount)
    return nFirstId ;
 }
 
+//-------------------------------------------------------------------------------
+bool
+ExeApproxSurface( int nId, double dLinTol)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, false)
+  // opero secondo il tipo di superficie
+   PtrOwner<ISurfTriMesh> pStm ;
+   int nType = pGeomDB->GetGeoType( nId) ;
+   if ( nType == SRF_TRIMESH) {
+     // copio la superficie
+      const ISurfTriMesh* pStri = GetSurfTriMesh( pGeomDB->GetGeoObj( nId)) ;
+      pStm.Set( pStri != nullptr ? pStri->Clone() : nullptr) ;
+   }
+   else if ( nType == SRF_FLATRGN) {
+     // recupero la superficie ausiliaria della regione
+      const ISurfFlatRegion* pSfr = GetSurfFlatRegion( pGeomDB->GetGeoObj( nId)) ;
+      const ISurfTriMesh* pAuxSurf = ( pSfr != nullptr ? pSfr->GetAuxSurf() : nullptr) ;
+      pStm.Set( pAuxSurf != nullptr ? pAuxSurf->Clone() : nullptr) ;
+   }
+   else if ( nType == SRF_BEZIER) {
+     // recupero la superficie ausiliaria della Bezier
+      const ISurfBezier* pSbez = GetSurfBezier( pGeomDB->GetGeoObj( nId)) ;
+      const ISurfTriMesh* pAuxSurf = ( pSbez != nullptr ? pSbez->GetAuxSurf() : nullptr) ;
+      pStm.Set( pAuxSurf != nullptr ? pAuxSurf->Clone() : nullptr) ;
+   }
+   bool bOk = ( ! IsNull( pStm)) ;
+  // semplificazione della trimesh
+   bOk = bOk && pStm->DoCompacting( dLinTol) ;
+  // sostituisco la vecchia superficie con la nuova
+   bOk = bOk && pGeomDB->ReplaceGeoObj( nId, Release( pStm)) ;
+   ExeSetModified() ;
+  // se richiesto, salvo il comando Lua equivalente
+   if ( IsCmdLog()) {
+      string sLua = "EgtApproxSurf(" + ToString( nId) + "," +
+                                       ToString( dLinTol) + ")" +
+                    " -- Ok=" + ToString( bOk) ;
+      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
+   }
+   return bOk ;
+}
+
 //----------------------------------------------------------------------------
 bool
 ExeSurfFrAdd( int nId1, int nId2)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
-   VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
+   VERIFY_GEOMDB( pGeomDB, false)
   // recupero la prima superficie FlatRegion
    ISurfFlatRegion* pSfr1 = GetSurfFlatRegion( pGeomDB->GetGeoObj( nId1)) ;
    bool bOk = ( pSfr1 != nullptr) ;
@@ -238,7 +283,7 @@ bool
 ExeSurfFrSubtract( int nId1, int nId2)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
-   VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
+   VERIFY_GEOMDB( pGeomDB, false)
   // recupero la prima superficie FlatRegion
    ISurfFlatRegion* pSfr1 = GetSurfFlatRegion( pGeomDB->GetGeoObj( nId1)) ;
    bool bOk = ( pSfr1 != nullptr) ;
@@ -251,7 +296,7 @@ ExeSurfFrSubtract( int nId1, int nId2)
    bOk = bOk && ( pSfr2L != nullptr) ;
   // eseguo la sottrazione della seconda superficie dalla prima
    bOk = bOk && pSfr1->Subtract( *pSfr2L) ;
-  // se il risultato è vuoto, cancello la FlatRegion
+  // se il risultato � vuoto, cancello la FlatRegion
    if ( bOk  && ! pSfr1->IsValid())
       pGeomDB->Erase( nId1) ;
    ExeSetModified() ;
@@ -270,7 +315,7 @@ bool
 ExeSurfFrIntersect( int nId1, int nId2)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
-   VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
+   VERIFY_GEOMDB( pGeomDB, false)
   // recupero la prima superficie FlatRegion
    ISurfFlatRegion* pSfr1 = GetSurfFlatRegion( pGeomDB->GetGeoObj( nId1)) ;
    bool bOk = ( pSfr1 != nullptr) ;
@@ -283,7 +328,7 @@ ExeSurfFrIntersect( int nId1, int nId2)
    bOk = bOk && ( pSfr2L != nullptr) ;
   // eseguo l'intersezione tra le due superfici
    bOk = bOk && pSfr1->Intersect( *pSfr2L) ;
-  // se il risultato è vuoto, cancello la FlatRegion
+  // se il risultato � vuoto, cancello la FlatRegion
    if ( bOk  && ! pSfr1->IsValid())
       pGeomDB->Erase( nId1) ;
    ExeSetModified() ;
@@ -302,13 +347,13 @@ bool
 ExeSurfFrOffset( int nId, double dDist, int nType)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
-   VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
+   VERIFY_GEOMDB( pGeomDB, false)
   // recupero la superficie FlatRegion
    ISurfFlatRegion* pSfr = GetSurfFlatRegion( pGeomDB->GetGeoObj( nId)) ;
    bool bOk = ( pSfr != nullptr) ;
   // eseguo l'offset
    bOk = bOk && pSfr->Offset( dDist, nType) ;
-  // se il risultato è vuoto, cancello la FlatRegion
+  // se il risultato � vuoto, cancello la FlatRegion
    if ( bOk  && ! pSfr->IsValid())
       pGeomDB->Erase( nId) ;
    ExeSetModified() ;
@@ -325,10 +370,36 @@ ExeSurfFrOffset( int nId, double dDist, int nType)
 
 //----------------------------------------------------------------------------
 bool
-ExeSurfFrMoveSimpleNoCollision( int nId1, int nId2, const Vector3d& vtDir, double& dLen, int nRefType)
+ExeSurfFrOffsetAdv( int nId, double dDist, int nType, int& nNewId)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
    VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
+  // recupero la superficie FlatRegion
+   ISurfFlatRegion* pSfr = GetSurfFlatRegion( pGeomDB->GetGeoObj( nId)) ;
+   if ( pSfr == nullptr)
+      return false ;      
+  // eseguo l'offset
+   PtrOwner<ISurfFlatRegion> pSfrOffs( pSfr->CreateOffsetSurf( dDist, nType)) ;
+   if ( IsNull( pSfrOffs))
+      return false ;
+  // salvo la superficie di offset
+   nNewId = GDB_ID_NULL ;
+   if ( pSfr->GetChunkCount() > 0) {
+     // inserisco nel DB geometrico
+      nNewId = pGeomDB->InsertGeoObj( GDB_ID_NULL, nId, GDB_AFTER, Release( pSfrOffs)) ;
+     // copio gli attributi
+      pGeomDB->CopyAttributes( nId, nNewId) ;
+      ExeSetModified() ;
+   }
+   return true ;
+}
+
+//----------------------------------------------------------------------------
+bool
+ExeSurfFrMoveSimpleNoCollision( int nId1, int nId2, const Vector3d& vtDir, double& dLen, int nRefType)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, false)
   // recupero la prima superficie FlatRegion
    ISurfFlatRegion* pSfr1 = GetSurfFlatRegion( pGeomDB->GetGeoObj( nId1)) ;
    bool bOk = ( pSfr1 != nullptr) ;
@@ -350,7 +421,7 @@ bool
 ExeSurfFrRotateSimpleNoCollision( int nId1, int nId2, const Point3d& ptCen, double& dAngDeg, int nRefType)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
-   VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
+   VERIFY_GEOMDB( pGeomDB, false)
   // recupero la prima superficie FlatRegion
    ISurfFlatRegion* pSfr1 = GetSurfFlatRegion( pGeomDB->GetGeoObj( nId1)) ;
    bool bOk = ( pSfr1 != nullptr) ;
@@ -367,6 +438,111 @@ ExeSurfFrRotateSimpleNoCollision( int nId1, int nId2, const Point3d& ptCen, doub
    return ( bOk && CAvSimpleSurfFrMove( *pSfr1, *pSfr2L).Rotate(ptCenL, dAngDeg)) ;
 }
 
+//-------------------------------------------------------------------------------
+bool
+ExeSurfTmMoveVertex( int nId, int nVert, const Point3d& ptNewVert, int nRefType, bool bUpdate)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
+  // recupero la superficie
+   ISurfTriMesh* pStm = GetSurfTriMesh( pGeomDB->GetGeoObj( nId)) ;
+   bool bOk = ( pStm != nullptr) ;
+  // recupero il riferimento in cui � immersa la superficie
+   Frame3d frStm ;
+   bOk = bOk && pGeomDB->GetGlobFrame( nId, frStm) ;
+  // eseguo la modifica
+   if ( bOk) {
+     // porto il nuovo vertice nel riferimento della superficie
+      Point3d ptNewVertL = GetPointLocal( pGeomDB, ptNewVert, nRefType, frStm) ;
+     // eseguo la modifica
+      bOk = pStm->MoveVertex( nVert, ptNewVertL) ;
+     // se richiesto, semplificazione della trimesh
+      if ( bUpdate)
+         bOk = bOk && pStm->DoCompacting() ;
+   }
+   ExeSetModified() ;
+  // se richiesto, salvo il comando Lua equivalente
+   if ( IsCmdLog()) {
+      string sLua = "EgtSurfTmMoveVertex(" + IdToString( nId) + "," +
+                                             ToString( nVert) + ",{"  +
+                                             ToString( ptNewVert) + "}," +
+                                             RefTypeToString( nRefType) + "," +
+                                             ( bUpdate ? "true" : "false") + ")" +
+                    " -- Ok=" + ToString( bOk) ;
+      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
+   }
+  // restituisco risultato
+   return bOk ;
+}
+
+//-------------------------------------------------------------------------------
+static int
+MySurfTmToTriangles( int nId, int& nCount)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
+  // recupero la superficie TriMesh
+   const ISurfTriMesh* pStm = GetSurfTriMesh( pGeomDB->GetGeoObj( nId)) ;
+   if ( pStm == nullptr)
+      return GDB_ID_NULL ;
+  // recupero il numero di triangoli
+   int nTria = pStm->GetTriangleCount() ;
+  // se ci sono pi� triangoli, li separo
+   if ( nTria > 1) {
+     // copio tutti triangoli
+      int nFirstId = GDB_ID_NULL ;
+      nCount = 0 ;
+      for ( int i = 0 ; i < pStm->GetTriangleSize() ; ++ i) {
+         ISurfTriMesh* pFac = pStm->CloneTriangle( i) ;
+         if ( pFac == nullptr)
+            continue ;
+        // inserisco la superficie nello stesso gruppo e nello stesso posto del GeomDB
+         int nNewId = pGeomDB->InsertGeoObj( GDB_ID_NULL, nId, GDB_BEFORE, pFac) ;
+         if ( nNewId == GDB_ID_NULL)
+            return GDB_ID_NULL ;
+        // copio gli attributi
+        if ( ! pGeomDB->CopyAttributes( nId, nNewId))
+            return GDB_ID_NULL ;
+        // aggiorno contatori
+         if ( nFirstId == GDB_ID_NULL)
+            nFirstId = nNewId ;
+         ++ nCount ;
+      }
+     // elimino la superficie originale
+      pGeomDB->Erase( nId) ;
+     // restituisco risultati
+      return nFirstId ;
+   }
+  // non devo fare alcunch�
+   nCount = 1 ;
+   return nId ;
+}
+
+//-------------------------------------------------------------------------------
+int
+ExeSurfTmToTriangles( int nId, int* pnCount)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
+  // verifico sia una superficie trimesh
+   int nFirstId = GDB_ID_NULL ;
+   int nCount = 0 ;
+   if ( pGeomDB->GetGeoType( nId) == SRF_TRIMESH) {
+      nFirstId = MySurfTmToTriangles( nId, nCount) ;
+   }
+   ExeSetModified() ;
+  // se richiesto, salvo il comando Lua equivalente
+   if ( IsCmdLog()) {
+      string sLua = "EgtSurfTmToTriangles(" + IdToString( nId) + ")" +
+                    " -- Id1=" + ToString( nFirstId) + ",Nbr=" + ToString( nCount) ;
+      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
+   }
+  // restituisco risultati
+   if ( pnCount != nullptr)
+      *pnCount = nCount ;
+   return nFirstId ;
+}
+
 //-------------------------------------------------------------------------------
 bool
 ExeSurfTmRemoveFacet( int nId, int nFacet)
@@ -381,7 +557,7 @@ ExeSurfTmRemoveFacet( int nId, int nFacet)
    ExeSetModified() ;
   // se richiesto, salvo il comando Lua equivalente
    if ( IsCmdLog()) {
-      string sLua = "EgtSurfTmRemoveFacet(" + ToString( nId) + "," +
+      string sLua = "EgtSurfTmRemoveFacet(" + IdToString( nId) + "," +
                                               ToString( nFacet) + ")" +
                     " -- Ok=" + ToString( bOk) ;
       LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
@@ -404,7 +580,7 @@ ExeSurfTmSwapFacets( int nId, int nFacet1, int nFacet2)
    ExeSetModified() ;
   // se richiesto, salvo il comando Lua equivalente
    if ( IsCmdLog()) {
-      string sLua = "EgtSurfTmSwapFacets(" + ToString( nId) + "," +
+      string sLua = "EgtSurfTmSwapFacets(" + IdToString( nId) + "," +
                                              ToString( nFacet1) + "," +
                                              ToString( nFacet2) + ")" +
                     " -- Ok=" + ToString( bOk) ;
@@ -428,7 +604,7 @@ ExeSurfTmRemovePart( int nId, int nPart)
    ExeSetModified() ;
   // se richiesto, salvo il comando Lua equivalente
    if ( IsCmdLog()) {
-      string sLua = "EgtSurfTmRemovePart(" + ToString( nId) + "," +
+      string sLua = "EgtSurfTmRemovePart(" + IdToString( nId) + "," +
                                              ToString( nPart) + ")" +
                     " -- Ok=" + ToString( bOk) ;
       LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
@@ -442,7 +618,7 @@ bool
 ExeCutSurfTmPlane( int nId, const Point3d& ptOn, const Vector3d& vtN, bool bSaveOnEq, int nRefType)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
-   VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
+   VERIFY_GEOMDB( pGeomDB, false)
   // recupero la superficie TriMesh
    ISurfTriMesh* pStm = GetSurfTriMesh( pGeomDB->GetGeoObj( nId)) ;
    bool bOk = ( pStm != nullptr) ;
@@ -460,7 +636,7 @@ ExeCutSurfTmPlane( int nId, const Point3d& ptOn, const Vector3d& vtN, bool bSave
    ExeSetModified() ;
   // se richiesto, salvo il comando Lua equivalente
    if ( IsCmdLog()) {
-      string sLua = "EgtCutSurfTmPlane(" + ToString( nId) + ",{" +
+      string sLua = "EgtCutSurfTmPlane(" + IdToString( nId) + ",{" +
                                            ToString( ptOn) + "},{" +
                                            ToString( vtN) + "}," +
                                            ( bSaveOnEq ? "true" : "false") + "," +
@@ -477,7 +653,7 @@ bool
 ExeCutSurfTmClosedCurve( int nSurfId, int nCurveId, bool bSaveOnEq)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
-   VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
+   VERIFY_GEOMDB( pGeomDB, false)
   // recupero la superficie TriMesh
    ISurfTriMesh* pStm = GetSurfTriMesh( pGeomDB->GetGeoObj( nSurfId)) ;
    bool bOk = ( pStm != nullptr) ;
@@ -507,7 +683,7 @@ bool
 ExeSurfTmAdd( int nId1, int nId2, bool bTwoColors)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
-   VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
+   VERIFY_GEOMDB( pGeomDB, false)
   // recupero la prima superficie TriMesh
    ISurfTriMesh* pStm1 = GetSurfTriMesh( pGeomDB->GetGeoObj( nId1)) ;
    bool bOk = ( pStm1 != nullptr) ;
@@ -539,7 +715,7 @@ bool
 ExeSurfTmSubtract( int nId1, int nId2, bool bTwoColors)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
-   VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
+   VERIFY_GEOMDB( pGeomDB, false)
   // recupero la prima superficie TriMesh
    ISurfTriMesh* pStm1 = GetSurfTriMesh( pGeomDB->GetGeoObj( nId1)) ;
    bool bOk = ( pStm1 != nullptr) ;
@@ -552,7 +728,7 @@ ExeSurfTmSubtract( int nId1, int nId2, bool bTwoColors)
    bOk = bOk && ( pStm2L != nullptr) ;
   // eseguo la sottrazione tra le due superfici
    bOk = bOk && pStm1->Subtract( *pStm2L) ;
-  // se il risultato è vuoto, cancello la superficie
+  // se il risultato � vuoto, cancello la superficie
    if ( bOk  && ! pStm1->IsValid()) {
       pGeomDB->Erase( nId1) ;
       pStm1 = nullptr ;
@@ -576,7 +752,7 @@ bool
 ExeSurfTmIntersect( int nId1, int nId2, bool bTwoColors)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
-   VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
+   VERIFY_GEOMDB( pGeomDB, false)
   // recupero la prima superficie TriMesh
    ISurfTriMesh* pStm1 = GetSurfTriMesh( pGeomDB->GetGeoObj( nId1)) ;
    bool bOk = ( pStm1 != nullptr) ;
@@ -589,7 +765,7 @@ ExeSurfTmIntersect( int nId1, int nId2, bool bTwoColors)
    bOk = bOk && ( pStm2L != nullptr) ;
   // eseguo l'intersezione tra le due superfici
    bOk = bOk && pStm1->Intersect( *pStm2L) ;
-  // se il risultato è vuoto, cancello la superficie
+  // se il risultato � vuoto, cancello la superficie
    if ( bOk  && ! pStm1->IsValid()) {
       pGeomDB->Erase( nId1) ;
       pStm1 = nullptr ;
@@ -613,7 +789,7 @@ bool
 ExeSurfTmResetTwoColors( int nId)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
-   VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
+   VERIFY_GEOMDB( pGeomDB, false)
   // recupero la superficie TriMesh
    ISurfTriMesh* pStm = GetSurfTriMesh( pGeomDB->GetGeoObj( nId)) ;
    bool bOk = ( pStm != nullptr) ;
@@ -776,3 +952,111 @@ ExeSurfTmCut( int nId, int nCutterId, bool bInVsOut, bool bSaveOnEq)
    }
    return bOk ;
 }
+
+//----------------------------------------------------------------------------
+bool
+ExeSurfTmSubtractProjectedFacesOnFace( int nSurfId, int nFaceInd, int nDestGrpId,
+                                       INTVECTOR vSurfsId, bool bOCFlag,
+                                       bool& bExistProjection, int& nNewId, int& nNewFaceNbr)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, false)
+  // recupero la superficie TriMesh su cui proiettare
+   ISurfTriMesh* pStm = GetSurfTriMesh( pGeomDB->GetGeoObj( nSurfId)) ;
+   if ( pStm == nullptr)
+      return false ;
+  // recupero il riferimento della superficie
+   Frame3d frSurf ;
+   if ( ! pGeomDB->GetGlobFrame( nSurfId, frSurf))
+      return false ;
+  // recupero il riferimento del gruppo di destinazione
+   Frame3d frDest ;
+   if ( ! pGeomDB->GetGroupGlobFrame( nDestGrpId, frDest))
+      return false ;
+  // costruzione vettori di superfici e indici delle facce per proiezione
+   ISURFTMPOVECTOR vpStmOthers ;
+   vector<SurfLocal> vSurfCLoc ;
+  // recupero le altre superfici e le porto nel sistema di riferimento della prima
+   for ( int i = 0 ; i < int( vSurfsId.size()) ; ++ i) {
+      if ( pGeomDB->GetGeoType( vSurfsId[i]) != SRF_TRIMESH)
+         return false ;
+      vSurfCLoc.emplace_back( pGeomDB, vSurfsId[i], frSurf) ;
+      const ISurfTriMesh* pStmCurr = GetSurfTriMesh( vSurfCLoc.back().Get()) ;
+      vpStmOthers.emplace_back( pStmCurr->Clone()) ;
+   }
+  // eseguo la proiezione
+   ISurfTriMesh* pStmRes = nullptr ;
+   bool bOk = SubtractProjectedFacesOnStmFace( *pStm, nFaceInd, vpStmOthers, bOCFlag,
+                                               bExistProjection, pStmRes, nNewFaceNbr) ;
+   if ( ! bOk) {
+      delete( pStmRes) ;
+      pStmRes = nullptr ;
+   }
+
+   nNewId = GDB_ID_NULL ;
+   if ( bOk  &&  pStmRes != nullptr) {
+     // porto nel sistema di riferimento destinazione
+      pStmRes->LocToLoc( frSurf, frDest) ;
+     // la inserisco nel DB geometrico
+      nNewId = pGeomDB->AddGeoObj( GDB_ID_NULL, nDestGrpId, pStmRes) ;
+      if ( nNewId == GDB_ID_NULL)
+         return false ;
+      ExeSetModified() ;
+   }
+
+   if ( IsCmdLog()) {
+      string sLua = "EgtSubtractProjectedFacesOnStmFace(" + ToString( nSurfId) + "," +
+                                                            ToString( nFaceInd) + "," +
+                                                            ToString( nDestGrpId) + "," +
+                                                            ToString( vSurfsId) + "," +
+                                                            ToString( bOCFlag) + ")" +
+                    " -- Ok=" + ToString( bOk) + " Id=" + ToString( nNewId) ;
+      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
+   }
+   return bOk ;
+}
+
+
+//----------------------------------------------------------------------------
+static bool 
+MySurfBzTrim( int nId, int nTrimmerId)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, false)
+      // recupero la superficie Bezier da trimmare
+   ISurfBezier* pSrfBz = GetSurfBezier( pGeomDB->GetGeoObj( nId)) ;
+   if ( pSrfBz == nullptr)
+      return false ;
+   // recupero il riferimento della superficie
+   Frame3d frSurf ;
+   if ( ! pGeomDB->GetGlobFrame( nId, frSurf))
+      return false ;
+   // recupero la superficie TriMesh divisore in locale alla prima
+
+   SurfLocal SurfCLoc( pGeomDB, nTrimmerId, frSurf) ;
+   //const ISurfTriMesh* pStmCLoc = GetSurfTriMesh( SurfCLoc) ;
+   const ISurfFlatRegion* pSrfFr = GetSurfFlatRegion( SurfCLoc) ;
+   if ( pSrfFr == nullptr)
+      return false ;
+   PtrOwner<ISurfFlatRegion> pSrfFrCopy( pSrfFr->Clone()) ;
+   if ( ! pSrfFr->GetNormVersor().IsZplus())
+      pSrfFrCopy->Invert() ;
+   // eseguo il taglio
+   return pSrfBz->SetTrimRegion( *pSrfFrCopy) ;
+}
+
+//----------------------------------------------------------------------------
+bool
+ExeSurfBzTrim( int nId, int nCutterId)
+{
+   bool bOk = MySurfBzTrim( nId, nCutterId) ;
+   ExeSetModified() ;
+   // se richiesto, salvo il comando Lua equivalente
+   if ( IsCmdLog()) {
+      string sLua = "EgtSurfTmCut(" + ToString( nId) + "," +
+         ToString( nCutterId) + "," +
+         " -- Ok=" + ToString( bOk) ;
+      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
+   }
+   return bOk ;
+}

EXE_GdbModifyVol.cpp

@@ -144,7 +144,7 @@ ExeRemoveVolZmapPart( int nId, int nPart)
 //----------------------------------------------------------------------------
 bool
 ExeVolZmapSetStdTool( const INTVECTOR& vIds, const string& sToolName,
-                      double dLen, double dDiam, double dCornR, double dCutterH, int nFlag)
+                      double dLen, double dDiam, double dCornR, double dCutterH, int nFlag, bool bFirst)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
    VERIFY_GEOMDB( pGeomDB, false)
@@ -152,7 +152,7 @@ ExeVolZmapSetStdTool( const INTVECTOR& vIds, const string& sToolName,
    bool bOk = true ;
    for ( int i = 0 ; i < int( vIds.size()) ; ++ i) {
       IVolZmap* pVZM = GetVolZmap( pGeomDB->GetGeoObj( vIds[i])) ;
-      bOk = ( pVZM != nullptr  &&  pVZM->SetStdTool( sToolName, dLen, 0.5 * dDiam, dCornR, dCutterH, nFlag)) && bOk ;
+      bOk = ( pVZM != nullptr  &&  pVZM->SetStdTool( sToolName, dLen, 0.5 * dDiam, dCornR, dCutterH, nFlag, bFirst)) && bOk ;
    }
   // se richiesto, salvo il comando Lua equivalente
    if ( IsCmdLog()) {
@@ -173,7 +173,7 @@ ExeVolZmapSetStdTool( const INTVECTOR& vIds, const string& sToolName,
 //----------------------------------------------------------------------------
 bool
 ExeVolZmapSetAdvTool( const INTVECTOR& vIds, const string& sToolName,
-                      double dLen, double dDiam, double dTipLen, double dTipDiam, double dCornR, double dCutterH, int nFlag)
+                      double dLen, double dDiam, double dTipLen, double dTipDiam, double dCornR, double dCutterH, int nFlag, bool bFirst)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
    VERIFY_GEOMDB( pGeomDB, false)
@@ -181,7 +181,7 @@ ExeVolZmapSetAdvTool( const INTVECTOR& vIds, const string& sToolName,
    bool bOk = true ;
    for ( int i = 0 ; i < int( vIds.size()) ; ++ i) {
       IVolZmap* pVZM = GetVolZmap( pGeomDB->GetGeoObj( vIds[i])) ;
-      bOk = ( pVZM != nullptr  &&  pVZM->SetAdvTool( sToolName, dLen, dDiam / 2, dTipLen, dTipDiam / 2, dCornR, dCutterH, nFlag)) && bOk ;
+      bOk = ( pVZM != nullptr  &&  pVZM->SetAdvTool( sToolName, dLen, dDiam / 2, dTipLen, dTipDiam / 2, dCornR, dCutterH, nFlag, bFirst)) && bOk ;
    }
   // se richiesto, salvo il comando Lua equivalente
    if ( IsCmdLog()) {
@@ -204,7 +204,7 @@ ExeVolZmapSetAdvTool( const INTVECTOR& vIds, const string& sToolName,
 //----------------------------------------------------------------------------
 bool
 ExeVolZmapSetSawTool( const INTVECTOR& vIds, const string& sToolName,
-                      double dLen, double dDiam, double dThick, double dStemDiam, double dCornR, int nFlag)
+                      double dLen, double dDiam, double dThick, double dStemDiam, double dCornR, int nFlag, bool bFirst)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
    VERIFY_GEOMDB( pGeomDB, false)
@@ -212,7 +212,7 @@ ExeVolZmapSetSawTool( const INTVECTOR& vIds, const string& sToolName,
    bool bOk = true ;
    for ( int i = 0 ; i < int( vIds.size()) ; ++ i) {
       IVolZmap* pVZM = GetVolZmap( pGeomDB->GetGeoObj( vIds[i])) ;
-      bOk = ( pVZM != nullptr && pVZM->SetSawTool( sToolName, dLen, dDiam / 2, dThick, dStemDiam / 2, dCornR, nFlag)) && bOk ;
+      bOk = ( pVZM != nullptr && pVZM->SetSawTool( sToolName, dLen, dDiam / 2, dThick, dStemDiam / 2, dCornR, nFlag, bFirst)) && bOk ;
    }
   // se richiesto, salvo il comando Lua equivalente
    if ( IsCmdLog()) {
@@ -233,7 +233,7 @@ ExeVolZmapSetSawTool( const INTVECTOR& vIds, const string& sToolName,
 
 //----------------------------------------------------------------------------
 bool
-ExeVolZmapSetGenTool( const INTVECTOR& vIds, const string& sToolName, int nToolSectId, int nFlag)
+ExeVolZmapSetGenTool( const INTVECTOR& vIds, const string& sToolName, int nToolSectId, int nFlag, bool bFirst)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
    VERIFY_GEOMDB( pGeomDB, false)
@@ -243,7 +243,7 @@ ExeVolZmapSetGenTool( const INTVECTOR& vIds, const string& sToolName, int nToolS
   // recupero gli Zmap e assegno i dati dell'utensile
    for ( int i = 0 ; i < int( vIds.size()) ; ++ i) {
       IVolZmap* pVZM = GetVolZmap( pGeomDB->GetGeoObj( vIds[i])) ;
-      bOk = ( pVZM != nullptr && pVZM->SetGenTool( sToolName, pCC, nFlag) && bOk) ;
+      bOk = ( pVZM != nullptr && pVZM->SetGenTool( sToolName, pCC, nFlag, bFirst) && bOk) ;
    }
   // se richiesto, salvo il comando Lua equivalente
    if ( IsCmdLog()) {
@@ -261,7 +261,7 @@ ExeVolZmapSetGenTool( const INTVECTOR& vIds, const string& sToolName, int nToolS
 //----------------------------------------------------------------------------
 bool
 ExeVolZmapSetMortiserTool( const INTVECTOR& vIds, const string& sToolName,
-                           double dLen, double dWidth, double dThick, double dCornR, int nFlag)
+                           double dLen, double dWidth, double dThick, double dCornR, int nFlag, bool bFirst)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
    VERIFY_GEOMDB( pGeomDB, false)
@@ -269,7 +269,7 @@ ExeVolZmapSetMortiserTool( const INTVECTOR& vIds, const string& sToolName,
    bool bOk = true ;
    for ( int i = 0 ; i < int( vIds.size()) ; ++ i) {
       IVolZmap* pVZM = GetVolZmap( pGeomDB->GetGeoObj( vIds[i])) ;
-      bOk = ( pVZM != nullptr && pVZM->SetMortiserTool( sToolName, dLen, dWidth, dThick, dCornR, nFlag) && bOk) ;
+      bOk = ( pVZM != nullptr && pVZM->SetMortiserTool( sToolName, dLen, dWidth, dThick, dCornR, nFlag, bFirst) && bOk) ;
    }
   // se richiesto, salvo il comando Lua equivalente
    if ( IsCmdLog()) {
@@ -290,7 +290,7 @@ ExeVolZmapSetMortiserTool( const INTVECTOR& vIds, const string& sToolName,
 //----------------------------------------------------------------------------
 bool
 ExeVolZmapSetChiselTool( const INTVECTOR& vIds, const string& sToolName,
-                         double dLen, double dWidth, double dThick, int nFlag)
+                         double dLen, double dWidth, double dThick, int nFlag, bool bFirst)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
    VERIFY_GEOMDB( pGeomDB, false)
@@ -298,7 +298,7 @@ ExeVolZmapSetChiselTool( const INTVECTOR& vIds, const string& sToolName,
    bool bOk = true ;
    for ( int i = 0 ; i < int( vIds.size()) ; ++ i) {
       IVolZmap* pVZM = GetVolZmap( pGeomDB->GetGeoObj( vIds[i])) ;
-      bOk = ( pVZM != nullptr && pVZM->SetChiselTool( sToolName, dLen, dWidth, dThick, nFlag) && bOk) ;
+      bOk = ( pVZM != nullptr && pVZM->SetChiselTool( sToolName, dLen, dWidth, dThick, nFlag, bFirst) && bOk) ;
    }
   // se richiesto, salvo il comando Lua equivalente
    if ( IsCmdLog()) {
@@ -317,7 +317,7 @@ ExeVolZmapSetChiselTool( const INTVECTOR& vIds, const string& sToolName,
 
 //----------------------------------------------------------------------------
 bool
-ExeVolZmapResetTool( const INTVECTOR& vIds)
+ExeVolZmapResetTools( const INTVECTOR& vIds)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
    VERIFY_GEOMDB( pGeomDB, false)
@@ -325,7 +325,7 @@ ExeVolZmapResetTool( const INTVECTOR& vIds)
    bool bOk = true ;
    for ( int i = 0 ; i < int( vIds.size()) ; ++ i) {
       IVolZmap* pVZM = GetVolZmap( pGeomDB->GetGeoObj( vIds[i])) ;
-      bOk = ( pVZM != nullptr && pVZM->ResetTool() && bOk) ;
+      bOk = ( pVZM != nullptr && pVZM->ResetTools() && bOk) ;
    }
   // se richiesto, salvo il comando Lua equivalente
    if ( IsCmdLog()) {
@@ -397,7 +397,7 @@ ExeVolZmapMillingStep( int nId, const Point3d& ptPs, const Vector3d& vtDs,
    Vector3d vtDeL = GetVectorLocal( pGeomDB, vtDe, nRefType, frLoc) ;
   // recupero lo Zmap e eseguo movimento di fresatura con l'utensile già associato
    IVolZmap* pVZM = GetVolZmap( pGeomDB->GetGeoObj( nId)) ;
-   bOk = bOk && ( pVZM != nullptr  &&  pVZM->MillingStep( ptPsL, vtDsL, ptPeL, vtDeL)) ;
+   bOk = bOk && ( pVZM != nullptr  &&  pVZM->MillingStep( 0, ptPsL, vtDsL, ptPeL, vtDeL)) ;
    ExeSetModified() ;
   // se richiesto, salvo il comando Lua equivalente
    if ( IsCmdLog()) {
@@ -433,7 +433,7 @@ ExeVolZmapMillingStep( int nId, const Point3d& ptPs, const Vector3d& vtDs, const
    Vector3d vtAeL = GetVectorLocal( pGeomDB, vtAe, nRefType, frLoc) ;
   // recupero lo Zmap e eseguo movimento di fresatura con l'utensile già associato
    IVolZmap* pVZM = GetVolZmap( pGeomDB->GetGeoObj( nId)) ;
-   bOk = bOk && ( pVZM != nullptr  &&  pVZM->MillingStep( ptPsL, vtDsL, vtAsL, ptPeL, vtDeL, vtAeL)) ;
+   bOk = bOk && ( pVZM != nullptr  &&  pVZM->MillingStep( 0, ptPsL, vtDsL, vtAsL, ptPeL, vtDeL, vtAeL)) ;
    ExeSetModified() ;
   // se richiesto, salvo il comando Lua equivalente
    if ( IsCmdLog()) {

EXE_GdbObjAttribs.cpp

@@ -746,6 +746,16 @@ ExeRemoveInfo( int nId, const string& sKey)
    return bOk ;
 }
 
+//-----------------------------------------------------------------------------
+bool
+ExeGetAllInfo( int nId, STRVECTOR& vsInfo)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, false)
+  // recupero tutte le info
+   return pGeomDB->GetAllInfo( nId, vsInfo) ;
+}
+
 //-----------------------------------------------------------------------------
 bool
 ExeSetTextureName( int nId, const string& sTxrName)

EXE_GdbObjects.cpp

@@ -15,6 +15,7 @@
 #include "stdafx.h"
 #include "EXE.h"
 #include "EXE_Macro.h"
+#include "GeoTools.h"
 #include "AuxTools.h"
 #include "/EgtDev/Include/EXeExecutor.h"
 #include "/EgtDev/Include/EGkStringUtils3d.h"
@@ -254,6 +255,7 @@ ExeCopy( int nSouId, int nRefId, int nSonBeforeAfter)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
    VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
+   nRefId = AdjustId( nRefId) ;
   // eseguo la copia
    int nNewId = pGeomDB->Copy( nSouId, GDB_ID_NULL, nRefId, nSonBeforeAfter) ;
    pGeomDB->RemoveInfo( nNewId, GDB_SI_LIST) ;
@@ -264,11 +266,11 @@ ExeCopy( int nSouId, int nRefId, int nSonBeforeAfter)
       string sLua ;
       if ( nSonBeforeAfter == GDB_LAST_SON)
          sLua = "EgtCopy(" + ToString( nSouId) + "," +
-                             ToString( nRefId) + ")" +
+                             IdToString( nRefId) + ")" +
                 " -- Id=" + ToString( nNewId) ;
       else
          sLua = "EgtCopy(" + ToString( nSouId) + "," +
-                             ToString( nRefId) + "," +
+                             IdToString( nRefId) + "," +
                              InsToString( nSonBeforeAfter) + ")" +
                 " -- Id=" + ToString( nNewId) ;
       LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
@@ -283,6 +285,7 @@ ExeCopyGlob( int nSouId, int nRefId, int nSonBeforeAfter)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
    VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
+   nRefId = AdjustId( nRefId) ;
   // eseguo la copia mantenendo la posizione in globale
    int nNewId = pGeomDB->CopyGlob( nSouId, GDB_ID_NULL, nRefId, nSonBeforeAfter) ;
    pGeomDB->RemoveInfo( nNewId, GDB_SI_LIST) ;
@@ -293,11 +296,11 @@ ExeCopyGlob( int nSouId, int nRefId, int nSonBeforeAfter)
       string sLua ;
       if ( nSonBeforeAfter == GDB_LAST_SON)
          sLua = "EgtCopyGlob(" + ToString( nSouId) + "," +
-                                 ToString( nRefId) + ")" +
+                                 IdToString( nRefId) + ")" +
                 " -- Id=" + ToString( nNewId) ;
       else
          sLua = "EgtCopyGlob(" + ToString( nSouId) + "," +
-                                 ToString( nRefId) + "," +
+                                 IdToString( nRefId) + "," +
                                  InsToString( nSonBeforeAfter) + ")" +
                 " -- Id=" + ToString( nNewId) ;
       LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
@@ -312,6 +315,7 @@ ExeRelocate( int nSouId, int nRefId, int nSonBeforeAfter)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
    VERIFY_GEOMDB( pGeomDB, false)
+   nRefId = AdjustId( nRefId) ;
   // eseguo la rilocazione
    bool bOk = pGeomDB->Relocate( nSouId, nRefId, nSonBeforeAfter) ;
    ExeSetModified() ;
@@ -320,11 +324,11 @@ ExeRelocate( int nSouId, int nRefId, int nSonBeforeAfter)
       string sLua ;
       if ( nSonBeforeAfter == GDB_LAST_SON)
          sLua = "EgtRelocate(" + ToString( nSouId) + "," +
-                                 ToString( nRefId) + ")" +
+                                 IdToString( nRefId) + ")" +
                 " -- Ok=" + ToString( bOk) ;
       else
          sLua = "EgtRelocate(" + ToString( nSouId) + "," +
-                                 ToString( nRefId) + "," +
+                                 IdToString( nRefId) + "," +
                                  InsToString( nSonBeforeAfter) + ")" +
                 " -- Ok=" + ToString( bOk) ;
       LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
@@ -339,6 +343,7 @@ ExeRelocateGlob( int nSouId, int nRefId, int nSonBeforeAfter)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
    VERIFY_GEOMDB( pGeomDB, false)
+   nRefId = AdjustId( nRefId) ;
   // eseguo la rilocazione mantenendo la posizione in globale
    bool bOk = pGeomDB->RelocateGlob( nSouId, nRefId, nSonBeforeAfter) ;
    ExeSetModified() ;
@@ -347,11 +352,11 @@ ExeRelocateGlob( int nSouId, int nRefId, int nSonBeforeAfter)
       string sLua ;
       if ( nSonBeforeAfter == GDB_LAST_SON)
          sLua = "EgtRelocateGlob(" + ToString( nSouId) + "," +
-                                     ToString( nRefId) + ")" +
+                                     IdToString( nRefId) + ")" +
                 " -- Ok=" + ToString( bOk) ;
       else
          sLua = "EgtRelocateGlob(" + ToString( nSouId) + "," +
-                                     ToString( nRefId) + "," +
+                                     IdToString( nRefId) + "," +
                                      InsToString( nSonBeforeAfter) + ")" +
                 " -- Ok=" + ToString( bOk) ;
       LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
@@ -594,6 +599,8 @@ ExeGeoObjDump( int nId, string& sDump)
    sDump = pGeoObj->GetTitle() + " " + ToString( nId) + "\r\n" ;
   // preparo gli attributi
    pGeomDB->DumpAttributes( nId, sDump, bMM, "\r\n") ;
+  // preparo stipple
+   pGeomDB->DumpStipple( nId, sDump, bMM, "\r\n") ;
   // preparo TextureData
    pGeomDB->DumpTextureData( nId, sDump, bMM, "\r\n") ;
   // preparo UserObj

EXE_GdbPartLayers.cpp

@@ -344,6 +344,26 @@ ExeGetPrevLayer( int nId, bool bOnlyVisible)
    return ExeVerifyOrPrev( pGeomDB, nLayerId, bOnlyVisible) ;
 }
 
+//-------------------------------------------------------------------------------
+bool
+ExeIsGhostPart( int nGhostId)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, false)
+  // verifico sia il segnaposto di un pezzo (Ghost)
+   if ( pGeomDB->GetGdbType( nGhostId) == GDB_TY_GROUP  &&
+        pGeomDB->GetParentId( nGhostId) == GDB_ID_ROOT  &&
+        ExeIsSystemObj( pGeomDB, nGhostId)  &&
+        pGeomDB->ExistsInfo( nGhostId, GDB_SI_SOURCE)) {
+      int nPartId = GDB_ID_NULL ;
+      pGeomDB->GetInfo( nGhostId, GDB_SI_SOURCE, nPartId) ;
+      int nRawId = pGeomDB->GetParentId( nPartId) ;
+      if ( ExeIsRawPart( nRawId))
+         return true ;
+   }
+   return false ;  
+}
+
 //-------------------------------------------------------------------------------
 int
 ExeGetFirstGhostPart( void)
@@ -677,6 +697,32 @@ IsPartForDuplo( IGeomDB* pGeomDB, int nPartId)
    return false ;
 }
 
+//-----------------------------------------------------------------------------
+static bool
+IsDuplo( IGeomDB* pGeomDB, int nDupId, bool& bInDuploGroup)
+{
+  // verifica collegamento a DB geometrico
+   if ( pGeomDB == nullptr)
+      return false ;
+  // Recupero il gruppo base dei duplicati
+   int nDuploBaseId = GetDuploBase( pGeomDB) ;
+   if ( nDuploBaseId == GDB_ID_NULL)
+      return false ;
+  // Verifico sia un duplicato (gruppo sotto quello dei duplicati con riferimento a originale)
+   int nBaseId ;
+   if ( pGeomDB->GetGdbType( nDupId) == GDB_TY_GROUP  &&  pGeomDB->ExistsInfo( nDupId, GDB_SI_DUPSOU)) {
+      if ( pGeomDB->GetParentId( nDupId) == nDuploBaseId) {
+         bInDuploGroup = true ;
+         return true ;
+      }
+      else if ( pGeomDB->GetInfo( nDupId, GDB_SI_BASE, nBaseId)  &&  pGeomDB->GetParentId( nBaseId) == nDuploBaseId) {
+         bInDuploGroup = false ;
+         return true ;
+      }
+   }
+   return false ;  
+}
+
 //-----------------------------------------------------------------------------
 int
 ExeDuploNew( int nSouId)
@@ -729,7 +775,8 @@ ExeDuploCount( int nSouId, int& nCount)
   // Conto i reali duplo
    nCount = 0 ;
    for ( int i = 0 ; i < int( vnRef.size()) ; ++ i) {
-      if ( ExeIsDuplo( vnRef[i]))
+      bool bInDuploGroup ;
+      if ( IsDuplo( pGeomDB, vnRef[i], bInDuploGroup))
          ++ nCount ;
    }
    return true ;
@@ -754,6 +801,105 @@ ExeDuploList( int nSouId, INTVECTOR& vnRef)
    return true ;
 }
 
+//-----------------------------------------------------------------------------
+bool
+ExeDuploInRawCount( int nSouId, int& nCount)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, false)
+  // Verifico sia un pezzo
+   if ( ! IsPartForDuplo( pGeomDB, nSouId))
+      return false ;
+  // Recupero info del sorgente
+   INTVECTOR vnRef ;
+   pGeomDB->GetInfo( nSouId, GDB_SI_DUPLIST, vnRef) ;
+  // Conto i reali duplo che sono riferiti o che stanno in un grezzo
+   nCount = 0 ;
+   for ( int i = 0 ; i < int( vnRef.size()) ; ++ i) {
+     // verifico sia un duplo
+      int nDupId = vnRef[i] ;
+      bool bInDuploGroup ;
+      if ( ! IsDuplo( pGeomDB, nDupId, bInDuploGroup))
+         continue ;
+     // se nel gruppo dei duplo
+      if ( bInDuploGroup) {
+        // verifico sia incluso in un grezzo di un gruppo di lavoro
+         INTVECTOR vnRef ;
+         if ( ! pGeomDB->GetInfo( nDupId, GDB_SI_LIST, vnRef))
+            continue ;
+         for ( auto& nId : vnRef) {
+           // verifico esista 
+            if ( ! pGeomDB->ExistsObj( nId))
+               continue ;
+           // verifico sia in un grezzo (previsto solo in uno come massimo)
+            int nMachGrpId = pGeomDB->GetParentId( pGeomDB->GetParentId( pGeomDB->GetParentId( nId))) ;
+            string sMachGrpName ;
+            if ( ExeGetMachGroupName( nMachGrpId, sMachGrpName)) {
+               ++ nCount ;
+               break ;
+            }
+         }
+      }
+     // se in altro gruppo
+      else {
+        // verifico se incluso nel grezzo del gruppo di lavoro corrente (previsto solo in un gruppo)
+         if ( ExeIsRawPart( pGeomDB->GetParentId( nDupId)))
+            ++ nCount ;
+      }
+   }
+   return true ;
+}
+
+//-----------------------------------------------------------------------------
+bool
+ExeDuploWithoutRawList( INTVECTOR& vnDup)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, false)
+  // Reset del risultato
+   vnDup.clear() ;
+  // Recupero gruppo dei duplo
+   int nDuploBaseId = GetDuploBase( pGeomDB) ;
+   if ( nDuploBaseId == GDB_ID_NULL)
+      return true ;
+  // Ciclo sui duplo
+   for ( int nDuploId = pGeomDB->GetFirstGroupInGroup( nDuploBaseId) ;
+         nDuploId != GDB_ID_NULL ;
+         nDuploId = pGeomDB->GetNextGroup( nDuploId)) {
+     // se marcatore
+      if ( pGeomDB->ExistsInfo( nDuploId, GDB_SI_SOURCE)) {
+         int nPartId = GDB_ID_NULL ;
+         pGeomDB->GetInfo( nDuploId, GDB_SI_SOURCE, nPartId) ;
+         int nMachGrpId = pGeomDB->GetParentId( pGeomDB->GetParentId( pGeomDB->GetParentId( nPartId))) ;
+         string sMachGrpName ;
+         if ( pGeomDB->ExistsInfo( nPartId, GDB_SI_DUPSOU)  &&  ExeGetMachGroupName( nMachGrpId, sMachGrpName))
+            continue ;
+      }
+     // se vero duplo
+      else if ( pGeomDB->ExistsInfo( nDuploId, GDB_SI_DUPSOU)  &&  pGeomDB->ExistsInfo( nDuploId, GDB_SI_LIST)) {
+        // verifico sia incluso in un grezzo di un gruppo di lavoro
+         bool bFound = false ;
+         INTVECTOR vnRef ;
+         pGeomDB->GetInfo( nDuploId, GDB_SI_LIST, vnRef) ;
+         for ( auto& nId : vnRef) {
+           // verifico sia in un grezzo (previsto solo in uno come massimo)
+            int nMachGrpId = pGeomDB->GetParentId( pGeomDB->GetParentId( pGeomDB->GetParentId( nId))) ;
+            string sMachGrpName ;
+            if ( ExeGetMachGroupName( nMachGrpId, sMachGrpName)) {
+               bFound = true ;
+               break ;
+            }
+         }
+         if ( bFound)
+            continue ;
+      }
+     // inserisco nella lista dei duplo senza grezzo
+      vnDup.emplace_back( nDuploId) ;
+   }
+ 
+   return true ;
+}
+
 //-----------------------------------------------------------------------------
 bool
 ExeDuploSetModified( int nSouId)
@@ -955,19 +1101,9 @@ ExeIsDuplo( int nDupId)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
    VERIFY_GEOMDB( pGeomDB, false)
-  // Recupero il gruppo base dei duplicati
-   int nDuploBaseId = GetDuploBase( pGeomDB) ;
-   if ( nDuploBaseId == GDB_ID_NULL)
-      return false ;
-  // Verifico sia un duplicato (gruppo sotto quello dei duplicati con riferimento a originale)
-   int nBaseId ;
-   if ( pGeomDB->GetGdbType( nDupId) == GDB_TY_GROUP  &&
-        ( pGeomDB->GetParentId( nDupId) == nDuploBaseId  ||
-          ( pGeomDB->GetInfo( nDupId, GDB_SI_BASE, nBaseId)  &&  pGeomDB->GetParentId( nBaseId) == nDuploBaseId))  &&
-        pGeomDB->ExistsInfo( nDupId, GDB_SI_DUPSOU))
-      return true ;
-   else
-      return false ;  
+  // Verifico sia un duplicato
+   bool bPartVsGhost ;
+   return IsDuplo( pGeomDB, nDupId, bPartVsGhost) ;
 }
 
 //-----------------------------------------------------------------------------

EXE_General.cpp

@@ -1,13 +1,14 @@
 //----------------------------------------------------------------------------
-//  EgalTech 2014-2015
+//  EgalTech 2014-2023
 //----------------------------------------------------------------------------
-// File : EXE_General.cpp       Data : 01.09.14        Versione : 1.5i1
+// File : EXE_General.cpp       Data : 14.11.23        Versione : 2.5k2
 // Contenuto : Funzioni generali per EXE.
 //
 //
 //
 // Modifiche : 01.09.14 DS Creazione modulo.
-//             28.11.19 DS Aggiunto caricamento opzionale del Nesting.
+//             28.11.19 DS Aggiunto caricamento opzionale di Nesting.
+//             14.11.23 DS Aggiunto caricamento opzionale di Exchange 3dm.
 //
 //----------------------------------------------------------------------------
 
@@ -17,6 +18,7 @@
 #include "LUA_Base.h"
 #include "DllGraphics.h"
 #include "DllExchange.h"
+#include "DllExch3dm.h"
 #include "DllMachKernel.h"
 #include "DllNesting.h"
 #include "/EgtDev/Include/EXeExecutor.h"
@@ -29,6 +31,7 @@
 #include "/EgtDev/Include/EGnFileUtils.h"
 #include "/EgtDev/Include/EGnGetModuleVer.h"
 #include "/EgtDev/Include/EGnPcInfo.h"
+#include "/EgtDev/Include/EGnGetKeyData.h"
 #include "/EgtDev/Include/EgtIniFile.h"
 #include "/EgtDev/Include/EgtLogger.h"
 #include "/EgtDev/Include/EgtStringConverter.h"
@@ -49,10 +52,13 @@ static string  s_sKey ;
 static int     s_nKeyType = KEY_LOCK_TYPE_ANY ;
 static bool    s_bNetHwKey = false ;
 static int     s_nKeyExpDays = 0 ;
+static int     s_nKeyAssExpDays = 0 ;
 static int     s_nKeyOptExpDays = 0 ;
 static string  s_sNestKey ;
+static string  s_sLockId ;
 static string  s_sIniFile ;
 static bool    s_bEnableUI = true ;
+static pfOnTerminateProcess s_pFunOnTerminateProcess = nullptr ;
 static pfProcEvents s_pFunProcEvents = nullptr ;
 static pfOutText    s_pFunOutText = nullptr ;
 static HWND    s_hMainWnd = nullptr ;
@@ -68,6 +74,7 @@ ExeInit( int nDebug, const string& sLogFile, const string& sLogMsg)
    if ( s_pGenLog != nullptr)
       delete s_pGenLog ;
   // cancello riferimenti a funzioni installate
+   s_pFunOnTerminateProcess = nullptr ;
    s_pFunProcEvents = nullptr ;
    s_pFunOutText = nullptr ;
    s_bEnableUI = true ;
@@ -110,12 +117,16 @@ ExeInit( int nDebug, const string& sLogFile, const string& sLogMsg)
    if ( LoadExchangeDll( s_pGenLog, s_sKey, s_bNetHwKey))
       LOG_INFO( s_pGenLog, MyGetEExVersion())
 
+  // carico libreria exchange 3dm opzionale
+   if ( LoadExch3dmDll( s_pGenLog, s_sKey, s_bNetHwKey))
+      LOG_INFO( s_pGenLog, MyGetEE3Version())
+
   // carico libreria di lavorazione opzionale
    if ( LoadMachKernelDll( s_pGenLog, s_sKey, s_bNetHwKey))
       LOG_INFO( s_pGenLog, MyGetEMkVersion())
 
   // carico libreria nesting opzionale (non può usare la chiave di rete)
-   if ( LoadNestingDll( s_pGenLog, s_sKey, s_sNestKey))
+   if ( LoadNestingDll( s_pGenLog, s_sKey, s_sNestKey, s_bNetHwKey))
       LOG_INFO( s_pGenLog, MyGetENsVersion())
 
   // Info sulla protezione e sul sistema
@@ -166,9 +177,11 @@ ExeExit( void)
   // libero le librerie opzionali
    FreeMachKernelDll() ;
    FreeExchangeDll() ;
+   FreeExch3dmDll() ;
    FreeGraphicsDll() ;
 
   // cancello riferimenti a funzioni installate
+   s_pFunOnTerminateProcess = nullptr ;
    s_pFunProcEvents = nullptr ;
    s_pFunOutText = nullptr ;
    s_bEnableUI = true ;
@@ -188,9 +201,37 @@ ExeExit( void)
       s_pGenLog = nullptr ;
    }
 
+  // libero eventuale chiave di rete
+   if ( s_bNetHwKey)
+      CloseNetHwKey() ;
+
    return true ;
 }
 
+//-----------------------------------------------------------------------------
+bool
+ExeSetOnTerminateProcess( pfOnTerminateProcess pFun)
+{
+   s_pFunOnTerminateProcess = pFun ;
+   return ( pFun != nullptr) ;
+}
+
+//-----------------------------------------------------------------------------
+bool
+ExeOnTerminateProcess( int nExitCode)
+{
+  // lancio eventuale callback
+   bool bTerminate = true ;
+   if ( s_pFunOnTerminateProcess != nullptr)
+      bTerminate = s_pFunOnTerminateProcess( nExitCode) ;
+
+  // se confermata chiusura, libero eventuale chiave di rete
+   if ( bTerminate  &&  s_bNetHwKey)
+      CloseNetHwKey() ;
+
+   return bTerminate ;
+}
+
 //-----------------------------------------------------------------------------
 int
 ExeGetDebugLevel( void)
@@ -218,6 +259,7 @@ bool
 ExeSetKey( const string& sKey)
 {
    s_sKey = sKey ;
+   SetEGnKey( s_sKey) ;
    return true ;
 }
 
@@ -248,15 +290,59 @@ bool
 ExeSetLockType( int nType)
 {
    s_nKeyType = nType ;
+   SetEGnKeyType( s_nKeyType) ;
    return SetLockType( nType) ;
 }
 
 //-----------------------------------------------------------------------------
 bool
-ExeSetNetHwKey( bool bNetHwKey)
+ExeSetLockId( const string& sLockId)
+{
+   int nKeyType ;
+   bool bNetKey ;
+   int nUserId ;
+   GetLockIdStringInfo( sLockId, nKeyType, bNetKey, nUserId) ;
+   bool bOk ;
+   switch ( nKeyType) {
+   default :
+      ExeSetNetHwKey( false) ;
+      bOk = false ;
+      break ;
+   case KEY_LOCK_TYPE_SW :
+      ExeSetNetHwKey( false) ;
+      bOk = ( s_nKeyType != KEY_LOCK_TYPE_HW) ;
+      break ;
+   case KEY_LOCK_TYPE_HW :
+      {  string sAddrPort ;
+         GetLockIdStringNetData( sLockId, sAddrPort) ;
+         ExeSetNetHwKey( bNetKey, nUserId, sAddrPort) ;
+         bOk = true ;
+         break ;
+      }
+   }
+   if ( bOk)
+      s_sLockId = sLockId ;
+   else
+      s_sLockId = "" ;
+   return bOk ;
+}
+
+//-----------------------------------------------------------------------------
+const string&
+ExeGetLockId( void)
+{
+   if ( s_sLockId.empty())
+      GetLockId( s_sLockId) ;
+   return s_sLockId ;
+}
+
+//-----------------------------------------------------------------------------
+bool
+ExeSetNetHwKey( bool bNetHwKey, int nUserId, const string& sAddrPort)
 {
    s_bNetHwKey = bNetHwKey ;
-   return SetNetHwKey( bNetHwKey) ;
+   SetEGnNetHwKey( s_bNetHwKey) ;
+   return SetNetHwKey( s_bNetHwKey, nUserId, sAddrPort) ;
 }
 
 //-----------------------------------------------------------------------------
@@ -387,6 +473,10 @@ ExeGetVersionInfo( string& sVer, const char* szNewLine)
       sVer += szNewLine ;
       sVer += MyGetEExVersion() ;
    }
+   if ( IsLoadedExch3dmDll()) {
+      sVer += szNewLine ;
+      sVer += MyGetEE3Version() ;
+   }
    if ( IsLoadedMachKernelDll()) {
       sVer += szNewLine ;
       sVer += MyGetEMkVersion() ;
@@ -411,7 +501,7 @@ ExeGetKeyInfo( string& sKey)
       sLockId = sLockId.substr( 7, 6) ;
       if ( sLockId.empty())
          return false ;
-      int nLockSN ;
+      int nLockSN = 0 ;
       if ( GetLockSN( nLockSN))
          sLockId += " (" + ToString( nLockSN) + ")" ;
    }
@@ -430,14 +520,14 @@ bool
 ExeGetKeyLevel( int nProd, int nVer, int nLev, int& nKLev)
 {
   // verifico la chiave e il livello
-   int nRet = GetKeyLevel( s_sKey, nProd, nVer, nLev, nKLev, s_nKeyExpDays) ;
+   int nRet = GetKeyLevelEx( s_sKey, nProd, nVer, nLev, nKLev, s_nKeyExpDays, s_nKeyAssExpDays) ;
+   SetEGnKeyLevel( nRet, nKLev, s_nKeyExpDays) ;
    if ( nRet != KEY_OK) {
       string sErr = "Error on Key (EGKL/" + ToString( nRet) + ")" ;
       LOG_ERROR( s_pGenLog, sErr.c_str()) ;
       nKLev = - nRet ;
       return false ;
    }
-
    return true ;
 }
 
@@ -448,6 +538,7 @@ ExeGetKeyOptions( int nProd, int nVer, int nLev, unsigned int& nOpt2)
   // verifico la chiave e le opzioni
    unsigned int nOpt1 ;
    int nRet = GetKeyOptions( s_sKey, nProd, nVer, nLev, nOpt1, nOpt2, s_nKeyOptExpDays) ;
+   SetEGnKeyOptions( nRet, nOpt1, nOpt2, s_nKeyOptExpDays) ;
    if ( nRet != KEY_OK) {
       nOpt2 = 0 ;
       string sErr = "Error on Key (EGKO/" + ToString( nRet) + ")" ;
@@ -460,7 +551,6 @@ ExeGetKeyOptions( int nProd, int nVer, int nLev, unsigned int& nOpt2)
       LOG_ERROR( s_pGenLog, sErr.c_str()) ;
       return true ;
    }
-
    return true ;
 }
 
@@ -474,6 +564,16 @@ ExeGetKeyLeftDays( int& nLeftDays)
    return true ;
 }
 
+//-----------------------------------------------------------------------------
+bool
+ExeGetKeyAssLeftDays( int& nAssLeftDays)
+{
+   if ( s_nKeyAssExpDays == 0)
+      return false ;
+   nAssLeftDays = s_nKeyAssExpDays - GetCurrDay() ;
+   return true ;
+}
+
 //-----------------------------------------------------------------------------
 bool
 ExeGetKeyOptLeftDays( int& nOptLeftDays)
@@ -536,6 +636,18 @@ ExeGetEnableUI( void)
    return s_bEnableUI ;
 }
 
+//-----------------------------------------------------------------------------
+int
+ExeMessageBox( const string& sText, const string& sTitle, int nType)
+{
+   int nRes = 0 ;
+   if ( ExeGetEnableUI()) {
+      HWND hTopWnd = ExeGetMainWindowHandle() ;
+      nRes = MessageBox( hTopWnd, stringtoW( sText), stringtoW( sTitle), nType | MB_TASKMODAL) ;
+   }
+   return nRes ;
+}
+
 //-----------------------------------------------------------------------------
 bool
 ExeSetProcessEvents( pfProcEvents pFun)

EXE_GeomDB.cpp

@@ -277,6 +277,8 @@ ExeNewFile( void)
                     " -- Ok=" + ToString( bOk) ;
       LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
    }
+  // scrivo il log
+   LOG_INFO( GetLogger(), "New File") ;
   // restituisco il risultato
    return bOk ;
 }
@@ -316,6 +318,11 @@ ExeOpenFile( const string& sFilePath)
                     " -- Ok=" + ToString( bOk) ;
       LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
    }
+  // scrivo il log
+   {
+      string sLog = "Open File " + sFilePath ;
+      LOG_INFO( GetLogger(), sLog.c_str()) ;
+   }
   // restituisco il risultato
    return bOk ;
 }
@@ -447,6 +454,11 @@ ExeSaveFile( const string& sFilePath, int nFlag)
                     " -- Ok=" + ToString( bOk) ;
       LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
    }
+  // scrivo il log
+   {
+      string sLog = "Saved File " + sFilePath ;
+      LOG_INFO( GetLogger(), sLog.c_str()) ;
+   }
   // restituisco il risultato
    return bOk ;
 }

EXE_Lua.cpp

@@ -262,11 +262,13 @@ ExeLuaExecLine( const string& sLine)
 
 //-----------------------------------------------------------------------------
 bool
-ExeLuaExecFile( const string& sFilePath)
+ExeLuaExecFile( const string& sFilePath, bool LogInfo)
 {
   // emetto info
-   string sInfo = "Exec File = " + sFilePath ;
-   LOG_INFO( GetLogger(), sInfo.c_str())
+   if ( LogInfo) {
+      string sInfo = "Exec File = " + sFilePath ;
+      LOG_INFO( GetLogger(), sInfo.c_str())
+   }
   // disabilito il log dei comandi
    CmdLogOff cmdLogOff ;
   // esecuzione script

EXE_MachMgr.cpp

@@ -245,6 +245,26 @@ ExeAddMachGroup( const string& sName, const string& sMachineName)
    return nId ;
 }
 
+//-----------------------------------------------------------------------------
+int
+ExeCopyMachGroup( const string& sSouName, const string& sName)
+{
+   IMachMgr* pMachMgr = GetCurrMachMgr() ;
+   VERIFY_MACHMGR( pMachMgr, GDB_ID_NULL)
+  // copio la macchinata (gruppo di lavorazione)
+   int nId = pMachMgr->CopyMachGroup( sSouName, sName) ;
+   ExeSetModified() ;
+  // se richiesto, salvo il comando Lua equivalente
+   if ( IsCmdLog()) {
+      string sLua = "EgtCopyMachGroup('" + sSouName + "','" +
+                                           sName + "')" +
+                    " -- Id=" + ToString( nId) ;
+      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
+   }
+  // restituisco il risultato
+   return nId ;
+}
+
 //-----------------------------------------------------------------------------
 bool
 ExeRemoveMachGroup( int nMGroupId)
@@ -264,6 +284,26 @@ ExeRemoveMachGroup( int nMGroupId)
    return bOk ;
 }
 
+//-----------------------------------------------------------------------------
+bool
+ExeChangeMachGroupName( int nId, const string& sNewName)
+{
+   IMachMgr* pMachMgr = GetCurrMachMgr() ;
+   VERIFY_MACHMGR( pMachMgr, false)
+  // cambia il nome della macchinata
+   bool bOk = pMachMgr->ChangeMachGroupName( nId, sNewName) ;
+   ExeSetModified() ;
+  // se richiesto, salvo il comando Lua equivalente
+   if ( IsCmdLog()) {
+      string sLua = "EgtChangeMachGroupName(" + ToString( nId) + ",'" +
+                                                sNewName + "')" +
+                    " -- Ok=" + ToString( bOk) ;
+      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
+   }
+  // restituisco il risultato
+   return bOk ;
+}
+
 //-----------------------------------------------------------------------------
 bool
 ExeGetMachGroupName( int nId, string& sName)
@@ -291,8 +331,8 @@ int
 ExeGetMachGroupId( const string& sName)
 {
    IMachMgr* pMachMgr = GetCurrMachMgr() ;
-   VERIFY_MACHMGR( pMachMgr, false)
-  // recupero l'indice della macchinata
+   VERIFY_MACHMGR( pMachMgr, GDB_ID_NULL)
+  // recupero l'identificativo della macchinata
    return pMachMgr->GetMachGroupId( sName) ;
 }
 
@@ -353,16 +393,16 @@ ExeAddPhase( void)
    IMachMgr* pMachMgr = GetCurrMachMgr() ;
    VERIFY_MACHMGR( pMachMgr, 0)
   // aggiungo una nuova fase di lavorazione alla macchinata corrente
-   int nId = pMachMgr->AddPhase() ;
+   int nInd = pMachMgr->AddPhase() ;
    ExeSetModified() ;
   // se richiesto, salvo il comando Lua equivalente
    if ( IsCmdLog()) {
       string sLua = "EgtAddPhase()"
-                    " -- Id=" + ToString( nId) ;
+                    " -- Ind=" + ToString( nInd) ;
       LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
    }
   // restituisco il risultato
-   return nId ;
+   return nInd ;
 }
 
 //-----------------------------------------------------------------------------
@@ -451,7 +491,7 @@ bool
 ExeIsRawPart( int nRawId)
 {
    IMachMgr* pMachMgr = GetCurrMachMgr() ;
-   VERIFY_MACHMGR( pMachMgr, GDB_ID_NULL)
+   VERIFY_MACHMGR( pMachMgr, false)
   // verifico se è un grezzo della macchinata corrente
    return pMachMgr->IsRawPart( nRawId) ;
 }
@@ -1565,6 +1605,16 @@ ExeFindToolInCurrSetup( const string& sTool)
    return pMachMgr->FindToolInCurrSetup( sTool) ;
 }
 
+//-----------------------------------------------------------------------------
+bool
+ExeGetToolSetupPosInCurrSetup( const string& sTool, string& sTcPos)
+{
+   IMachMgr* pMachMgr = GetCurrMachMgr() ;
+   VERIFY_MACHMGR( pMachMgr, false)
+  // eseguo la verifica
+   return pMachMgr->GetToolSetupPosInCurrSetup( sTool, sTcPos) ;
+}
+
 //-----------------------------------------------------------------------------
 bool
 ExeGetToolsInCurrSetupPos( const string& sTcPos, STRVECTOR& vsTools)
@@ -2700,7 +2750,7 @@ ExeApplyAllMachiningsEx( bool bRecalc, bool bStopOnFirstErr, string& sErrList, s
    while ( nOperId != GDB_ID_NULL) {
       if ( pMachMgr->GetOperationType( nOperId) == OPER_DISP) {
          pMachMgr->SetCurrPhase( pMachMgr->GetOperationPhase( nOperId)) ;
-         if ( ! pMachMgr->DispositionSpecialApply( nOperId, bRecalc)) {
+         if ( ! pMachMgr->DispositionSpecialApply( nOperId, true)) {
             bOk = false ;
             if ( pMachMgr->GetLastErrorId() != 0)
                sErrList += pMachMgr->GetOperationName( nOperId) + " -> " + pMachMgr->GetLastErrorString() + "\r\n" ;
@@ -2846,12 +2896,12 @@ ExeGetClEntMove( int nEntId, int& nMove)
 
 //-----------------------------------------------------------------------------
 bool
-ExeGetClEntFlag( int nEntId, int& nFlag)
+ExeGetClEntFlag( int nEntId, int& nFlag, int& nFlag2)
 {
    IMachMgr* pMachMgr = GetCurrMachMgr() ;
    VERIFY_MACHMGR( pMachMgr, false)
-  // recupero il flag
-   return pMachMgr->GetClEntFlag( nEntId, nFlag) ;
+  // recupero i flag
+   return pMachMgr->GetClEntFlag( nEntId, nFlag, nFlag2) ;
 }
 
 //-----------------------------------------------------------------------------
@@ -2864,6 +2914,16 @@ ExeGetClEntIndex( int nEntId, int& nIndex)
    return pMachMgr->GetClEntIndex( nEntId, nIndex) ;
 }
 
+//-----------------------------------------------------------------------------
+bool
+ExeGetClEntAxesVal( int nEntId, DBLVECTOR& vAxes)
+{
+   IMachMgr* pMachMgr = GetCurrMachMgr() ;
+   VERIFY_MACHMGR( pMachMgr, false)
+  // recupero il valore degli assi
+   return pMachMgr->GetClEntAxesVal( nEntId, vAxes) ;
+}
+
 //-----------------------------------------------------------------------------
 //    Simulazione
 //-----------------------------------------------------------------------------
@@ -3142,6 +3202,16 @@ ExeSetCalcTool( const string& sTool, const string& sHead, int nExit)
    return pMachMgr->SetCalcTool( sTool, sHead, nExit) ;
 }
 
+//-----------------------------------------------------------------------------
+bool
+ExeGetAllCurrAxesName( STRVECTOR& vAxName)
+{
+   IMachMgr* pMachMgr = GetCurrMachMgr() ;
+   VERIFY_MACHMGR( pMachMgr, false)
+  // recupero gli assi correnti derivanti dalla scelta di tavola e utensile
+   return pMachMgr->GetAllCurrAxesName( vAxName) ;
+}
+
 //----------------------------------------------------------------------------
 bool
 ExeSetRotAxisBlock( const string& sAxis, double dVal)

EXE_Mutex.cpp

@@ -0,0 +1,57 @@
+//----------------------------------------------------------------------------
+//  EgalTech 2023-2023
+//----------------------------------------------------------------------------
+// File : EXE_Mutex.cpp       Data : 05.02.23        Versione : 2.5a6
+// Contenuto : Funzioni per gestione mutex.
+//
+//
+//
+// Modifiche : 05.02.23 DS Creazione modulo.
+//
+//
+//----------------------------------------------------------------------------
+
+//--------------------------- Include ----------------------------------------
+#include "stdafx.h"
+#include "EXE.h"
+#include "/EgtDev/Include/EgtStringConverter.h"
+
+using namespace std ;
+
+//----------------------------------------------------------------------------
+static HANDLE s_hMutex = NULL ;
+
+//----------------------------------------------------------------------------
+bool
+ExeCreateMutex( const string& sMutexName)
+{
+   if ( s_hMutex != NULL)
+      return false ;
+
+   HANDLE hMutex = CreateMutex( NULL, TRUE, stringtoW( sMutexName)) ;
+
+   if ( hMutex == NULL)
+      return false ;
+   else if ( GetLastError() == ERROR_ALREADY_EXISTS) {
+      ReleaseMutex( hMutex) ;
+      CloseHandle( hMutex) ;
+      return false ;
+   }
+   else {
+      s_hMutex = hMutex ;
+      return true ;
+   }
+}
+
+//----------------------------------------------------------------------------
+bool
+ExeReleaseMutex( void)
+{
+   if ( s_hMutex == NULL)
+      return true ;
+
+   bool bOk = ( ReleaseMutex( s_hMutex) != FALSE) ;
+   CloseHandle( s_hMutex) ;
+   s_hMutex = NULL ;
+   return bOk ;
+}

EXE_Scene.cpp

@@ -183,10 +183,23 @@ ExeSetGridGeo( double dSnapStep, int nMinLineSstep, int nMajLineSstep, int nExtS
 {
    IEGrScene* pScene = GetCurrScene() ;
    VERIFY_SCENE( pScene, false)
+
   // imposto i parametri geometrici di griglia
    return pScene->SetGridGeo( dSnapStep, nMinLineSstep, nMajLineSstep, nExtSstep) ;
 }
 
+//-----------------------------------------------------------------------------
+bool
+ExeSetGridGeoAdv( double dSnapStep, int nMinLineSstep, int nMajLineSstep,
+                  double dXmin, double dXmax, double dYmin, double dYmax)
+{
+   IEGrScene* pScene = GetCurrScene() ;
+   VERIFY_SCENE( pScene, false)
+
+  // imposto i parametri geometrici di griglia
+   return pScene->SetGridGeoAdv( dSnapStep, nMinLineSstep, nMajLineSstep, dXmin, dXmax, dYmin, dYmax) ;
+}
+
 //-----------------------------------------------------------------------------
 bool
 ExeSetGridColor( Color colMin, Color colMaj)
@@ -212,11 +225,13 @@ ExeResize( int nW, int nH)
 bool
 ExeDraw( void)
 {
+  // se interfaccia disabilitata, esco subito
+   if ( ! ExeGetEnableUI())
+      return true ;
    GseContext* pGseCtx = GetCurrGseContext() ;
    VERIFY_CTX_SCENE( pGseCtx, false)
-  // se abilitato, eseguo disegno
-   if ( ExeGetEnableUI())
-      pGseCtx->m_pScene->Draw() ;
+  // eseguo disegno
+   pGseCtx->m_pScene->Draw() ;
   // valido la finestra disegnata
    ValidateRgn( pGseCtx->m_hWnd, NULL) ;
    return true ;

EgtExecutor.vcxproj

@@ -22,7 +22,7 @@
     <ProjectGuid>{DF654897-F85B-4108-A621-F2C4AB099A48}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>EgtExecutor</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.20348.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -104,6 +104,8 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
+      <OpenMPSupport>false</OpenMPSupport>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -164,6 +166,7 @@ copy $(TargetPath) \EgtProg\DllD64</Command>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
       <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -197,7 +200,7 @@ copy $(TargetPath) \EgtProg\Dll32</Command>
       <OpenMPSupport>false</OpenMPSupport>
       <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
       <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
-      <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <AdditionalOptions>-Wno-tautological-undefined-compare</AdditionalOptions>
     </ClCompile>
@@ -225,6 +228,7 @@ copy $(TargetPath) \EgtProg\Dll64</Command>
     <ClInclude Include="..\Include\EXeConst.h" />
     <ClInclude Include="..\Include\EXeDllMain.h" />
     <ClInclude Include="..\Include\EXeExecutor.h" />
+    <ClInclude Include="DllExch3dm.h" />
     <ClInclude Include="DllMain.h" />
     <ClInclude Include="DllNesting.h" />
     <ClInclude Include="EXE.h" />
@@ -245,6 +249,7 @@ copy $(TargetPath) \EgtProg\Dll64</Command>
     <ClInclude Include="stdafx.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="DllExch3dm.cpp" />
     <ClCompile Include="DllNesting.cpp" />
     <ClCompile Include="EXE_BeamMgr.cpp" />
     <ClCompile Include="EXE_CAvTool.cpp" />
@@ -252,6 +257,7 @@ copy $(TargetPath) \EgtProg\Dll64</Command>
     <ClCompile Include="EXE_GdbCreateVol.cpp" />
     <ClCompile Include="EXE_GdbGet.cpp" />
     <ClCompile Include="EXE_GdbGetCurve.cpp" />
+    <ClCompile Include="EXE_GdbGetPocketing.cpp" />
     <ClCompile Include="EXE_GdbGetSurf.cpp" />
     <ClCompile Include="EXE_GdbGetVol.cpp" />
     <ClCompile Include="EXE_GdbModifyVol.cpp" />
@@ -259,6 +265,7 @@ copy $(TargetPath) \EgtProg\Dll64</Command>
     <ClCompile Include="EXE_GeoInters.cpp" />
     <ClCompile Include="EXE_Image.cpp" />
     <ClCompile Include="EXE_MaxFiller.cpp" />
+    <ClCompile Include="EXE_Mutex.cpp" />
     <ClCompile Include="EXE_NstAutoNesting.cpp" />
     <ClCompile Include="EXE_NstMachining.cpp" />
     <ClCompile Include="EXE_NstPartNesting.cpp" />
@@ -301,6 +308,7 @@ copy $(TargetPath) \EgtProg\Dll64</Command>
     <ClCompile Include="LUA_CDeObjSolid.cpp" />
     <ClCompile Include="LUA_GdbGet.cpp" />
     <ClCompile Include="LUA_GdbGetCurve.cpp" />
+    <ClCompile Include="LUA_GdbGetPocketing.cpp" />
     <ClCompile Include="LUA_GdbGetSurf.cpp" />
     <ClCompile Include="LUA_GdbGetVol.cpp" />
     <ClCompile Include="LUA_GeoDist.cpp" />

EgtExecutor.vcxproj.filters

@@ -108,6 +108,9 @@
     <ClInclude Include="DllNesting.h">
       <Filter>File di intestazione</Filter>
     </ClInclude>
+    <ClInclude Include="DllExch3dm.h">
+      <Filter>File di intestazione</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="LUA_Exchange.cpp">
@@ -386,6 +389,18 @@
     <ClCompile Include="LUA_BeamMgr.cpp">
       <Filter>File di origine\LUA</Filter>
     </ClCompile>
+    <ClCompile Include="EXE_Mutex.cpp">
+      <Filter>File di origine\EXE</Filter>
+    </ClCompile>
+    <ClCompile Include="DllExch3dm.cpp">
+      <Filter>File di origine\Optional Dll</Filter>
+    </ClCompile>
+    <ClCompile Include="EXE_GdbGetPocketing.cpp">
+      <Filter>File di origine\EXE</Filter>
+    </ClCompile>
+    <ClCompile Include="LUA_GdbGetPocketing.cpp">
+      <Filter>File di origine\LUA</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="EgtExecutor.rc">

LUA.h

@@ -54,6 +54,9 @@ bool LuaInstallGdbModifyVol( LuaMgr& luaMgr) ;
 //-------------------------- GdbGet ------------------------------------------
 bool LuaInstallGdbGet( LuaMgr& luaMgr) ;
 
+//-------------------------- GdbGetPocketing ---------------------------------
+bool LuaInstallGdbGetPocketing( LuaMgr& luaMgr) ;
+
 //-------------------------- GdbGetCurve -------------------------------------
 bool LuaInstallGdbGetCurve( LuaMgr& luaMgr) ;
 
@@ -62,7 +65,7 @@ bool LuaInstallGdbGetSurf( LuaMgr& luaMgr) ;
 
 //-------------------------- GdbGetVol ---------------------------------------
 bool LuaInstallGdbGetVol( LuaMgr& luaMgr) ;
-                                              
+
 //-------------------------- GdbPartLayer ------------------------------------
 bool LuaInstallGdbPartLayer( LuaMgr& luaMgr) ;
 

LUA_Base.cpp

@@ -78,6 +78,10 @@ LuaInstallEgtFunctions( LuaMgr& LuaMgr)
       LOG_ERROR( GetLogger(), "Error in LuaInstallGdbGet (LuaInstallEgtFunctions)")
       return false ;
    }
+   if ( ! LuaInstallGdbGetPocketing( LuaMgr)) {
+      LOG_ERROR( GetLogger(), "Error in LuaInstallGdbGetPocketing (LuaInstallEgtFunctions)")
+      return false ;
+   }
    if ( ! LuaInstallGdbGetCurve( LuaMgr)) {
       LOG_ERROR( GetLogger(), "Error in LuaInstallGdbGetCurve (LuaInstallEgtFunctions)")
       return false ;

LUA_CAvTool.cpp

@@ -118,6 +118,27 @@ LuaCAvGetToolOutline( lua_State* L)
    return 1 ;
 }
 
+//-------------------------------------------------------------------------------
+static int
+LuaCAvToolPosBox( lua_State* L)
+{
+  // 4 parametri : ptP, vtAx, b3Box, vtMove
+   Point3d ptP ;
+   LuaCheckParam( L, 1, ptP)
+   Vector3d vtAx ;
+   LuaCheckParam( L, 2, vtAx)
+   BBox3d b3Box ;
+   LuaCheckParam( L, 3, b3Box)
+   Vector3d vtMove ;
+   LuaCheckParam( L, 4, vtMove)
+   LuaClearStack( L) ;
+  // determino il movimento da dare all'utensile per evitare la collisione con il parallelepipedo
+   double dMove = ExeCAvToolPosBox( ptP, vtAx, b3Box, vtMove) ;
+  // restituisco il risultato
+   LuaSetParam( L, dMove) ;
+   return 1 ;
+}
+
 //-------------------------------------------------------------------------------
 static int
 LuaCAvToolPosStm( lua_State* L)
@@ -176,6 +197,7 @@ LuaInstallCAvTool( LuaMgr& luaMgr)
    bOk = bOk && luaMgr.RegisterFunction( "EgtCAvSetSawTool", LuaCAvSetSawTool) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtCAvSetGenTool", LuaCAvSetGenTool) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtCAvGetToolOutline", LuaCAvGetToolOutline) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtCAvToolPosBox", LuaCAvToolPosBox) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtCAvToolPosStm", LuaCAvToolPosStm) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtCAvToolPathStm", LuaCAvToolPathStm) ;
    return bOk ;

LUA_CDeObjSolid.cpp

@@ -165,6 +165,28 @@ LuaCDeSpheSolid( lua_State* L)
    return 1 ;
 }
 
+//----------------------------------------------------------------------------
+static int
+LuaCDeSolidSolid( lua_State* L)
+{
+  // 3 parametri : nSolid1Id, nSolid2Id, dSafeDist
+   int nSolid1Id ;
+   LuaCheckParam( L, 1, nSolid1Id)
+   int nSolid2Id ;
+   LuaCheckParam( L, 2, nSolid2Id)
+   double dSafeDist ;
+   LuaCheckParam( L, 3, dSafeDist)
+   LuaClearStack( L) ;
+  // eseguo verifica di collisione
+   int nRes = ExeCDeSolidSolid( nSolid1Id, nSolid2Id, dSafeDist) ;
+  // restituisco il risultato
+   if ( nRes >= 0)
+      LuaSetParam( L, ( nRes != 0)) ;
+   else
+      LuaSetParam( L) ;
+   return 1 ;
+}
+
 //-------------------------------------------------------------------------------
 bool
 LuaInstallCDeObjSolid( LuaMgr& luaMgr)
@@ -175,5 +197,6 @@ LuaInstallCDeObjSolid( LuaMgr& luaMgr)
    bOk = bOk && luaMgr.RegisterFunction( "EgtCDeCylSolid", LuaCDeCylSolid) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtCDeConeSolid", LuaCDeConeSolid) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtCDeSpheSolid", LuaCDeSpheSolid) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtCDeSolidSolid", LuaCDeSolidSolid) ;
    return bOk ;
 }

LUA_Exchange.cpp

@@ -169,6 +169,21 @@ LuaImport3MF( lua_State* L)
    return 1 ;
 }
 
+//-------------------------------------------------------------------------------
+static int
+LuaImport3dm( lua_State* L)
+{
+   // 1 parametro : path del file da importare
+   string sFilePath ;
+   LuaCheckParam( L, 1, sFilePath)
+   LuaClearStack( L) ;
+   // apro il file
+   bool bOk = ExeImport3dm( sFilePath) ; 
+   // restituisco il risultato
+   LuaSetParam( L, bOk) ;
+   return 1 ;
+}
+
 //-------------------------------------------------------------------------------
 static int
 LuaAdvancedImport( lua_State* L)
@@ -190,16 +205,18 @@ LuaAdvancedImport( lua_State* L)
 static int
 LuaExportDxf( lua_State* L)
 {
-  // 2 o 3 parametri, GroupId e path del file da esportare [, Flag]
+  // 2, 3 o 4 parametri : GroupId e path del file da esportare [, Flag] [, Filter]
    int nGroupId ;
    LuaCheckParam( L, 1, nGroupId)
    string sFilePath ;
    LuaCheckParam( L, 2, sFilePath)
    int nFlag = EEXFLAG_DEFAULT ;
    LuaGetParam( L, 3, nFlag) ;
+   int nFilter = EEXFLT_DEFAULT ;
+   LuaGetParam( L, 4, nFilter) ;
    LuaClearStack( L) ;
   // creo il file
-   bool bOk = ExeExportDxf( nGroupId, sFilePath, nFlag) ; 
+   bool bOk = ExeExportDxf( nGroupId, sFilePath, nFlag, nFilter) ; 
   // restituisco il risultato
    LuaSetParam( L, bOk) ;
    return 1 ;
@@ -209,11 +226,13 @@ LuaExportDxf( lua_State* L)
 static int
 LuaExportStl( lua_State* L)
 {
-  // 2 parametri, GroupId e path del file da esportare
+  // 2 parametri : GroupId e path del file da esportare [, Filter]
    int nGroupId ;
    LuaCheckParam( L, 1, nGroupId)
    string sFilePath ;
    LuaCheckParam( L, 2, sFilePath)
+   int nFilter = EEXFLT_DEFAULT ;
+   LuaGetParam( L, 3, nFilter) ;
    LuaClearStack( L) ;
   // creo il file
    bool bOk = ExeExportStl( nGroupId, sFilePath) ; 
@@ -226,14 +245,16 @@ LuaExportStl( lua_State* L)
 static int
 LuaExport3MF( lua_State* L)
 {
-  // 2 parametri, GroupId e path del file da esportare
+  // 2 o 3 parametri : GroupId e path del file da esportare [, Filter]
    int nGroupId ;
    LuaCheckParam( L, 1, nGroupId)
    string sFilePath ;
    LuaCheckParam( L, 2, sFilePath)
+   int nFilter = EEXFLT_DEFAULT ;
+   LuaGetParam( L, 3, nFilter) ;
    LuaClearStack( L) ;
   // creo il file
-   bool bOk = ExeExport3MF( nGroupId, sFilePath) ; 
+   bool bOk = ExeExport3MF( nGroupId, sFilePath, nFilter) ; 
   // restituisco il risultato
    LuaSetParam( L, bOk) ;
    return 1 ;
@@ -241,19 +262,19 @@ LuaExport3MF( lua_State* L)
 
 //-------------------------------------------------------------------------------
 static int
-LuaExportThreeJS( lua_State* L)
+LuaExport3dm( lua_State* L)
 {
-   // 2 o 3 parametri, GroupId e path del file da esportare [, Filter]
+  // 2 o 3 parametri : GroupId e path del file da esportare [, Filter]
    int nGroupId ;
    LuaCheckParam( L, 1, nGroupId)
    string sFilePath ;
    LuaCheckParam( L, 2, sFilePath)
-   int nFilter = EEXFLT_DEFAULT;
-   LuaGetParam( L, 3, nFilter);
+   int nFilter = EEXFLT_DEFAULT ;
+   LuaGetParam( L, 3, nFilter) ;
    LuaClearStack( L) ;
-   // creo il file
-   bool bOk = ExeExportThreeJS( nGroupId, sFilePath, nFilter) ;
-   // restituisco il risultato
+  // creo il file
+   bool bOk = ExeExport3dm( nGroupId, sFilePath, nFilter) ; 
+  // restituisco il risultato
    LuaSetParam( L, bOk) ;
    return 1 ;
 }
@@ -262,7 +283,7 @@ LuaExportThreeJS( lua_State* L)
 static int
 LuaExportSvg( lua_State* L)
 {
-  // 2 o 3 parametri, GroupId, Path del file da esportare [, Filter]
+  // 2 o 3 parametri : GroupId, Path del file da esportare [, Filter]
    int nGroupId ;
    LuaCheckParam( L, 1, nGroupId)
    string sFilePath ;
@@ -277,6 +298,25 @@ LuaExportSvg( lua_State* L)
    return 1 ;
 }
 
+//-------------------------------------------------------------------------------
+static int
+LuaExportThreeJS( lua_State* L)
+{
+   // 2 o 3 parametri : GroupId, Path del file da esportare [, Filter]
+   int nGroupId ;
+   LuaCheckParam( L, 1, nGroupId)
+   string sFilePath ;
+   LuaCheckParam( L, 2, sFilePath)
+   int nFilter = EEXFLT_DEFAULT ;
+   LuaGetParam( L, 3, nFilter) ;
+   LuaClearStack( L) ;
+   // creo il file
+   bool bOk = ExeExportThreeJS( nGroupId, sFilePath, nFilter) ;
+   // restituisco il risultato
+   LuaSetParam( L, bOk) ;
+   return 1 ;
+}
+
 //-------------------------------------------------------------------------------
 bool
 LuaInstallExchange( LuaMgr& luaMgr)
@@ -291,11 +331,13 @@ LuaInstallExchange( LuaMgr& luaMgr)
    bOk = bOk && luaMgr.RegisterFunction( "EgtImportPnt", LuaImportPnt) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtImportStl", LuaImportStl) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtImport3MF", LuaImport3MF) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtImport3dm", LuaImport3dm) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtAdvancedImport", LuaAdvancedImport) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtExportDxf", LuaExportDxf) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtExportStl", LuaExportStl) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtExport3MF", LuaExport3MF) ;
-   bOk = bOk && luaMgr.RegisterFunction( "EgtExportThreeJS", LuaExportThreeJS) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtExport3dm", LuaExport3dm) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtExportSvg", LuaExportSvg) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtExportThreeJS", LuaExportThreeJS) ;
    return bOk ;
 }

LUA_GdbCreate.cpp

@@ -344,6 +344,140 @@ LuaCreateAlignedDimension( lua_State* L)
    return 1 ;
 }
 
+//-------------------------------------------------------------------------------
+static int
+LuaCreateRadialDimension( lua_State* L)
+{
+  // 4 o 5 parametri : nParentId, nCrvId, ptDim, Text [, nRefType]
+   int nParentId ;
+   LuaCheckParam( L, 1, nParentId)
+   int nCrvId ;
+   LuaCheckParam( L, 2, nCrvId) ;
+   Point3d ptDim ;
+   LuaCheckParam( L, 3, ptDim) ;
+   string sText ;
+   LuaCheckParam( L, 4, sText) ;
+   int nRefType = RTY_DEFAULT ;
+   LuaGetParam( L, 5, nRefType) ;
+   LuaClearStack( L ) ;
+  // creo la quota allineata
+   int nId = ExeCreateRadialDimension( nParentId, nCrvId, ptDim, sText, nRefType) ;
+  // restituisco il risultato
+   if ( nId != GDB_ID_NULL)
+      LuaSetParam( L, nId) ;
+   else
+      LuaSetParam( L) ;
+   return 1 ;
+}
+
+//-------------------------------------------------------------------------------
+static int
+LuaCreateDiametralDimension( lua_State* L )
+{
+  // 4 o 5 parametri : nParentId, nCrvId, ptDim, Text [, nRefType]
+   int nParentId ;
+   LuaCheckParam( L, 1, nParentId)
+   int nCrvId ;
+   LuaCheckParam( L, 2, nCrvId) ;
+   Point3d ptDim ;
+   LuaCheckParam( L, 3, ptDim) ;
+   string sText ;
+   LuaCheckParam( L, 4, sText) ;
+   int nRefType = RTY_DEFAULT ;
+   LuaGetParam( L, 5, nRefType) ;
+   LuaClearStack( L) ;
+  // creo la quota allineata
+   int nId = ExeCreateDiametralDimension( nParentId, nCrvId, ptDim, sText, nRefType) ;
+  // restituisco il risultato
+   if ( nId != GDB_ID_NULL)
+      LuaSetParam( L, nId) ;
+   else
+      LuaSetParam( L) ;
+   return 1 ;
+}
+
+//-------------------------------------------------------------------------------
+static int
+LuaCreateAngularDimension(lua_State* L)
+{
+   // 6 o 7 parametri : ParentId, ptP1, ptV, ptP2, ptDim, Text [, nRefType]
+    int nParentId ;
+    LuaCheckParam( L, 1, nParentId)
+    Point3d ptP1 ;
+    LuaCheckParam( L, 2, ptP1) ;
+    Point3d ptV ;
+    LuaCheckParam( L, 3, ptV) ;
+    Point3d ptP2 ;
+    LuaCheckParam( L, 4, ptP2) ;
+    Point3d ptDim ;
+    LuaCheckParam( L, 5, ptDim) ;
+    string sText ;
+    LuaCheckParam( L, 6, sText) ;
+    int nRefType = RTY_DEFAULT ;
+    LuaGetParam( L, 7, nRefType) ;
+    LuaClearStack( L) ;
+   // creo la quota angolare
+    int nId = ExeCreateAngularDimension( nParentId, ptP1, ptV, ptP2, ptDim, sText, nRefType) ;
+   // restituisco il risultato
+    if ( nId != GDB_ID_NULL)
+        LuaSetParam( L, nId) ;
+    else
+        LuaSetParam( L) ;
+    return 1 ;
+}
+
+//-------------------------------------------------------------------------------
+static int
+LuaCreateAngularDimensionFromLines( lua_State* L)
+{
+   // 4 o 5 parametri : nParentId, vLineIds, ptDim, Text [, nRefType]
+    int nParentId ;
+    LuaCheckParam( L, 1, nParentId)
+    INTVECTOR vLineIds ;
+    LuaCheckParam( L, 2, vLineIds) ;
+    Point3d ptDim ;
+    LuaCheckParam( L, 3, ptDim) ;
+    string sText ;
+    LuaCheckParam( L, 4, sText) ;
+    int nRefType = RTY_DEFAULT ;
+    LuaGetParam( L, 5, nRefType) ;
+    LuaClearStack( L ) ;
+   // creo la quota allineata
+    int nId = ExeCreateAngularDimensionFromLines( nParentId, vLineIds, ptDim, sText, nRefType) ;
+   // restituisco il risultato
+    if ( nId != GDB_ID_NULL)
+        LuaSetParam( L, nId) ;
+    else
+        LuaSetParam( L ) ;
+    return 1 ;
+}
+
+//-------------------------------------------------------------------------------
+static int
+LuaCreateAngularDimensionFromArc( lua_State* L)
+{
+   // 4 o 5 parametri : nParentId, nCrvId, ptDim, Text [, nRefType]
+    int nParentId ;
+    LuaCheckParam( L, 1, nParentId)
+    int nCrvId ;
+    LuaCheckParam( L, 2, nCrvId) ;
+    Point3d ptDim ;
+    LuaCheckParam( L, 3, ptDim) ;
+    string sText ;
+    LuaCheckParam( L, 4, sText) ;
+    int nRefType = RTY_DEFAULT ;
+    LuaGetParam( L, 5, nRefType) ;
+    LuaClearStack( L) ;
+   // creo la quota allineata
+    int nId = ExeCreateAngularDimensionFromArc( nParentId, nCrvId, ptDim, sText, nRefType) ;
+   // restituisco il risultato
+    if ( nId != GDB_ID_NULL)
+        LuaSetParam( L, nId) ;
+    else
+        LuaSetParam( L) ;
+    return 1 ;
+}
+
 //-------------------------------------------------------------------------------
 bool
 LuaInstallGdbCreate( LuaMgr& luaMgr)
@@ -361,5 +495,10 @@ LuaInstallGdbCreate( LuaMgr& luaMgr)
    bOk = bOk && luaMgr.RegisterFunction( "EgtHorizontalDimension", LuaCreateHorizontalDimension) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtVerticalDimension", LuaCreateVerticalDimension) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtAlignedDimension", LuaCreateAlignedDimension) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtRadialDimension", LuaCreateRadialDimension) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtDiametralDimension", LuaCreateDiametralDimension) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtAngularDimension", LuaCreateAngularDimension);
+   bOk = bOk && luaMgr.RegisterFunction( "EgtAngularDimensionFromLines", LuaCreateAngularDimensionFromLines) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtAngularDimensionFromArc", LuaCreateAngularDimensionFromArc) ;
    return bOk ;
 }

LUA_GdbCreateCurve.cpp

@@ -425,6 +425,32 @@ LuaCreateArc3P( lua_State* L)
    return 1 ;
 }
 
+//-------------------------------------------------------------------------------
+static int
+LuaCreateArc2PB( lua_State* L)
+{
+  // 4 o 5 parametri : ParentId, PtStart, PtEnd, dBulge [, nRefType]
+   int nParentId ;
+   LuaCheckParam( L, 1, nParentId)
+   Point3d ptStart ;
+   LuaCheckParam( L, 2, ptStart)
+   Point3d ptEnd ;
+   LuaCheckParam( L, 3, ptEnd)
+   double dBulge ;
+   LuaCheckParam( L, 4, dBulge)
+   int nRefType = RTY_DEFAULT ;
+   LuaGetParam( L, 5, nRefType) ;
+   LuaClearStack( L) ;
+  // creo l'arco
+   int nId = ExeCreateArc2PB( nParentId, ptStart, ptEnd, dBulge, nRefType) ;
+  // restituisco il risultato
+   if ( nId != GDB_ID_NULL)
+      LuaSetParam( L, nId) ;
+   else
+      LuaSetParam( L) ;
+   return 1 ;
+}
+
 //-------------------------------------------------------------------------------
 static int
 LuaCreateArc2PD( lua_State* L)
@@ -1057,6 +1083,7 @@ LuaInstallGdbCreateCurve( LuaMgr& luaMgr)
    bOk = bOk && luaMgr.RegisterFunction( "EgtArcC2P", LuaCreateArcC2P) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtArcC2PEx", LuaCreateArcC2PEx) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtArc3P", LuaCreateArc3P) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtArc2PB", LuaCreateArc2PB) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtArc2PD", LuaCreateArc2PD) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtArc2PDEx", LuaCreateArc2PDEx) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtArc2PV", LuaCreateArc2PV) ;

LUA_GdbCreateSurf.cpp

@@ -14,6 +14,7 @@
 //--------------------------- Include ----------------------------------------
 #include "stdafx.h"
 #include "LUA.h"
+#include "EXE_Const.h"
 #include "/EgtDev/Include/EXeExecutor.h"
 #include "/EgtDev/Include/EXeConst.h"
 #include "/EgtDev/Include/EGkLuaAux.h"
@@ -22,9 +23,6 @@
 
 using namespace std ;
 
-//-------------------------------------------------------------------------------
-static const double LIN_TOL_DEF = 0.05 ;
-
 //-------------------------------------------------------------------------------
 static int
 LuaCreateSurfFrRectangle( lua_State* L)
@@ -149,7 +147,7 @@ LuaCreateSurfFlatRegion( lua_State* L)
 static int
 LuaCreateSurfFrFatCurve( lua_State* L)
 {
-  // 4 parametri : ParentId, nCrvId, dRad, bSquared
+  // 4 o 5 o 6 parametri : ParentId, nCrvId, dRad, bSquared [, bSquaredMids] [, dLinTol]
    int nParentId ;
    LuaCheckParam( L, 1, nParentId)
    int nCrvId ;
@@ -158,9 +156,13 @@ LuaCreateSurfFrFatCurve( lua_State* L)
    LuaCheckParam( L, 3, dRad)
    bool bSquared ;
    LuaCheckParam( L, 4, bSquared)
+   bool bSquaredMids = bSquared ;
+   LuaGetParam( L, 5, bSquaredMids) ;
+   double dLinTol = 10 * EPS_SMALL ;
+   LuaGetParam( L, 6, dLinTol) ;
    LuaClearStack( L) ;
   // creo una regione piana
-   int nId = ExeCreateSurfFrFatCurve( nParentId, nCrvId, dRad, bSquared) ;
+   int nId = ExeCreateSurfFrFatCurve( nParentId, nCrvId, dRad, bSquared, bSquaredMids, dLinTol) ;
   // restituisco il risultato
    if ( nId != GDB_ID_NULL)
       LuaSetParam( L, nId) ;
@@ -320,7 +322,7 @@ LuaCreateSurfTmCylinder( lua_State* L)
    LuaCheckParam( L, 4, dRad)
    double dHeight ;
    LuaCheckParam( L, 5, dHeight)
-   double dLinTol = LIN_TOL_DEF ;
+   double dLinTol = LIN_TOL_SRF ;
    int nRefType = RTY_DEFAULT ;
    if ( LuaGetParam( L, 6, dLinTol))
       LuaGetParam( L, 7, nRefType) ;
@@ -352,7 +354,7 @@ LuaCreateSurfTmCone( lua_State* L)
    LuaCheckParam( L, 4, dRad)
    double dHeight ;
    LuaCheckParam( L, 5, dHeight)
-   double dLinTol = LIN_TOL_DEF ;
+   double dLinTol = LIN_TOL_SRF ;
    int nRefType = RTY_DEFAULT ;
    if ( LuaGetParam( L, 6, dLinTol))
       LuaGetParam( L, 7, nRefType) ;
@@ -380,14 +382,14 @@ LuaCreateSurfTmSphere( lua_State* L)
    LuaCheckParam( L, 2, ptOrig)
    double dRad ;
    LuaCheckParam( L, 3, dRad)
-   double dLinTol = LIN_TOL_DEF ;
+   double dLinTol = LIN_TOL_SRF ;
    int nRefType = RTY_DEFAULT ;
    if ( LuaGetParam( L, 4, dLinTol))
       LuaGetParam( L, 5, nRefType) ;
    else
       LuaGetParam( L, 4, nRefType) ;
    LuaClearStack( L) ;
-  // creo STM cilindro
+  // creo STM sfera
    int nId = ExeCreateSurfTmSphere( nParentId, ptOrig, dRad, dLinTol, nRefType) ;
   // restituisco il risultato
    if ( nId != GDB_ID_NULL)
@@ -397,6 +399,58 @@ LuaCreateSurfTmSphere( lua_State* L)
    return 1 ;
 }
 
+//-------------------------------------------------------------------------------
+static int
+LuaCreateSurfTmTriangle( lua_State* L)
+{
+  // 4 o 5 parametri : ParentId, PtP1, PtP2, PtP3 [, nRefType]
+   int nParentId ;
+   LuaCheckParam( L, 1, nParentId)
+   Point3d PtP1 ;
+   LuaCheckParam( L, 2, PtP1)
+   Point3d PtP2 ;
+   LuaCheckParam( L, 3, PtP2)
+   Point3d PtP3 ;
+   LuaCheckParam( L, 4, PtP3)
+   int nRefType = RTY_DEFAULT ;
+   LuaGetParam( L, 5, nRefType) ;
+   LuaClearStack( L) ;
+  // creo STM triangolo
+   int nId = ExeCreateSurfTmTriangle( nParentId, PtP1, PtP2, PtP3, nRefType) ;
+  // restituisco il risultato
+   if ( nId != GDB_ID_NULL)
+      LuaSetParam( L, nId) ;
+   else
+      LuaSetParam( L) ;
+   return 1 ;
+}
+
+//-------------------------------------------------------------------------------
+static int
+LuaCreateSurfTmRectangle( lua_State* L)
+{
+  // 4 o 5 parametri : ParentId, PtO, PtL, PtT [, nRefType]
+   int nParentId ;
+   LuaCheckParam( L, 1, nParentId)
+   Point3d ptO ;
+   LuaCheckParam( L, 2, ptO)
+   Point3d ptL ;
+   LuaCheckParam( L, 3, ptL)
+   Point3d ptT ;
+   LuaCheckParam( L, 4, ptT)
+   int nRefType = RTY_DEFAULT ;
+   LuaGetParam( L, 5, nRefType) ;
+   LuaClearStack( L) ;
+  // creo STM rettangolo
+   int nId = ExeCreateSurfTmRectangle( nParentId, ptO, ptL, ptT, nRefType) ;
+  // restituisco il risultato
+   if ( nId != GDB_ID_NULL)
+      LuaSetParam( L, nId) ;
+   else
+      LuaSetParam( L) ;
+   return 1 ;
+}
+
 //-------------------------------------------------------------------------------
 static int
 LuaCreateSurfTmByFlatContour( lua_State* L)
@@ -406,7 +460,7 @@ LuaCreateSurfTmByFlatContour( lua_State* L)
    LuaCheckParam( L, 1, nParentId)
    int nCrvId ;
    LuaCheckParam( L, 2, nCrvId)
-   double dLinTol = LIN_TOL_DEF ;
+   double dLinTol = LIN_TOL_SRF ;
    if ( lua_gettop( L) >= 3)
       LuaCheckParam( L, 3, dLinTol) ;
    LuaClearStack( L) ;
@@ -429,7 +483,7 @@ LuaCreateSurfTmByRegion( lua_State* L)
    LuaCheckParam( L, 1, nParentId)
    INTVECTOR vCrvIds ;
    LuaCheckParam( L, 2, vCrvIds)
-   double dLinTol = LIN_TOL_DEF ;
+   double dLinTol = LIN_TOL_SRF ;
    if ( lua_gettop( L) >= 3)
       LuaCheckParam( L, 3, dLinTol) ;
    LuaClearStack( L) ;
@@ -454,7 +508,7 @@ LuaCreateSurfTmByExtrusion( lua_State* L)
    LuaCheckParam( L, 2, vCrvIds)
    Vector3d vtExtr ;
    LuaCheckParam( L, 3, vtExtr)
-   double dLinTol = LIN_TOL_DEF ;
+   double dLinTol = LIN_TOL_SRF ;
    int nRefType = RTY_DEFAULT ;
    if ( LuaGetParam( L, 4, dLinTol))
       LuaGetParam( L, 5, nRefType) ;
@@ -483,7 +537,7 @@ LuaCreateSurfTmByRegionExtrusion( lua_State* L)
    LuaCheckParam( L, 2, vCrvIds)
    Vector3d vtExtr ;
    LuaCheckParam( L, 3, vtExtr)
-   double dLinTol = LIN_TOL_DEF ;
+   double dLinTol = LIN_TOL_SRF ;
    int nRefType = RTY_DEFAULT ;
    if ( LuaGetParam( L, 4, dLinTol))
       LuaGetParam( L, 5, nRefType) ;
@@ -515,7 +569,7 @@ LuaCreateSurfTmByRevolve( lua_State* L)
    LuaCheckParam( L, 4, vtAx)
    bool bCapEnds ;
    LuaCheckParam( L, 5, bCapEnds)
-   double dLinTol = LIN_TOL_DEF ;
+   double dLinTol = LIN_TOL_SRF ;
    int nRefType = RTY_DEFAULT ;
    if ( LuaGetParam( L, 6, dLinTol))
       LuaGetParam( L, 7, nRefType) ;
@@ -553,7 +607,7 @@ LuaCreateSurfTmByScrewing( lua_State* L)
    bool bCapEnds = false ;
    if ( LuaGetParam( L, nPar, bCapEnds))
       ++ nPar ;
-   double dLinTol = LIN_TOL_DEF ;
+   double dLinTol = LIN_TOL_SRF ;
    if ( LuaGetParam( L, nPar, dLinTol))
       ++ nPar ;
    int nRefType = RTY_DEFAULT ;
@@ -570,6 +624,38 @@ LuaCreateSurfTmByScrewing( lua_State* L)
    return 1 ;
 }
 
+//-------------------------------------------------------------------------------
+static int
+LuaCreateSurfTmRectSwept( lua_State* L)
+{
+  // 7 o 8 parametri : ParentId, dDimH, dDimV, dBevelH, dBevelV, GuideId, nCapType [, dTol]
+   int nParentId ;
+   LuaCheckParam( L, 1, nParentId)
+   double dDimH ;
+   LuaCheckParam( L, 2, dDimH)
+   double dDimV ;
+   LuaCheckParam( L, 3, dDimV)
+   double dBevelH ;
+   LuaCheckParam( L, 4, dBevelH)
+   double dBevelV ;
+   LuaCheckParam( L, 5, dBevelV)
+   int nGuideId ;
+   LuaCheckParam( L, 6, nGuideId)
+   int nCapType ;
+   LuaCheckParam( L, 7, nCapType)
+   double dLinTol = LIN_TOL_SRF ;
+   LuaGetParam( L, 8, dLinTol) ;
+   LuaClearStack( L) ;
+  // creo STM rectangular swept
+   int nId = ExeCreateSurfTmRectSwept( nParentId, dDimH, dDimV, dBevelH, dBevelV, nGuideId, nCapType, dLinTol) ;
+  // restituisco il risultato
+   if ( nId != GDB_ID_NULL)
+      LuaSetParam( L, nId) ;
+   else
+      LuaSetParam( L) ;
+   return 1 ;
+}
+
 //-------------------------------------------------------------------------------
 static int
 LuaCreateSurfTmSwept( lua_State* L)
@@ -583,9 +669,8 @@ LuaCreateSurfTmSwept( lua_State* L)
    LuaCheckParam( L, 3, nGuideId)
    bool bCapEnds ;
    LuaCheckParam( L, 4, bCapEnds)
-   double dLinTol = LIN_TOL_DEF ;
-   if ( lua_gettop( L) >= 5)
-      LuaCheckParam( L, 5, dLinTol) ;
+   double dLinTol = LIN_TOL_SRF ;
+   LuaGetParam( L, 5, dLinTol) ;
    LuaClearStack( L) ;
   // creo STM swept
    int nId = ExeCreateSurfTmSwept( nParentId, nSectId, nGuideId, bCapEnds, dLinTol) ;
@@ -609,7 +694,7 @@ LuaCreateSurfTmRuled( lua_State* L)
    int nPtOrCrvId2 ;
    LuaCheckParam( L, 3, nPtOrCrvId2)
    string sType = "IP" ;
-   double dLinTol = LIN_TOL_DEF ;
+   double dLinTol = LIN_TOL_SRF ;
    if ( LuaGetParam( L, 4, sType))
       LuaGetParam( L, 5, dLinTol) ;
    else
@@ -787,6 +872,37 @@ LuaCreateSurfBezierRational( lua_State* L)
    return 1 ;
 }
 
+//-------------------------------------------------------------------------------
+static int
+LuaCreateSurfBezierLeaves( lua_State* L)
+{
+   // 2, 3 o 4 parametri : ParentId, nId [, nTextHeight] [, bShowTrim]
+   int nParentId ;
+   LuaCheckParam( L, 1, nParentId)
+   int nSurfBzId ;
+   LuaCheckParam( L, 2, nSurfBzId)
+   int nTextHeight = 50 ;
+   bool bShowTrim = false ;
+   if ( LuaGetParam( L, 3, nTextHeight))
+      LuaGetParam( L, 4, bShowTrim) ;
+   else
+      LuaGetParam( L, 3, bShowTrim) ;
+   LuaClearStack( L) ;
+   // creo la superficie
+   int nCount = 0 ;
+   int nId = ExeCreateSurfBezierLeaves( nParentId, nSurfBzId, nTextHeight, bShowTrim, &nCount) ;
+   // restituisco il risultato
+   if ( nId != GDB_ID_NULL) {
+      LuaSetParam( L, nId) ;
+      LuaSetParam( L, nCount) ;  
+   }
+   else {
+      LuaSetParam( L) ;
+      LuaSetParam( L) ;
+   }
+   return 2 ;
+}
+
 //-------------------------------------------------------------------------------
 bool
 LuaInstallGdbCreateSurf( LuaMgr& luaMgr)
@@ -806,12 +922,15 @@ LuaInstallGdbCreateSurf( LuaMgr& luaMgr)
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmCylinder", LuaCreateSurfTmCylinder) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmCone", LuaCreateSurfTmCone) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmSphere", LuaCreateSurfTmSphere) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmTriangle", LuaCreateSurfTmTriangle) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmRectangle", LuaCreateSurfTmRectangle) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmByFlatContour", LuaCreateSurfTmByFlatContour) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmByRegion", LuaCreateSurfTmByRegion) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmByExtrusion", LuaCreateSurfTmByExtrusion) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmByRegionExtrusion", LuaCreateSurfTmByRegionExtrusion) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmByRevolve", LuaCreateSurfTmByRevolve) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmByScrewing", LuaCreateSurfTmByScrewing) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmRectSwept", LuaCreateSurfTmRectSwept) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmSwept", LuaCreateSurfTmSwept) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmRuled", LuaCreateSurfTmRuled) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmByTriangles", LuaCreateSurfTmByTriangles) ;
@@ -820,5 +939,6 @@ LuaInstallGdbCreateSurf( LuaMgr& luaMgr)
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmByVolZmap", LuaCreateSurfTmByVolZmap) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfBezier", LuaCreateSurfBezier) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfBezierRat", LuaCreateSurfBezierRational) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtSurfBezierLeaves", LuaCreateSurfBezierLeaves) ;
    return bOk ;
 }

LUA_GdbGetCurve.cpp

@@ -432,6 +432,25 @@ LuaArcNormVersor( lua_State* L)
    return 1 ;
 }
 
+//----------------------------------------------------------------------------
+static int
+LuaCurveCompoLength( lua_State* L)
+{
+  // 2 parametri : Id, nCrv
+   int nId ;
+   LuaCheckParam( L, 1, nId)
+   int nCrv ;
+   LuaCheckParam( L, 2, nCrv)
+   LuaClearStack( L) ;
+  // recupero il centro della curva semplice indicizzata
+   double dLen ;
+   if ( ExeCurveCompoLength( nId, nCrv, dLen))
+      LuaSetParam( L, dLen) ;
+   else
+      LuaSetParam( L) ;
+   return 1 ;
+}
+
 //----------------------------------------------------------------------------
 static int
 LuaCurveCompoCenter( lua_State* L)
@@ -538,6 +557,7 @@ LuaInstallGdbGetCurve( LuaMgr& luaMgr)
    bOk = bOk && luaMgr.RegisterFunction( "EgtArcAngCenter", LuaArcAngCenter) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtArcDeltaN", LuaArcDeltaN) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtArcNormVersor", LuaArcNormVersor) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtCurveCompoLength", LuaCurveCompoLength) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtCurveCompoCenter", LuaCurveCompoCenter) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtCurveCompoRadius", LuaCurveCompoRadius) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtCurveCompoAngCenter", LuaCurveCompoAngCenter) ;

LUA_GdbGetPocketing.cpp

@@ -0,0 +1,90 @@
+//----------------------------------------------------------------------------
+//  EgalTech 2023-2023
+//----------------------------------------------------------------------------
+// File : LUA_GdbGetPocketing.cpp       Data : 28.11.23        Versione : 2.5k6
+// Contenuto : Funzioni di creazione percorsi di svuotatura o infill per LUA.
+//
+//
+//
+// Modifiche : 29.11.23 RE Creazione modulo.
+//
+//
+//----------------------------------------------------------------------------
+
+//--------------------------- Include ----------------------------------------
+#include "stdafx.h"
+#include "LUA.h"
+#include "/EgtDev/Include/EXeExecutor.h"
+
+using namespace std ;
+
+//----------------------------------------------------------------------------
+static int
+LuaPocketing( lua_State* L) {
+  // 7 parametri : vId, dRad, dStep, dAngle, nType, bSmooth, nDestGrpId
+   int nId ;
+   LuaCheckParam( L, 1, nId) ;
+   double dRad ;
+   LuaCheckParam( L, 2, dRad) ;
+   double dStep ;
+   LuaCheckParam( L, 3, dStep) ;
+   double dAngle ;
+   LuaCheckParam( L, 4, dAngle) ;
+   int nType ;
+   LuaCheckParam( L, 5, nType) ;
+   bool bSmooth ;
+   LuaCheckParam( L, 6, bSmooth) ;
+   int nDestGrpId ;
+   LuaCheckParam( L, 7, nDestGrpId) ;
+   LuaClearStack( L) ;
+  // calcolo delle curve elementari di svuotatura
+   int nFirstId = GDB_ID_NULL ;
+   int nCrvCount = 0 ;
+   bool bOk = ExePocketing( nId, dRad, dStep, dAngle, nType, bSmooth, nDestGrpId, nFirstId, nCrvCount) ;
+   if ( ! bOk)
+      LuaSetParam( L) ;
+   else
+      LuaSetParam( L, nFirstId) ;
+   LuaSetParam( L, nCrvCount) ;
+   return 2 ;
+}
+
+//----------------------------------------------------------------------------
+static int
+LuaSurfFrGetZigZagInfill( lua_State* L)
+{
+  // 6 parametri : nId, nDestGrpId, dSideStep, dAng, bSmooth, bRemoveOverlapLink
+   int nId ;
+   LuaCheckParam( L, 1, nId)
+   int nDestGrpId ;
+   LuaCheckParam( L, 2, nDestGrpId)
+   double dStep ;
+   LuaCheckParam( L, 3, dStep)
+   double dAng ;
+   LuaCheckParam( L, 4, dAng) ;
+   bool bSmooth ;
+   LuaCheckParam( L, 5, bSmooth) ;
+   bool bRemoveOverlapLink ;
+   LuaCheckParam( L, 6, bRemoveOverlapLink) ;
+   LuaClearStack( L) ;
+  // recupero i contorni della superficie
+   int nCount = 0 ;
+   int nNewId = ExeSurfFrGetZigZagInfill( nId, nDestGrpId, dStep, dAng, bSmooth, bRemoveOverlapLink, &nCount) ;
+  // restituisco il risultato
+   if ( nNewId != GDB_ID_NULL)
+      LuaSetParam( L, nNewId) ;
+   else
+      LuaSetParam( L) ;
+   LuaSetParam( L, nCount) ;
+   return 2 ;
+}
+
+//-------------------------------------------------------------------------------
+bool
+LuaInstallGdbGetPocketing( LuaMgr& luaMgr)
+{
+   bool bOk = ( &luaMgr != nullptr) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtPocketing", LuaPocketing) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtGetSurfFrZigZagInfill", LuaSurfFrGetZigZagInfill) ;
+   return bOk ;
+}

LUA_GdbGetSurf.cpp

@@ -40,6 +40,20 @@ LuaSurfArea( lua_State* L)
    return 1 ;
 }
 
+//----------------------------------------------------------------------------
+static int
+LuaSurfIsClosed( lua_State* L)
+{
+  // 1 parametro : Id
+   int nId ;
+   LuaCheckParam( L, 1, nId)
+   LuaClearStack( L) ;
+  // verifico se è superficie chiusa
+   bool bOk = ExeSurfIsClosed( nId) ;
+   LuaSetParam( L, bOk) ;
+   return 1 ;
+}
+
 //----------------------------------------------------------------------------
 static int
 LuaSurfVolume( lua_State* L)
@@ -223,35 +237,18 @@ LuaSurfFrRotateSimpleNoCollision( lua_State* L)
    return 1 ;
 }
 
-
 //----------------------------------------------------------------------------
 static int
-LuaSurfFrGetZigZagInfill( lua_State* L)
+LuaSurfTmVertexCount( lua_State* L)
 {
-  // 6 parametri : nId, nDestGrpId, dSideStep, dAng, bAllowStepCorrection, bInvert 
+  // 1 parametro : Id
    int nId ;
    LuaCheckParam( L, 1, nId)
-   int nDestGrpId ;
-   LuaCheckParam( L, 2, nDestGrpId)
-   double dStep ;
-   LuaCheckParam( L, 3, dStep)
-   double dAng ;
-   LuaCheckParam( L, 4, dAng) ;
-   bool bStepCorrection ;
-   LuaCheckParam( L, 5, bStepCorrection)
-   bool bInvert ;
-   LuaCheckParam( L, 6, bInvert)
    LuaClearStack( L) ;
-  // recupero i contorni della superficie
-   int nCount = 0 ;
-   int nNewId = ExeSurfFrGetZigZagInfill( nId, nDestGrpId, dStep, dAng, bStepCorrection, bInvert, &nCount) ;
-  // restituisco il risultato
-   if ( nNewId != GDB_ID_NULL)
-      LuaSetParam( L, nNewId) ;
-   else
-      LuaSetParam( L) ;
-   LuaSetParam( L, nCount) ;
-   return 2 ;
+  // recupero il numero di vertici della superficie trimesh
+   int nNbr = ExeSurfTmVertexCount( nId) ;
+   LuaSetParam( L, nNbr) ;
+   return 1 ;
 }
 
 //----------------------------------------------------------------------------
@@ -268,6 +265,72 @@ LuaSurfTmFacetCount( lua_State* L)
    return 1 ;
 }
 
+//----------------------------------------------------------------------------
+static int
+LuaSurfTmPartCount( lua_State* L)
+{
+  // 1 parametro : Id
+   int nId ;
+   LuaCheckParam( L, 1, nId)
+   LuaClearStack( L) ;
+  // recupero il numero di parti della superficie trimesh
+   int nParts = ExeSurfTmPartCount( nId) ;
+   if ( nParts >= 0)
+      LuaSetParam( L, nParts) ;
+   else
+      LuaSetParam( L) ;
+   return 1 ;
+}
+
+//----------------------------------------------------------------------------
+static int
+LuaSurfTmGetVertex( lua_State* L)
+{
+  // 2 o 3 parametri : Id, nVert, [, nRefId]
+   int nId ;
+   LuaCheckParam( L, 1, nId)
+   int nVert ;
+   LuaCheckParam( L, 2, nVert)
+   int nRefId = nId ;
+   LuaGetParam( L, 3, nRefId) ;
+   LuaClearStack( L) ;
+  // recupero il vertice di indice dato (0-based)
+   Point3d ptVert ;
+   bool bOk = ExeSurfTmGetVertex( nId, nVert, nRefId, ptVert) ;
+   if ( bOk)
+      LuaSetParam( L, ptVert) ;
+   else
+      LuaSetParam( L) ;
+   return 1 ;
+}
+
+//----------------------------------------------------------------------------
+static int
+LuaSurfTmGetNearestVertex( lua_State* L)
+{
+  // 2 o 3 parametri : Id, ptNear [, nRefId]
+   int nId ;
+   LuaCheckParam( L, 1, nId)
+   Point3d ptNear ;
+   LuaCheckParam( L, 2, ptNear)
+   int nRefId = nId ;
+   LuaGetParam( L, 3, nRefId) ;
+   LuaClearStack( L) ;
+  // recupero il vertice più vicino della superficie
+   int nVert ;
+   Point3d ptVert ;
+   bool bOk = ExeSurfTmGetNearestVertex( nId, ptNear, nRefId, nVert, ptVert) ;
+   if ( bOk) {
+      LuaSetParam( L, nVert) ;
+      LuaSetParam( L, ptVert) ;
+   }
+   else {
+      LuaSetParam( L) ;
+      LuaSetParam( L) ;
+   }
+   return 2 ;
+}
+
 //----------------------------------------------------------------------------
 static int
 LuaSurfTmFacetFromTria( lua_State* L)
@@ -288,6 +351,27 @@ LuaSurfTmFacetFromTria( lua_State* L)
    return 1 ;
 }
 
+//----------------------------------------------------------------------------
+static int
+LuaSurfTmGetAllVertInFacet( lua_State* L)
+{
+  // 2 parametri : nId, nFacet
+   int nId ;
+   LuaCheckParam( L, 1, nId)
+   int nFacet ;
+   LuaCheckParam( L, 2, nFacet)
+   LuaClearStack( L) ;
+  // recupero l'elenco dei vertici nella faccia
+   INTVECTOR vVert ;
+   bool bOk = ExeSurfTmGetAllVertInFacet( nId, nFacet, vVert) ;
+  // restituisco il risultato
+   if ( bOk)
+      LuaSetParam( L, vVert) ;
+   else
+      LuaSetParam( L) ;
+   return 1 ;
+}
+
 //----------------------------------------------------------------------------
 static int
 LuaSurfTmGetFacetBBox( lua_State* L)
@@ -510,6 +594,58 @@ LuaSurfTmFacetMinAreaRectangle( lua_State* L)
    }
 }
 
+//----------------------------------------------------------------------------
+static int
+LuaSurfTmFacetElevationInBBox( lua_State* L)
+{
+  // 3 o 4 o 5 parametri : Id, nFacet, b3Box [, bAcceptOutFacet] [, nRefId]
+   int nId ;
+   LuaCheckParam( L, 1, nId)
+   int nFacet ;
+   LuaCheckParam( L, 2, nFacet)
+   BBox3d b3Box ;
+   LuaCheckParam( L, 3, b3Box)
+   bool bAcceptOutFacet = false ;
+   int nRefId = nId ;
+   if ( ! LuaGetParam( L, 4, nRefId)) {
+      LuaGetParam( L, 4, bAcceptOutFacet) ;
+      LuaGetParam( L, 5, nRefId) ;
+   }
+   LuaClearStack( L) ;
+  // calcolo elevazione
+   double dElev ;
+   bool bOk = ExeSurfTmFacetElevationInBBox( nId, nFacet, b3Box, bAcceptOutFacet, nRefId, dElev) ;
+   if ( bOk)
+      LuaSetParam( L, dElev) ;
+   else
+      LuaSetParam( L) ;
+   return 1 ;
+}
+
+//----------------------------------------------------------------------------
+static int
+LuaSurfTmFacetElevationInClosedSurfTm( lua_State* L)
+{
+  // 3 o 4 parametri : nFacetStmId, nFacet, nClosedStmId [, bAcceptOutFacet]
+   int nFacetStmId ;
+   LuaCheckParam( L, 1, nFacetStmId)
+   int nFacet ;
+   LuaCheckParam( L, 2, nFacet)
+   int nClosedStmId ;
+   LuaCheckParam( L, 3, nClosedStmId)
+   bool bAcceptOutFacet = false ;
+   LuaGetParam( L, 4, bAcceptOutFacet) ;
+   LuaClearStack( L) ;
+  // calcolo elevazione
+   double dElev ;
+   bool bOk = ExeSurfTmFacetElevationInClosedSurfTm( nFacetStmId, nFacet, nClosedStmId, bAcceptOutFacet, dElev) ;
+   if ( bOk)
+      LuaSetParam( L, dElev) ;
+   else
+      LuaSetParam( L) ;
+   return 1 ;
+}
+
 //----------------------------------------------------------------------------
 static int
 LuaSurfTmFacetOppositeSide( lua_State* L)
@@ -608,7 +744,7 @@ LuaExtractSurfTmLoops( lua_State* L)
 static int
 LuaGetSurfTmSilhouette( lua_State* L)
 {
-  // 4 o 5 parametri : nId, vtDir, dToler, nDestGrpId [, nRefType]
+  // 4 o 5 o 6 parametri : nId, vtDir, dToler, nDestGrpId [, nRefType [, bAllTria]]
    int nId ;
    LuaCheckParam( L, 1, nId)
    Vector3d vtDir ;
@@ -618,11 +754,15 @@ LuaGetSurfTmSilhouette( lua_State* L)
    int nDestGrpId ;
    LuaCheckParam( L, 4, nDestGrpId)
    int nRefType = RTY_DEFAULT ;
-   LuaGetParam( L, 5, nRefType) ;
+   bool bAllTria = false ;
+   if ( LuaGetParam( L, 5, nRefType))
+      LuaGetParam( L, 6, bAllTria) ;
+   else
+      LuaGetParam( L, 5, bAllTria) ;
    LuaClearStack( L) ;
   // recupero i contorni della superficie
    int nCount = 0 ;
-   int nNewId = ExeGetSurfTmSilhouette( nId, vtDir, dToler, nDestGrpId, nRefType, &nCount) ;
+   int nNewId = ExeGetSurfTmSilhouette( nId, vtDir, dToler, nDestGrpId, nRefType, &nCount, bAllTria) ;
   // restituisco il risultato
    if ( nNewId != GDB_ID_NULL)
       LuaSetParam( L, nNewId) ;
@@ -678,6 +818,33 @@ LuaCopySurfTmFacet( lua_State* L)
    return 1 ;
 }
 
+//----------------------------------------------------------------------------
+static int
+LuaSurfTmGetEdges( lua_State* L)
+{
+  // 2 o 3 parametri : nId, nDestGrpId [, bSmoothAng]
+   int nId ;
+   LuaCheckParam( L, 1, nId)
+   int nDestGrpId ;
+   LuaCheckParam( L, 2, nDestGrpId)
+   bool bSmoothAng = true ;
+   LuaGetParam( L, 3, bSmoothAng) ;
+   LuaClearStack( L) ;
+  // calcolo gli spigoli della superficie
+   int nCount ;
+   int nFirstId = ExeSurfTmGetEdges( nId, nDestGrpId, bSmoothAng, &nCount) ;
+  // restituisco il risultato
+   if ( nFirstId != GDB_ID_NULL  ||  nCount != -1) {
+      LuaSetParam( L, nFirstId) ;
+      LuaSetParam( L, nCount) ;
+   }
+   else {
+      LuaSetParam( L) ;
+      LuaSetParam( L) ;
+   }
+   return 2 ;
+}
+
 //----------------------------------------------------------------------------
 static int
 LuaSurfBezierGetPoint( lua_State* L)
@@ -919,6 +1086,7 @@ LuaInstallGdbGetSurf( LuaMgr& luaMgr)
 {
    bool bOk = ( &luaMgr != nullptr) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfArea", LuaSurfArea) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtSurfIsClosed", LuaSurfIsClosed) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfVolume", LuaSurfVolume) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfFrNormVersor", LuaSurfFrNormVersor) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfFrGrossArea", LuaSurfFrGrossArea) ;
@@ -928,9 +1096,13 @@ LuaInstallGdbGetSurf( LuaMgr& luaMgr)
    bOk = bOk && luaMgr.RegisterFunction( "EgtExtractSurfFrChunkLoops", LuaExtractSurfFrChunkLoops) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfFrMoveSimpleNoCollision", LuaSurfFrMoveSimpleNoCollision) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfFrRotateSimpleNoCollision", LuaSurfFrRotateSimpleNoCollision) ;
-   bOk = bOk && luaMgr.RegisterFunction( "EgtGetSurfFrZigZagInfill", LuaSurfFrGetZigZagInfill) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmVertexCount", LuaSurfTmVertexCount) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmFacetCount", LuaSurfTmFacetCount) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmPartCount", LuaSurfTmPartCount) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmGetVertex", LuaSurfTmGetVertex) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmGetNearestVertex", LuaSurfTmGetNearestVertex) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmFacetFromTria", LuaSurfTmFacetFromTria) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmGetAllVertInFacet", LuaSurfTmGetAllVertInFacet) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmGetFacetBBox", LuaSurfTmGetFacetBBox) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmGetFacetBBoxGlob", LuaSurfTmGetFacetBBoxGlob) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmGetFacetBBoxRef", LuaSurfTmGetFacetBBoxRef) ;
@@ -940,12 +1112,15 @@ LuaInstallGdbGetSurf( LuaMgr& luaMgr)
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmFacetCenter", LuaSurfTmFacetCenter) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmFacetNormVersor", LuaSurfTmFacetNormVersor) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmFacetMinAreaRectangle", LuaSurfTmFacetMinAreaRectangle) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmFacetElevationInBBox", LuaSurfTmFacetElevationInBBox) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmFacetElevationInClosedSurfTm", LuaSurfTmFacetElevationInClosedSurfTm) ;  
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmFacetOppositeSide", LuaSurfTmFacetOppositeSide) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmFacetsContact", LuaSurfTmFacetsContact) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtExtractSurfTmLoops", LuaExtractSurfTmLoops) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtGetSurfTmSilhouette", LuaGetSurfTmSilhouette) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtExtractSurfTmFacetLoops", LuaExtractSurfTmFacetLoops) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtCopySurfTmFacet", LuaCopySurfTmFacet) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmGetEdges", LuaSurfTmGetEdges) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfBezierGetPoint", LuaSurfBezierGetPoint) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfBezierGetPointD1", LuaSurfBezierGetPointD1) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfBezierGetPointNrmD1", LuaSurfBezierGetPointNrmD1) ;

LUA_GdbGetVol.cpp

@@ -211,6 +211,7 @@ LuaVolZmapGetDepth( lua_State* L)
    }
    return 2 ;
 }
+
 //----------------------------------------------------------------------------
 static int
 LuaVolZmapGetEdges( lua_State* L)
@@ -221,7 +222,7 @@ LuaVolZmapGetEdges( lua_State* L)
    int nDestGrpId ;
    LuaCheckParam( L, 2, nDestGrpId)
    LuaClearStack( L) ;
-  // eseguo calcolo profondità dal punto lungo la direzione
+  // calcolo gli spigoli del solido
    int nCount ;
    int nFirstId = ExeVolZmapGetEdges( nId, nDestGrpId, &nCount) ;
   // restituisco il risultato

LUA_GdbModifyCurve.cpp

@@ -19,6 +19,7 @@
 #include "/EgtDev/Include/EXeConst.h"
 #include "/EgtDev/Include/EGkCurve.h"
 #include "/EgtDev/Include/EGkLuaAux.h"
+#include "/EgtDev/Include/EGkCalcPocketing.h"
 
 using namespace std ;
 
@@ -59,17 +60,19 @@ LuaOffsetCurve( lua_State* L)
 static int
 LuaOffsetCurveAdv( lua_State* L)
 {
-  // 2 o 3 parametri : Id, dDist [, nType]
+  // 2 o 3 o 4 parametri : Id, dDist [, nType] [, dLinTol]
    int nId ;
    LuaCheckParam( L, 1, nId)
    double dDist ;
    LuaCheckParam( L, 2, dDist)
    int nType = ICurve::OFF_FILLET ;
    LuaGetParam( L, 3, nType) ;
+   double dLinTol = 10 * EPS_SMALL ;
+   LuaGetParam( L, 4, dLinTol) ;
    LuaClearStack( L) ;
   // offset della curva
    int nCount ;
-   int nNewId = ExeOffsetCurveAdv( nId, dDist, nType, &nCount) ;
+   int nNewId = ExeOffsetCurveAdv( nId, dDist, nType, &nCount, dLinTol) ;
    if ( nCount >= 0) {
       LuaSetParam( L, nNewId) ;
       LuaSetParam( L, nCount) ;
@@ -206,6 +209,40 @@ LuaModifyCurveEndPoint( lua_State* L)
    return 1 ;
 }
 
+//----------------------------------------------------------------------------
+static int
+LuaSpiralizeCurveAlongExtrusion( lua_State* L)
+{
+  // 2 parametri : Id, Delta
+   int nId ;
+   LuaCheckParam( L, 1, nId)
+   double dDelta ;
+   LuaCheckParam( L, 2, dDelta)
+   LuaClearStack( L) ;
+  // modifico la curva
+   bool bOk = ExeSpiralizeCurveAlongExtrusion( nId, dDelta) ;
+   LuaSetParam( L, bOk) ;
+   return 1 ;
+}
+
+//----------------------------------------------------------------------------
+static int
+LuaSpiralizeCurveAlongGuide( lua_State* L)
+{
+  // 2 o 3 parametri : Id, IdGuide, dTol
+   int nId ;
+   LuaCheckParam( L, 1, nId)
+   int nGuideId ; 
+   LuaCheckParam( L, 2, nGuideId) 
+   double dTol = 10 * EPS_SMALL ;
+   LuaGetParam( L, 3, dTol) ;
+   LuaClearStack( L) ;
+  // modifico la curva
+   bool bOk = ExeSpiralizeCurveAlongGuide( nId, nGuideId, dTol) ;
+   LuaSetParam( L, bOk) ;
+   return 1 ;
+}
+
 //----------------------------------------------------------------------------
 static int
 LuaModifyCurveExtrusion( lua_State* L)
@@ -910,6 +947,106 @@ LuaReorderCurvesInGroup( lua_State* L)
    return 1 ;
 }
 
+//----------------------------------------------------------------------------
+static int
+LuaProjectCurveOnSurfTm( lua_State* L)
+{
+  // 4, 5 o 6 parametri : nCurveId, nSurfTmId, vtDir, nDestGrpId [, dLinTol [, nRefType]]
+   int nCurveId ;
+   LuaCheckParam( L, 1, nCurveId)
+   int nSurfTmId ;
+   LuaCheckParam( L, 2, nSurfTmId)
+   Vector3d vtDir ;
+   LuaCheckParam( L, 3, vtDir)
+   int nDestGrpId ;
+   LuaCheckParam( L, 4, nDestGrpId)
+   double dLinTol = 0.01 ;
+   int nRefType = RTY_DEFAULT ;
+   if ( LuaGetParam( L, 5, dLinTol))
+      LuaGetParam( L, 6, nRefType) ;
+   LuaClearStack( L) ;
+  // proietto la curva su una trimesh secondo la direzione data
+   bool bOk = ExeProjectCurveOnSurfTm( nCurveId, nSurfTmId, vtDir, nDestGrpId, dLinTol, nRefType) ;
+   LuaSetParam( L, bOk) ;
+   return 1 ;
+}
+
+//----------------------------------------------------------------------------
+static int
+LuaCurveGetVoronoi( lua_State* L)
+{
+  // 2 o 3 parametri : Id, nDestGrpId [, nBound]
+   int nId ;
+   LuaCheckParam( L, 1, nId)
+   int nDestGrpId ;
+   LuaCheckParam( L, 2, nDestGrpId)
+   int nBound = 3 ;      // VORONOI_STD_BOUND
+   LuaGetParam( L, 3, nBound) ;
+   LuaClearStack( L) ;
+  // eseguo
+   int nCount = 0 ;
+   int nNewId = ExeCurveGetVoronoi( nId, nDestGrpId, nBound, &nCount) ;
+   if ( nNewId != GDB_ID_NULL)
+      LuaSetParam( L, nNewId) ;
+   else
+      LuaSetParam( L) ;
+   LuaSetParam( L, nCount) ;
+
+   return 2 ;
+}
+
+//----------------------------------------------------------------------------
+static int
+LuaCurveMedialAxisAdv( lua_State* L)
+{
+  // 2 o 3 parametri : Id, nDestGrpId [, nSide]
+   int nId ;
+   LuaCheckParam( L, 1, nId)
+   int nDestGrpId ;
+   LuaCheckParam( L, 2, nDestGrpId)
+   int nSide = 1 ;         // WMAT_LEFT
+   LuaGetParam( L, 3, nSide) ;
+   LuaClearStack( L) ;
+  // eseguo
+   int nCount = 0 ;
+   int nNewId = ExeCurveGetMedialAxis( nId, nDestGrpId, nSide, &nCount) ;
+   if ( nNewId != GDB_ID_NULL)
+      LuaSetParam( L, nNewId) ;
+   else
+      LuaSetParam( L) ;
+   LuaSetParam( L, nCount) ;
+
+   return 2 ;
+}
+
+//----------------------------------------------------------------------------
+static int
+LuaCurveGetFatCurve( lua_State* L)
+{
+  // 4 o 5 parametri : Id, nDestGrpId, dRad, bSquare [, bSquareMids]
+   int nId ;
+   LuaCheckParam( L, 1, nId)
+   int nDestGrpId ;
+   LuaCheckParam( L, 2, nDestGrpId)
+   double dRad ;
+   LuaCheckParam( L, 3, dRad)
+   bool bSquareEnds ;
+   LuaCheckParam( L, 4, bSquareEnds)
+   bool bSquareMids = bSquareEnds ;
+   LuaGetParam( L, 5, bSquareMids) ;
+   LuaClearStack( L) ;
+  // eseguo
+   int nCount = 0 ;
+   int nNewId = ExeCurveGetFatCurve( nId, nDestGrpId, dRad, bSquareEnds, bSquareMids, &nCount) ;
+   if ( nNewId != GDB_ID_NULL)
+      LuaSetParam( L, nNewId) ;
+   else
+      LuaSetParam( L) ;
+   LuaSetParam( L, nCount) ;
+
+   return 2 ;
+}
+
 //-------------------------------------------------------------------------------
 bool
 LuaInstallGdbModifyCurve( LuaMgr& luaMgr)
@@ -925,6 +1062,8 @@ LuaInstallGdbModifyCurve( LuaMgr& luaMgr)
    bOk = bOk && luaMgr.RegisterFunction( "EgtChangeClosedCurveStartPoint", LuaChangeClosedCurveStartPoint) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtModifyCurveStartPoint", LuaModifyCurveStartPoint) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtModifyCurveEndPoint", LuaModifyCurveEndPoint) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtSpiralizeCurveAlongExtrusion", LuaSpiralizeCurveAlongExtrusion) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtSpiralizeCurveAlongGuide", LuaSpiralizeCurveAlongGuide) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtModifyCurveExtrusion", LuaModifyCurveExtrusion) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtModifyCurveThickness", LuaModifyCurveThickness) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtTrimCurveStartAtLen", LuaTrimCurveStartAtLen) ;
@@ -963,5 +1102,9 @@ LuaInstallGdbModifyCurve( LuaMgr& luaMgr)
    bOk = bOk && luaMgr.RegisterFunction( "EgtRemoveCurveCompoUndercutOnY", LuaRemoveCurveCompoUndercutOnY) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtChainCurvesInGroup", LuaChainCurvesInGroup) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtReorderCurvesInGroup", LuaReorderCurvesInGroup) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtProjectCurveOnSurfTm", LuaProjectCurveOnSurfTm) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtCurveGetVoronoi", LuaCurveGetVoronoi) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtCurveMedialAxisAdv", LuaCurveMedialAxisAdv) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtCurveGetFatCurve", LuaCurveGetFatCurve) ;
    return bOk ;
 }

LUA_GdbModifySurf.cpp

@@ -14,6 +14,7 @@
 //--------------------------- Include ----------------------------------------
 #include "stdafx.h"
 #include "LUA.h"
+#include "EXE_Const.h"
 #include "/EgtDev/Include/EXeExecutor.h"
 #include "/EgtDev/Include/EXeConst.h"
 #include "/EgtDev/Include/EGkCurve.h"
@@ -57,6 +58,23 @@ LuaExplodeSurf( lua_State* L)
    return 2 ;
 }
 
+//-------------------------------------------------------------------------------
+static int
+LuaApproxSurf( lua_State* L)
+{
+  // 1 o 2 parametri : Id [, dLinTol]
+   int nId ;
+   LuaCheckParam( L, 1, nId)
+   double dLinTol = LIN_TOL_SRF ;
+   LuaGetParam( L, 2, dLinTol) ;
+   LuaClearStack( L) ;
+  // approssimazione della superficie
+   bool bOk = ExeApproxSurface( nId, dLinTol) ;
+  // restituisco il risultato
+   LuaSetParam( L, bOk) ;
+   return 1 ;
+}
+
 //-------------------------------------------------------------------------------
 static int
 LuaSurfFrAdd( lua_State* L)
@@ -123,6 +141,72 @@ LuaSurfFrOffset( lua_State* L)
    return 1 ;
 }
 
+//-------------------------------------------------------------------------------
+static int
+LuaSurfFrOffsetAdv( lua_State* L)
+{
+  // 3 parametri : Id, dDist, nType
+   int nId ;
+   LuaCheckParam( L, 1, nId)
+   double dDist ;
+   LuaCheckParam( L, 2, dDist)
+   int nType = ICurve::OFF_FILLET ;
+   LuaGetParam( L, 3, nType) ;
+   LuaClearStack( L) ;
+  // eseguo l'offset della regione
+   int nNewId = GDB_ID_NULL ;
+   bool bOk = ExeSurfFrOffsetAdv( nId, dDist, nType, nNewId) ;
+   if ( bOk) 
+      LuaSetParam( L, nNewId) ;
+   else
+      LuaSetParam( L) ;
+
+   return 1 ;
+}
+
+//----------------------------------------------------------------------------
+static int
+LuaSurfTmMoveVertex( lua_State* L)
+{
+  // 3 o 4 o 5 parametri : nId, nVert, ptNewVert [, nRefId] [, bUpdate]
+   int nId ;
+   LuaCheckParam( L, 1, nId)
+   int nVert ;
+   LuaCheckParam( L, 2, nVert)
+   Point3d ptNewVert ;
+   LuaCheckParam( L, 3, ptNewVert)
+   int nRefType = RTY_DEFAULT ;
+   bool bUpdate = true ;
+   if ( LuaGetParam( L, 4, nRefType))
+      LuaGetParam( L, 5, bUpdate) ;
+   else
+      LuaGetParam( L, 4, bUpdate) ;
+   LuaClearStack( L) ;
+  // sposto il vertice di indice dato della trimesh
+   bool bOk = ExeSurfTmMoveVertex( nId, nVert, ptNewVert, nRefType, bUpdate) ;
+   LuaSetParam( L, bOk) ;
+   return 1 ;
+}
+
+//----------------------------------------------------------------------------
+static int
+LuaSurfTmToTriangles( lua_State* L)
+{
+  // 1 parametro : nId
+   int nId ;
+   LuaCheckParam( L, 1, nId)
+   LuaClearStack( L) ;
+  // esplosione della trimesh in triangoli
+   int nCount ;
+   int nFirstId = ExeSurfTmToTriangles( nId, &nCount) ;
+   if ( nFirstId != GDB_ID_NULL)
+      LuaSetParam( L, nFirstId) ;
+   else
+      LuaSetParam( L) ;
+   LuaSetParam( L, nCount) ;
+   return 2 ;
+}
+
 //----------------------------------------------------------------------------
 static int
 LuaSurfTmRemoveFacet( lua_State* L)
@@ -327,6 +411,57 @@ LuaSurfTmCut( lua_State* L)
    return 1 ;
 }
 
+//-------------------------------------------------------------------------------
+static int
+LuaSurfTmSubtractProjectedFacesOnFace( lua_State* L)
+{
+  // 3 o 4 o 5 parametri : nSurfId, nFaceInd, nDestGrpId [, vSurfsId] [, bOCFlag]
+   int nSurfId ;
+   LuaCheckParam( L, 1, nSurfId) ;
+   int nFaceInd ;
+   LuaCheckParam( L, 2, nFaceInd) ;
+   int nDestGrpId ;
+   LuaCheckParam( L, 3, nDestGrpId) ;
+   INTVECTOR vSurfsId ;
+   bool bOCFlag = true ;
+   if ( LuaGetParam( L, 4, vSurfsId))
+      LuaGetParam( L, 5, bOCFlag) ;
+   else
+      LuaGetParam( L, 4, bOCFlag) ;
+   LuaClearStack( L) ;
+  // sottraggo alla faccia scelta la proiezione delle altre TriMesh
+   int nNewId = GDB_ID_NULL;
+   bool bExistProjection = false ;
+   int nNewFaceNbr = 0 ;
+   bool bOk = ExeSurfTmSubtractProjectedFacesOnFace( nSurfId, nFaceInd, nDestGrpId, vSurfsId,
+                                                     bOCFlag, bExistProjection, nNewId, nNewFaceNbr) ;
+   LuaSetParam( L, bOk) ;
+   LuaSetParam( L, bExistProjection) ;
+   if ( nNewId != GDB_ID_NULL)
+      LuaSetParam( L, nNewId) ;
+   else
+      LuaSetParam( L) ;
+   LuaSetParam( L, nNewFaceNbr) ;
+   return 4 ;
+}
+
+//-------------------------------------------------------------------------------
+static int
+LuaSurfBzTrim( lua_State* L)
+{
+   // 2 parametri : nId, nCutterId
+   int nId ;
+   LuaCheckParam( L, 1, nId)
+   int nCutterId ;
+   LuaCheckParam( L, 2, nCutterId)
+   LuaClearStack( L) ;
+   // taglio la prima superficie in base alla seconda
+   //bool bOk = ExeSurfTmCut( nId, nCutterId, bInVsOut, bOn) ;
+   bool bOk = ExeSurfBzTrim( nId, nCutterId) ;
+   LuaSetParam( L, bOk) ;
+   return 1 ;
+}
+
 //-------------------------------------------------------------------------------
 bool
 LuaInstallGdbModifySurf( LuaMgr& luaMgr)
@@ -334,10 +469,14 @@ LuaInstallGdbModifySurf( LuaMgr& luaMgr)
    bool bOk = ( &luaMgr != nullptr) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtInvertSurf", LuaInvertSurf) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtExplodeSurf", LuaExplodeSurf) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtApproxSurf", LuaApproxSurf) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfFrAdd", LuaSurfFrAdd) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfFrSubtract", LuaSurfFrSubtract) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfFrIntersect", LuaSurfFrIntersect) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfFrOffset", LuaSurfFrOffset) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtSurfFrOffsetAdv", LuaSurfFrOffsetAdv) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmMoveVertex", LuaSurfTmMoveVertex) ;  
+   bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmToTriangles", LuaSurfTmToTriangles) ;  
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmRemoveFacet", LuaSurfTmRemoveFacet) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmSwapFacets", LuaSurfTmSwapFacets) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmRemovePart", LuaSurfTmRemovePart) ;
@@ -349,5 +488,7 @@ LuaInstallGdbModifySurf( LuaMgr& luaMgr)
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmResetTwoColors", LuaSurfTmResetTwoColors) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmSplit", LuaSurfTmSplit) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmCut", LuaSurfTmCut) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmSubtractProjectedFacesOnFace", LuaSurfTmSubtractProjectedFacesOnFace) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtSurfBzTrim", LuaSurfBzTrim) ;
    return bOk ;
 }

LUA_GdbModifyVol.cpp

@@ -94,7 +94,7 @@ LuaVolZmapSetStdTool( lua_State* L)
    LuaGetParam( L, 7, nFlag) ;
    LuaClearStack( L) ;
   // imposto utensile standard a Zmap indicati
-   bool bOk = ExeVolZmapSetStdTool( vIds, sToolName, dLen, dDiam, dCornR, dCutterH, nFlag) ;
+   bool bOk = ExeVolZmapSetStdTool( vIds, sToolName, dLen, dDiam, dCornR, dCutterH, nFlag, true) ;
   // restituisco il risultato
    LuaSetParam( L, bOk) ;
    return 1 ;
@@ -125,7 +125,7 @@ LuaVolZmapSetAdvTool( lua_State* L)
    LuaGetParam( L, 9, nFlag) ;
    LuaClearStack( L) ;
   // imposto utensile avanzato a Zmap indicati
-   bool bOk = ExeVolZmapSetAdvTool( vIds, sToolName, dLen, dDiam, dTipLen, dTipDiam, dCornR, dCutterH, nFlag) ;
+   bool bOk = ExeVolZmapSetAdvTool( vIds, sToolName, dLen, dDiam, dTipLen, dTipDiam, dCornR, dCutterH, nFlag, true) ;
   // restituisco il risultato
    LuaSetParam( L, bOk) ;
    return 1 ;
@@ -154,7 +154,7 @@ LuaVolZmapSetSawTool( lua_State* L)
    LuaGetParam( L, 8, nFlag) ;
    LuaClearStack( L) ;
   // imposto utensile avanzato a Zmap indicati
-   bool bOk = ExeVolZmapSetSawTool( vIds, sToolName, dLen, dDiam, dThick, dStemDiam, dCornR, nFlag) ;
+   bool bOk = ExeVolZmapSetSawTool( vIds, sToolName, dLen, dDiam, dThick, dStemDiam, dCornR, nFlag, true) ;
   // restituisco il risultato
    LuaSetParam( L, bOk) ;
    return 1 ;
@@ -175,7 +175,7 @@ LuaVolZmapSetGenTool( lua_State* L)
    LuaGetParam( L, 4, nFlag) ;
    LuaClearStack( L) ;
   // imposto utensile generico a Zmap indicati
-   bool bOk = ExeVolZmapSetGenTool( vIds, sToolName, nToolSectId, nFlag) ;
+   bool bOk = ExeVolZmapSetGenTool( vIds, sToolName, nToolSectId, nFlag, true) ;
   // restituisco il risultato
    LuaSetParam( L, bOk) ;
    return 1 ;
@@ -202,7 +202,7 @@ LuaVolZmapSetMortiserTool( lua_State* L)
    LuaGetParam( L, 7, nFlag) ;
    LuaClearStack( L) ;
   // imposto mortasatrice a Zmap indicati
-   bool bOk = ExeVolZmapSetMortiserTool( vIds, sToolName, dLen, dWidth, dThick, dCornR, nFlag) ;
+   bool bOk = ExeVolZmapSetMortiserTool( vIds, sToolName, dLen, dWidth, dThick, dCornR, nFlag, true) ;
   // restituisco il risultato
    LuaSetParam( L, bOk) ;
    return 1 ;
@@ -227,7 +227,7 @@ LuaVolZmapSetChiselTool( lua_State* L)
    LuaGetParam( L, 6, nFlag) ;
    LuaClearStack( L) ;
   // imposto scalpello a Zmap indicati
-   bool bOk = ExeVolZmapSetChiselTool( vIds, sToolName, dLen, dWidth, dThick, nFlag) ;
+   bool bOk = ExeVolZmapSetChiselTool( vIds, sToolName, dLen, dWidth, dThick, nFlag, true) ;
   // restituisco il risultato
    LuaSetParam( L, bOk) ;
    return 1 ;
@@ -242,7 +242,7 @@ LuaVolZmapResetTool( lua_State* L)
    LuaCheckParam( L, 1, vIds)
    LuaClearStack( L) ;
   // reset utensile a Zmap indicati
-   bool bOk = ExeVolZmapResetTool( vIds) ;
+   bool bOk = ExeVolZmapResetTools( vIds) ;
   // restituisco il risultato
    LuaSetParam( L, bOk) ;
    return 1 ;

LUA_GdbObjAttribs.cpp

@@ -519,10 +519,8 @@ LuaSetInfo( lua_State* L)
       } break ;
    case LUA_TTABLE :
       {  Frame3d frVal ;
-         BBox3d b3Val ;
-         Vector3d vtVal ;     // va bene anche per Point3d
-         INTVECTOR vnVal ;
-         DBLVECTOR vdVal ;
+         BBox3d b3Val ;  
+         DBLVECTOR vdVal ;    // va bene anche per Vector3d, Point3d, vnVal
          STRVECTOR vsVal ;
          if ( LuaGetParam( L, 3, frVal)) {
             LuaClearStack( L) ;
@@ -531,15 +529,7 @@ LuaSetInfo( lua_State* L)
          else if ( LuaGetParam( L, 3, b3Val)) {
             LuaClearStack( L) ;
             bOk = ExeSetInfo( nId, sKey, b3Val) ;
-         }
-         else if ( LuaGetParam( L, 3, vtVal)) {
-            LuaClearStack( L) ;
-            bOk = ExeSetInfo( nId, sKey, vtVal) ;
-         }
-         else if ( LuaGetParam( L, 3, vnVal)) {
-            LuaClearStack( L) ;
-            bOk = ExeSetInfo( nId, sKey, vnVal) ;
-         }
+         }        
          else if ( LuaGetParam( L, 3, vdVal)) {
             LuaClearStack( L) ;
             bOk = ExeSetInfo( nId, sKey, vdVal) ;
@@ -682,6 +672,25 @@ LuaRemoveInfo( lua_State* L)
    return 1 ;
 }
 
+//-------------------------------------------------------------------------------
+static int
+LuaGetAllInfo( lua_State* L)
+{
+  // 1 parametro : Id
+   int nId ;
+   LuaCheckParam( L, 1, nId)
+   LuaClearStack( L) ;
+  // recupero tutte le info
+   STRVECTOR vsInfo ;
+   bool bOk = ExeGetAllInfo( nId, vsInfo) ;
+  // restituisco il risultato
+   if ( bOk)
+      LuaSetParam( L, vsInfo) ;
+   else
+      LuaSetParam( L) ;
+   return 1 ;
+}
+
 //-------------------------------------------------------------------------------
 static int
 LuaSetTextureName( lua_State* L)
@@ -809,6 +818,7 @@ LuaInstallGdbObjAttribs( LuaMgr& luaMgr)
    bOk = bOk && luaMgr.RegisterFunction( "EgtGetInfo", LuaGetInfo) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtExistsInfo", LuaExistsInfo) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtRemoveInfo", LuaRemoveInfo) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtGetAllInfo", LuaGetAllInfo) ;  
    bOk = bOk && luaMgr.RegisterFunction( "EgtSetTextureName", LuaSetTextureName) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSetTextureFrame", LuaSetTextureFrame) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtRemoveTextureData", LuaRemoveTextureData) ;

LUA_GdbPartLayers.cpp

@@ -277,6 +277,21 @@ LuaGetPrevLayer( lua_State* L)
    return 1 ;
 }
 
+//-------------------------------------------------------------------------------
+static int
+LuaIsGhostPart( lua_State* L)
+{
+  // 1 parametro : nGhostId
+   int nGhostId ;
+   LuaCheckParam( L, 1, nGhostId)
+   LuaClearStack( L) ;
+  // verifico sia un segnaposto di pezzo messo in grezzo
+   bool bOk = ExeIsGhostPart( nGhostId) ;
+  // restituisco il risultato
+   LuaSetParam( L, bOk) ;
+   return 1 ;
+}
+
 //-------------------------------------------------------------------------------
 static int
 LuaGetFirstGhostPart( lua_State* L)
@@ -454,6 +469,42 @@ LuaDuploList( lua_State* L)
    return 1 ;
 }
 
+//-------------------------------------------------------------------------------
+static int
+LuaDuploInRawCount( lua_State* L)
+{
+  // 1 parametro : nSouId
+   int nSouId ;
+   LuaCheckParam( L, 1, nSouId)
+   LuaClearStack( L) ;
+  // recupero il numero di duplicati che sono riferiti da grezzi nei vari gruppi di lavoro del progetto
+   int nCount ;
+   bool bOk = ExeDuploInRawCount( nSouId, nCount) ;
+  // restituisco il risultato
+   if ( bOk)
+      LuaSetParam( L, nCount) ;
+   else
+      LuaSetParam( L) ;
+   return 1 ;
+}
+
+//-------------------------------------------------------------------------------
+static int
+LuaDuploWithoutRawList( lua_State* L)
+{
+  // nessun parametro
+   LuaClearStack( L) ;
+  // recupero l'elenco dei duplicati
+   INTVECTOR vnDup ;
+   bool bOk = ExeDuploWithoutRawList( vnDup) ;
+  // restituisco il risultato
+   if ( bOk)
+      LuaSetParam( L, vnDup) ;
+   else
+      LuaSetParam( L) ;
+   return 1 ;
+}
+
 //-------------------------------------------------------------------------------
 static int
 LuaDuploSetModified( lua_State* L)
@@ -605,6 +656,7 @@ LuaInstallGdbPartLayer( LuaMgr& luaMgr)
    bOk = bOk && luaMgr.RegisterFunction( "EgtGetNextLayer", LuaGetNextLayer) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtGetLastLayer", LuaGetLastLayer) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtGetPrevLayer", LuaGetPrevLayer) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtIsGhostPart", LuaIsGhostPart) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtGetFirstGhostPart", LuaGetFirstGhostPart) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtGetNextGhostPart", LuaGetNextGhostPart) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtEraseEmptyParts", LuaEraseEmptyParts) ;
@@ -616,6 +668,8 @@ LuaInstallGdbPartLayer( LuaMgr& luaMgr)
    bOk = bOk && luaMgr.RegisterFunction( "EgtDuploNew", LuaDuploNew) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtDuploCount", LuaDuploCount) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtDuploList", LuaDuploList) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtDuploInRawCount", LuaDuploInRawCount) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtDuploWithoutRawList", LuaDuploWithoutRawList) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtDuploSetModified", LuaDuploSetModified) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtDuploGetModified", LuaDuploGetModified) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtDuploSetLocked", LuaDuploSetLocked) ;

LUA_General.cpp

@@ -52,7 +52,7 @@ MyPrint( lua_State* L)
       s = lua_tostring( L, -1) ;  /* get result */
       if ( s == nullptr)
          return luaL_error( L,
-                            LUA_QL("tostring") " must return a string to " LUA_QL("print")) ;
+                            "'tostring' must return a string to 'print'") ;
       if ( i > 1)
          sOut += "\t" ;
       sOut += s ;
@@ -178,11 +178,11 @@ LuaSplitStringPlus( lua_State* L)
   // 2 parametri : sVal, sHea
    string sVal ;
    string sHea ;
-   bool bFound = LuaGetParam( L, 1, sVal) ;
-   LuaCheckParam( L, 2, sHea)
+   bool bOk = LuaGetParam( L, 1, sVal)  &&
+              LuaGetParam( L, 2, sHea) ;
    LuaClearStack( L) ;
-  // se ricevuta stringa, la divido in parti conservandone le intestazioni
-   if ( bFound) {
+  // se ricevute stringhe, divido la prima in parti con intestazioni della seconda (che conservo)
+   if ( bOk) {
       STRVECTOR vsVal ;
       TokenizePlus( sVal, sHea, vsVal) ;
      // ritorno il risultato
@@ -194,6 +194,25 @@ LuaSplitStringPlus( lua_State* L)
    return 1 ;
 }
 
+//-------------------------------------------------------------------------------
+static int
+LuaReplaceString( lua_State* L)
+{
+  // 3 parametri : sVal, sOld, sNew
+   string sVal ;
+   LuaCheckParam( L, 1, sVal)
+   string sOld ;
+   LuaCheckParam( L, 2, sOld)
+   string sNew ;
+   LuaCheckParam( L, 3, sNew)
+   LuaClearStack( L) ;
+  // eseguo sostituzione nella stringa della sequenza indicata dal secondo parametro con quella del terzo
+   int nRes = ReplaceString( sVal, sOld, sNew) ;
+  // restituisco il risultato
+   LuaSetParam( L, sVal) ;
+   LuaSetParam( L, nRes) ;
+   return 2 ;
+}
 //-------------------------------------------------------------------------------
 static int
 LuaSetVal( lua_State* L)
@@ -208,19 +227,19 @@ LuaSetVal( lua_State* L)
       {  bool bVal ;
          LuaGetParam( L, 2, bVal) ;
          LuaClearStack( L) ;
-         bOk = SetValInNotes( sKey, bVal, sNotes) ;
+         bOk = SetVal( sKey, bVal, sNotes) ;
       } break ;
    case LUA_TNUMBER :
       {  double dVal ;
          LuaGetParam( L, 2, dVal) ;
          LuaClearStack( L) ;
-         bOk = SetValInNotes( sKey, dVal, sNotes) ;
+         bOk = SetVal( sKey, dVal, sNotes) ;
       } break ;
    case LUA_TSTRING :
       {  string sVal ;
          LuaGetParam( L, 2, sVal) ;
          LuaClearStack( L) ;
-         bOk = SetValInNotes( sKey, (const string&) sVal, sNotes) ;
+         bOk = SetVal( sKey, (const string&) sVal, sNotes) ;
       } break ;
    case LUA_TTABLE :
       {  Frame3d frVal ;
@@ -231,32 +250,35 @@ LuaSetVal( lua_State* L)
          STRVECTOR vsVal ;
          if ( LuaGetParam( L, 2, frVal)) {
             LuaClearStack( L) ;
-            bOk = SetValInNotes( sKey, frVal, sNotes) ;
+            bOk = SetVal( sKey, frVal, sNotes) ;
          }
          else if ( LuaGetParam( L, 2, b3Val)) {
             LuaClearStack( L) ;
-            bOk = SetValInNotes( sKey, b3Val, sNotes) ;
+            bOk = SetVal( sKey, b3Val, sNotes) ;
          }
          else if ( LuaGetParam( L, 2, vtVal)) {
             LuaClearStack( L) ;
-            bOk = SetValInNotes( sKey, vtVal, sNotes) ;
+            bOk = SetVal( sKey, vtVal, sNotes) ;
          }
          else if ( LuaGetParam( L, 2, vnVal)) {
             LuaClearStack( L) ;
-            bOk = SetValInNotes( sKey, vnVal, sNotes) ;
+            bOk = SetVal( sKey, vnVal, sNotes) ;
          }
          else if ( LuaGetParam( L, 2, vdVal)) {
             LuaClearStack( L) ;
-            bOk = SetValInNotes( sKey, vdVal, sNotes) ;
+            bOk = SetVal( sKey, vdVal, sNotes) ;
          }
          else if ( LuaGetParam( L, 2, vsVal)) {
             LuaClearStack( L) ;
-            bOk = SetValInNotes( sKey, vsVal, sNotes) ;
+            bOk = SetVal( sKey, vsVal, sNotes) ;
          }
       } break ;
    }
   // restituisco il risultato
-   LuaSetParam( L, sNotes) ;
+   if ( bOk)
+      LuaSetParam( L, sNotes) ;
+   else
+      LuaSetParam(L, "") ;
    return 1 ;
 }
 
@@ -493,7 +515,7 @@ LuaGetEnableUI( lua_State* L)
 static int
 LuaOutBox( lua_State* L)
 {
-  // 2 o 3 parametri : stringa, titolo [, icona]
+  // 2, 3 o 4 parametri : sOut, sTitle [, sIcon] [, sButtons]
    string sOut ;
    LuaCheckParam( L, 1, sOut)
    string sTitle ;
@@ -510,16 +532,34 @@ LuaOutBox( lua_State* L)
       nIcon = MB_ICONINFORMATION ;
    else if ( sIcon == "QUESTION")
       nIcon = MB_ICONQUESTION ;
+   string sButtons ;
+   LuaGetParam( L, 4, sButtons) ;
+   int nButtons = MB_OKCANCEL ;
+   ToUpper( sButtons) ;
+   if ( sButtons == "OK")
+      nButtons = MB_OK ;
+   else if ( sButtons == "OKCANCEL")
+      nButtons = MB_OKCANCEL ;
+   else if ( sButtons == "ABORTRETRYIGNORE")
+      nButtons = MB_ABORTRETRYIGNORE ;
+   else if ( sButtons == "YESNOCANCEL")
+      nButtons = MB_YESNOCANCEL ;
+   else if ( sButtons == "YESNO")
+      nButtons = MB_YESNO ;
+   else if ( sButtons == "RETRYCANCEL")
+      nButtons = MB_RETRYCANCEL ;
+   else if ( sButtons == "CANCELTRYCONTINUE")
+      nButtons = MB_CANCELTRYCONTINUE ;
    LuaClearStack( L) ;
-  // se abilitata UI, emetto la finestra di dialogo
-   int nRes = IDCANCEL ;
-   if ( ExeGetEnableUI()) {
-      HWND hTopWnd = ExeGetMainWindowHandle() ; // FindTopWindow() ;
-      nRes = MessageBox( hTopWnd, stringtoW( sOut), stringtoW( sTitle),
-                         MB_OKCANCEL | nIcon | MB_TASKMODAL) ;
-   }
-  // risultato (Ok->true, Cancel->false)
-   LuaSetParam( L, ( nRes == IDOK)) ;
+  // emetto finestra di dialogo (solo se ablitata UI)
+   int nRes = ExeMessageBox( sOut, sTitle, nButtons | nIcon) ;
+  // risultato
+   if ( nRes == IDOK  ||  nRes == IDRETRY  ||  nRes == IDYES  ||  nRes == IDTRYAGAIN)
+      LuaSetParam( L, true) ;
+   else if ( nRes ==  IDNO  ||  nRes == IDCONTINUE  ||  nRes == IDIGNORE)
+      LuaSetParam( L, false) ;
+   else
+      LuaSetParam( L) ;
    return 1 ;
 }
 
@@ -985,6 +1025,50 @@ LuaWinExec( lua_State* L)
    return 1 ;
 }
 
+//-------------------------------------------------------------------------------
+static int
+LuaCloseExe( lua_State* L)
+{
+  // 1 parametro opzionale : [nExitCode]
+   int nExitCode = 0 ;
+   LuaGetParam( L, 1, nExitCode) ;
+   LuaClearStack( L) ;
+  // eseguo chiusura forzata
+   if ( ExeOnTerminateProcess( nExitCode))
+      TerminateProcess( GetCurrentProcess(), abs( nExitCode)) ;
+  // restituisco il risultato (se arrivo qui vuol dire che non è consnetito terminare l'esecuzione)
+   LuaSetParam( L, false) ;
+   return 1 ;
+}
+
+//-------------------------------------------------------------------------------
+static int
+LuaCreateMutex( lua_State* L)
+{
+  // un solo parametro : sMutexName
+   string sMutexName ;
+   LuaCheckParam( L, 1, sMutexName)
+   LuaClearStack( L) ;
+  // verifico esistenza Mutex con Nome (altrimenti lo creo per bloccare gli altri)
+   bool bOk = ExeCreateMutex( sMutexName) ;
+  // restituisco il risultato
+   LuaSetParam( L, bOk) ;
+   return 1 ;
+}
+
+//-------------------------------------------------------------------------------
+static int
+LuaReleaseMutex( lua_State* L)
+{
+  // nessun parametro
+   LuaClearStack( L) ;
+  // rilascio l'eventuale Mutex con Nome attivo 
+   bool bOk = ExeReleaseMutex() ;
+  // restituisco il risultato
+   LuaSetParam( L, bOk) ;
+   return 1 ;
+}
+
 //-------------------------------------------------------------------------------
 const int MAX_CTRLS = IDC_TEXT8 -IDC_TEXT1 + 1 ;
 const int OFFS_CTRLS = 40 ;
@@ -1150,7 +1234,7 @@ LuaDialogBox( lua_State* L)
   // se abilitata UI, lancio dialogo
    if ( ExeGetEnableUI()) {
      // lancio dialogo
-      HWND hTopWnd = ExeGetMainWindowHandle() ;  // FindTopWindow() ;
+      HWND hTopWnd = ExeGetMainWindowHandle() ;
       bool bOk = ( DialogBox( GetModuleIstance(), MAKEINTRESOURCE( IDD_LUADLG), hTopWnd, (DLGPROC)DialogBoxProc) == IDOK) ;
      // restituzione parametri
       if ( bOk) {
@@ -1181,6 +1265,7 @@ LuaInstallGeneral( LuaMgr& luaMgr)
    bOk = bOk && luaMgr.RegisterFunction( "EgtNumToString", LuaNumToString) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSplitString", LuaSplitString) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSplitStringPlus", LuaSplitStringPlus) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtReplaceString", LuaReplaceString) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSetVal", LuaSetVal) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtGetVal", LuaGetVal) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtGetUUID", LuaGetUUID) ;
@@ -1219,6 +1304,9 @@ LuaInstallGeneral( LuaMgr& luaMgr)
    bOk = bOk && luaMgr.RegisterFunction( "EgtMsg", LuaGetMsg) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtDialogBox", LuaDialogBox) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtWinExec", LuaWinExec) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtCloseExe", LuaCloseExe) ;  
+   bOk = bOk && luaMgr.RegisterFunction( "EgtCreateMutex", LuaCreateMutex) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtReleaseMutex", LuaReleaseMutex) ;
    
    return bOk ;
 }

LUA_GeoDist.cpp

@@ -49,6 +49,38 @@ LuaPointCurveDist( lua_State* L)
    return 3 ;
 }
 
+//----------------------------------------------------------------------------
+static int
+LuaPointCurveDistSide( lua_State* L)
+{
+  // 3 o 4 parametri : ptP, nCrvId, vtN [, nRefId]
+   Point3d ptP ;
+   LuaCheckParam( L, 1, ptP)
+   int nId ;
+   LuaCheckParam( L, 2, nId)
+   Vector3d vtN ;
+   LuaCheckParam( L, 3, vtN)
+   int nRefType = nId ;
+   LuaGetParam( L, 4, nRefType) ;
+   LuaClearStack( L) ;
+  // calcolo la distanza
+   int nSide ;
+   double dDist ;
+   Point3d ptMin ;
+   bool bOk = ExePointCurveDistSide( ptP, nId, vtN, nRefType, &dDist, ptMin, &nSide) ;
+   if ( bOk) {
+      LuaSetParam( L, dDist) ;
+      LuaSetParam( L, ptMin) ;
+      LuaSetParam( L, nSide) ;
+   }
+   else {
+      LuaSetParam( L) ;
+      LuaSetParam( L) ;
+      LuaSetParam( L) ;
+   }
+   return 3 ;
+}
+
 //----------------------------------------------------------------------------
 static int
 LuaPointSurfTmDist( lua_State* L)
@@ -85,6 +117,7 @@ LuaInstallGeoDist( LuaMgr& luaMgr)
 {
    bool bOk = ( &luaMgr != nullptr) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtPointCurveDist", LuaPointCurveDist) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtPointCurveDistSide", LuaPointCurveDistSide) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtPointSurfTmDist", LuaPointSurfTmDist) ;
    return bOk ;
 }

LUA_GeoInters.cpp

@@ -20,6 +20,41 @@
 
 using namespace std ;
 
+//----------------------------------------------------------------------------
+static int
+LuaLineCurveInters( lua_State* L)
+{
+  // 3 o 4 parametri : ptP, vtDir, Id, [, nRefId]
+   Point3d ptP ;
+   LuaCheckParam( L, 1, ptP)
+   Vector3d vtDir ;
+   LuaCheckParam( L, 2, vtDir)
+   int nId ;
+   LuaCheckParam( L, 3, nId)
+   int nRefType = nId ;
+   LuaGetParam( L, 4, nRefType) ;
+   LuaClearStack( L) ;
+  // recupero i punti di intersezione tra linea e curva
+   INTDBLVECTOR vInters ;
+   if ( ExeLineCurveInters( ptP, vtDir, nId, nRefType, vInters)) {
+      LuaSetParam( L, true) ;
+      INTVECTOR vType( vInters.size()) ;
+      DBLVECTOR vPar( vInters.size()) ;
+      for ( size_t i = 0 ; i < vInters.size() ; ++ i) {
+         vType[i] = vInters[i].first ;
+         vPar[i] = vInters[i].second ;
+      }
+      LuaSetParam( L, vType) ;
+      LuaSetParam( L, vPar) ;
+   }
+   else {
+      LuaSetParam( L) ;
+      LuaSetParam( L) ;
+      LuaSetParam( L) ;
+   }
+   return 3 ;
+}
+
 //----------------------------------------------------------------------------
 static int
 LuaLineBoxInters( lua_State* L)
@@ -53,38 +88,6 @@ LuaLineBoxInters( lua_State* L)
    return 3 ;
 }
 
-//----------------------------------------------------------------------------
-static int
-LuaPlaneBoxInters( lua_State* L)
-{
-  // 4 o 5 parametri : ptOn, vtN, b3Box, nDestGrpId [, nRefType]
-   Point3d ptOn ;
-   LuaCheckParam( L, 1, ptOn)
-   Vector3d vtN ;
-   LuaCheckParam( L, 2, vtN)
-   BBox3d b3Box ;
-   LuaCheckParam( L, 3, b3Box)
-   int nDestGrpId ;
-   LuaCheckParam( L, 4, nDestGrpId) ;
-   int nRefType = RTY_DEFAULT ;
-   LuaGetParam( L, 5, nRefType) ;
-   LuaClearStack( L) ;
-  // eseguo l'intersezione
-   int nPntCount = 0 ;
-   int nCrvCount = 0 ;
-   int nSrfCount = 0 ;
-   int nNewId = ExePlaneBoxInters( ptOn, vtN, b3Box, nDestGrpId, nRefType, &nPntCount, &nCrvCount, &nSrfCount) ;
-  // restituisco il risultato
-   if ( nNewId != GDB_ID_NULL)
-      LuaSetParam( L, nNewId) ;
-   else
-      LuaSetParam( L) ;
-   LuaSetParam( L, nPntCount) ;
-   LuaSetParam( L, nCrvCount) ;
-   LuaSetParam( L, nSrfCount) ;
-   return 4 ;
-}
-
 //----------------------------------------------------------------------------
 static int
 LuaLineSurfTmInters( lua_State* L)
@@ -120,6 +123,101 @@ LuaLineSurfTmInters( lua_State* L)
    return 3 ;
 }
 
+//----------------------------------------------------------------------------
+static int
+LuaLineVolZmapInters( lua_State* L)
+{
+  // 3 o 4 parametri : ptP, vtDir, Id, [, nRefId]
+   Point3d ptP ;
+   LuaCheckParam( L, 1, ptP)
+   Vector3d vtDir ;
+   LuaCheckParam( L, 2, vtDir)
+   int nId ;
+   LuaCheckParam( L, 3, nId)
+   int nRefType = nId ;
+   LuaGetParam( L, 4, nRefType) ;
+   LuaClearStack( L) ;
+  // eseguo calcolo intersezione
+   INTDBLVECTOR vInters ;
+   if ( ExeLineVolZmapInters( ptP, vtDir, nId, nRefType, vInters)) {
+      LuaSetParam( L, true) ;
+      INTVECTOR vType( vInters.size()) ;
+      DBLVECTOR vPar( vInters.size()) ;
+      for ( size_t i = 0 ; i < vInters.size() ; ++ i) {
+         vType[i] = vInters[i].first ;
+         vPar[i] = vInters[i].second ;
+      }
+      LuaSetParam( L, vType) ;
+      LuaSetParam( L, vPar) ;
+   }
+   else {
+      LuaSetParam( L) ;
+      LuaSetParam( L) ;
+      LuaSetParam( L) ;
+   }
+   return 3 ;
+}
+
+//----------------------------------------------------------------------------
+static int
+LuaPlaneCurveInters( lua_State* L)
+{
+  // 4 o 5 parametri : ptOn, vtN, nId, nDestGrpId [, nRefType] 
+   Point3d ptOn ;
+   LuaCheckParam( L, 1, ptOn)
+   Vector3d vtN ;
+   LuaCheckParam( L, 2, vtN)
+   int nId ;
+   LuaCheckParam( L, 3, nId)
+   int nDestGrpId ;
+   LuaCheckParam( L, 4, nDestGrpId) ;
+   int nRefType = RTY_DEFAULT ;
+   LuaGetParam( L, 5, nRefType) ;
+   LuaClearStack( L) ;
+  // eseguo l'intersezione
+   int nCount = 0 ;
+   int nNewId = ExePlaneCurveInters( ptOn, vtN, nId, nDestGrpId, nRefType, &nCount) ;
+  // restituisco il risultato
+   if ( nNewId != GDB_ID_NULL)
+      LuaSetParam( L, nNewId) ;
+   else
+      LuaSetParam( L) ;
+   LuaSetParam( L, nCount) ;
+   return 2 ;
+}
+
+//----------------------------------------------------------------------------
+static int
+LuaPlaneBoxInters( lua_State* L)
+{
+  // 4 o 5 parametri : ptOn, vtN, b3Box, nDestGrpId [, nRefType]
+   Point3d ptOn ;
+   LuaCheckParam( L, 1, ptOn)
+   Vector3d vtN ;
+   LuaCheckParam( L, 2, vtN)
+   BBox3d b3Box ;
+   LuaCheckParam( L, 3, b3Box)
+   int nDestGrpId ;
+   LuaCheckParam( L, 4, nDestGrpId) ;
+   int nRefType = RTY_DEFAULT ;
+   LuaGetParam( L, 5, nRefType) ;
+   LuaClearStack( L) ;
+  // eseguo l'intersezione
+   int nPntCount = 0 ;
+   int nCrvCount = 0 ;
+   int nSrfCount = 0 ;
+   int nNewId = ExePlaneBoxInters( ptOn, vtN, b3Box, nDestGrpId, nRefType, &nPntCount, &nCrvCount, &nSrfCount) ;
+  // restituisco il risultato
+   if ( nNewId != GDB_ID_NULL)
+      LuaSetParam( L, nNewId) ;
+   else
+      LuaSetParam( L) ;
+   LuaSetParam( L, nPntCount) ;
+   LuaSetParam( L, nCrvCount) ;
+   LuaSetParam( L, nSrfCount) ;
+   return 4 ;
+}
+
 //----------------------------------------------------------------------------
 static int
 LuaPlaneSurfTmInters( lua_State* L)
@@ -186,99 +284,6 @@ LuaParPlanesSurfTmInters( lua_State* L)
    return 2 ;
 }
 
-//----------------------------------------------------------------------------
-static int
-LuaSurfTmSurfTmInters( lua_State* L)
-{
-  // 3 o 4 parametri : Id1, nId2, nDestGrpId [, dToler]
-   int nId1 ;
-   LuaCheckParam( L, 1, nId1)
-   int nId2 ;
-   LuaCheckParam( L, 2, nId2)
-   int nDestGrpId ;
-   LuaCheckParam( L, 3, nDestGrpId) ;
-   double dToler = 20 * EPS_SMALL ;
-   LuaGetParam( L, 4, dToler) ;
-   LuaClearStack( L) ;
-  // eseguo l'intersezione
-   int nPntCount = 0 ;
-   int nCrvCount = 0 ;
-   int nSrfCount = 0 ;
-   int nNewId = ExeSurfTmSurfTmInters( nId1, nId2, nDestGrpId, dToler, &nPntCount, &nCrvCount, &nSrfCount) ;
-  // restituisco il risultato
-   if ( nNewId != GDB_ID_NULL)
-      LuaSetParam( L, nNewId) ;
-   else
-      LuaSetParam( L) ;
-   LuaSetParam( L, nPntCount) ;
-   LuaSetParam( L, nCrvCount) ;
-   LuaSetParam( L, nSrfCount) ;
-   return 4 ;
-}
-
-//----------------------------------------------------------------------------
-static int
-LuaPlaneCurveInters( lua_State* L)
-{
-  // 4 o 5 parametri : ptOn, vtN, nId, nDestGrpId [, nRefType] 
-   Point3d ptOn ;
-   LuaCheckParam( L, 1, ptOn)
-   Vector3d vtN ;
-   LuaCheckParam( L, 2, vtN)
-   int nId ;
-   LuaCheckParam( L, 3, nId)
-   int nDestGrpId ;
-   LuaCheckParam( L, 4, nDestGrpId) ;
-   int nRefType = RTY_DEFAULT ;
-   LuaGetParam( L, 5, nRefType) ;
-   LuaClearStack( L) ;
-  // eseguo l'intersezione
-   int nCount = 0 ;
-   int nNewId = ExePlaneCurveInters( ptOn, vtN, nId, nDestGrpId, nRefType, &nCount) ;
-  // restituisco il risultato
-   if ( nNewId != GDB_ID_NULL)
-      LuaSetParam( L, nNewId) ;
-   else
-      LuaSetParam( L) ;
-   LuaSetParam( L, nCount) ;
-   return 2 ;
-}
-
-//----------------------------------------------------------------------------
-static int
-LuaLineVolZmapInters( lua_State* L)
-{
-  // 3 o 4 parametri : ptP, vtDir, Id, [, nRefId]
-   Point3d ptP ;
-   LuaCheckParam( L, 1, ptP)
-   Vector3d vtDir ;
-   LuaCheckParam( L, 2, vtDir)
-   int nId ;
-   LuaCheckParam( L, 3, nId)
-   int nRefType = nId ;
-   LuaGetParam( L, 4, nRefType) ;
-   LuaClearStack( L) ;
-  // eseguo calcolo intersezione
-   INTDBLVECTOR vInters ;
-   if ( ExeLineVolZmapInters( ptP, vtDir, nId, nRefType, vInters)) {
-      LuaSetParam( L, true) ;
-      INTVECTOR vType( vInters.size()) ;
-      DBLVECTOR vPar( vInters.size()) ;
-      for ( size_t i = 0 ; i < vInters.size() ; ++ i) {
-         vType[i] = vInters[i].first ;
-         vPar[i] = vInters[i].second ;
-      }
-      LuaSetParam( L, vType) ;
-      LuaSetParam( L, vPar) ;
-   }
-   else {
-      LuaSetParam( L) ;
-      LuaSetParam( L) ;
-      LuaSetParam( L) ;
-   }
-   return 3 ;
-}
-
 //----------------------------------------------------------------------------
 static int
 LuaPlaneVolZmapInters( lua_State* L)
@@ -310,19 +315,77 @@ LuaPlaneVolZmapInters( lua_State* L)
    return 2 ;
 }
 
+//----------------------------------------------------------------------------
+static int
+LuaCurveCurveInters( lua_State* L)
+{
+  // 3 parametri : nId1, nId2, nDestGrpId
+   int nId1 ;
+   LuaCheckParam( L, 1, nId1)
+   int nId2 ;
+   LuaCheckParam( L, 2, nId2)
+   int nDestGrpId ;
+   LuaCheckParam( L, 3, nDestGrpId) ;   
+   LuaClearStack( L) ;
+  // eseguo l'intersezione
+   int nPntCount = 0 ;
+   int nCrvCount = 0 ;
+   int nNewId = ExeCurveCurveInters( nId1, nId2, nDestGrpId, &nPntCount, &nCrvCount) ;
+   // restituisco il risultato
+   if ( nNewId != GDB_ID_NULL)
+      LuaSetParam( L, nNewId) ;
+   else
+      LuaSetParam( L) ;
+   LuaSetParam( L, nPntCount) ;
+   LuaSetParam( L, nCrvCount) ;
+   return 3 ;
+}
+
+//----------------------------------------------------------------------------
+static int
+LuaSurfTmSurfTmInters( lua_State* L)
+{
+  // 3 o 4 parametri : Id1, nId2, nDestGrpId [, dToler]
+   int nId1 ;
+   LuaCheckParam( L, 1, nId1)
+   int nId2 ;
+   LuaCheckParam( L, 2, nId2)
+   int nDestGrpId ;
+   LuaCheckParam( L, 3, nDestGrpId) ;
+   double dToler = 20 * EPS_SMALL ;
+   LuaGetParam( L, 4, dToler) ;
+   LuaClearStack( L) ;
+  // eseguo l'intersezione
+   int nPntCount = 0 ;
+   int nCrvCount = 0 ;
+   int nSrfCount = 0 ;
+   int nNewId = ExeSurfTmSurfTmInters( nId1, nId2, nDestGrpId, dToler, &nPntCount, &nCrvCount, &nSrfCount) ;
+  // restituisco il risultato
+   if ( nNewId != GDB_ID_NULL)
+      LuaSetParam( L, nNewId) ;
+   else
+      LuaSetParam( L) ;
+   LuaSetParam( L, nPntCount) ;
+   LuaSetParam( L, nCrvCount) ;
+   LuaSetParam( L, nSrfCount) ;
+   return 4 ;
+}
+
 //-------------------------------------------------------------------------------
 bool
 LuaInstallGeoInters( LuaMgr& luaMgr)
 {
    bool bOk = ( &luaMgr != nullptr) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtLineCurveInters", LuaLineCurveInters) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtLineBoxInters", LuaLineBoxInters) ;
-   bOk = bOk && luaMgr.RegisterFunction( "EgtPlaneBoxInters", LuaPlaneBoxInters) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtLineSurfTmInters", LuaLineSurfTmInters) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtLineVolZmapInters", LuaLineVolZmapInters) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtPlaneCurveInters", LuaPlaneCurveInters) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtPlaneBoxInters", LuaPlaneBoxInters) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtPlaneSurfTmInters", LuaPlaneSurfTmInters) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtParPlanesSurfTmInters", LuaParPlanesSurfTmInters) ;
-   bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmSurfTmInters", LuaSurfTmSurfTmInters) ;
-   bOk = bOk && luaMgr.RegisterFunction( "EgtPlaneCurveInters", LuaPlaneCurveInters) ;
-   bOk = bOk && luaMgr.RegisterFunction( "EgtLineVolZmapInters", LuaLineVolZmapInters) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtPlaneVolZmapInters", LuaPlaneVolZmapInters) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtCurveCurveInters", LuaCurveCurveInters) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtSurfTmSurfTmInters", LuaSurfTmSurfTmInters) ;
    return bOk ;
-}
+}

LUA_MachMgr.cpp

@@ -227,6 +227,26 @@ LuaAddMachGroup( lua_State* L)
    return 1 ;
 }
 
+//-------------------------------------------------------------------------------
+static int
+LuaCopyMachGroup( lua_State* L)
+{
+  // 2 parametri : nome del gruppo sorgente, nome del nuovo gruppo
+   string sSouName ;
+   LuaCheckParam( L, 1, sSouName)
+   string sName ;
+   LuaCheckParam( L, 2, sName) ;
+   LuaClearStack( L) ;
+  // copio la macchinata
+   int nId = ExeCopyMachGroup( sSouName, sName) ; 
+  // restituisco il risultato
+   if ( nId != GDB_ID_NULL)
+      LuaSetParam( L, nId) ;
+   else
+      LuaSetParam( L) ;
+   return 1 ;
+}
+
 //-------------------------------------------------------------------------------
 static int
 LuaRemoveMachGroup( lua_State* L)
@@ -242,6 +262,24 @@ LuaRemoveMachGroup( lua_State* L)
    return 1 ;
 }
 
+//-------------------------------------------------------------------------------
+static int
+LuaChangeMachGroupName( lua_State* L)
+{
+  // 2 parametri : identificativo del gruppo, nuovo nome
+   int nMGroupInd ;
+   LuaCheckParam( L, 1, nMGroupInd)
+   string sNewName ;
+   LuaCheckParam( L, 2, sNewName)
+   LuaClearStack( L) ;
+  // cambio il nome della macchinata
+   string sName ;
+   bool bOk = ExeChangeMachGroupName( nMGroupInd, sNewName) ; 
+  // restituisco il risultato
+   LuaSetParam( L, bOk) ;
+   return 1 ;
+}
+
 //-------------------------------------------------------------------------------
 static int
 LuaGetMachGroupName( lua_State* L)
@@ -1714,10 +1752,12 @@ LuaFindToolInCurrSetup( lua_State* L)
    string sTool ;
    LuaGetParam( L, 1, sTool) ;
    LuaClearStack( L) ;
-  // verifico l'attrezzaggio della macchinata corrente
-   bool bOk = ExeFindToolInCurrSetup( sTool) ;
+  // verifico attrezzaggio utensile e ne recupero l'eventuale posizione
+   string sTcPos ;
+   bool bOk = ExeGetToolSetupPosInCurrSetup( sTool, sTcPos) ;
    LuaSetParam( L, bOk) ;
-   return 1 ;
+   LuaSetParam( L, sTcPos) ;
+   return 2 ;
 }
 
 //-----------------------------------------------------------------------------
@@ -2957,14 +2997,18 @@ LuaGetClEntFlag( lua_State* L)
    LuaGetParam( L, 1, nEntId) ;
    LuaClearStack( L) ;
   // recupero il flag
-   int nFlag ;
-   bool bOk = ExeGetClEntFlag( nEntId, nFlag) ;
+   int nFlag, nFlag2 ;
+   bool bOk = ExeGetClEntFlag( nEntId, nFlag, nFlag2) ;
   // restituisco il risultato
-   if ( bOk)
+   if ( bOk) {
       LuaSetParam( L, nFlag) ;
-   else
+      LuaSetParam( L, nFlag2) ;  
+   }
+   else {
       LuaSetParam( L) ;
-   return 1 ;
+      LuaSetParam( L) ;
+   }
+   return 2 ;
 }
 
 //-----------------------------------------------------------------------------
@@ -2986,6 +3030,25 @@ LuaGetClEntIndex( lua_State* L)
    return 1 ;
 }
 
+//-----------------------------------------------------------------------------
+static int
+LuaGetClEntAxesVal( lua_State* L)
+{
+  // 1 parametro : nEntId
+   int nEntId ;
+   LuaGetParam( L, 1, nEntId) ;
+   LuaClearStack( L) ;
+  // recupero il valore degli assi
+   DBLVECTOR vAxes ;
+   bool bOk = ExeGetClEntAxesVal( nEntId, vAxes) ;
+  // restituisco il risultato
+   if ( bOk)
+      LuaSetParam( L, vAxes) ;
+   else
+      LuaSetParam( L) ;
+   return 1 ;
+}
+
 //-------------------------------------------------------------------------------
 //    Simulation
 //-------------------------------------------------------------------------------
@@ -3272,6 +3335,23 @@ LuaSetCalcTool( lua_State* L)
    return 1 ;
 }
 
+//-------------------------------------------------------------------------------
+static int
+LuaGetAllCurrAxesName( lua_State* L)
+{
+  // nessun parametro
+   LuaClearStack( L) ;
+  // imposto l'utensile corrente per il calcolo
+   STRVECTOR vAxName ;
+   bool bOk = ExeGetAllCurrAxesName( vAxName) ;
+  // restituisco il risultato
+   if ( bOk)
+      LuaSetParam( L, vAxName) ;
+   else
+      LuaSetParam( L) ;
+   return 1 ;
+}
+
 //-------------------------------------------------------------------------------
 static int
 LuaSetRotAxisBlock( lua_State* L)
@@ -3983,7 +4063,9 @@ LuaInstallMachMgr( LuaMgr& luaMgr)
    bOk = bOk && luaMgr.RegisterFunction( "EgtGetPrevMachGroup", LuaGetPrevMachGroup) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtGetMachGroupNewName", LuaGetMachGroupNewName) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtAddMachGroup", LuaAddMachGroup) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtCopyMachGroup", LuaCopyMachGroup) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtRemoveMachGroup", LuaRemoveMachGroup) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtChangeMachGroupName", LuaChangeMachGroupName) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtGetMachGroupName", LuaGetMachGroupName) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtGetMachGroupMachineName", LuaGetMachGroupMachineName) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtGetMachGroupId", LuaGetMachGroupId) ;
@@ -4140,6 +4222,7 @@ LuaInstallMachMgr( LuaMgr& luaMgr)
    bOk = bOk && luaMgr.RegisterFunction( "EgtGetClEntMove", LuaGetClEntMove) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtGetClEntFlag", LuaGetClEntFlag) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtGetClEntIndex", LuaGetClEntIndex) ;  
+   bOk = bOk && luaMgr.RegisterFunction( "EgtGetClEntAxesVal", LuaGetClEntAxesVal) ;  
    // Simulation
    bOk = bOk && luaMgr.RegisterFunction( "EgtSimInit", LuaSimInit) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSimStart", LuaSimStart) ;
@@ -4173,6 +4256,7 @@ LuaInstallMachMgr( LuaMgr& luaMgr)
    // Machine Calc
    bOk = bOk && luaMgr.RegisterFunction( "EgtSetCalcTable", LuaSetCalcTable) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSetCalcTool", LuaSetCalcTool) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtGetAllCurrAxesName", LuaGetAllCurrAxesName) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSetRotAxisBlock", LuaSetRotAxisBlock) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtGetRotAxisBlocked", LuaGetRotAxisBlocked) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtGetCalcTool", LuaGetCalcTool) ;

stdafx.h

@@ -31,5 +31,5 @@
 #pragma comment(lib, EGTLIBDIR "EgtGeneral" EGTLIBVER ".lib")
 #pragma comment(lib, EGTLIBDIR "EgtNumKernel" EGTLIBVER ".lib")
 #pragma comment(lib, EGTLIBDIR "EgtGeomKernel" EGTLIBVER ".lib")
-#pragma comment(lib, EGTEXTDIR "Lua/Lib/Lua53" EGTLIBVER ".lib")
+#pragma comment(lib, EGTEXTDIR "Lua/Lib/Lua54" EGTLIBVER ".lib")
 #pragma comment(lib, EGTLIBDIR "SEgtLock" EGTLIBVER ".lib")