diff --git a/EExImportPnt.h b/EExImportPnt.h new file mode 100644 index 0000000..e0da7d4 --- /dev/null +++ b/EExImportPnt.h @@ -0,0 +1,38 @@ +//---------------------------------------------------------------------------- +// EgalTech 2018-2018 +//---------------------------------------------------------------------------- +// File : EExImportPnt.h Data : 03.07.18 Versione : 1.9g1 +// Contenuto : Dichiarazione della interfaccia IImportPnt. +// +// +// +// Modifiche : 03.07.18 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) IImportPnt +{ + public : + virtual ~IImportPnt( void) {} + virtual bool Import( const std::string& sFile, IGeomDB* pGDB, int nIdGroup, int nFlag = 0) = 0 ; +} ; + +//----------------------------------------------------------------------------- +extern "C" { + EEX_EXPORT IImportPnt* CreateImportPnt( void) ; +} diff --git a/EGkCAvToolSurfTm.h b/EGkCAvToolSurfTm.h index 8ef69c9..5f9496a 100644 --- a/EGkCAvToolSurfTm.h +++ b/EGkCAvToolSurfTm.h @@ -32,8 +32,9 @@ class __declspec( novtable) ICAvToolSurfTm { virtual bool SetStdTool( double dH, double dR, double dCornR) = 0 ; virtual bool SetAdvTool( double dH, double dR, double dTipH, double dTipR, double dCornR) = 0 ; virtual bool SetGenTool( const ICurveComposite* pToolOutline) = 0 ; - virtual double GetToolRadius( void) = 0 ; - virtual double GetToolHeight( void) = 0 ; + virtual double GetToolRadius( void) const = 0 ; + virtual double GetToolHeight( void) const = 0 ; + virtual const ICurveComposite* GetToolOutline( void) const = 0 ; virtual bool TestPosition( const Point3d& ptT, const Vector3d& vtDir, double& dTotDist) = 0 ; virtual bool TestPath( PNTULIST& lPntM, const Vector3d& vtDir, double dLinTol) = 0 ; } ; diff --git a/EInAPI.h b/EInAPI.h index a3417dc..2c320e4 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -93,11 +93,12 @@ EIN_EXPORT BOOL __stdcall EgtSaveObjToFile( int nId, const wchar_t* wsFilePath, // Exchange 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 EgtImportBtl( const wchar_t* wsFilePath, int nFlag) ; 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, int nFlag) ; +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 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 0485f58..c1e3470 100644 --- a/EXeConst.h +++ b/EXeConst.h @@ -24,6 +24,7 @@ enum FileType { FT_NULL = 0, FT_CSF = 14, FT_BTL = 15, FT_IMG = 16, + FT_PNT = 17, FT_TSC = 101, FT_LUA = 102} ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 419ec2a..f51bd39 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -97,11 +97,12 @@ EXE_EXPORT bool ExeSaveObjToFile( int nId, const std::string& sFilePath, int nFl // Exchange 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 ExeImportBtl( const std::string& sFilePath, int nFlag) ; 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, int nFlag) ; +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 ExeExportDxf( int nId, const std::string& sFilePath) ; EXE_EXPORT bool ExeExportStl( int nId, const std::string& sFilePath) ; @@ -618,6 +619,7 @@ EXE_EXPORT int ExeVerifyCutAsSplitting( int nMchId) ; EXE_EXPORT bool ExeCAvSetStdTool( double dToolLen, double dToolDiam, double dToolCornR) ; EXE_EXPORT bool ExeCAvSetAdvTool( double dToolLen, double dToolDiam, double dTipLen, double dTipDiam, double dToolCornR) ; EXE_EXPORT bool ExeCAvSetGenTool( int nToolSectId) ; +EXE_EXPORT int ExeCAvGetToolOutline( int nDestGrpId) ; EXE_EXPORT double ExeCAvToolPosStm( const Point3d& ptP, const Vector3d& vtAx, int nSurfTmId, const Vector3d& vtMove, int nRefType) ; EXE_EXPORT bool ExeCAvToolPathStm( int nCrvId, const Vector3d& vtAx, int nSurfTmId, const Vector3d& vtMove, double dLinTol, int nRefType) ;