From be6efe65e44c2f0f9c1e626a2c28b0d8f954cdc0 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Sat, 28 Oct 2023 18:12:16 +0200 Subject: [PATCH] Include : - aggiornamento prototipi. --- EMkMachMgr.h | 10 +++++++--- EXeExecutor.h | 6 +++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/EMkMachMgr.h b/EMkMachMgr.h index a9c3de7..822b452 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- // EgalTech 2015-2023 //---------------------------------------------------------------------------- -// File : EMkMachMgr.h Data : 25.08.23 Versione : 2.5h3 +// File : EMkMachMgr.h Data : 28.10.23 Versione : 2.5j4 // Contenuto : Dichiarazione della interfaccia IMachMgr. // // @@ -14,6 +14,7 @@ // 13.01.21 DS Aggiunte in interfaccia GetCalcHead e GetCalcExit. // 21.09.22 DS Aggiunta in interfaccia GetAxisOffset. // 25.08.23 DS Aggiunta in interfaccia CopyMachGroup. +// 28.10.23 DS Aggiunte in interfaccia GetClEntAxesVal, GetToolSetupPosInCurrSetup e GetAllCurrAxesName. // //---------------------------------------------------------------------------- @@ -166,6 +167,7 @@ class __declspec( novtable) IMachMgr virtual bool ImportSetup( const std::string& sName) = 0 ; virtual bool VerifyCurrSetup( STRVECTOR& vsErrors) = 0 ; virtual bool FindToolInCurrSetup( const std::string& sTool) = 0 ; + virtual bool GetToolSetupPosInCurrSetup( const std::string& sTool, std::string& sTcPos) = 0 ; virtual bool GetToolsInCurrSetupPos( const std::string& sTcPos, STRVECTOR& vsTools) = 0 ; virtual bool UpdateCurrSetup( void) = 0 ; virtual bool EraseCurrSetup( void) = 0 ; @@ -201,7 +203,7 @@ class __declspec( novtable) IMachMgr virtual bool MdbToBeImported( const std::string& sFile, STRVECTOR& vsMachiningsNames, INTVECTOR& vMachiningsTypes) const = 0 ; virtual bool MdbImport( const std::string& sFile, const STRVECTOR& vsMachiningsToImport, const STRVECTOR& vsMachiningsNames, STRVECTOR& vsImported) = 0 ; - // Operations : general + // Operations : general virtual int GetOperationCount( void) const = 0 ; virtual int GetFirstOperation( void) const = 0 ; virtual int GetNextOperation( int nId) const = 0 ; @@ -264,8 +266,9 @@ class __declspec( novtable) IMachMgr virtual bool GetMachiningEndPoint( Point3d& ptEnd) const = 0 ; // CL Entities Interrogations virtual bool GetClEntMove( int nEntId, int& nMove) const = 0 ; - virtual bool GetClEntFlag( int nEntId, int& nFlag) const = 0 ; + virtual bool GetClEntFlag( int nEntId, int& nFlag, int& nFlag2) const = 0 ; virtual bool GetClEntIndex( int nEntId, int& nIndex) const = 0 ; + virtual bool GetClEntAxesVal( int nEntId, DBLVECTOR& vAxes) const = 0 ; // Simulation virtual bool SimInit( void) = 0 ; virtual bool SimStart( bool bFirst) = 0 ; @@ -284,6 +287,7 @@ class __declspec( novtable) IMachMgr // Machine Calc virtual bool SetCalcTable( const std::string& sTable) = 0 ; virtual bool SetCalcTool( const std::string& sTool, const std::string& sHead, int nExit) = 0 ; + virtual bool GetAllCurrAxesName( STRVECTOR& vAxName) const = 0 ; 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 ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 5cae25f..4f08f09 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -1014,6 +1014,7 @@ EXE_EXPORT bool ExeGetDefaultSetupName( std::string& sName) ; EXE_EXPORT bool ExeImportSetup( const std::string& sName) ; EXE_EXPORT bool ExeVerifyCurrSetup( STRVECTOR& vsErrors) ; EXE_EXPORT bool ExeFindToolInCurrSetup( const std::string& sTool) ; +EXE_EXPORT bool ExeGetToolSetupPosInCurrSetup( const std::string& sTool, std::string& sTcPos) ; EXE_EXPORT bool ExeGetToolsInCurrSetupPos( const std::string& sTcPos, STRVECTOR& vsTools) ; EXE_EXPORT bool ExeUpdateCurrSetup( void) ; EXE_EXPORT bool ExeEraseCurrSetup( void) ; @@ -1112,8 +1113,10 @@ EXE_EXPORT bool ExeUpdateAllMachinings( bool bStopOnFirstErr, std::string& sErrL EXE_EXPORT bool ExeUpdateAllMachiningsEx( bool bStopOnFirstErr, std::string& sErrList, std::string& sWarnList) ; // CL Entities Interrogations EXE_EXPORT bool ExeGetClEntMove( int nEntId, int& nMove) ; -EXE_EXPORT bool ExeGetClEntFlag( int nEntId, int& nFlag) ; +EXE_EXPORT bool ExeGetClEntFlag( int nEntId, int& nFlag, int& nFlag2) ; EXE_EXPORT bool ExeGetClEntIndex( int nEntId, int& nIndex) ; +EXE_EXPORT bool ExeGetClEntAxesVal( int nEntId, DBLVECTOR& vAxes) ; + // Simulation EXE_EXPORT bool ExeSimInit( void) ; EXE_EXPORT bool ExeSimStart( bool bFirst) ; @@ -1147,6 +1150,7 @@ EXE_EXPORT bool ExeGetAllTcPosNames( STRVECTOR& vNames) ; // Machine Calc EXE_EXPORT bool ExeSetCalcTable( const std::string& sTable) ; EXE_EXPORT bool ExeSetCalcTool( const std::string& sTool, const std::string& sHead, int nExit) ; +EXE_EXPORT bool ExeGetAllCurrAxesName( STRVECTOR& vAxName) ; EXE_EXPORT bool ExeSetRotAxisBlock( const std::string& sAxis, double dVal) ; EXE_EXPORT bool ExeGetCalcTool( std::string& sTool, std::string& sHead, int& nExit) ; EXE_EXPORT bool ExeGetRotAxisBlocked( int nInd, std::string& sAxis, double& dVal) ;