From 0dd9b62386d892a65c7e9a422b72773404ef2862 Mon Sep 17 00:00:00 2001 From: SaraP Date: Mon, 16 Dec 2024 10:54:39 +0100 Subject: [PATCH] Include : - aggiornamento prototipi per conservare la gerarchia nell'importazione 3MF. --- EExImport3MF.h | 5 ++++- EXeExecutor.h | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/EExImport3MF.h b/EExImport3MF.h index 7cb15f8..935108a 100644 --- a/EExImport3MF.h +++ b/EExImport3MF.h @@ -29,10 +29,13 @@ class __declspec( novtable) IImport3MF { public : virtual ~IImport3MF( 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) = 0 ; } ; //----------------------------------------------------------------------------- extern "C" { EEX_EXPORT IImport3MF* CreateImport3MF( void) ; } + +enum EIm3MFFlag { EI3FLAG_NONE = 0x0000, + EI3FLAG_KEEP_GROUPS = 0x0001} ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 25ee0a6..6ed1963 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -125,7 +125,7 @@ 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 ExeImportOff( const std::string& sFilePath, double dScaleFactor) ; -EXE_EXPORT bool ExeImport3MF( const std::string& sFilePath) ; +EXE_EXPORT bool ExeImport3MF( const std::string& sFilePath, int nFlag = 0) ; EXE_EXPORT bool ExeImport3dm( const std::string& sFilePath) ; EXE_EXPORT bool ExeAdvancedImportIsEnabled( void) ; EXE_EXPORT bool ExeAdvancedImport( const std::string& sFilePath, double dToler = 0.1, int nFlag = 0) ;