From e2ccddd93ae22f024f54d8de7fa8adf8c7a60743 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Fri, 11 Dec 2015 16:01:09 +0000 Subject: [PATCH] Include : - aggiornamenti. --- EInAPI.h | 3 +++ EMkMachMgr.h | 1 + EXeExecutor.h | 1 + 3 files changed, 5 insertions(+) diff --git a/EInAPI.h b/EInAPI.h index 3a0e473..2a4f062 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -555,6 +555,9 @@ EIN_EXPORT BOOL __stdcall EgtGenerate( const wchar_t* wsCncFile, const wchar_t* EIN_EXPORT BOOL __stdcall EgtSetCalcTool( const wchar_t* wsTool, const wchar_t* wsHead, int nExit) ; EIN_EXPORT BOOL __stdcall EgtGetCalcTipFromPositions( double dX, double dY, double dZ, double dAngA, double dAngB, BOOL bBottom, double ptTip[3]) ; +EIN_EXPORT BOOL __stdcall EgtGetCalcToolDirFromAngles( double dAngA, double dAngB, double vtDir[3]) ; +// Machine Move +EIN_EXPORT BOOL __stdcall EgtSetAxisPos( const wchar_t* wsAxis, double dVal) ; // Scene EIN_EXPORT BOOL __stdcall EgtInitScene( HWND hWnd, int nDriver, BOOL b2Buff, int nColorBits, int nDepthBits) ; diff --git a/EMkMachMgr.h b/EMkMachMgr.h index 0b98860..2bc3fd9 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -168,6 +168,7 @@ class __declspec( novtable) IMachMgr int& nStat, double& dX, double& dY, double& dZ) = 0 ; virtual bool GetCalcTipFromPositions( double dX, double dY, double dZ, double dAngA, double dAngB, bool bBottom, Point3d& ptTip) = 0 ; + virtual bool GetCalcToolDirFromAngles( double dAngA, double dAngB, Vector3d& vtDir) = 0 ; virtual bool GetNearestAngleInStroke( int nId, double dAngRef, double& dAng) = 0 ; virtual bool VerifyOutOfStroke( double dX, double dY, double dZ, double dAngA, double dAngB, int& nStat) = 0 ; // Machine Move diff --git a/EXeExecutor.h b/EXeExecutor.h index 2b1628a..1b77b64 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -593,6 +593,7 @@ EXE_EXPORT bool ExeGetCalcPositions( const Point3d& ptP, double dAngA, double dA int& nStat, double& dX, double& dY, double& dZ) ; EXE_EXPORT bool ExeGetCalcTipFromPositions( double dX, double dY, double dZ, double dAngA, double dAngB, bool bBottom, Point3d& ptTip) ; +EXE_EXPORT bool ExeGetCalcToolDirFromAngles( double dAngA, double dAngB, Vector3d& vtDir) ; EXE_EXPORT bool ExeVerifyOutOfStroke( double dX, double dY, double dZ, double dAngA, double dAngB, int& nStat) ; // Machine Move EXE_EXPORT bool ExeSetAxisPos( const std::string& sAxis, double dVal) ;