From b577e5ef0f480f3c391e8c1a14c496e2a52c6c1c Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 1 Sep 2014 17:07:22 +0000 Subject: [PATCH] Include : - aggiornamento interfacce. --- EInAPI.h | 63 ++++++++++++++++++++++++++++-------------------- EgnCmdExecutor.h | 1 + 2 files changed, 38 insertions(+), 26 deletions(-) diff --git a/EInAPI.h b/EInAPI.h index 497e83e..853a95d 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -29,32 +29,43 @@ extern "C" { #endif // API -EIN_EXPORT int __stdcall EgtSetLog( int nDebug, const wchar_t* sLogFile) ; -EIN_EXPORT int __stdcall EgtSetFont( const wchar_t* sNfeFontDir, const wchar_t* sDefaultFont) ; -EIN_EXPORT int __stdcall EgtInit( HWND hWnd, int nDriver, int b2Buff, int nColorBits, int nDepthBits) ; -EIN_EXPORT int __stdcall EgtExit( void) ; -EIN_EXPORT int __stdcall EgtSetDefaultMaterial( int nRed, int nGreen, int nBlue) ; -EIN_EXPORT int __stdcall EgtSetBackground( int nTopRed, int nTopGreen, int nTopBlue, - int nBottomRed, int nBottomGreen, int nBottomBlue) ; -EIN_EXPORT int __stdcall EgtNewFile( void) ; -EIN_EXPORT int __stdcall EgtOpenFile( const wchar_t* sFilePath) ; -EIN_EXPORT int __stdcall EgtTestImportExt( const wchar_t* sFilePath) ; -EIN_EXPORT int __stdcall EgtImportDxf( const wchar_t* sFilePath) ; -EIN_EXPORT int __stdcall EgtImportStl( const wchar_t* sFilePath) ; -EIN_EXPORT int __stdcall EgtDraw( void) ; -EIN_EXPORT int __stdcall EgtResize( int nW, int nH) ; -EIN_EXPORT int __stdcall EgtSetShowMode( int nShowMode) ; -EIN_EXPORT int __stdcall EgtSetShowCurveDirection( int nShow) ; -EIN_EXPORT int __stdcall EgtZoom( int nZoom) ; -EIN_EXPORT int __stdcall EgtZoomOnPoint( int nWinX, int nWinY, double dCoeff) ; -EIN_EXPORT int __stdcall EgtSetWinRect( int nPrevX, int nPrevY, int nCurrX, int nCurrY) ; -EIN_EXPORT int __stdcall EgtResetWinRect( void) ; -EIN_EXPORT int __stdcall EgtZoomWin( int nPrevX, int nPrevY, int nCurrX, int nCurrY) ; -EIN_EXPORT int __stdcall EgtSetView( int nView) ; -EIN_EXPORT int __stdcall EgtPanCamera( int nPrevX, int nPrevY, int nCurrX, int nCurrY) ; -EIN_EXPORT int __stdcall EgtRotateCamera( int nPrevX, int nPrevY, int nCurrX, int nCurrY) ; -EIN_EXPORT int __stdcall EgtGetCameraDir( int* pnDir) ; -EIN_EXPORT int __stdcall EgtUnProject( int nWinX, int nWinY, double ptP[3]) ; +// 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) ; +// GeomDB +EIN_EXPORT int __stdcall EgtInitGeomDB( void) ; +EIN_EXPORT BOOL __stdcall EgtSetDefaultMaterial( int nGseCtx, int nRed, int nGreen, int nBlue) ; +EIN_EXPORT BOOL __stdcall EgtNewFile( int nGseCtx) ; +EIN_EXPORT BOOL __stdcall EgtOpenFile( int nGseCtx, const wchar_t* wsFilePath) ; +EIN_EXPORT BOOL __stdcall EgtSaveFile( int nGseCtx, const wchar_t* wsFilePath, int nFlag) ; +EIN_EXPORT int __stdcall EgtGetFileType( const wchar_t* wsFilePath) ; +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) ; +// 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) ; +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) ; +EIN_EXPORT BOOL __stdcall EgtSetShowCurveDirection( int nGseCtx, int nShow, BOOL bRedraw) ; +EIN_EXPORT BOOL __stdcall EgtZoom( int nGseCtx, int nZoom, BOOL bRedraw) ; +EIN_EXPORT BOOL __stdcall EgtZoomOnPoint( int nGseCtx, int nWinX, int nWinY, double dCoeff, BOOL bRedraw) ; +EIN_EXPORT BOOL __stdcall EgtSetWinRect( int nGseCtx, int nPrevX, int nPrevY, int nCurrX, int nCurrY, BOOL bRedraw) ; +EIN_EXPORT BOOL __stdcall EgtResetWinRect( int nGseCtx, BOOL bRedraw) ; +EIN_EXPORT BOOL __stdcall EgtZoomWin( int nGseCtx, int nPrevX, int nPrevY, int nCurrX, int nCurrY, BOOL bRedraw) ; +EIN_EXPORT BOOL __stdcall EgtSetView( int nGseCtx, int nView, BOOL bRedraw) ; +EIN_EXPORT BOOL __stdcall EgtPanCamera( int nGseCtx, int nPrevX, int nPrevY, int nCurrX, int nCurrY, BOOL bRedraw) ; +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 diff --git a/EgnCmdExecutor.h b/EgnCmdExecutor.h index 0f7181f..a0fc53c 100644 --- a/EgnCmdExecutor.h +++ b/EgnCmdExecutor.h @@ -21,6 +21,7 @@ class ICmdParser ; class __declspec( novtable) ICmdExecutor { public : + virtual ~ICmdExecutor( void) {} virtual bool SetCmdParser( ICmdParser* pParser) = 0 ; virtual bool AddStandardVariables( void) = 0 ; virtual int Execute( const std::string& sCmd1, const std::string& sCmd2, const STRVECTOR& vsParams) = 0 ;