diff --git a/EExBeamMgr.h b/EExBeamMgr.h index dc55e30..49c7fd0 100644 --- a/EExBeamMgr.h +++ b/EExBeamMgr.h @@ -16,6 +16,7 @@ #include "/EgtDev/Include/EGkGeomDB.h" #include "/EgtDev/Include/EExBeamConst.h" +#include "/EgtDev/Include/EgtFunPtrType.h" #include //----------------------- Macro per import/export ---------------------------- @@ -53,6 +54,8 @@ class __declspec( novtable) IBeamMgr int nCrvId, int nCrv2Id, 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 CalcAllSolids( bool bShow, bool bRecalc, pcfProcEvents pFun = nullptr) = 0 ; + virtual bool ShowAllSolids( bool bShow, pcfProcEvents pFun = nullptr) = 0 ; virtual bool CalcSolid( int nPartId, bool bRecalc = false) = 0 ; virtual int GetSolid( int nPartId) const = 0 ; virtual bool ShowSolid( int nPartId, bool bShow) = 0 ; diff --git a/EGkDllMain.h b/EGkDllMain.h index 271f5df..27c1b30 100644 --- a/EGkDllMain.h +++ b/EGkDllMain.h @@ -50,4 +50,4 @@ EGK_EXPORT const std::string& GetNfeFontDir( void) ; // restituisce il nome del font di default EGK_EXPORT const std::string& GetDefaultFont( void) ; // imposto il gestore eventi -EGK_EXPORT bool SetEGkProcessEvents( pfProcEvents pFun) ; +EGK_EXPORT bool SetEGkProcessEvents( psfProcEvents pFun) ; diff --git a/EInAPI.h b/EInAPI.h index 2335f6b..a11d1cf 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -34,8 +34,8 @@ extern "C" { // General EIN_EXPORT BOOL __stdcall EgtInit( int nDebug, const wchar_t* wsLogFile, const wchar_t* wsLogMsg) ; EIN_EXPORT BOOL __stdcall EgtExit( void) ; -typedef bool (__stdcall * pfOnTerminateProcess) ( int) ; -EIN_EXPORT BOOL __stdcall EgtSetOnTerminateProcess( pfOnTerminateProcess pFun) ; +typedef bool (__stdcall * psfOnTerminateProcess) ( int) ; +EIN_EXPORT BOOL __stdcall EgtSetOnTerminateProcess( psfOnTerminateProcess pFun) ; EIN_EXPORT BOOL __stdcall EgtSetUserLevel( int nUserLev) ; EIN_EXPORT int __stdcall EgtGetUserLevel( void) ; EIN_EXPORT BOOL __stdcall EgtSetKey( const wchar_t* wsKey) ; @@ -65,10 +65,10 @@ EIN_EXPORT BOOL __stdcall EgtGetCpuInfo( wchar_t*& wsCpu) ; EIN_EXPORT BOOL __stdcall EgtGetMemoryInfo( wchar_t*& wsMem) ; EIN_EXPORT BOOL __stdcall EgtFreeMemory( void* pMem) ; EIN_EXPORT BOOL __stdcall EgtOutLog( const wchar_t* wsMsg) ; -typedef int (__stdcall * pfProcEvents) (int, int) ; -EIN_EXPORT BOOL __stdcall EgtSetProcessEvents( pfProcEvents pFun) ; -typedef BOOL (__stdcall * pfOutTextW) (wchar_t*&) ; -EIN_EXPORT BOOL __stdcall EgtSetOutText( pfOutTextW pFun) ; +typedef int (__stdcall * psfProcEvents) (int, int) ; +EIN_EXPORT BOOL __stdcall EgtSetProcessEvents( psfProcEvents pFun) ; +typedef BOOL (__stdcall * psfOutTextW) (wchar_t*&) ; +EIN_EXPORT BOOL __stdcall EgtSetOutText( psfOutTextW pFun) ; EIN_EXPORT BOOL __stdcall EgtSetTempDir( const wchar_t* wsTempDir) ; EIN_EXPORT BOOL __stdcall EgtGetTempDir( wchar_t*& wsTempDir) ; EIN_EXPORT BOOL __stdcall EgtSetMainWindowHandle( HWND hMainWnd) ; diff --git a/EXeExecutor.h b/EXeExecutor.h index f45f129..62acb10 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -37,7 +37,7 @@ class LuaMgr ; // General EXE_EXPORT bool ExeInit( int nDebug, const std::string& sLogFile, const std::string& sLogMsg) ; EXE_EXPORT bool ExeExit( void) ; -EXE_EXPORT bool ExeSetOnTerminateProcess( pfOnTerminateProcess pFun) ; +EXE_EXPORT bool ExeSetOnTerminateProcess( psfOnTerminateProcess pFun) ; EXE_EXPORT bool ExeOnTerminateProcess( int nExitCode) ; EXE_EXPORT int ExeGetDebugLevel( void) ; EXE_EXPORT bool ExeSetUserLevel( int nUserLev) ; @@ -72,9 +72,9 @@ EXE_EXPORT bool ExeOutLog( const std::string& sMsg, int nDebugLevel = 0) ; EXE_EXPORT bool ExeSetEnableUI( bool bEnableUI) ; EXE_EXPORT bool ExeGetEnableUI( void) ; EXE_EXPORT int ExeMessageBox( const std::string& sText, const std::string& sTitle, int nType) ; -EXE_EXPORT bool ExeSetProcessEvents( pfProcEvents pFun) ; +EXE_EXPORT bool ExeSetProcessEvents( psfProcEvents pFun) ; EXE_EXPORT int ExeProcessEvents( int nProg, int nPause) ; -EXE_EXPORT bool ExeSetOutText( pfOutText pFun) ; +EXE_EXPORT bool ExeSetOutText( psfOutText pFun) ; EXE_EXPORT bool ExeOutText( const std::string& sText) ; EXE_EXPORT bool ExeSetTempDir( const std::string& sTempDir) ; EXE_EXPORT bool ExeGetTempDir( std::string& sTempDir) ; @@ -160,6 +160,8 @@ EXE_EXPORT int ExeBeamModifyProcess( int nGeomId, int nGroup, int nProc, int nS int nCrvId, int nCrv2Id, 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 ExeBeamCalcAllSolids( bool bShow, bool bRecalc = false) ; +EXE_EXPORT bool ExeBeamShowAllSolids( bool bShow) ; EXE_EXPORT bool ExeBeamCalcSolid( int nPartId, bool bRecalc = false) ; EXE_EXPORT int ExeBeamGetSolid( int nPartId) ; EXE_EXPORT bool ExeBeamShowSolid( int nPartId, bool bShow) ; diff --git a/EgtFunPtrType.h b/EgtFunPtrType.h index 853e7a1..f97965b 100644 --- a/EgtFunPtrType.h +++ b/EgtFunPtrType.h @@ -1,13 +1,14 @@ //---------------------------------------------------------------------------- -// EgalTech 2018-2023 +// EgalTech 2018-2025 //---------------------------------------------------------------------------- -// File : EgtFunPtrType.h Data : 23.11.23 Versione : 2.5k5 +// File : EgtFunPtrType.h Data : 12.10.25 Versione : 2.7j25 // Contenuto : Dichiarazione tipi puntatori a funzione. // // // // Modifiche : 19.07.18 DS Creazione modulo. // 23.11.23 DS Aggiunta pfOnTerminateProcess. +// 12.10.25 DS Aggiunta pfCdeclProcEvents. // //---------------------------------------------------------------------------- @@ -16,6 +17,9 @@ #include //---------------------------------------------------------------------------- -typedef bool (__stdcall * pfOnTerminateProcess) ( int) ; -typedef int (__stdcall * pfProcEvents) ( int, int) ; -typedef bool (__stdcall * pfOutText) ( const std::string&) ; +typedef bool (__stdcall * psfOnTerminateProcess) ( int) ; +typedef int (__stdcall * psfProcEvents) ( int, int) ; +typedef bool (__stdcall * psfOutText) ( const std::string&) ; + +//---------------------------------------------------------------------------- +typedef int (__cdecl * pcfProcEvents) ( int, int) ;