From 6b170b6ec17afd14ab63b485347dceda6b91bf13 Mon Sep 17 00:00:00 2001 From: DarioS Date: Mon, 24 May 2021 20:08:00 +0200 Subject: [PATCH 1/3] Include : - aggiunta costante MCH_SIM_COB_CONE. --- EGkCDeConeFrustumClosedSurfTm.h | 2 +- EMkMachMgr.h | 2 +- EMkSimuGenConst.h | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/EGkCDeConeFrustumClosedSurfTm.h b/EGkCDeConeFrustumClosedSurfTm.h index c74e185..735c2bd 100644 --- a/EGkCDeConeFrustumClosedSurfTm.h +++ b/EGkCDeConeFrustumClosedSurfTm.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- // EgalTech 2020-2020 //---------------------------------------------------------------------------- -// File : EGkCDeConeClosedSurfTm.h Data : 09.11.20 Versione : +// File : EGkCDeConeFrustumClosedSurfTm.h Data : 09.11.20 Versione : // Contenuto : Dichiarazione funzione verifica collisione tra // Cone e Closed SurfTriMesh. // diff --git a/EMkMachMgr.h b/EMkMachMgr.h index a510c0d..923f8dc 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- // EgalTech 2015-2021 //---------------------------------------------------------------------------- -// File : EMkMachMgr.h Data : 13.01.21 Versione : 2.3a3 +// File : EMkMachMgr.h Data : 24.05.21 Versione : 2.3e3 // Contenuto : Dichiarazione della interfaccia IMachMgr. // // diff --git a/EMkSimuGenConst.h b/EMkSimuGenConst.h index 2ea3dbd..3fcb367 100644 --- a/EMkSimuGenConst.h +++ b/EMkSimuGenConst.h @@ -34,7 +34,8 @@ enum SimUiStat { MCH_UISIM_NULL = 0, 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_SPHE = 3, + MCH_SIM_COB_CONE = 4} ; //------------------------ Stato di visualizzazione della macchina ------------ enum MachLook { MCH_LOOK_NONE = -1, From 3a3198b63bbabe33c8af0c6a546bcc10064ecf72 Mon Sep 17 00:00:00 2001 From: DarioS Date: Tue, 1 Jun 2021 19:36:25 +0200 Subject: [PATCH 2/3] Include : - aggiornamento prototipi. --- EExBeamMgr.h | 10 +++++----- EInAPI.h | 4 ++-- EXeExecutor.h | 4 ++-- EgtKeyCodes.h | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/EExBeamMgr.h b/EExBeamMgr.h index ae7b1ab..6c98f7e 100644 --- a/EExBeamMgr.h +++ b/EExBeamMgr.h @@ -1,13 +1,13 @@ //---------------------------------------------------------------------------- -// EgalTech 2020-2020 +// EgalTech 2020-2021 //---------------------------------------------------------------------------- -// File : EExBeamMgr.h Data : 30.08.20 Versione : 2.2i1 +// File : EExBeamMgr.h Data : 01.06.21 Versione : 2.2f1 // Contenuto : Dichiarazione della interfaccia IBeamMgr. // // // // Modifiche : 30.08.20 DS Creazione modulo. -// +// 01.06.21 DS Aggiunti parametri vsUAtt per Process. // //---------------------------------------------------------------------------- @@ -41,9 +41,9 @@ class __declspec( novtable) IBeamMgr virtual bool SetPartCount( int nCount) = 0 ; virtual bool SetPartBox( double dLength, double dHeight, double dWidth, bool bUpdate = true) = 0 ; virtual int AddProcess( int nGroup, int nProc, int nSide, const std::string& sDes, int nProcId, - const Frame3d& frRef, const DBLVECTOR& vdPar, const std::string& sPar, bool bUpdate = true) = 0 ; + const Frame3d& frRef, const DBLVECTOR& vdPar, const std::string& sPar, const STRVECTOR& vsUAtt, bool bUpdate = true) = 0 ; virtual int ModifyProcess( int nGeomId, int nGroup, int nProc, int nSide, const std::string& sDes, int nProcId, - const Frame3d& frRef, const DBLVECTOR& vdPar, const std::string& sPar, bool bUpdate = true) = 0 ; + const Frame3d& frRef, const DBLVECTOR& vdPar, const std::string& sPar, const STRVECTOR& vsUAtt, bool bUpdate = true) = 0 ; virtual bool EraseProcess( int nGeomId, bool bUpdate = true) = 0 ; virtual bool EnableProcess( int nGeomId, bool bEnable, bool bUpdate = true) = 0 ; virtual bool CalcSolid( int nPartId, bool bRecalc = false) = 0 ; diff --git a/EInAPI.h b/EInAPI.h index a7b8c23..43e69bf 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -126,10 +126,10 @@ EIN_EXPORT BOOL __stdcall EgtBeamSetPartCount( int nCount) ; EIN_EXPORT BOOL __stdcall EgtBeamSetPartBox( double dLength, double dHeight, double dWidth, BOOL bUpdate) ; EIN_EXPORT int __stdcall EgtBeamAddProcess( int nGroup, int nProc, int nSide, const wchar_t* wsDes, int nProcId, const double ptOrig[3], const double vX[3], const double vY[3], const double vZ[3], - int nPar, const double vPar[], const wchar_t* wsPar, BOOL bUpdate) ; + int nPar, const double vPar[], const wchar_t* wsPar, const wchar_t* wsUAtts, BOOL bUpdate) ; EIN_EXPORT int __stdcall EgtBeamModifyProcess( int nGeomId, int nGroup, int nProc, int nSide, const wchar_t* wsDes, int nProcId, const double ptOrig[3], const double vX[3], const double vY[3], const double vZ[3], - int nPar, const double vPar[], const wchar_t* wsPar, BOOL bUpdate) ; + int nPar, const double vPar[], const wchar_t* wsPar, const wchar_t* wsUAtts, BOOL bUpdate) ; EIN_EXPORT BOOL __stdcall EgtBeamEraseProcess( int nGeomId, BOOL bUpdate) ; EIN_EXPORT BOOL __stdcall EgtBeamEnableProcess( int nGeomId, BOOL bEnable, BOOL bUpdate) ; EIN_EXPORT BOOL __stdcall EgtBeamCalcSolid( int nPartId, BOOL bRecalc) ; diff --git a/EXeExecutor.h b/EXeExecutor.h index f50434e..0cfcd6a 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -131,9 +131,9 @@ EXE_EXPORT bool ExeBeamSetPartName( const std::string& sName) ; EXE_EXPORT bool ExeBeamSetPartCount( int nCount) ; EXE_EXPORT bool ExeBeamSetPartBox( double dLength, double dHeight, double dWidth, bool bUpdate = true) ; EXE_EXPORT int ExeBeamAddProcess( int nGroup, int nProc, int nSide, const std::string& sDes, int nProcId, - const Frame3d& frRef, const DBLVECTOR& vdPar, const std::string& sPar, bool bUpdate = true) ; + const Frame3d& frRef, const DBLVECTOR& vdPar, const std::string& sPar, const STRVECTOR& vsUAtt, bool bUpdate = true) ; EXE_EXPORT int ExeBeamModifyProcess( int nGeomId, int nGroup, int nProc, int nSide, const std::string& sDes, int nProcId, - const Frame3d& frRef, const DBLVECTOR& vdPar, const std::string& sPar, bool bUpdate = true) ; + const Frame3d& frRef, const DBLVECTOR& vdPar, const std::string& sPar, const STRVECTOR& vsUAtt, bool bUpdate = true) ; EXE_EXPORT bool ExeBeamEraseProcess( int nGeomId, bool bUpdate = true) ; EXE_EXPORT bool ExeBeamEnableProcess( int nGeomId, bool bEnable, bool bUpdate = true) ; EXE_EXPORT bool ExeBeamCalcSolid( int nPartId, bool bRecalc = false) ; diff --git a/EgtKeyCodes.h b/EgtKeyCodes.h index 3bc6a85..d43e6dd 100644 --- a/EgtKeyCodes.h +++ b/EgtKeyCodes.h @@ -21,7 +21,7 @@ //---------------------------------------------------------------------------- const int KEY_BASELIB_PROD = 207 ; -const int KEY_BASELIB_VER = 2305 ; +const int KEY_BASELIB_VER = 2306 ; const int KEY_BASELIB_LEV = 1 ; //---------------------------------------------------------------------------- From 828a8017cbf15500b2865bf602245facab47b389 Mon Sep 17 00:00:00 2001 From: DarioS Date: Wed, 16 Jun 2021 17:24:35 +0200 Subject: [PATCH 3/3] Include : - aggiornamento prototipi. --- EXeExecutor.h | 1 + 1 file changed, 1 insertion(+) diff --git a/EXeExecutor.h b/EXeExecutor.h index 0cfcd6a..9a98ca9 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -49,6 +49,7 @@ EXE_EXPORT bool ExeGetIniFile( std::string& sIniFile) ; EXE_EXPORT bool ExeSetCommandLogger( const std::string& sLogFile) ; EXE_EXPORT bool ExeEnableCommandLogger( void) ; EXE_EXPORT bool ExeDisableCommandLogger( void) ; +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) ;