From 28d676555e213b6a4439919098c3ea8e2bc7950a Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Mon, 6 Nov 2017 07:44:47 +0000
Subject: [PATCH] EgtExecutor 1.8j7 : - modifiche per import BTL.

---
 EXE_Exchange.cpp      |  10 +++++-----
 EXE_GdbModifySurf.cpp |   8 ++++++++
 EgtExecutor.rc        | Bin 15096 -> 15096 bytes
 LUA_Exchange.cpp      |  10 ++++------
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/EXE_Exchange.cpp b/EXE_Exchange.cpp
index 35fda6c..7b1ab38 100644
--- a/EXE_Exchange.cpp
+++ b/EXE_Exchange.cpp
@@ -155,7 +155,8 @@ ExeImportCnc( const string& sFilePath, int nFlag)
    ExeSetModified() ;
   // se richiesto, salvo il comando Lua equivalente
    if ( IsCmdLog()) {
-      string sLua = "EgtImportCnc('" + StringToLuaString( sFilePath) + "')" +
+      string sLua = "EgtImportCnc('" + StringToLuaString( sFilePath) + "'," +
+                                       ToString( nFlag) + ")" +
                     " -- Ok=" + ToString( bOk) ;
       LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
    }
@@ -192,7 +193,7 @@ ExeImportCsf( const string& sFilePath)
 
 //-----------------------------------------------------------------------------
 bool
-ExeImportBtl( const string& sFilePath, bool bFlatPos, bool bSpecialTrim)
+ExeImportBtl( const string& sFilePath, int nFlag)
 {
    GseContext* pGseCtx = GetCurrGseContext() ;
    VERIFY_CTX_GEOMDB( pGseCtx, false)
@@ -202,7 +203,7 @@ ExeImportBtl( const string& sFilePath, bool bFlatPos, bool bSpecialTrim)
    PtrOwner<IImportBtl> pImpBtl( MyCreateImportBtl()) ;
    bOk = bOk && ! IsNull( pImpBtl) ;
    // eseguo l'importazione (direttamente nella radice)
-   bOk = bOk && pImpBtl->Import( sFilePath, pGseCtx->m_pGeomDB, bFlatPos, bSpecialTrim) ;
+   bOk = bOk && pImpBtl->Import( sFilePath, pGseCtx->m_pGeomDB, nFlag) ;
   // aggiorno stato file corrente
    if ( pGseCtx->m_sFilePath.empty())
       pGseCtx->m_sFilePath = sFilePath ;
@@ -210,8 +211,7 @@ ExeImportBtl( const string& sFilePath, bool bFlatPos, bool bSpecialTrim)
   // se richiesto, salvo il comando Lua equivalente
    if ( IsCmdLog()) {
       string sLua = "EgtImportBtl('" + StringToLuaString( sFilePath) + "'," +
-                                       ( bFlatPos ? "true" : "false") + "," +
-                                       ( bSpecialTrim ? "true" : "false") + ")" +
+                                       ToString( nFlag) + ")" +
                     " -- Ok=" + ToString( bOk) ;
       LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
    }
diff --git a/EXE_GdbModifySurf.cpp b/EXE_GdbModifySurf.cpp
index af7807e..d557e37 100644
--- a/EXE_GdbModifySurf.cpp
+++ b/EXE_GdbModifySurf.cpp
@@ -564,6 +564,14 @@ ExeExtractSurfTmFacetLoops( int nId, int nFacet, int nDestGrpId, int* pnCount)
    return nFirstId ;
 }
 
+////----------------------------------------------------------------------------
+//bool
+//ExeGetSurfTmFacetOppositeSide( int nId, int nFacet, const Vector3d& vtDir, int nRefId, Point3d& ptP1, Point3d& ptP2)
+//{
+//
+//
+//}
+
 //-------------------------------------------------------------------------------
 int
 ExeCopySurfTmFacet( int nId, int nFacet, int nDestGrpId)
diff --git a/EgtExecutor.rc b/EgtExecutor.rc
index 0522ba08775b5db7d0a36a52f6dde83780f917ec..6bd4620768890828fe66cc6d13a367c5920c6bc3 100644
GIT binary patch
delta 97
zcmexS`lEEiA2vqw%@@V4Gflq2na5~8Ignd-a{*Tk3sCf++-0W82LxfF21;&>n->Y|
cF@rU@0x76sKgP|Iq`|@m<s4zc21+L+0O|T5g8%>k

delta 97
zcmexS`lEEiA2vqQ%@@V4Gflq2na5~4Ignd-a{*Tk3sCf++-0W82LxfF21;&>n->Y|
cF@rU@0x76sKgP|Iq`|@m<s4zc21+L+0Osx>a{vGU

diff --git a/LUA_Exchange.cpp b/LUA_Exchange.cpp
index f068c2f..425e437 100644
--- a/LUA_Exchange.cpp
+++ b/LUA_Exchange.cpp
@@ -91,16 +91,14 @@ LuaImportCsf( lua_State* L)
 static int
 LuaImportBtl( lua_State* L)
 {
-  // 1,2 o 3 parametri : path del file da importare, flag per mettere di piatto, flag per trim speciale pareti
+  // 1 o 2 : FilePath [, Flag]
    string sFilePath ;
    LuaCheckParam( L, 1, sFilePath)
-   bool bFlatPos = false ;
-   LuaGetParam( L, 2, bFlatPos) ;
-   bool bSpecialTrim = false ;
-   LuaGetParam( L, 3, bSpecialTrim) ;
+   int nFlag = EIB_FLAG_NONE ;
+   LuaGetParam( L, 2, nFlag) ;
    LuaClearStack( L) ;
   // apro il file
-   bool bOk = ExeImportBtl( sFilePath, bFlatPos, bSpecialTrim) ; 
+   bool bOk = ExeImportBtl( sFilePath, nFlag) ; 
   // restituisco il risultato
    LuaSetParam( L, bOk) ;
    return 1 ;