diff --git a/TestEGk.cpp b/TestEGk.cpp index 42d8de9..963a6eb 100644 --- a/TestEGk.cpp +++ b/TestEGk.cpp @@ -1,12 +1,13 @@ //---------------------------------------------------------------------------- -// EgalTech 2013-2013 +// EgalTech 2013-2014 //---------------------------------------------------------------------------- -// File : TestEGk.cpp Data : 20.11.13 Versione : 1.3a1 +// File : TestEGk.cpp Data : 04.04.14 Versione : 1.5d2 // Contenuto : Programma di test della libreria EgtGeomKernel. // // // // Modifiche : 20.11.13 DS Creazione modulo. +// 04.04.14 DS Agg. esecutore di Exchange. // // //---------------------------------------------------------------------------- @@ -22,6 +23,8 @@ #include "/EgtDev/Include/EGkDllMain.h" #include "/EgtDev/Include/EGkGeomDB.h" #include "/EgtDev/Include/EGkGdbExecutor.h" +#include "/EgtDev/Include/EExDllMain.h" +#include "/EgtDev/Include/EExExcExecutor.h" #include "/EgtDev/Include/EgtPointerOwner.h" #include "/EgtDev/Include/EgtLogger.h" #include "/EgtDev/Include/EgtIniFile.h" @@ -95,11 +98,13 @@ wmain( int argc, wchar_t* argv[]) LOG_INFO( &logger, GetEGnVersion()) LOG_INFO( &logger, GetENkVersion()) LOG_INFO( &logger, GetEGkVersion()) + LOG_INFO( &logger, GetEExVersion()) // passo logger alle librerie SetEGnLogger( &logger) ; SetENkLogger( &logger) ; SetEGkLogger( &logger) ; + SetEExLogger( &logger) ; // nessun errore nErr = 0 ; @@ -107,6 +112,7 @@ wmain( int argc, wchar_t* argv[]) // esecuzione script PtrOwner pGdb( CreateGeomDB()) ; PtrOwner pGdbExec( CreateGdbExecutor()) ; + PtrOwner pExcExec( CreateExcExecutor()) ; PtrOwner pCmdParser( CreateCmdParser()) ; // controllo validità oggetti @@ -120,6 +126,11 @@ wmain( int argc, wchar_t* argv[]) nErr = 1 ; goto END ; } + if ( ! IsValid( pExcExec)) { + LOG_ERROR( &logger, "Error in CreateExcExecutor") + nErr = 1 ; + goto END ; + } if ( ! IsValid( pCmdParser)) { LOG_ERROR( &logger, "Error in CreateCmdParser") nErr = 1 ; @@ -129,7 +140,9 @@ wmain( int argc, wchar_t* argv[]) // inizializzazioni pGdb->Init() ; pGdbExec->SetGeomDB( Get( pGdb)) ; + pExcExec->SetGeomDB( Get( pGdb)) ; pCmdParser->SetExecutor( Get( pGdbExec)) ; + pCmdParser->AddExecutor( Get( pExcExec)) ; if ( ! pCmdParser->Init( )) { LOG_ERROR( &logger, "Error on Parser.Init") nErr = 2 ; diff --git a/TestEGk.rc b/TestEGk.rc index a42095c..b22d328 100644 Binary files a/TestEGk.rc and b/TestEGk.rc differ diff --git a/stdafx.h b/stdafx.h index 290772c..0dfcd35 100644 --- a/stdafx.h +++ b/stdafx.h @@ -31,3 +31,4 @@ #pragma comment(lib, EGTLIBDIR "EgtGeneral" EGTLIBVER ".lib") #pragma comment(lib, EGTLIBDIR "EgtNumKernel" EGTLIBVER ".lib") #pragma comment(lib, EGTLIBDIR "EgtGeomKernel" EGTLIBVER ".lib") +#pragma comment(lib, EGTLIBDIR "EgtExchange" EGTLIBVER ".lib")