From 964381af0eb8b96301148e29a0fcf235d4e3acb5 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Thu, 4 Sep 2014 12:38:30 +0000 Subject: [PATCH] Include : - aggiornamento interfacce. --- EGnStringConverter.h | 2 ++ EInAPI.h | 54 +++++++++++++++++++++++++++++++++++--------- 2 files changed, 45 insertions(+), 11 deletions(-) diff --git a/EGnStringConverter.h b/EGnStringConverter.h index 6fa13cb..7a85cad 100644 --- a/EGnStringConverter.h +++ b/EGnStringConverter.h @@ -185,6 +185,7 @@ class AtoWEX typedef AtoWEX<> AtoW ; #define stringtoW(s) LPWSTR( AtoW( s.c_str())) +#define strztoW(sz) LPWSTR( AtoW( sz)) //----------------------------------------------------------------------------- @@ -252,6 +253,7 @@ class WtoAEX typedef WtoAEX<> WtoA ; #define wstringtoA(ws) LPSTR( WtoA( ws.c_str())) +#define wstrztoA(wsz) LPSTR( WtoA( wsz)) //----------------------------------------------------------------------------- diff --git a/EInAPI.h b/EInAPI.h index 853a95d..f7036be 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -29,10 +29,13 @@ extern "C" { #endif // API + // General EIN_EXPORT BOOL __stdcall EgtInit( int nDebug, const wchar_t* sLogFile) ; EIN_EXPORT BOOL __stdcall EgtExit( void) ; EIN_EXPORT BOOL __stdcall EgtSetFont( const wchar_t* sNfeFontDir, const wchar_t* sDefaultFont) ; +EIN_EXPORT BOOL __stdcall EgtFreeMemory( void* pMem) ; + // GeomDB EIN_EXPORT int __stdcall EgtInitGeomDB( void) ; EIN_EXPORT BOOL __stdcall EgtSetDefaultMaterial( int nGseCtx, int nRed, int nGreen, int nBlue) ; @@ -44,10 +47,48 @@ EIN_EXPORT BOOL __stdcall EgtImportDxf( int nGseCtx, const wchar_t* wsFilePath) EIN_EXPORT BOOL __stdcall EgtImportStl( int nGseCtx, const wchar_t* wsFilePath) ; EIN_EXPORT BOOL __stdcall EgtExportDxf( int nGseCtx, int nId, const wchar_t* wsFilePath) ; EIN_EXPORT BOOL __stdcall EgtExportStl( int nGseCtx, int nId, const wchar_t* wsFilePath) ; + +// GeomDB Objects +EIN_EXPORT BOOL __stdcall EgtExistsObj( int nGseCtx, int nId) ; +EIN_EXPORT int __stdcall EgtGetFirstInGroup( int nGseCtx, int nGroupId) ; +EIN_EXPORT int __stdcall EgtGetNext( int nGseCtx, int nId) ; +EIN_EXPORT int __stdcall EgtGetLastInGroup( int nGseCtx, int nGroupId) ; +EIN_EXPORT int __stdcall EgtGetPrev( int nGseCtx, int nId) ; +EIN_EXPORT int __stdcall EgtGetType( int nGseCtx, int nId) ; +EIN_EXPORT BOOL __stdcall EgtGetTitle( int nGseCtx, int nId, wchar_t*& wsTitle) ; +EIN_EXPORT BOOL __stdcall EgtGroupDump( int nGseCtx, int nId, wchar_t*& wsDump) ; +EIN_EXPORT BOOL __stdcall EgtGeoObjDump( int nGseCtx, int nId, wchar_t*& wsDump) ; + +// GeomDB Obj Attributes +EIN_EXPORT BOOL __stdcall EgtSetLevel( int nGseCtx, int nId, int nLevel) ; +EIN_EXPORT BOOL __stdcall EgtRevertLevel( int nGseCtx, int nId) ; +EIN_EXPORT BOOL __stdcall EgtGetLevel( int nGseCtx, int nId, int* pnLevel) ; +EIN_EXPORT BOOL __stdcall EgtGetCalcLevel( int nGseCtx, int nId, int* pnLevel) ; +EIN_EXPORT BOOL __stdcall EgtSetMode( int nGseCtx, int nId, int nMode) ; +EIN_EXPORT BOOL __stdcall EgtRevertMode( int nGseCtx, int nId) ; +EIN_EXPORT BOOL __stdcall EgtGetMode( int nGseCtx, int nId, int* pnMode) ; +EIN_EXPORT BOOL __stdcall EgtGetCalcMode( int nGseCtx, int nId, int* pnMode) ; +EIN_EXPORT BOOL __stdcall EgtSetStatus( int nGseCtx, int nId, int nStat) ; +EIN_EXPORT BOOL __stdcall EgtRevertStatus( int nGseCtx, int nId) ; +EIN_EXPORT BOOL __stdcall EgtGetStatus( int nGseCtx, int nId, int* pnStat) ; +EIN_EXPORT BOOL __stdcall EgtGetCalcStatus( int nGseCtx, int nId, int* pnStat) ; +EIN_EXPORT BOOL __stdcall EgtSetMark( int nGseCtx, int nId) ; +EIN_EXPORT BOOL __stdcall EgtResetMark( int nGseCtx, int nId) ; +EIN_EXPORT BOOL __stdcall EgtGetMark( int nGseCtx, int nId, BOOL* pnMark) ; +EIN_EXPORT BOOL __stdcall EgtGetCalcMark( int nGseCtx, int nId, BOOL* pnMark) ; +EIN_EXPORT BOOL __stdcall EgtSetName( int nGseCtx, int nId, const wchar_t* wsName) ; +EIN_EXPORT BOOL __stdcall EgtGetName( int nGseCtx, int nId, wchar_t*& wsName) ; +EIN_EXPORT BOOL __stdcall EgtExistsName( int nGseCtx, int nId) ; +EIN_EXPORT BOOL __stdcall EgtRemoveName( int nGseCtx, int nId) ; +EIN_EXPORT BOOL __stdcall EgtSetInfo( int nGseCtx, int nId, const wchar_t* wsKey, const wchar_t* wsInfo) ; +EIN_EXPORT BOOL __stdcall EgtGetInfo( int nGseCtx, int nId, const wchar_t* wsKey, wchar_t*& wsInfo) ; +EIN_EXPORT BOOL __stdcall EgtExistsInfo( int nGseCtx, int nId, const wchar_t* wsKey) ; +EIN_EXPORT BOOL __stdcall EgtRemoveInfo( int nGseCtx, int nId, const wchar_t* wsKey) ; + // Scene EIN_EXPORT BOOL __stdcall EgtInitScene( int nGseCtx, HWND hWnd, int nDriver, int b2Buff, int nColorBits, int nDepthBits) ; EIN_EXPORT BOOL __stdcall EgtSetBackground( int nGseCtx, int nTopRed, int nTopGreen, int nTopBlue, - int nBottomRed, int nBottomGreen, int nBottomBlue) ; + int nBottomRed, int nBottomGreen, int nBottomBlue, BOOL bRedraw) ; EIN_EXPORT BOOL __stdcall EgtDraw( int nGseCtx) ; EIN_EXPORT BOOL __stdcall EgtResize( int nGseCtx, int nW, int nH) ; EIN_EXPORT BOOL __stdcall EgtSetShowMode( int nGseCtx, int nShowMode, BOOL bRedraw) ; @@ -62,21 +103,12 @@ EIN_EXPORT BOOL __stdcall EgtPanCamera( int nGseCtx, int nPrevX, int nPrevY, int EIN_EXPORT BOOL __stdcall EgtRotateCamera( int nGseCtx, int nPrevX, int nPrevY, int nCurrX, int nCurrY, BOOL bRedraw) ; EIN_EXPORT BOOL __stdcall EgtGetCameraDir( int nGseCtx, int* pnDir) ; EIN_EXPORT BOOL __stdcall EgtUnProjectPoint( int nGseCtx, int nWinX, int nWinY, double ptP[3]) ; + // Tsc Executor EIN_EXPORT BOOL __stdcall EgtInitTscExec( int nGseCtx) ; EIN_EXPORT BOOL __stdcall EgtTscFileExec( int nGseCtx, const wchar_t* wsFilePath) ; EIN_EXPORT BOOL __stdcall EgtTscLineExec( int nGseCtx, const wchar_t* wsLine) ; - -// API di prova -EIN_EXPORT double __stdcall Summ( double dA, double dB) ; -EIN_EXPORT int __stdcall Summ2( double& dA, double dB) ; -EIN_EXPORT int __stdcall Append( const wchar_t* wsA, wchar_t*& wsB) ; -EIN_EXPORT int __stdcall FreeMemory( void* pMem) ; -EIN_EXPORT int __stdcall SetPoint( double ptP[3]) ; -EIN_EXPORT int __stdcall OutText( HWND hWnd, const wchar_t* wsA) ; -EIN_EXPORT int __stdcall DrawCross( HWND hWnd, int nX, int nY, int nDim) ; - #ifdef __cplusplus } #endif