From dd4380d4d671252544471ad666f511c0c9ea8493 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Wed, 15 Apr 2020 09:46:41 +0000 Subject: [PATCH] Include : - aggiornamento prototipi. --- EGkVolZmap.h | 4 ++-- EXeExecutor.h | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/EGkVolZmap.h b/EGkVolZmap.h index 0a442fa..d7e645e 100644 --- a/EGkVolZmap.h +++ b/EGkVolZmap.h @@ -62,9 +62,9 @@ class __declspec( novtable) IVolZmap : public IGeoObj virtual bool GetVolume( double& dVol) const = 0 ; virtual bool GetDexelLines( int nDir, int nPos1, int nPos2, POLYLINELIST& lstPL) const = 0 ; virtual bool SetTolerances( double dLinTol, double dAngTolDeg = 90) = 0 ; - virtual bool SetStdTool( const std::string& sToolName, double dH, double dR, double dCornR, int nFlag) = 0 ; + virtual bool SetStdTool( const std::string& sToolName, double dH, double dR, double dCornR, double dCutterH, int nFlag) = 0 ; virtual bool SetAdvTool( const std::string& sToolName, - double dH, double dR, double dTipH, double dTipR, double dCornR, int nFlag) = 0 ; + double dH, double dR, double dTipH, double dTipR, double dCornR, double dCutterH, int nFlag) = 0 ; virtual bool SetSawTool( const std::string& sToolName, double dH, double dR, double dThick, double dStemR, double dCornR, int nFlag) = 0 ; virtual bool SetGenTool( const std::string& sToolName, const ICurveComposite* pToolOutline, int nFlag) = 0 ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 04460b6..834d955 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -517,9 +517,10 @@ EXE_EXPORT bool ExeVolZmapGetPartBBox( int nId, int nPart, int nFlag, BBox3d& b3 EXE_EXPORT bool ExeVolZmapGetPartBBoxGlob( int nId, int nPart, int nFlag, BBox3d& b3Box) ; EXE_EXPORT int ExeCopyVolZmapPart( int nId, int nPart, int nDestGrpId) ; EXE_EXPORT bool ExeRemoveVolZmapPart( int nId, int nPart) ; -EXE_EXPORT bool ExeVolZmapSetStdTool( const INTVECTOR& vIds, const std::string& sToolName, double dLen, double dDiam, double dCornR, int nFlag) ; +EXE_EXPORT bool ExeVolZmapSetStdTool( const INTVECTOR& vIds, const std::string& sToolName, + double dLen, double dDiam, double dCornR, double dCutterH, int nFlag) ; EXE_EXPORT bool ExeVolZmapSetAdvTool( const INTVECTOR& vIds, const std::string& sToolName, - double dLen, double dDiam, double dTipLen, double dTipDiam, double dCornR, int nFlag) ; + double dLen, double dDiam, double dTipLen, double dTipDiam, double dCornR, double dCutterH, int nFlag) ; EXE_EXPORT bool ExeVolZmapSetSawTool( const INTVECTOR& vIds, const std::string& sToolName, double dLen, double dDiam, double dThick, double dStemDiam, double dCornR, int nFlag) ; EXE_EXPORT bool ExeVolZmapSetGenTool( const INTVECTOR& vIds, const std::string& sToolName, int nToolSectId, int nFlag) ;