From bbbfb9a6d71a4e40c462d3181d01895bea21db0d Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Sat, 2 Jul 2016 15:06:05 +0000 Subject: [PATCH] Include : - aggiornamenti. --- EInAPI.h | 2 ++ EMkMachMgr.h | 2 ++ EXeExecutor.h | 2 ++ 3 files changed, 6 insertions(+) diff --git a/EInAPI.h b/EInAPI.h index 80b3188..2207b2d 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -544,6 +544,7 @@ EIN_EXPORT BOOL __stdcall EgtAddPartToRawPart( int nPartId, const double ptPos[3 EIN_EXPORT BOOL __stdcall EgtRemovePartFromRawPart( int nPartId) ; // Table & Fixtures EIN_EXPORT BOOL __stdcall EgtSetTable( const wchar_t* wsTable) ; +EIN_EXPORT BOOL __stdcall EgtGetTableName( wchar_t*& wsTableName) ; EIN_EXPORT BOOL __stdcall EgtGetTableRef( int nInd, double ptPos[3]) ; EIN_EXPORT BOOL __stdcall EgtGetTableArea( int nInd, double ptMin[3], double ptMax[3]) ; EIN_EXPORT BOOL __stdcall EgtShowOnlyTable( bool bVal) ; @@ -554,6 +555,7 @@ EIN_EXPORT BOOL __stdcall EgtTdbCopyTool( const wchar_t* wsSource, const wchar_t EIN_EXPORT BOOL __stdcall EgtTdbRemoveTool( const wchar_t* wsName) ; EIN_EXPORT BOOL __stdcall EgtTdbGetFirstTool( int nFamily, wchar_t*& wsName, int* pnType) ; EIN_EXPORT BOOL __stdcall EgtTdbGetNextTool( int nFamily, wchar_t*& wsName, int* pnType) ; +EIN_EXPORT BOOL __stdcall EgtTdbGetToolFromUUID( wchar_t* wsTuuid, wchar_t*& wsName) ; EIN_EXPORT BOOL __stdcall EgtTdbSetCurrTool( const wchar_t* wsName) ; EIN_EXPORT BOOL __stdcall EgtTdbSaveCurrTool( void) ; EIN_EXPORT BOOL __stdcall EgtTdbIsCurrToolModified( void) ; diff --git a/EMkMachMgr.h b/EMkMachMgr.h index 51b55dd..175c2b8 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -84,6 +84,7 @@ class __declspec( novtable) IMachMgr virtual bool RotatePartInRawPart( int nPartId, const Vector3d& vtAx, double dAngRotDeg) = 0 ; // Tables and Fixtures virtual bool SetTable( const std::string& sTable) = 0 ; + virtual bool GetTable( std::string& sTable) = 0 ; virtual bool GetTableRef( int nInd, Point3d& ptPos) = 0 ; virtual bool GetTableArea( int nInd, BBox3d& b3Area) = 0 ; virtual int AddFixture( const std::string& sName, const Point3d& ptPos, double dAngRotDeg) = 0 ; @@ -97,6 +98,7 @@ class __declspec( novtable) IMachMgr virtual bool TdbRemoveTool( const std::string& sName) = 0 ; virtual bool TdbGetFirstTool( int nFamily, std::string& sName, int& nType) const = 0 ; virtual bool TdbGetNextTool( int nFamily, std::string& sName, int& nType) const = 0 ; + virtual bool TdbGetToolFromUUID( const std::string& sTuuid, std::string& sName) const = 0 ; virtual bool TdbSetCurrTool( const std::string& sName) = 0 ; virtual bool TdbSaveCurrTool( void) = 0 ; virtual bool TdbIsCurrToolModified( void) const = 0 ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 1a53b94..4c85e67 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -586,6 +586,7 @@ EXE_EXPORT bool ExeTranslatePartInRawPart( int nPartId, const Vector3d& vtMove) EXE_EXPORT bool ExeRotatePartInRawPart( int nPartId, const Vector3d& vtAx, double dAngRotDeg) ; // Table & Disposition EXE_EXPORT bool ExeSetTable( const std::string& sTable) ; +EXE_EXPORT bool ExeGetTable( std::string& sTable) ; EXE_EXPORT bool ExeGetTableRef( int nInd, Point3d& ptPos) ; EXE_EXPORT bool ExeGetTableArea( int nInd, BBox3d& b3Area) ; EXE_EXPORT bool ExeShowOnlyTable( bool bVal) ; @@ -599,6 +600,7 @@ EXE_EXPORT bool ExeTdbCopyTool( const std::string& sSource, const std::string& s EXE_EXPORT bool ExeTdbRemoveTool( const std::string& sName) ; EXE_EXPORT bool ExeTdbGetFirstTool( int nFamily, std::string& sName, int& nType) ; EXE_EXPORT bool ExeTdbGetNextTool( int nFamily, std::string& sName, int& nType) ; +EXE_EXPORT bool ExeTdbGetToolFromUUID( const std::string& sTuuid, std::string& sName) ; EXE_EXPORT bool ExeTdbSetCurrTool( const std::string& sName) ; EXE_EXPORT bool ExeTdbSaveCurrTool( void) ; EXE_EXPORT bool ExeTdbIsCurrToolModified( void) ;