From 114c76814b3f6cb8fa2a95340ea9f8edc03a93ba Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 14 Dec 2020 11:42:54 +0000 Subject: [PATCH] Include : - aggiornamento prototipi e nuovo file prototipi per ImportBTLx - aggiunta costante FT_BTLX = 19. --- EExBeamMgr.h | 13 ++++++++++++- EExImportBtlx.h | 39 +++++++++++++++++++++++++++++++++++++++ EInAPI.h | 1 + EXeConst.h | 1 + EXeExecutor.h | 12 ++++++++++++ 5 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 EExImportBtlx.h diff --git a/EExBeamMgr.h b/EExBeamMgr.h index e0a3247..16e3eb2 100644 --- a/EExBeamMgr.h +++ b/EExBeamMgr.h @@ -32,9 +32,20 @@ class __declspec( novtable) IBeamMgr virtual ~IBeamMgr( void) {} virtual bool Init( IGeomDB* pGDB, int nFlag = 0) = 0 ; + virtual int CreatePart( void) = 0 ; + virtual bool SetPart( int nPartId) = 0 ; + virtual bool ErasePart( void) = 0 ; + virtual bool SetPartProdNbr( int nProdNbr) = 0 ; + virtual bool SetPartName( const std::string& sName) = 0 ; + virtual bool SetPartCount( int nCount) = 0 ; + virtual bool SetPartBox( double dLength, double dHeight, double dWidth) = 0 ; + virtual int AddProcess( int nGroup, int nProc, int nSide, const std::string& sDes, int nProcId, + const Frame3d& frRef, const DBLVECTOR& vdPar, const std::string& sPar) = 0 ; virtual bool CalcSolid( int nPartId, bool bRecalc = false) = 0 ; - virtual int GetSolid( int nPartId) = 0 ; + virtual int GetSolid( int nPartId) const = 0 ; virtual bool ShowSolid( int nPartId, bool bShow) = 0 ; + virtual bool GetBuildingIsOn( void) const = 0 ; + virtual bool ShowBuilding( bool bShow) = 0 ; } ; diff --git a/EExImportBtlx.h b/EExImportBtlx.h new file mode 100644 index 0000000..6a703e5 --- /dev/null +++ b/EExImportBtlx.h @@ -0,0 +1,39 @@ +//---------------------------------------------------------------------------- +// EgalTech 2020-2020 +//---------------------------------------------------------------------------- +// File : EExImportBtlx.h Data : 14.12.20 Versione : 2.2l1 +// Contenuto : Dichiarazione della interfaccia IImportBtl. +// +// +// +// Modifiche : 14.12.20 DS Creazione modulo. +// +// +//---------------------------------------------------------------------------- + +#pragma once + +#include "/EgtDev/Include/EGkGeomDB.h" +#include "/EgtDev/Include/EExBeamConst.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) IImportBtlx +{ + public : + virtual ~IImportBtlx( void) {} + virtual bool Import( const std::string& sFile, IGeomDB* pGDB, int nFlag = 0) = 0 ; +} ; + +//----------------------------------------------------------------------------- +extern "C" { + EEX_EXPORT IImportBtlx* CreateImportBtlx( void) ; +} diff --git a/EInAPI.h b/EInAPI.h index 78b6931..dfc455f 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -101,6 +101,7 @@ EIN_EXPORT BOOL __stdcall EgtSaveMachGroupToFile( int nMGroupId, const wchar_t* // Exchange EIN_EXPORT int __stdcall EgtGetFileType( const wchar_t* wsFilePath) ; EIN_EXPORT BOOL __stdcall EgtImportBtl( const wchar_t* wsFilePath, int nFlag) ; +EIN_EXPORT BOOL __stdcall EgtImportBtlx( 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 EgtImportDxf( const wchar_t* wsFilePath, double dScaleFactor) ; diff --git a/EXeConst.h b/EXeConst.h index a5f4c43..2c2d4ee 100644 --- a/EXeConst.h +++ b/EXeConst.h @@ -26,6 +26,7 @@ enum FileType { FT_NULL = 0, FT_IMG = 16, FT_PNT = 17, FT_SVG = 18, + FT_BTLX = 19, FT_IGES = 31, FT_STEP = 32, FT_ACIS = 33, diff --git a/EXeExecutor.h b/EXeExecutor.h index d64f689..b2f97bd 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -107,6 +107,7 @@ EXE_EXPORT bool ExeSaveMachGroupToFile( int nMGroupId, const std::string& sFileP // Exchange EXE_EXPORT int ExeGetFileType( const std::string& sFilePath) ; EXE_EXPORT bool ExeImportBtl( const std::string& sFilePath, int nFlag) ; +EXE_EXPORT bool ExeImportBtlx( 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 ExeImportDxf( const std::string& sFilePath, double dScaleFactor) ; @@ -120,9 +121,20 @@ EXE_EXPORT bool ExeExportSvg( int nId, const std::string& sFilePath, int nFilter // BeamManager EXE_EXPORT bool ExeInitBeamMgr( int nFlag) ; +EXE_EXPORT int ExeBeamCreatePart( void) ; +EXE_EXPORT bool ExeBeamSetPart( int nPartId) ; +EXE_EXPORT bool ExeBeamErasePart( void) ; +EXE_EXPORT bool ExeBeamSetPartProdNbr( int nProdNbr) ; +EXE_EXPORT bool ExeBeamSetPartName( const std::string& sName) ; +EXE_EXPORT bool ExeBeamSetPartCount( int nCount) ; +EXE_EXPORT bool ExeBeamSetPartBox( double dLength, double dHeight, double dWidth) ; +EXE_EXPORT int ExeBeamAddProcess( int nGroup, int nProc, int nSide, const std::string& sDes, int nProcId, + const Frame3d& frRef, const DBLVECTOR& vdPar, const std::string& sPar) ; EXE_EXPORT bool ExeBeamCalcSolid( int nPartId, bool bRecalc = false) ; EXE_EXPORT int ExeBeamGetSolid( int nPartId) ; EXE_EXPORT bool ExeBeamShowSolid( int nPartId, bool bShow) ; +EXE_EXPORT bool ExeBeamGetBuildingIsOn( void) ; +EXE_EXPORT bool ExeBeamShowBuilding( bool bShow) ; // Tsc Executor EXE_EXPORT bool ExeInitTscExec( void) ;