From 32054b7f99fd51d011b04e20da0df78a939bfd1a Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Thu, 14 Jan 2021 06:36:56 +0000 Subject: [PATCH] Include : - aggiornamento prototipi. --- EMkMachMgr.h | 7 +++++-- EXeExecutor.h | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/EMkMachMgr.h b/EMkMachMgr.h index d81d825..0ac616f 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- -// EgalTech 2015-2020 +// EgalTech 2015-2021 //---------------------------------------------------------------------------- -// File : EMkMachMgr.h Data : 10.11.20 Versione : 2.2k3 +// File : EMkMachMgr.h Data : 13.01.21 Versione : 2.3a3 // Contenuto : Dichiarazione della interfaccia IMachMgr. // // @@ -11,6 +11,7 @@ // 26.06.19 DS Aggiunta gestione Warnings. // 17.08.20 DS Aggiunte GetAxisMin e GetAxisMax. // 10.11.20 DS Portate in interfaccia funzioni di calcolo con vettori di angoli. +// 13.01.21 DS Aggiunte in interfaccia GetCalcHead e GetCalcExit. // //---------------------------------------------------------------------------- @@ -273,6 +274,8 @@ class __declspec( novtable) IMachMgr virtual bool SetRotAxisBlock( const std::string& sAxis, double dVal) = 0 ; virtual bool GetRotAxisBlocked( int nInd, std::string& sAxis, double& dVal) const = 0 ; virtual bool GetCalcTool( std::string& sTool) const = 0 ; + virtual bool GetCalcHead( std::string& sHead) const = 0 ; + virtual bool GetCalcExit( int& nExit) const = 0 ; virtual bool GetCalcAngles( const Vector3d& vtDirT, const Vector3d& vtDirA, int& nStat, double& dAngA1, double& dAngB1, double& dAngA2, double& dAngB2) const = 0 ; virtual bool GetCalcAngles( const Vector3d& vtDirT, const Vector3d& vtDirA, diff --git a/EXeExecutor.h b/EXeExecutor.h index fa9e5aa..43e32fc 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -1040,6 +1040,8 @@ EXE_EXPORT bool ExeSetCalcTool( const std::string& sTool, const std::string& sHe EXE_EXPORT bool ExeSetRotAxisBlock( const std::string& sAxis, double dVal) ; EXE_EXPORT bool ExeGetRotAxisBlocked( int nInd, std::string& sAxis, double& dVal) ; EXE_EXPORT bool ExeGetCalcTool( std::string& sTool) ; +EXE_EXPORT bool ExeGetCalcHead( std::string& sHead) ; +EXE_EXPORT bool ExeGetCalcExit( int& nExit) ; EXE_EXPORT bool ExeGetCalcAngles( const Vector3d& vtDirT, const Vector3d& vtDirA, int& nStat, double& dAngA1, double& dAngB1, double& dAngA2, double& dAngB2) ; EXE_EXPORT bool ExeGetCalcAngles( const Vector3d& vtDirT, const Vector3d& vtDirA,