diff --git a/EGkProjectCurveSurfTm.h b/EGkProjectCurveSurfTm.h index cbf8319..368e65d 100644 --- a/EGkProjectCurveSurfTm.h +++ b/EGkProjectCurveSurfTm.h @@ -13,6 +13,7 @@ #pragma once +#include "/EgtDev/Include/EGkGeoPoint3d.h" #include "/EgtDev/Include/EGkCurve.h" #include "/EgtDev/Include/EGkSurfTriMesh.h" @@ -44,5 +45,9 @@ typedef std::vector PNT5AXVECTOR ; // vettore di Punti 5assi // Proiezione di una curva su una superficie TriMesh lungo la direzione data. EGK_EXPORT bool ProjectCurveOnSurfTm( const ICurve& crCrv, const ISurfTriMesh& tmSurf, const Vector3d& vtDir, double dLinTol, double dMaxSegmLen, PNT5AXVECTOR& vPt5ax) ; +EGK_EXPORT bool ProjectCurveOnSurfTm( const ICurve& crCrv, const ISurfTriMesh& tmSurf, const IGeoPoint3d& gpRef, + double dLinTol, double dMaxSegmLen, PNT5AXVECTOR& vPt5ax) ; EGK_EXPORT bool ProjectCurveOnSurfTm( const ICurve& crCrv, const ISurfTriMesh& tmSurf, const ICurve& crRef, double dLinTol, double dMaxSegmLen, PNT5AXVECTOR& vPt5ax) ; +EGK_EXPORT bool ProjectCurveOnSurfTm( const ICurve& crCrv, const ISurfTriMesh& tmSurf, const ISurfTriMesh& tmRef, + double dLinTol, double dMaxSegmLen, PNT5AXVECTOR& vPt5ax) ; diff --git a/EGkSurfLocal.h b/EGkSurfLocal.h index 163f45c..42a76d5 100644 --- a/EGkSurfLocal.h +++ b/EGkSurfLocal.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- -// EgalTech 2017-2017 +// EgalTech 2017-2024 //---------------------------------------------------------------------------- -// File : EGkSurfLocal.h Data : 29.03.17 Versione : 1.8c3 +// File : EGkSurfLocal.h Data : 08.04.24 Versione : 2.6d2 // Contenuto : Classe gestione superfici nel locale desiderato. // // @@ -45,6 +45,25 @@ class SurfLocal m_pCopy->LocToLoc( frSrf, frLoc) ; m_pSrf = m_pCopy ; } + SurfLocal( const ISurf* pSurf, const Frame3d& frSrf, const Frame3d& frLoc) + : m_pSrf( nullptr), m_pCopy( nullptr) + { // verifica dei parametri + if ( pSurf == nullptr || &frSrf == nullptr || &frLoc == nullptr) + return ; + // assegno la superficie originale + m_pSrf = pSurf ; + // se i riferimenti coincidono non devo fare altro + if ( AreSameFrame( frSrf, frLoc)) + return ; + // copio la superficie e la porto in locale + m_pCopy = m_pSrf->Clone() ; + if ( m_pCopy == nullptr) { + m_pSrf = nullptr ; + return ; + } + m_pCopy->LocToLoc( frSrf, frLoc) ; + m_pSrf = m_pCopy ; + } SurfLocal( const SurfLocal& Other) : m_pSrf( nullptr), m_pCopy( nullptr) { // se non devo clonare diff --git a/EInAPI.h b/EInAPI.h index e1e4345..6e0441f 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -59,6 +59,7 @@ EIN_EXPORT BOOL __stdcall EgtGetKeyOptions( int nProd, int nVer, int nLev, unsig EIN_EXPORT BOOL __stdcall EgtGetKeyLeftDays( int* pnLeftDays) ; EIN_EXPORT BOOL __stdcall EgtGetKeyAssLeftDays( int* pnAssLeftDays) ; EIN_EXPORT BOOL __stdcall EgtGetKeyOptLeftDays( int* pnOptLeftDays) ; +EIN_EXPORT BOOL __stdcall EgtGetNetHwKey( void) ; EIN_EXPORT BOOL __stdcall EgtGetOsInfo( wchar_t*& wsOs) ; EIN_EXPORT BOOL __stdcall EgtGetCpuInfo( wchar_t*& wsCpu) ; EIN_EXPORT BOOL __stdcall EgtGetMemoryInfo( wchar_t*& wsMem) ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 8c60832..2bf02af 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -64,6 +64,7 @@ EXE_EXPORT bool ExeGetKeyOptions( int nProd, int nVer, int nLev, unsigned int& n EXE_EXPORT bool ExeGetKeyLeftDays( int& nLeftDays) ; EXE_EXPORT bool ExeGetKeyAssLeftDays( int& nAssLeftDays) ; EXE_EXPORT bool ExeGetKeyOptLeftDays( int& nOptLeftDays) ; +EXE_EXPORT bool ExeGetNetHwKey( void) ; EXE_EXPORT bool ExeGetOsInfo( std::string& sOs) ; EXE_EXPORT bool ExeGetCpuInfo( std::string& sCpu) ; EXE_EXPORT bool ExeGetMemoryInfo( std::string& sMem) ; diff --git a/SELkKeyProc.h b/SELkKeyProc.h index 673d6ac..84b5de9 100644 --- a/SELkKeyProc.h +++ b/SELkKeyProc.h @@ -44,3 +44,4 @@ const int KEY_ERR_VER = 5 ; const int KEY_ERR_LEV = 6 ; const int KEY_ERR_WRONG_TIME = 7 ; const int KEY_ERR_TIME = 8 ; +const int KEY_ERR_NETKEY_NOTFOUND = 9 ; diff --git a/SELkLockId.h b/SELkLockId.h index f7a6b09..b8c2c0e 100644 --- a/SELkLockId.h +++ b/SELkLockId.h @@ -23,6 +23,8 @@ bool SetLockType( int nType) ; bool SetNetHwKey( bool bNetHwKey, int nUserId, const std::string& sAddrPort) ; // Libero chiave di rete (da eseguire al termine del programma) bool CloseNetHwKey( void) ; +// Chiave di rete non trovata (il dispositivo non risponde) +bool NotFoundNetHwKey( void) ; // Recupero l'identificativo in chiaro della protezione bool GetLockId( std::string& sLockId) ; // Recupero l'identificativo cifrato della protezione