diff --git a/EExImportCsf.h b/EExImportCsf.h new file mode 100644 index 0000000..52c6472 --- /dev/null +++ b/EExImportCsf.h @@ -0,0 +1,38 @@ +//---------------------------------------------------------------------------- +// EgalTech 2015-2015 +//---------------------------------------------------------------------------- +// File : EExImportCsf.h Data : 17.05.15 Versione : 1.6e3 +// Contenuto : Dichiarazione della interfaccia IImportCsf. +// +// +// +// Modifiche : 17.05.15 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) IImportCsf +{ + public : + virtual ~IImportCsf( void) {} + virtual bool Import( const std::string& sFile, IGeomDB* pGDB) = 0 ; +} ; + +//----------------------------------------------------------------------------- +extern "C" { + EEX_EXPORT IImportCsf* CreateImportCsf( void) ; +} diff --git a/EGnFileUtils.h b/EGnFileUtils.h index 5ef6b88..3e4ed41 100644 --- a/EGnFileUtils.h +++ b/EGnFileUtils.h @@ -27,6 +27,7 @@ //----------------------------------------------------------------------------- EGN_EXPORT bool ExistsFile( const std::string& sFile) ; EGN_EXPORT bool EraseFile( const std::string& sFile) ; +EGN_EXPORT std::string ChangeFileExtension( const std::string& sFile, const std::string& sNewExt) ; EGN_EXPORT bool FileExtensionMatches( const std::string& sFile, const std::string& sExt) ; EGN_EXPORT bool FindFirstFileEgt( const std::string& sFileSpec, std::string& sFileName) ; EGN_EXPORT bool ExistsDirectory( const std::string& sDir) ; diff --git a/EInAPI.h b/EInAPI.h index fbfe9fb..f0329ad 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -75,6 +75,7 @@ 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 EgtImportCsf( const wchar_t* wsFilePath) ; 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/EMkMachMgr.h b/EMkMachMgr.h index 954fd6c..3c281df 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -65,6 +65,8 @@ class __declspec( novtable) IMachMgr virtual bool RemovePartFromRawPart( int nPartId) = 0 ; virtual bool TranslatePartInRawPart( int nPartId, const Vector3d& vtMove) = 0 ; virtual bool RotatePartInRawPart( int nPartId, const Vector3d& vtAx, double dAngRotDeg) = 0 ; + // Fixtures + virtual int AddSubPiece( const std::string& sName, const Point3d& ptPos) = 0 ; // Machine virtual bool SetAxisPos( const std::string& sAxis, double dVal) = 0 ; virtual bool GetAxisPos( const std::string& sAxis, double& dVal) = 0 ; diff --git a/EXeExecutor.h b/EXeExecutor.h index bfa1775..9f407af 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -75,6 +75,7 @@ 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 ExeImportCsf( const std::string& sFilePath) ; EXE_EXPORT bool ExeExportDxf( int nId, const std::string& sFilePath) ; EXE_EXPORT bool ExeExportStl( int nId, const std::string& sFilePath) ; @@ -413,6 +414,7 @@ EXE_EXPORT bool ExeAddPartToRawPart( int nPartId, const Point3d& ptPos, int nRaw EXE_EXPORT bool ExeRemovePartFromRawPart( int nPartId) ; EXE_EXPORT bool ExeTranslatePartInRawPart( int nPartId, const Vector3d& vtMove) ; EXE_EXPORT bool ExeRotatePartInRawPart( int nPartId, const Vector3d& vtAx, double dAngRotDeg) ; +EXE_EXPORT int ExeAddSubPiece( const std::string& sName, const Point3d& ptPos) ; EXE_EXPORT bool ExeSetAxisPos( const std::string& sAxis, double dVal) ; EXE_EXPORT bool ExeGetAxisPos( const std::string& sAxis, double* pdVal) ; EXE_EXPORT bool ExeGetAxisHomePos( const std::string& sAxis, double* pdHomeVal) ;