From dd08440af4c07cafde9cc704f412ecaec39fec30 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Thu, 21 Nov 2019 11:44:42 +0000 Subject: [PATCH] Include : - aggiornamento prototipi. --- EGkSurfTriMesh.h | 4 ++-- EGkVolZmap.h | 10 ++++++---- EXeExecutor.h | 2 ++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/EGkSurfTriMesh.h b/EGkSurfTriMesh.h index 22b6a59..ee294bc 100644 --- a/EGkSurfTriMesh.h +++ b/EGkSurfTriMesh.h @@ -98,8 +98,8 @@ class __declspec( novtable) ISurfTriMesh : public ISurf virtual bool Add( const ISurfTriMesh& Other) = 0 ; virtual bool Intersect( const ISurfTriMesh& Other) = 0 ; virtual bool Subtract( const ISurfTriMesh& Other) = 0 ; - virtual bool GetAllTriaOverlapBox( const BBox3d& b3Box, INTVECTOR& vT) const ; - virtual const BBox3d& GetAllTriaBox( void) const ; + virtual bool GetAllTriaOverlapBox( const BBox3d& b3Box, INTVECTOR& vT) const = 0 ; + virtual const BBox3d& GetAllTriaBox( void) const = 0 ; virtual int GetPartCount( void) const = 0 ; virtual bool RemovePart( int nPart) = 0 ; virtual ISurfTriMesh* ClonePart( int nPart) const = 0 ; diff --git a/EGkVolZmap.h b/EGkVolZmap.h index 5bbe3ce..7a479cd 100644 --- a/EGkVolZmap.h +++ b/EGkVolZmap.h @@ -58,8 +58,6 @@ class __declspec( novtable) IVolZmap : public IGeoObj virtual bool GetBlockTriangles( int nBlock, TRIA3DEXVECTOR& vTria) const = 0 ; virtual bool GetEdges( ICURVEPOVECTOR& vpCurve) const = 0 ; virtual bool GetVolume( double& dVol) const = 0 ; - virtual int GetPartCount( void) const = 0 ; - virtual bool GetPartVolume( int nPart, 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 ; @@ -81,10 +79,14 @@ class __declspec( novtable) IVolZmap : public IGeoObj virtual bool AvoidBox( const Frame3d& frBox, const Vector3d& vtDiag, double dSafeDist) const = 0 ; virtual bool AvoidSphere( const Point3d& ptCenter, double dRad, double dSafeDist) const = 0 ; virtual bool AvoidCylinder( const Frame3d& frCyl, double dH, double dR, double dSafeDist) const = 0 ; - virtual IVolZmap* ClonePart( int nPart) const = 0 ; - virtual bool RemovePart( int nPart) = 0 ; virtual bool Cut( const Plane3d& plPlane) = 0 ; virtual bool Compact( void) = 0 ; + virtual int GetPartCount( void) const = 0 ; + virtual bool GetPartVolume( int nPart, double& dVol) const = 0 ; + virtual bool GetPartLocalBBox( int nPart, BBox3d& b3Loc, int nFlag = BBF_STANDARD) const = 0 ; + virtual bool GetPartBBox( int nPart, const Frame3d& frRef, BBox3d& b3Ref, int nFlag = BBF_STANDARD) const = 0 ; + virtual IVolZmap* ClonePart( int nPart) const = 0 ; + virtual bool RemovePart( int nPart) = 0 ; } ; //----------------------------------------------------------------------------- diff --git a/EXeExecutor.h b/EXeExecutor.h index 40058eb..ed750ff 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -505,6 +505,8 @@ EXE_EXPORT bool ExeSurfTmIntersect( int nId1, int nId2) ; // GeomDb Volume Modify EXE_EXPORT int ExeExplodeVolume( int nId, int* pnCount) ; +EXE_EXPORT bool ExeVolZmapGetPartBBox( int nId, int nPart, int nFlag, BBox3d& b3Box) ; +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) ;