From 08928860bda6233fc8fbf19de247e460a74cf9f8 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Thu, 27 Oct 2016 16:46:10 +0000
Subject: [PATCH] Include : - aggiornamenti per solidi Zmap.

---
 EGkVolZmap.h  | 20 ++++++--------------
 EXeExecutor.h |  9 +++++++++
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/EGkVolZmap.h b/EGkVolZmap.h
index 0a4d897..0c199b4 100644
--- a/EGkVolZmap.h
+++ b/EGkVolZmap.h
@@ -22,25 +22,17 @@
 //----------------------------------------------------------------------------
 class __declspec( novtable) IVolZmap : public IGeoObj
 {
-
-// Tipi utensile
-   public :
-      enum ToolType { GenericTool = 0,                 // generico da profilo -> usare SetTool
-                      CylindricalMill = 1,             // cilindrica
-                      BallEndMill = 2,                 // sferica
-                      BullNoseMill = 3,                // naso di toro
-                      ConusMill = 4} ;                 // con parte terminale conica
-
    public :
       virtual bool CopyFrom( const IGeoObj* pGObjSrc) = 0 ;
-      virtual bool CreateMap( const Point3d& ptO, double dPrec, double dLenX, double dLenY, double dLenZ) = 0 ;
+      virtual bool CreateMap( const Point3d& ptO, double dLenX, double dLenY, double dLenZ, double dPrec) = 0 ;
       virtual bool GetAllTriangles( TRIA3DLIST& lstTria) 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 SetTool( const std::string& sToolName, const ICurveComposite* pToolOutline) = 0 ;
-      virtual bool SetStdTool( const std::string& sToolName, unsigned int nToolType,
-                               double dH, double dTipH, double dR, double dTipR, double dRc = 0) = 0 ;
-      virtual bool MillingStep( const Point3d& ptPs, const Point3d& ptPe, Vector3d& vtDs, Vector3d& vtDe) = 0 ;
+      virtual bool SetStdTool( const std::string& pToolName, double dH, double dR, double dCornR) = 0 ;
+      virtual bool SetAdvTool( const std::string& sToolName,
+                               double dH, double dR, double dTipH, double dTipR, double dCornR) = 0 ;
+      virtual bool SetGenTool( const std::string& sToolName, const ICurveComposite* pToolOutline) = 0 ;
+      virtual bool MillingStep( const Point3d& ptPs, const Vector3d& vtDs, const Point3d& ptPe, const Vector3d& vtDe) = 0 ;
       virtual bool Deepness( const Point3d& ptP, const Vector3d& vtDir, double& dInLength, double& dOutLength) = 0 ;
       virtual bool BBoxZmapIntersection( const Frame3d& frBBox, const Point3d& ptMax) = 0 ;
 } ;
diff --git a/EXeExecutor.h b/EXeExecutor.h
index 0af6ce9..b7bbda5 100644
--- a/EXeExecutor.h
+++ b/EXeExecutor.h
@@ -256,6 +256,10 @@ EXE_EXPORT int  ExeCreateSurfTmRuled( int nParentId, int nPtOrCrvId1, int nPtOrC
 EXE_EXPORT int  ExeCreateSurfTmByTriangles( int nParentId, const INTVECTOR& vIds, bool bErase) ;
 EXE_EXPORT int  ExeCreateSurfTmBySewing( int nParentId, const INTVECTOR& vIds, bool bErase) ;
 
+// GeomDB Create Volume
+EXE_EXPORT int  ExeCreateVolZmap( int nParentId, const Point3d& ptIni,
+                                  double dDimX, double dDimY, double dDimZ, double dPrec, int nRefType) ;
+
 // GeomDB PartLayer
 EXE_EXPORT bool ExeIsPart( int nPartId) ;
 EXE_EXPORT bool ExeIsLayer( int nLayerId) ;
@@ -448,6 +452,11 @@ EXE_EXPORT int  ExeExtractSurfTmLoops( int nId, int nDestGrpId, int* pnCount) ;
 EXE_EXPORT int  ExeGetSurfTmSilhouette( int nId, const Vector3d& vtDir, int nDestGrpId, int nRefType, int* pnCount) ;
 EXE_EXPORT int  ExeExtractSurfTmFacetLoops( int nId, int nFacet, int nDestGrpId, int* pnCount) ;
 
+// GeomDb Volume Modify
+EXE_EXPORT bool ExeVolZmapSetStdTool( int nId, const std::string& sToolName, double dLen, double dDiam, double dCornR) ;
+EXE_EXPORT bool ExeVolZmapMillingStep( int nId, const Point3d& ptPs, const Vector3d& vtDs,
+                                                const Point3d& ptPe, const Vector3d& vtD, int nRefTypee) ;
+
 // Geo Snap Vector/Point/Frame
 EXE_EXPORT bool ExeStartPoint( int nId, int nRefId, Point3d& ptP) ;
 EXE_EXPORT bool ExeEndPoint( int nId, int nRefId, Point3d& ptP) ;