EgtExecutor :

- aggiunte funzioni exe e lua CopyEx e CopyGlobEx.
2025-10-08 18:32:36 +02:00
parent 248aa6f948
commit 16930e4c4e
6 changed files with 148 additions and 44 deletions
@@ -18,6 +18,7 @@
 #include "GeoTools.h"
 #include "AuxTools.h"
 #include "/EgtDev/Include/EXeExecutor.h"
+#include "/EgtDev/Include/EGkMultiGeomDB.h"
 #include "/EgtDev/Include/EGkStringUtils3d.h"
 #include "/EgtDev/Include/EGkUiUnits.h"
 #include "/EgtDev/Include/EgtStringConverter.h"
@@ -300,16 +301,39 @@ ExeCopy( int nSouId, int nRefId, int nSonBeforeAfter)
   ExeSetModified() ;
  // se richiesto, salvo il comando Lua equivalente
   if ( IsCmdLog()) {
-      string sLua ;
-      if ( nSonBeforeAfter == GDB_LAST_SON)
-         sLua = "EgtCopy(" + ToString( nSouId) + "," +
-                             IdToString( nRefId) + ")" +
-                " -- Id=" + ToString( nNewId) ;
-      else
-         sLua = "EgtCopy(" + ToString( nSouId) + "," +
-                             IdToString( nRefId) + "," +
-                             InsToString( nSonBeforeAfter) + ")" +
-                " -- Id=" + ToString( nNewId) ;
+      string sLua = "EgtCopy(" + ToString( nSouId) + "," +
+                                 IdToString( nRefId) + "," +
+                                 InsToString( nSonBeforeAfter) + ")" +
+                    " -- Id=" + ToString( nNewId) ;
+      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
+   }
+  // restituisco risultato
+   return nNewId ;
+}
+
+//-----------------------------------------------------------------------------
+int
+ExeCopyEx( int nSouCtx, int nSouId, int nDestCtx, int nRefId, int nSonBeforeAfter)
+{
+  // recupero i due GeomDB
+   IGeomDB* pSouGeomDB = GetGeomDB( nSouCtx) ;
+   VERIFY_GEOMDB( pSouGeomDB, GDB_ID_NULL)
+   IGeomDB* pDstGeomDB = GetGeomDB( nDestCtx) ;
+   VERIFY_GEOMDB( pDstGeomDB, GDB_ID_NULL)
+  // risolvo l'Id di riferimento per destinazione
+   nRefId = AdjustId( nRefId, nDestCtx) ;
+  // eseguo la copia
+   int nNewId = Copy( pSouGeomDB, nSouId, pDstGeomDB, GDB_ID_NULL, nRefId, nSonBeforeAfter) ;
+   pDstGeomDB->RemoveInfo( nNewId, GDB_SI_LIST) ;
+   pDstGeomDB->RemoveInfo( nNewId, GDB_SI_DUPLIST) ;
+  // se richiesto, salvo il comando Lua equivalente
+   if ( IsCmdLog()) {
+      string sLua = "EgtCopyEx(" + ToString( nSouCtx) + "," +
+                                   ToString( nSouId) + "," +
+                                   ToString( nDestCtx) + "," +
+                                   IdToString( nRefId) + "," +
+                                   InsToString( nSonBeforeAfter) + ")" +
+                    " -- Id=" + ToString( nNewId) ;
      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
   }
  // restituisco risultato
@@ -330,16 +354,39 @@ ExeCopyGlob( int nSouId, int nRefId, int nSonBeforeAfter)
   ExeSetModified() ;
  // se richiesto, salvo il comando Lua equivalente
   if ( IsCmdLog()) {
-      string sLua ;
-      if ( nSonBeforeAfter == GDB_LAST_SON)
-         sLua = "EgtCopyGlob(" + ToString( nSouId) + "," +
-                                 IdToString( nRefId) + ")" +
-                " -- Id=" + ToString( nNewId) ;
-      else
-         sLua = "EgtCopyGlob(" + ToString( nSouId) + "," +
-                                 IdToString( nRefId) + "," +
-                                 InsToString( nSonBeforeAfter) + ")" +
-                " -- Id=" + ToString( nNewId) ;
+      string sLua = "EgtCopyGlob(" + ToString( nSouId) + "," +
+                                     IdToString( nRefId) + "," +
+                                     InsToString( nSonBeforeAfter) + ")" +
+                    " -- Id=" + ToString( nNewId) ;
+      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
+   }
+  // restituisco risultato
+   return nNewId ;
+}
+
+//-----------------------------------------------------------------------------
+int
+ExeCopyGlobEx( int nSouCtx, int nSouId, int nDestCtx, int nRefId, int nSonBeforeAfter)
+{
+  // recupero i due GeomDB
+   IGeomDB* pSouGeomDB = GetGeomDB( nSouCtx) ;
+   VERIFY_GEOMDB( pSouGeomDB, GDB_ID_NULL)
+   IGeomDB* pDstGeomDB = GetGeomDB( nDestCtx) ;
+   VERIFY_GEOMDB( pDstGeomDB, GDB_ID_NULL)
+  // risolvo l'Id di riferimento per destinazione
+   nRefId = AdjustId( nRefId, nDestCtx) ;
+  // eseguo la copia
+   int nNewId = CopyGlob( pSouGeomDB, nSouId, pDstGeomDB, GDB_ID_NULL, nRefId, nSonBeforeAfter) ;
+   pDstGeomDB->RemoveInfo( nNewId, GDB_SI_LIST) ;
+   pDstGeomDB->RemoveInfo( nNewId, GDB_SI_DUPLIST) ;
+  // se richiesto, salvo il comando Lua equivalente
+   if ( IsCmdLog()) {
+      string sLua = "EgtCopyGlobEx(" + ToString( nSouCtx) + "," +
+                                       ToString( nSouId) + "," +
+                                       ToString( nDestCtx) + "," +
+                                       IdToString( nRefId) + "," +
+                                       InsToString( nSonBeforeAfter) + ")" +
+                    " -- Id=" + ToString( nNewId) ;
      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
   }
  // restituisco risultato
@@ -358,16 +405,10 @@ ExeRelocate( int nSouId, int nRefId, int nSonBeforeAfter)
   ExeSetModified() ;
  // se richiesto, salvo il comando Lua equivalente
   if ( IsCmdLog()) {
-      string sLua ;
-      if ( nSonBeforeAfter == GDB_LAST_SON)
-         sLua = "EgtRelocate(" + ToString( nSouId) + "," +
-                                 IdToString( nRefId) + ")" +
-                " -- Ok=" + ToString( bOk) ;
-      else
-         sLua = "EgtRelocate(" + ToString( nSouId) + "," +
-                                 IdToString( nRefId) + "," +
-                                 InsToString( nSonBeforeAfter) + ")" +
-                " -- Ok=" + ToString( bOk) ;
+      string sLua = "EgtRelocate(" + ToString( nSouId) + "," +
+                                     IdToString( nRefId) + "," +
+                                     InsToString( nSonBeforeAfter) + ")" +
+                    " -- Ok=" + ToString( bOk) ;
      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
   }
  // restituisco risultato
@@ -386,16 +427,10 @@ ExeRelocateGlob( int nSouId, int nRefId, int nSonBeforeAfter)
   ExeSetModified() ;
  // se richiesto, salvo il comando Lua equivalente
   if ( IsCmdLog()) {
-      string sLua ;
-      if ( nSonBeforeAfter == GDB_LAST_SON)
-         sLua = "EgtRelocateGlob(" + ToString( nSouId) + "," +
-                                     IdToString( nRefId) + ")" +
-                " -- Ok=" + ToString( bOk) ;
-      else
-         sLua = "EgtRelocateGlob(" + ToString( nSouId) + "," +
-                                     IdToString( nRefId) + "," +
-                                     InsToString( nSonBeforeAfter) + ")" +
-                " -- Ok=" + ToString( bOk) ;
+      string sLua = "EgtRelocateGlob(" + ToString( nSouId) + "," +
+                                         IdToString( nRefId) + "," +
+                                         InsToString( nSonBeforeAfter) + ")" +
+                    " -- Ok=" + ToString( bOk) ;
      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
   }
  // restituisco risultato