From a55b658dd38f4f1c516c9755ddf4381954189b07 Mon Sep 17 00:00:00 2001 From: Riccardo Elitropi Date: Mon, 22 Apr 2024 13:25:02 +0200 Subject: [PATCH] Include : - aggiunta prototipi e costanti per Vmill additivo. --- EGkVolZmap.h | 3 +++ EMkToolConst.h | 4 +++- EXeExecutor.h | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/EGkVolZmap.h b/EGkVolZmap.h index 0184877..447a394 100644 --- a/EGkVolZmap.h +++ b/EGkVolZmap.h @@ -28,6 +28,7 @@ class __declspec( novtable) IVolZmap : public IGeoObj virtual bool CopyFrom( const IGeoObj* pGObjSrc) = 0 ; virtual bool Clear( void) = 0 ; virtual bool Create( const Point3d& ptO, double dDimX, double dDimY, double dDimZ, double dPrec, bool bTriDex) = 0 ; + virtual bool CreateEmptyMap( const Point3d& ptO, double dLengthX, double dLengthY, double dLengthZ, double dStep, bool bTriDex) = 0 ; virtual bool CreateFromFlatRegion( const ISurfFlatRegion& Surf, double dDimZ, double dPrec, bool bTriDex) = 0 ; virtual bool CreateFromTriMesh( const ISurfTriMesh& Surf, double dPrec, bool bTriDex) = 0 ; virtual int GetBlockCount( void) const = 0 ; @@ -54,6 +55,8 @@ class __declspec( novtable) IVolZmap : public IGeoObj double dH, double dW, double dTh, double dRc, int nFlag, bool bFirst) = 0 ; virtual bool SetChiselTool( const std::string& sToolName, double dH, double dW, double dTh, int nFlag, bool bFirst) = 0 ; + virtual bool SetAdditiveTool( const std::string& sToolName, + double dH, double dR, double dRC, int nFlag, bool bFirst) = 0 ; virtual int GetToolCount( void) const = 0 ; virtual bool SetCurrTool( int nCurrTool) = 0 ; virtual bool ResetTools( void) = 0 ; diff --git a/EMkToolConst.h b/EMkToolConst.h index 51e5103..c421f92 100644 --- a/EMkToolConst.h +++ b/EMkToolConst.h @@ -27,6 +27,7 @@ const int TF_MORTISE = 0x0800 ; // 2048 const int TF_CHISEL = 0x1000 ; // 4096 const int TF_WATERJET = 0x2000 ; // 8192 const int TF_COMPO = 0x4000 ; // 16384 +const int TF_ADDITIVE = 0x8000 ; // 32768 // Costante per tutte le famiglie const int TF_ALL = 0xFF00 ; // Tipologie di utensili @@ -42,7 +43,8 @@ enum ToolType { TT_MORTISE_STD = TF_MORTISE + 0, // 2048 TT_CHISEL_STD = TF_CHISEL + 0, // 4096 TT_WATERJET = TF_WATERJET + 0, // 8192 - TT_COMPO = TF_COMPO + 0 // 16384 + TT_COMPO = TF_COMPO + 0, // 16384 + TT_ADDITIVE = TF_ADDITIVE + 0 // 32768 } ; // Controllo tipo valido bool inline IsValidToolType( int nType) diff --git a/EXeExecutor.h b/EXeExecutor.h index af177ad..abedaa8 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -376,6 +376,8 @@ EXE_EXPORT int ExeCreateSurfBezierTria2D( int nParentId, int nSurfBzId, int nTe // GeomDB Create Volume EXE_EXPORT int ExeCreateVolZmap( int nParentId, const Point3d& ptIni, double dDimX, double dDimY, double dDimZ, double dPrec, bool bTriDex, int nRefType) ; +EXE_EXPORT int ExeCreateVolZmapEmpty( int nParentId, const Point3d& ptIni, double dDimX, + double dDimY, double dDimZ, double dPrec, bool bTriDex, int nRefType) ; EXE_EXPORT int ExeCreateVolZmapByRegionExtrusion( int nParentId, int nSfrId, double dDimZ, double dPrec, bool bTriDex) ; EXE_EXPORT int ExeCreateVolZmapFromSurfTm( int nParentId, int nStmId, double dPrec, bool bTriDex) ; @@ -657,6 +659,8 @@ EXE_EXPORT bool ExeVolZmapSetMortiserTool( const INTVECTOR& vIds, const std::str double dLen, double dWidth, double dThick, double dCornR, int nFlag, bool bFirst) ; EXE_EXPORT bool ExeVolZmapSetChiselTool( const INTVECTOR& vIds, const std::string& sToolName, double dLen, double dWidth, double dThick, int nFlag, bool bFirst) ; +EXE_EXPORT bool ExeVolZmapSetAdditiveTool( const INTVECTOR& vIds, const std::string& sToolName, + double dLen, double dDiam, double dCornR, int nFlag, bool bFirst) ; EXE_EXPORT bool ExeVolZmapResetTools( const INTVECTOR& vIds) ; EXE_EXPORT int ExeVolZmapGetToolOutline( int nId, int nDestGrpId, bool bApprox = false) ; EXE_EXPORT bool ExeVolZmapMillingStep( int nId, const Point3d& ptPs, const Vector3d& vtDs,