diff --git a/EGkVolZmap.h b/EGkVolZmap.h index f03796c..26883de 100644 --- a/EGkVolZmap.h +++ b/EGkVolZmap.h @@ -61,7 +61,9 @@ class __declspec( novtable) IVolZmap : public IGeoObj virtual bool GetEdges( ICURVEPOVECTOR& vpCurve) const = 0 ; 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 int GetResolution( void) const = 0 ; + virtual bool ChangeResolution( int nDexvoxRatio) = 0 ; + virtual bool SetToolTolerances( double dLinTol, double dAngTolDeg = 90) = 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, double dCutterH, int nFlag) = 0 ; @@ -90,7 +92,6 @@ class __declspec( novtable) IVolZmap : public IGeoObj virtual IVolZmap* ClonePart( int nPart) const = 0 ; virtual bool RemovePart( int nPart) = 0 ; virtual int GetPartMinDistFromPoint( const Point3d& ptP) const = 0 ; - virtual bool ChangeResolution( int nDexvoxRatio) = 0 ; } ; //----------------------------------------------------------------------------- diff --git a/EXeExecutor.h b/EXeExecutor.h index 1af6926..77c506f 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -521,9 +521,7 @@ EXE_EXPORT int ExeSurfTmSplit( int nId, int nSplitterId, int* pnCount) ; // 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 ExeVolZmapChangeResolution( int nId, int nNewRes) ; 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, double dCutterH, int nFlag) ; @@ -542,9 +540,6 @@ EXE_EXPORT bool ExeVolZmapMillingStep( int nId, const Point3d& ptPs, const Vecto const Point3d& ptPe, const Vector3d& vtD, int nRefTypee) ; EXE_EXPORT bool ExeVolZmapMillingStep( int nId, const Point3d& ptPs, const Vector3d& vtDs, const Vector3d& vtAs, const Point3d& ptPe, const Vector3d& vtDe, const Vector3d& vtAe, int nRefType) ; -EXE_EXPORT bool ExeVolZmapGetDepth( int nId, const Point3d& ptP, const Vector3d& vtDir, int nRefType, bool bExact, - double& dInLen, double& dOutLen) ; -EXE_EXPORT int ExeVolZmapGetEdges( int nId, int nDestGrpId, int* pnCount) ; EXE_EXPORT bool ExeCutVolZmapPlane( int nId, const Point3d& ptOn, const Vector3d& vtN, int nRefType) ; // GeomDB Get @@ -622,9 +617,16 @@ EXE_EXPORT int ExeExtractSurfBezierLoops( int nId, int nDestGrpId, int* pnCount // GeomDb Volume Get EXE_EXPORT bool ExeVolZmapVolume( int nId, double& dVol) ; +EXE_EXPORT int ExeVolZmapResolution( int nId) ; EXE_EXPORT int ExeVolZmapPartCount( int nId) ; EXE_EXPORT bool ExeVolZmapPartVolume( int nId, int nPart, double& dVol) ; +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 bool ExeVolZmapGetPartMinDist( int nId, const Point3d ptNear, int nRefType, int& nPart) ; +EXE_EXPORT int ExeCopyVolZmapPart( int nId, int nPart, int nDestGrpId) ; +EXE_EXPORT bool ExeVolZmapGetDepth( int nId, const Point3d& ptP, const Vector3d& vtDir, int nRefType, bool bExact, + double& dInLen, double& dOutLen) ; +EXE_EXPORT int ExeVolZmapGetEdges( int nId, int nDestGrpId, int* pnCount) ; // Geo Snap Vector/Point/Frame EXE_EXPORT bool ExeStartPoint( int nId, int nRefId, Point3d& ptP) ;