From 7e8c953620e5fd924b59926af2f8bf60ddcff0de Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Thu, 7 Sep 2017 09:16:28 +0000
Subject: [PATCH] Include : - aggiornamento interfacce.

---
 EGkVolZmap.h  | 5 ++++-
 EInAPI.h      | 2 ++
 EXeExecutor.h | 8 ++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/EGkVolZmap.h b/EGkVolZmap.h
index 5a58f9a..2020b2e 100644
--- a/EGkVolZmap.h
+++ b/EGkVolZmap.h
@@ -35,11 +35,14 @@ class __declspec( novtable) IVolZmap : public IGeoObj
       virtual bool GetTriangles( bool bAllBlocks, INTVECTOR& nModifiedBlocks, TRIA3DLISTVECTOR& vLstTria) const ;
       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& pToolName, double dH, double dR, double dCornR) = 0 ;
+      virtual bool SetStdTool( const std::string& sToolName, 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 SetMortiserTool( const std::string& sToolName, double dH, double dW, double dTh, double dRc) = 0 ;    
+      virtual bool SetChiselTool( const std::string& sToolName, double dH, double dW, double dTh) = 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 MillingStep( const Point3d& ptPs, const Vector3d& vtDs, const Vector3d& vtAs, const Point3d& ptPe, const Vector3d& vtDe, const Vector3d& vtAe) = 0 ;
       virtual bool GetDepth( const Point3d& ptP, const Vector3d& vtDir, double& dInLength, double& dOutLength) = 0 ;
       virtual bool AvoidBox( const Frame3d& frBox, const Vector3d& vtDiag) = 0 ;
 } ;
diff --git a/EInAPI.h b/EInAPI.h
index f281148..d6ebbea 100644
--- a/EInAPI.h
+++ b/EInAPI.h
@@ -57,6 +57,8 @@ typedef int (__stdcall * pfProcEvents) (int, int) ;
 EIN_EXPORT BOOL __stdcall EgtSetProcessEvents( pfProcEvents pFun) ;
 typedef BOOL (__stdcall * pfOutTextW) (wchar_t*&) ;
 EIN_EXPORT BOOL __stdcall EgtSetOutText( pfOutTextW pFun) ;
+EIN_EXPORT BOOL __stdcall EgtSetTempDir( const wchar_t* wsTempDir) ;
+EIN_EXPORT BOOL __stdcall EgtGetTempDir( wchar_t*& wsTempDir) ;
 EIN_EXPORT BOOL __stdcall EgtSetMainWindowHandle( HWND hMainWnd) ;
 
 // UiUnits
diff --git a/EXeExecutor.h b/EXeExecutor.h
index 8ac787a..f31e3b9 100644
--- a/EXeExecutor.h
+++ b/EXeExecutor.h
@@ -60,6 +60,8 @@ EXE_EXPORT int  ExeProcessEvents( int nProg, int nPause) ;
 typedef bool (__stdcall * pfOutText) ( const std::string&) ;
 EXE_EXPORT bool ExeSetOutText( pfOutText pFun) ;
 EXE_EXPORT bool ExeOutText( const std::string& sText) ;
+EXE_EXPORT bool ExeSetTempDir( const std::string& sTempDir) ;
+EXE_EXPORT bool ExeGetTempDir( std::string& sTempDir) ;
 EXE_EXPORT bool ExeSetMainWindowHandle( HWND hMainWnd) ;
 
 // UiUnits
@@ -470,8 +472,14 @@ EXE_EXPORT bool ExeCutSurfTm( int nId, const Point3d& ptOn, const Vector3d& vtN,
 EXE_EXPORT bool ExeVolZmapSetStdTool( int nId, const std::string& sToolName, double dLen, double dDiam, double dCornR) ;
 EXE_EXPORT bool ExeVolZmapSetAdvTool( int nId, const std::string& sToolName,
                                       double dLen, double dDiam, double dTipLen, double dTipDiam, double dCornR) ;
+EXE_EXPORT bool ExeVolZmapSetMortiserTool( int nId, const std::string& sToolName,
+                                           double dLen, double dWidth, double dThick, double dCornR) ;
+EXE_EXPORT bool ExeVolZmapSetChiselTool( int nId, const std::string& sToolName,
+                                         double dLen, double dWidth, double dThick) ;
 EXE_EXPORT bool ExeVolZmapMillingStep( int nId, const Point3d& ptPs, const Vector3d& vtDs,
                                                 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,
                                     double& dInLen, double& dOutLen) ;
 EXE_EXPORT bool ExeVolZmapAvoidBox( int nId, const Frame3d& frBox, const Vector3d& vtDiag, int nRefType) ;