From f9931961303d195d54ee21487168efd9f9af7288 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Wed, 26 Oct 2016 16:07:02 +0000
Subject: [PATCH] Include : - aggiornamenti.

---
 EExImportCnc.h | 13 +++++++++----
 EInAPI.h       |  2 +-
 EXeConst.h     |  5 +++++
 EXeExecutor.h  |  2 +-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/EExImportCnc.h b/EExImportCnc.h
index 751a713..3907a15 100644
--- a/EExImportCnc.h
+++ b/EExImportCnc.h
@@ -1,13 +1,13 @@
 //----------------------------------------------------------------------------
-//  EgalTech 2014-2014
+//  EgalTech 2014-2016
 //----------------------------------------------------------------------------
-// File : EExImportCnc.h          Data : 15.09.14          Versione : 1.5i3
+// File : EExImportCnc.h          Data : 25.10.16          Versione : 1.6v6
 // Contenuto : Dichiarazione della interfaccia IImportCnc.
 //
 //
 //
 // Modifiche : 15.09.14 DS Creazione modulo.
-//
+//             25.10.16 DS Aggiunto flag.
 //
 //----------------------------------------------------------------------------
 
@@ -29,10 +29,15 @@ class __declspec( novtable) IImportCnc
 {
    public :
       virtual ~IImportCnc( void) {} 
-      virtual bool Import( const std::string& sFile, IGeomDB* pGDB, int nIdGroup) = 0 ;
+      virtual bool Import( const std::string& sFile, IGeomDB* pGDB, int nIdGroup, int nFlag) = 0 ;
 } ;
 
 //-----------------------------------------------------------------------------
 extern "C" {
    EEX_EXPORT IImportCnc* CreateImportCnc( void) ;
 }
+
+//-----------------------------------------------------------------------------
+enum EImCncFlag { EICFLAG_NONE =       0x0000,
+                  EICFLAG_CHAIN =      0x0001,
+                  EICFLAG_SKIP_RAPID = 0x0002} ;
diff --git a/EInAPI.h b/EInAPI.h
index 715e551..2e14b89 100644
--- a/EInAPI.h
+++ b/EInAPI.h
@@ -90,7 +90,7 @@ EIN_EXPORT BOOL __stdcall EgtSaveObjToFile( int nId, const wchar_t* wsFilePath,
 EIN_EXPORT int  __stdcall EgtGetFileType( const wchar_t* wsFilePath) ;
 EIN_EXPORT BOOL __stdcall EgtImportDxf( const wchar_t* wsFilePath, double dScaleFactor) ;
 EIN_EXPORT BOOL __stdcall EgtImportStl( const wchar_t* wsFilePath, double dScaleFactor) ;
-EIN_EXPORT BOOL __stdcall EgtImportCnc( const wchar_t* wsFilePath) ;
+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 EgtExportDxf( int nId, const wchar_t* wsFilePath) ;
diff --git a/EXeConst.h b/EXeConst.h
index 938e57c..0f57d59 100644
--- a/EXeConst.h
+++ b/EXeConst.h
@@ -52,6 +52,11 @@ enum ApprType{ APP_LINES = 0,                // come ICurve::APL_STD
                APP_RIGHT_CONVEX_LINES = 12,  // come ICurve::APL_RIGHT_CONVEX
                APP_ARCS = 3} ;
 
+//----------------- 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
+
 //----------------- Costanti tipo costruzione pezzi piani ----------------------
 enum FpcType{ FPC_NGE = 0,                   // costruzione da pezzo Nge
               FPC_REGION = 1,                // costruzione da regione
diff --git a/EXeExecutor.h b/EXeExecutor.h
index f95264f..0af6ce9 100644
--- a/EXeExecutor.h
+++ b/EXeExecutor.h
@@ -94,7 +94,7 @@ EXE_EXPORT bool ExeSaveObjToFile( int nId, const std::string& sFilePath, int nFl
 EXE_EXPORT int  ExeGetFileType( const std::string& sFilePath) ;
 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) ;
+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 ExeExportDxf( int nId, const std::string& sFilePath) ;