Merge commit 'dd73dd57835d5e30b2acd4c52aef1e3c8a9e3894' into ThreeJS
This commit is contained in:
@@ -923,6 +923,7 @@ EIN_EXPORT int __stdcall EgtGetAxisId( const wchar_t* wsAxis) ;
|
||||
EIN_EXPORT int __stdcall EgtGetHeadId( const wchar_t* wsHead) ;
|
||||
EIN_EXPORT int __stdcall EgtGetHeadExitCount( const wchar_t* wsHead) ;
|
||||
EIN_EXPORT BOOL __stdcall EgtGetAxisInvert( const wchar_t* wsAxis, BOOL* pbInvert) ;
|
||||
EIN_EXPORT BOOL __stdcall EgtGetAxisOffset( const wchar_t* wsAxis, double* pdOffset) ;
|
||||
EIN_EXPORT BOOL __stdcall EgtGetAllHeadsNames( wchar_t*& wsNames) ;
|
||||
EIN_EXPORT BOOL __stdcall EgtGetAllTablesNames( wchar_t*& wsNames) ;
|
||||
// Machine Calc
|
||||
|
||||
+4
-2
@@ -1,7 +1,7 @@
|
||||
//----------------------------------------------------------------------------
|
||||
// EgalTech 2015-2021
|
||||
// EgalTech 2015-2022
|
||||
//----------------------------------------------------------------------------
|
||||
// File : EMkMachMgr.h Data : 24.05.21 Versione : 2.3e3
|
||||
// File : EMkMachMgr.h Data : 21.09.22 Versione : 2.4i4
|
||||
// Contenuto : Dichiarazione della interfaccia IMachMgr.
|
||||
//
|
||||
//
|
||||
@@ -12,6 +12,7 @@
|
||||
// 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.
|
||||
// 21.09.22 DS Aggiunta in interfaccia GetAxisOffset.
|
||||
//
|
||||
//----------------------------------------------------------------------------
|
||||
|
||||
@@ -314,6 +315,7 @@ class __declspec( novtable) IMachMgr
|
||||
virtual bool GetAxisToken( const std::string& sAxis, std::string& sToken) const = 0 ;
|
||||
virtual bool GetAxisType( const std::string& sAxis, bool& bLinear) const = 0 ;
|
||||
virtual bool GetAxisInvert( const std::string& sAxis, bool& bInvert) const = 0 ;
|
||||
virtual bool GetAxisOffset( const std::string& sAxis, double& dOffset) const = 0 ;
|
||||
virtual bool SetAxisPos( const std::string& sAxis, double dVal, double* pdNewVal = nullptr) = 0 ;
|
||||
virtual bool GetAxisPos( const std::string& sAxis, double& dVal) const = 0 ;
|
||||
virtual bool GetAxisMin( const std::string& sAxis, double& dMin) const = 0 ;
|
||||
|
||||
@@ -1099,6 +1099,7 @@ EXE_EXPORT int ExeGetTcPosId( const std::string& sTcPos) ;
|
||||
EXE_EXPORT bool ExeGetAxisToken( const std::string& sAxis, std::string& sToken) ;
|
||||
EXE_EXPORT bool ExeGetAxisType( const std::string& sAxis, bool& bLinear) ;
|
||||
EXE_EXPORT bool ExeGetAxisInvert( const std::string& sAxis, bool& bInvert) ;
|
||||
EXE_EXPORT bool ExeGetAxisOffset( const std::string& sAxis, double& dOffset) ;
|
||||
EXE_EXPORT bool ExeGetAllTablesNames( STRVECTOR& vNames) ;
|
||||
EXE_EXPORT bool ExeGetAllHeadsNames( STRVECTOR& vNames) ;
|
||||
EXE_EXPORT bool ExeGetAllTcPosNames( STRVECTOR& vNames) ;
|
||||
|
||||
Reference in New Issue
Block a user