TestEgr 1.5d3 :

- aggiunta esecuzione di comandi Exchange.

TestEGr.cpp

@@ -18,6 +18,7 @@
 #include "/EgtDev/Include/EGkDllMain.h"
 #include "/EgtDev/Include/ENkDllMain.h"
 #include "/EgtDev/Include/EGnDllMain.h"
+#include "/EgtDev/Include/EExDllMain.h"
 #include "/EgtDev/Include/EGrDllMain.h"
 #include "/EgtDev/Include/EgnGetModuleVer.h"
 #include "/EgtDev/Include/EGnStringConverter.h"
@@ -95,6 +96,7 @@ CTestEGrApp::InitInstance( void)
    SetEGnLogger( &logGen) ;
    SetENkLogger( &logGen) ;
    SetEGkLogger( &logGen) ;
+   SetEExLogger( &logGen) ;
    SetEGrLogger( &logGen) ;
 
   // inizio programma
@@ -107,6 +109,7 @@ CTestEGrApp::InitInstance( void)
    LOG_INFO( &logGen, GetEGnVersion())
    LOG_INFO( &logGen, GetENkVersion())
    LOG_INFO( &logGen, GetEGkVersion())
+   LOG_INFO( &logGen, GetEExVersion())
    LOG_INFO( &logGen, GetEGrVersion())
 
   // inizializzazione logger dei comandi

TestEGrDlg.cpp

@@ -24,6 +24,7 @@
 #include "/EgtDev/Include/EGnCmdParser.h"
 #include "/EgtDev/Include/EGkGeomDB.h"
 #include "/EgtDev/Include/EGkGdbExecutor.h"
+#include "/EgtDev/Include/EExExcExecutor.h"
 #include "/EgtDev/Include/EGrScene.h"
 #include "/EgtDev/Include/EGrSceExecutor.h"
 
@@ -92,6 +93,7 @@ CTestEGrDlg::CTestEGrDlg( const std::string& sFileToOpen, ILogger* pLogGen, ILog
   // inizializzazioni varie
    m_pGeomDB = nullptr ;
    m_pGdbExec = nullptr ;
+   m_pExcExec = nullptr ;
    m_pSceExec = nullptr ;
    m_pCmdParser = nullptr ;
    m_pImgList = nullptr ;
@@ -108,6 +110,9 @@ CTestEGrDlg::~CTestEGrDlg( void)
    if ( m_pGdbExec != nullptr)
       delete m_pGdbExec ;
    m_pGdbExec = nullptr ;
+   if ( m_pExcExec != nullptr)
+      delete m_pExcExec ;
+   m_pExcExec = nullptr ;
    if ( m_pSceExec != nullptr)
       delete m_pSceExec ;
    m_pSceExec = nullptr ;
@@ -766,6 +771,9 @@ CTestEGrDlg::PrepareExecutor( void)
    if ( m_pGdbExec != nullptr)
       delete m_pGdbExec ;
    m_pGdbExec = nullptr ;
+   if ( m_pExcExec != nullptr)
+      delete m_pExcExec ;
+   m_pExcExec = nullptr ;
    if ( m_pSceExec != nullptr)
       delete m_pSceExec ;
    m_pSceExec = nullptr ;
@@ -779,6 +787,12 @@ CTestEGrDlg::PrepareExecutor( void)
       LOG_ERROR( m_pLogGen, "Error in CreateGdbExecutor")
       return false ;
    }
+   m_pExcExec = CreateExcExecutor() ;
+   if ( m_pExcExec == nullptr) {
+      LOG_ERROR( m_pLogGen, "Error in CreateExcExecutor")
+      return false ;
+   }
+
    m_pSceExec = CreateSceExecutor() ;
    if ( m_pSceExec == nullptr) {
       LOG_ERROR( m_pLogGen, "Error in CreateSceExecutor")
@@ -792,8 +806,10 @@ CTestEGrDlg::PrepareExecutor( void)
 
   // inizializzazioni
    m_pGdbExec->SetGeomDB( m_pGeomDB) ;
+   m_pExcExec->SetGeomDB( m_pGeomDB) ;
    m_pSceExec->SetScene( m_View.GetScene()) ;
    m_pCmdParser->SetExecutor( m_pGdbExec) ;
+   m_pCmdParser->AddExecutor( m_pExcExec) ;
    m_pCmdParser->AddExecutor( m_pSceExec) ;
    m_pCmdParser->Init() ;
 

TestEGrDlg.h

@@ -20,6 +20,7 @@
 class ILogger ;
 class IGeomDB ;
 class IGdbExecutor ;
+class IExcExecutor ;
 class ISceExecutor ;
 class ICmdParser ; 
 class IGeoObj ;
@@ -93,6 +94,7 @@ class CTestEGrDlg : public CDialog
       ILogger*      m_pLogGen ;
       ILogger*      m_pLogCmd ;
       IGdbExecutor* m_pGdbExec ;
+      IExcExecutor* m_pExcExec ;
       ISceExecutor* m_pSceExec ;
       ICmdParser*   m_pCmdParser ;
       TestEGrView   m_View ;

stdafx.h

@@ -39,6 +39,7 @@
 #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")
 #pragma comment(lib, EGTLIBDIR "EgtGraphics" EGTLIBVER ".lib")
 
 #ifdef _UNICODE