From 129dfa412ef2cbee0dec696ca90a027cb9f71939 Mon Sep 17 00:00:00 2001 From: DarioS Date: Mon, 5 Jun 2023 08:05:31 +0200 Subject: [PATCH 1/3] Include : - aggiornamento prototipi - aggiornamento codici mensili di protezione. --- EGnGetKeyData.h | 2 ++ EXeExecutor.h | 2 +- EgtKeyCodes.h | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/EGnGetKeyData.h b/EGnGetKeyData.h index 66c9b73..6b050bd 100644 --- a/EGnGetKeyData.h +++ b/EGnGetKeyData.h @@ -31,3 +31,5 @@ EGN_EXPORT bool SetEGnKeyLevel( int nRet, int nKeyLev, int nKeyExpDays) ; EGN_EXPORT int GetEGnKeyLevel( int nProd, int nVer, int nLev, int& nKeyLev, int& nKeyExpDays) ; EGN_EXPORT bool SetEGnKeyOptions( int nRet, int nKeyOpt1, int nKeyOpt2, int nKeyOptExpDays) ; EGN_EXPORT int GetEGnKeyOptions( int nProd, int nVer, int nLev, unsigned int& nKeyOpt1, unsigned int& nKeyOpt2, int& nKeyOptExpDays) ; +// Interpretazione della stringa di LockId +EGN_EXPORT bool GetLockIdStringInfo( const std::string& sLockId, int& nKeyType, bool& bNetKey, int& nUserId) ; diff --git a/EXeExecutor.h b/EXeExecutor.h index b15a8ff..c88c7a0 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -55,7 +55,7 @@ EXE_EXPORT bool ExeGetExecutableVersion( std::string& sVer) ; EXE_EXPORT bool ExeGetVersionInfo( std::string& sVer, const char* szNewLine) ; EXE_EXPORT bool ExeGetKeyInfo( std::string& sKey) ; EXE_EXPORT bool ExeSetLockType( int nType) ; -EXE_EXPORT bool ExeSetLockId( std::string sLockId) ; +EXE_EXPORT bool ExeSetLockId( const std::string& sLockId) ; EXE_EXPORT bool ExeSetNetHwKey( bool bNetHwKey, int nUserId = 0) ; EXE_EXPORT bool ExeGetKeyLevel( int nProd, int nVer, int nLev, int& nKLev) ; EXE_EXPORT bool ExeGetKeyOptions( int nProd, int nVer, int nLev, unsigned int& nOpt2) ; diff --git a/EgtKeyCodes.h b/EgtKeyCodes.h index 924176b..5184ef5 100644 --- a/EgtKeyCodes.h +++ b/EgtKeyCodes.h @@ -24,7 +24,7 @@ //---------------------------------------------------------------------------- const int KEY_BASELIB_PROD = 207 ; -const int KEY_BASELIB_VER = 2505 ; +const int KEY_BASELIB_VER = 2506 ; const int KEY_BASELIB_LEV = 1 ; //---------------------------------------------------------------------------- From 328f571012e6d0e31e945aa503b07a4b75b10116 Mon Sep 17 00:00:00 2001 From: DarioS Date: Mon, 19 Jun 2023 08:00:20 +0200 Subject: [PATCH 2/3] Include : - aggiornamento prototipi - aggiunta costante per verifica collisione in simulazione con poliedri. --- EGkCDeClosedSurfTmClosedSurfTm.h | 6 +++--- EMkSimuGenConst.h | 3 ++- EXeExecutor.h | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/EGkCDeClosedSurfTmClosedSurfTm.h b/EGkCDeClosedSurfTmClosedSurfTm.h index 011d3f6..f84a1fe 100644 --- a/EGkCDeClosedSurfTmClosedSurfTm.h +++ b/EGkCDeClosedSurfTmClosedSurfTm.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- -// EgalTech 2020-2020 +// EgalTech 2020-2023 //---------------------------------------------------------------------------- -// File : EGkCDeSurfTmSurfTm.h Data : 13.11.20 Versione : +// File : EGkCDeClosedSurfTmClosedSurfTm.h Data : 14.06.23 Versione : 2.5f3 // Contenuto : Dichiarazione funzione verifica collisione tra // SurfTm e SurfTm. // @@ -27,4 +27,4 @@ // di collisione o inconsistenza dei parametri di input. // Le due superfici devono essere espresse nel medesimo sistema di riferimento. // La distanza di sicurezza ha effetto solo se maggiore di EPS_SMALL. -EGK_EXPORT bool CDeClosedSurfTmClosedSurfTm( const SurfTriMesh& SurfA, const SurfTriMesh& SurfB, double dSafeDist) ; \ No newline at end of file +EGK_EXPORT bool CDeClosedSurfTmClosedSurfTm( const ISurfTriMesh& SurfA, const ISurfTriMesh& SurfB, double dSafeDist) ; diff --git a/EMkSimuGenConst.h b/EMkSimuGenConst.h index 049acbd..50fe8c3 100644 --- a/EMkSimuGenConst.h +++ b/EMkSimuGenConst.h @@ -35,7 +35,8 @@ enum SimCollObjType { MCH_SIM_COB_NULL = 0, MCH_SIM_COB_BOX = 1, MCH_SIM_COB_CYL = 2, MCH_SIM_COB_SPHE = 3, - MCH_SIM_COB_CONE = 4} ; + MCH_SIM_COB_CONE = 4, + MCH_SIM_COB_POLY = 101} ; //------------------------ Stato di visualizzazione della macchina ------------ enum MachLook { MCH_LOOK_NONE = -1, diff --git a/EXeExecutor.h b/EXeExecutor.h index c88c7a0..d82c2f4 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -792,6 +792,7 @@ EXE_EXPORT int ExeCDeRectPrismoidSolid( const Frame3d& frPrismoid, double dBase EXE_EXPORT int ExeCDeCylSolid( const Frame3d& frCyl, double dR, double dH, int nSolidId, double dSafeDist, int nRefType) ; EXE_EXPORT int ExeCDeConeSolid( const Frame3d& frCone, double dR1, double dR2, double dH, int nSolidId, double dSafeDist, int nRefType) ; EXE_EXPORT int ExeCDeSpheSolid( const Point3d& ptCen, double dR, int nSolidId, double dSafeDist, int nRefType) ; +EXE_EXPORT int ExeCDeSolidSolid( int nSolid1Id, int nSolid2Id, double dSafeDist) ; // Maximum Filler EXE_EXPORT bool ExeMaxFillerStart( void) ; From e2295d25025581da9357a4c7f806c0371063f191 Mon Sep 17 00:00:00 2001 From: Daniele Bariletti Date: Wed, 21 Jun 2023 09:39:09 +0200 Subject: [PATCH 3/3] Include : - aggiunte funzioni per superfici di bezier. --- EGkSurfBezier.h | 2 ++ EXeExecutor.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/EGkSurfBezier.h b/EGkSurfBezier.h index d53d306..6ebf797 100644 --- a/EGkSurfBezier.h +++ b/EGkSurfBezier.h @@ -37,6 +37,7 @@ class __declspec( novtable) ISurfBezier : public ISurf virtual bool SetControlPoint( int nIndU, int nIndV, const Point3d& ptCtrl, double dW) = 0 ; virtual bool SetControlPoint( int nInd, const Point3d& ptCtrl, double dW) = 0 ; virtual bool SetTrimRegion( const ISurfFlatRegion& sfrTrimReg) = 0 ; + virtual ISurfFlatRegion* GetTrimRegion( void) const = 0 ; virtual bool GetInfo( int& nDegU, int& nDegV, int& nSpanU, int& nSpanV, bool& bIsRat, bool& bTrimmed) const = 0 ; virtual const Point3d& GetControlPoint( int nIndU, int nIndV, bool* pbOk) const = 0 ; virtual const Point3d& GetControlPoint( int nInd, bool* pbOk) const = 0 ; @@ -57,6 +58,7 @@ class __declspec( novtable) ISurfBezier : public ISurf virtual bool GetControlCurveOnU( int nIndV, PolyLine& plCtrlU) const = 0 ; virtual bool GetControlCurveOnV( int nIndU, PolyLine& plCtrlV) const = 0 ; virtual const ISurfTriMesh* GetAuxSurf( void) const = 0 ; + virtual bool GetLeaves ( std::vector>& vLeaves) const = 0 ; } ; //----------------------------------------------------------------------------- diff --git a/EXeExecutor.h b/EXeExecutor.h index 3246be2..3cd861e 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -352,6 +352,7 @@ EXE_EXPORT int ExeCreateSurfTmBySurfBezier( int nParentId, int nSbezId) ; EXE_EXPORT int ExeCreateSurfTmByVolZmap( int nParentId, int nZmapId, int nPart) ; EXE_EXPORT int ExeCreateSurfBezier( int nParentId, int nDegU, int nDegV, int nSpanU, int nSpanV, const PNTVECTOR& vPnt, int nRefType) ; EXE_EXPORT int ExeCreateSurfBezierRational( int nParentId, int nDegU, int nDegV, int nSpanU, int nSpanV, const PNTUVECTOR& vPntW, int nRefType) ; +EXE_EXPORT int ExeCreateSurfBezierLeaves( int nParentId, int nSurfBzId, int nTextHeight) ; // GeomDB Create Volume EXE_EXPORT int ExeCreateVolZmap( int nParentId, const Point3d& ptIni, double dDimX, @@ -601,6 +602,7 @@ EXE_EXPORT bool ExeSurfTmIntersect( int nId1, int nId2, bool bTwoColors = false) EXE_EXPORT bool ExeSurfTmResetTwoColors( int nId) ; EXE_EXPORT int ExeSurfTmSplit( int nId, int nSplitterId, int* pnCount) ; EXE_EXPORT bool ExeSurfTmCut( int nId, int nCutterId, bool bInVsOut, bool bSaveOnEq) ; +EXE_EXPORT bool ExeSurfBzTrim( int nId, int nCutterId) ; // GeomDb Volume Modify EXE_EXPORT int ExeExplodeVolume( int nId, int* pnCount) ;