diff --git a/EExImport3MF.h b/EExImport3MF.h new file mode 100644 index 0000000..b5e73de --- /dev/null +++ b/EExImport3MF.h @@ -0,0 +1,38 @@ +//---------------------------------------------------------------------------- +// EgalTech 2021-2021 +//---------------------------------------------------------------------------- +// File : EExImport3MF.h Data : 28.01.21 Versione : 2.3a5 +// Contenuto : Dichiarazione della interfaccia IImport3MF. +// +// +// +// Modifiche : 28.01.21 DS Creazione modulo. +// +// +//---------------------------------------------------------------------------- + +#pragma once + +#include "/EgtDev/Include/EgkGeomDB.h" +#include + +//----------------------- Macro per import/export ---------------------------- +#undef EEK_EXPORT +#if defined( I_AM_EEX) // da definirsi solo nella DLL + #define EEX_EXPORT __declspec( dllexport) +#else + #define EEX_EXPORT __declspec( dllimport) +#endif + +//----------------------------------------------------------------------------- +class __declspec( novtable) IImport3MF +{ + public : + virtual ~IImport3MF( void) {} + virtual bool Import( const std::string& sFile, IGeomDB* pGDB, int nIdGroup) = 0 ; +} ; + +//----------------------------------------------------------------------------- +extern "C" { + EEX_EXPORT IImport3MF* CreateImport3MF( void) ; +} diff --git a/EGkIntersLineSurfTm.h b/EGkIntersLineSurfTm.h index a3008ea..e344c28 100644 --- a/EGkIntersLineSurfTm.h +++ b/EGkIntersLineSurfTm.h @@ -54,7 +54,7 @@ class IntersParLinesSurfTm { public : EGK_EXPORT IntersParLinesSurfTm( const Frame3d& frLines, const ISurfTriMesh& Stm) ; - EGK_EXPORT bool GetInters( const Point3d& ptL, double dLen, ILSIVECTOR& vInfo, bool bFinite = true) ; + EGK_EXPORT bool GetInters( const Point3d& ptL, double dLen, ILSIVECTOR& vInfo, bool bFinite = true) const ; private : bool m_bOk ; diff --git a/EInAPI.h b/EInAPI.h index fc8d08d..d373ec7 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -107,6 +107,7 @@ EIN_EXPORT BOOL __stdcall EgtImportCsf( const wchar_t* wsFilePath) ; EIN_EXPORT BOOL __stdcall EgtImportDxf( const wchar_t* wsFilePath, double dScaleFactor) ; EIN_EXPORT BOOL __stdcall EgtImportPnt( const wchar_t* wsFilePath, int nFlag) ; EIN_EXPORT BOOL __stdcall EgtImportStl( const wchar_t* wsFilePath, double dScaleFactor) ; +EIN_EXPORT BOOL __stdcall EgtImport3MF( const wchar_t* wsFilePath) ; EIN_EXPORT BOOL __stdcall EgtAdvancedImportIsEnabled( void) ; EIN_EXPORT BOOL __stdcall EgtAdvancedImport( const wchar_t* wsFilePath, double dLinToler) ; EIN_EXPORT BOOL __stdcall EgtExportDxf( int nId, const wchar_t* wsFilePath, int nFlag) ; diff --git a/EXeConst.h b/EXeConst.h index 2c2d4ee..d3375fb 100644 --- a/EXeConst.h +++ b/EXeConst.h @@ -27,6 +27,7 @@ enum FileType { FT_NULL = 0, FT_PNT = 17, FT_SVG = 18, FT_BTLX = 19, + FT_3MF = 20, FT_IGES = 31, FT_STEP = 32, FT_ACIS = 33, diff --git a/EXeExecutor.h b/EXeExecutor.h index 43e32fc..6477e94 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -113,6 +113,7 @@ EXE_EXPORT bool ExeImportCsf( const std::string& sFilePath) ; EXE_EXPORT bool ExeImportDxf( const std::string& sFilePath, double dScaleFactor) ; EXE_EXPORT bool ExeImportPnt( const std::string& sFilePath, int nFlag) ; EXE_EXPORT bool ExeImportStl( const std::string& sFilePath, double dScaleFactor) ; +EXE_EXPORT bool ExeImport3MF( const std::string& sFilePath) ; EXE_EXPORT bool ExeAdvancedImportIsEnabled( void) ; EXE_EXPORT bool ExeAdvancedImport( const std::string& sFilePath, double dToler = 0.1) ; EXE_EXPORT bool ExeExportDxf( int nId, const std::string& sFilePath, int nFlag = 1) ;