From f8bc7083a98e4be2d69086d1d72d4d3bda8db681 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.sassi@egalware.com>
Date: Tue, 9 Apr 2024 14:49:24 +0200
Subject: [PATCH] EgtExecutor 2.6d2 : - estensione gestione chiave di rete per
 meglio identificare l'eventuale problema - migliorie a proiezione di curva su
 superficie - ricompilazione per modifiche a EgtLock.

---
 EXE_GdbModifyCurve.cpp |  23 ++++++++++++++++-------
 EXE_General.cpp        |   7 +++++++
 EgtExecutor.rc         | Bin 18890 -> 18890 bytes
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/EXE_GdbModifyCurve.cpp b/EXE_GdbModifyCurve.cpp
index 0de5c07..9ccefab 100644
--- a/EXE_GdbModifyCurve.cpp
+++ b/EXE_GdbModifyCurve.cpp
@@ -27,6 +27,7 @@
 #include "/EgtDev/Include/EGkIntersCurves.h"
 #include "/EgtDev/Include/EGkDistPointCurve.h"
 #include "/EgtDev/Include/EGkCurveLocal.h"
+#include "/EgtDev/Include/EGkSurfLocal.h"
 #include "/EgtDev/Include/EGkCurveAux.h"
 #include "/EgtDev/Include/EGkOffsetCurve.h"
 #include "/EgtDev/Include/EGkMedialAxis.h"
@@ -2396,8 +2397,8 @@ MyProjectCurveOnSurfTmExt( int nCurveId, int nSurfTmId, int nGuideId, int nDestG
             return false ;
       }
    }
-   Frame3d frAux ;
-   if ( ! pGeomDB->GetGlobFrame( nGuideId, frAux))
+   Frame3d frGde ;
+   if ( ! pGeomDB->GetGlobFrame( nGuideId, frGde))
       return false ;
   // recupero il riferimento del gruppo di destinazione
    nDestGrpId = AdjustId( nDestGrpId) ;
@@ -2411,19 +2412,27 @@ MyProjectCurveOnSurfTmExt( int nCurveId, int nSurfTmId, int nGuideId, int nDestG
   // eseguo l'opportuna proiezione dopo aver portato l'entità guida nel riferimento della superficie
    PNT5AXVECTOR vPt5ax ;
    if ( pGdePnt != nullptr) {
-     // per ora non gestito
-      return false ;
+      PtrOwner<IGeoPoint3d> pGdeLoc( pGdePnt->Clone()) ;
+      if ( pGdeLoc == nullptr)
+         return false ;
+      pGdeLoc->LocToLoc( frGde, frStm) ;
+      if ( ! ProjectCurveOnSurfTm( *CrvLoc.Get(), *pStm, *pGdeLoc, dLinTol, dMaxSegmLen, vPt5ax))
+         return false ;
    }
    else if ( pGdeCrv != nullptr) {
-      CurveLocal GdeLoc( pGdeCrv, frCrv, frStm) ;
+      CurveLocal GdeLoc( pGdeCrv, frGde, frStm) ;
       if ( GdeLoc.Get() == nullptr)
          return false ;
       if ( ! ProjectCurveOnSurfTm( *CrvLoc.Get(), *pStm, *GdeLoc.Get(), dLinTol, dMaxSegmLen, vPt5ax))
          return false ;
    }
    else { // pGdeStm != nullptr
-     // per ora non gestito
-      return false ;
+      SurfLocal GdeLoc( pGdeStm, frGde, frStm) ;
+      const ISurfTriMesh* pGdeLoc = GetSurfTriMesh( GdeLoc.Get()) ;
+      if ( pGdeLoc == nullptr)
+         return false ;
+      if ( ! ProjectCurveOnSurfTm( *CrvLoc.Get(), *pStm, *pGdeLoc, dLinTol, dMaxSegmLen, vPt5ax))
+         return false ;
    }
   // inserisco la composita nel gruppo destinazione
    PtrOwner<ICurveComposite> pCompo ;
diff --git a/EXE_General.cpp b/EXE_General.cpp
index 3e27623..e6bc002 100644
--- a/EXE_General.cpp
+++ b/EXE_General.cpp
@@ -345,6 +345,13 @@ ExeSetNetHwKey( bool bNetHwKey, int nUserId, const string& sAddrPort)
    return SetNetHwKey( s_bNetHwKey, nUserId, sAddrPort) ;
 }
 
+//-----------------------------------------------------------------------------
+bool
+ExeGetNetHwKey( void)
+{
+   return s_bNetHwKey ;
+}
+
 //-----------------------------------------------------------------------------
 bool
 ExeSetFont( const string& sNfeFontDir, const string& sDefaultFont)
diff --git a/EgtExecutor.rc b/EgtExecutor.rc
index 8e6e47b18bb2b3e2f08f8dccb40f704b0e7b4019..af11a139a991fa018202d39918f7e2367b9a19ab 100644
GIT binary patch
delta 81
zcmX>#neo(Q#tpyN7>zdnW^-i*QjT29S-`yGOp`YVRxuh)cH~Ol+$UrM5<M*jRwF2d
OP}86YQxm6@qYeO>m>XaK

delta 81
zcmX>#neo(Q#tpyN7!5c7W^-i*QjT29S-`yGOp`YVRxuh*cH~Ol+$UrM5<M*jRwF2d
OP}86YQxm6@qYeO=OdD7L