From ad1e3e13cda17b3dc9d308a2e6e94fa8ddede50c Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Mon, 6 Nov 2017 07:46:20 +0000
Subject: [PATCH] Include : - modifiche prototipi e costanti.

---
 EExImportBtl.h | 9 +++++++--
 EExImportCnc.h | 4 ++--
 EInAPI.h       | 2 +-
 EXeConst.h     | 9 ++++++++-
 EXeExecutor.h  | 2 +-
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/EExImportBtl.h b/EExImportBtl.h
index 210f2f0..38f1f17 100644
--- a/EExImportBtl.h
+++ b/EExImportBtl.h
@@ -29,11 +29,16 @@ class __declspec( novtable) IImportBtl
 {
    public :
       virtual ~IImportBtl( void) {} 
-      virtual bool Import( const std::string& sFile, IGeomDB* pGDB,
-                           bool bFlatPos = false, bool bSpecialTrim = false) = 0 ;
+      virtual bool Import( const std::string& sFile, IGeomDB* pGDB, int nFlag = 0) = 0 ;
 } ;
 
 //-----------------------------------------------------------------------------
 extern "C" {
    EEX_EXPORT IImportBtl* CreateImportBtl( void) ;
 }
+
+//-----------------------------------------------------------------------------
+enum EImBtlFlag { EIBFLAG_NONE =          0x0000,
+                  EIBFLAG_FLAT_POS =      0x0001,             // pezzi di piatto (prevale sul successivo)
+                  EIBFLAG_VERT_POS =      0x0002,             // pezzi in verticale
+                  EIBFLAG_SPECIAL_TRIM =  0x0004} ;           // trim speciale per pareti
diff --git a/EExImportCnc.h b/EExImportCnc.h
index ff422bc..23d95b9 100644
--- a/EExImportCnc.h
+++ b/EExImportCnc.h
@@ -29,7 +29,7 @@ class __declspec( novtable) IImportCnc
 {
    public :
       virtual ~IImportCnc( void) {} 
-      virtual bool Import( const std::string& sFile, IGeomDB* pGDB, int nIdGroup, int nFlag) = 0 ;
+      virtual bool Import( const std::string& sFile, IGeomDB* pGDB, int nIdGroup, int nFlag = 0) = 0 ;
 } ;
 
 //-----------------------------------------------------------------------------
@@ -41,4 +41,4 @@ extern "C" {
 enum EImCncFlag { EICFLAG_NONE =          0x0000,
                   EICFLAG_CHAIN =         0x0001,
                   EICFLAG_SKIP_ZEROMACH = 0x0002,
-                  EICFLAG_SKIP_RAPID =    0x0004,} ;
+                  EICFLAG_SKIP_RAPID =    0x0004} ;
diff --git a/EInAPI.h b/EInAPI.h
index 838d57d..693e521 100644
--- a/EInAPI.h
+++ b/EInAPI.h
@@ -96,7 +96,7 @@ EIN_EXPORT BOOL __stdcall EgtImportDxf( const wchar_t* wsFilePath, double dScale
 EIN_EXPORT BOOL __stdcall EgtImportStl( const wchar_t* wsFilePath, double dScaleFactor) ;
 EIN_EXPORT BOOL __stdcall EgtImportCnc( const wchar_t* wsFilePath, int nFlag) ;
 EIN_EXPORT BOOL __stdcall EgtImportCsf( const wchar_t* wsFilePath) ;
-EIN_EXPORT BOOL __stdcall EgtImportBtl( const wchar_t* wsFilePath, BOOL bFlatPos, BOOL bSpecialTrim) ;
+EIN_EXPORT BOOL __stdcall EgtImportBtl( const wchar_t* wsFilePath, int nFlag) ;
 EIN_EXPORT BOOL __stdcall EgtExportDxf( int nId, const wchar_t* wsFilePath) ;
 EIN_EXPORT BOOL __stdcall EgtExportStl( int nId, const wchar_t* wsFilePath) ;
 
diff --git a/EXeConst.h b/EXeConst.h
index 383c875..6c5bd16 100644
--- a/EXeConst.h
+++ b/EXeConst.h
@@ -56,7 +56,14 @@ enum ApprType{ APP_LINES = 0,                // come ICurve::APL_STD
 //----------------- Costanti flag import CNC -----------------------------------
 enum EicFlag { EIC_FLAG_NONE = 0,            // come EImCncFlag::EICFLAG_NONE
                EIC_FLAG_CHAIN = 1,           // come EImCncFlag::EICFLAG_CHAIN
-               EIC_FLAG_SKIP_RAPID = 2} ;    // come EImCncFlag::EICFLAG_SKIP_RAPID
+               EIC_FLAG_SKIP_ZEROMACH = 2,   // come EImCncFlag::EICFLAG_SKIP_ZEROMACH
+               EIC_FLAG_SKIP_RAPID = 4} ;    // come EImCncFlag::EICFLAG_SKIP_RAPID
+
+//----------------- Costanti flag import BTL -----------------------------------
+enum EibFlag { EIB_FLAG_NONE = 0,            // come EImBtlFlag::EIBFLAG_NONE
+               EIB_FLAG_FLAT_POS = 1,        // come EImBtlFlag::EIBFLAG_FLAT_POS
+               EIB_FLAG_VERT_POS = 2,        // come EImBtlFlag::EIBFLAG_VERT_POS
+               EIB_FLAG_SPECIAL_TRIM = 4} ;  // come EImBtlFlag::EIBFLAG_SPECIAL_TRIM
 
 //----------------- Costanti tipo costruzione pezzi piani ----------------------
 enum FpcType{ FPC_NGE = 0,                   // costruzione da pezzo Nge
diff --git a/EXeExecutor.h b/EXeExecutor.h
index 349cc67..35eb8f3 100644
--- a/EXeExecutor.h
+++ b/EXeExecutor.h
@@ -100,7 +100,7 @@ EXE_EXPORT bool ExeImportDxf( const std::string& sFilePath, double dScaleFactor)
 EXE_EXPORT bool ExeImportStl( const std::string& sFilePath, double dScaleFactor) ;
 EXE_EXPORT bool ExeImportCnc( const std::string& sFilePath, int nFlag) ;
 EXE_EXPORT bool ExeImportCsf( const std::string& sFilePath) ;
-EXE_EXPORT bool ExeImportBtl( const std::string& sFilePath, bool bFlatPos, bool bSpecialTrim) ;
+EXE_EXPORT bool ExeImportBtl( const std::string& sFilePath, int nFlag) ;
 EXE_EXPORT bool ExeExportDxf( int nId, const std::string& sFilePath) ;
 EXE_EXPORT bool ExeExportStl( int nId, const std::string& sFilePath) ;