From 2726461a20ece9f511a2c87fb1b9aa6cc4c582c0 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 7 Sep 2015 08:24:47 +0000 Subject: [PATCH] Include : - aggiornamenti. --- EInAPI.h | 8 +++++++- EXeExecutor.h | 8 +++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/EInAPI.h b/EInAPI.h index cbba89f..793ec6c 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -254,6 +254,10 @@ EIN_EXPORT int __stdcall EgtGetFirstGroupInGroup( int nGroupId) ; EIN_EXPORT int __stdcall EgtGetNextGroup( int nId) ; EIN_EXPORT int __stdcall EgtGetLastGroupInGroup( int nGroupId) ; EIN_EXPORT int __stdcall EgtGetPrevGroup( int nId) ; +EIN_EXPORT int __stdcall EgtGetFirstNameInGroup( int nGroupId, const wchar_t* wsName) ; +EIN_EXPORT int __stdcall EgtGetNextName( int nId, const wchar_t* wsName) ; +EIN_EXPORT int __stdcall EgtGetLastNameInGroup( int nGroupId, const wchar_t* wsName) ; +EIN_EXPORT int __stdcall EgtGetPrevName( int nId, const wchar_t* wsName) ; EIN_EXPORT BOOL __stdcall EgtGetBBox( int nId, int nFlag, double ptMin[3], double ptMax[3]) ; EIN_EXPORT BOOL __stdcall EgtGetBBoxGlob( int nId, int nFlag, double ptMin[3], double ptMax[3]) ; EIN_EXPORT BOOL __stdcall EgtGetBBoxRef( int nId, int nFlag, const double ptOrig[3], @@ -300,8 +304,10 @@ EIN_EXPORT BOOL __stdcall EgtExistsName( int nId) ; EIN_EXPORT BOOL __stdcall EgtRemoveName( int nId) ; EIN_EXPORT BOOL __stdcall EgtSetInfo( int nId, const wchar_t* wsKey, const wchar_t* wsInfo) ; EIN_EXPORT BOOL __stdcall EgtSetInfoInt( int nId, const wchar_t* wsKey, int nInfo) ; +EIN_EXPORT BOOL __stdcall EgtSetInfoDouble( int nId, const wchar_t* wsKey, double dInfo) ; EIN_EXPORT BOOL __stdcall EgtGetInfo( int nId, const wchar_t* wsKey, wchar_t*& wsInfo) ; EIN_EXPORT BOOL __stdcall EgtGetInfoInt( int nId, const wchar_t* wsKey, int* pnInfo) ; +EIN_EXPORT BOOL __stdcall EgtGetInfoDouble( int nId, const wchar_t* wsKey, double* pdInfo) ; EIN_EXPORT BOOL __stdcall EgtExistsInfo( int nId, const wchar_t* wsKey) ; EIN_EXPORT BOOL __stdcall EgtRemoveInfo( int nId, const wchar_t* wsKey) ; @@ -426,7 +432,7 @@ EIN_EXPORT BOOL __stdcall EgtShearGroup( int nId, const double vPnt[3], const do // Nesting EIN_EXPORT BOOL __stdcall EgtCreateFlatParts( int nType) ; -EIN_EXPORT BOOL __stdcall EgtPackPart( int nId, double dXmax, double dOffs) ; +EIN_EXPORT BOOL __stdcall EgtPackPart( int nId, double dXmin, double dYmin, double dXmax, double dOffs) ; // Machining EIN_EXPORT BOOL __stdcall EgtInitMachMgr( const wchar_t* wsMachinesDir) ; diff --git a/EXeExecutor.h b/EXeExecutor.h index aaa341f..c97d7de 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -305,10 +305,12 @@ EXE_EXPORT bool ExeSetName( int nId, const std::string& sName) ; EXE_EXPORT bool ExeGetName( int nId, std::string& sName) ; EXE_EXPORT bool ExeExistsName( int nId) ; EXE_EXPORT bool ExeRemoveName( int nId) ; -EXE_EXPORT bool ExeSetInfo( int nId, const std::string& sKey, const std::string& sInfo) ; EXE_EXPORT bool ExeSetInfo( int nId, const std::string& sKey, int nInfo) ; -EXE_EXPORT bool ExeGetInfo( int nId, const std::string& sKey, std::string& sInfo) ; +EXE_EXPORT bool ExeSetInfo( int nId, const std::string& sKey, double dInfo) ; +EXE_EXPORT bool ExeSetInfo( int nId, const std::string& sKey, const std::string& sInfo) ; EXE_EXPORT bool ExeGetInfo( int nId, const std::string& sKey, int& nInfo) ; +EXE_EXPORT bool ExeGetInfo( int nId, const std::string& sKey, double& dInfo) ; +EXE_EXPORT bool ExeGetInfo( int nId, const std::string& sKey, std::string& sInfo) ; EXE_EXPORT bool ExeExistsInfo( int nId, const std::string& sKey) ; EXE_EXPORT bool ExeRemoveInfo( int nId, const std::string& sKey) ; @@ -439,7 +441,7 @@ EXE_EXPORT bool ExeShearGroup( int nId, const Point3d& ptP, const Vector3d& vtN, // Nesting EXE_EXPORT bool ExeCreateFlatParts( int nType) ; -EXE_EXPORT bool ExePackPart( int nId, double dXmax, double dOffs) ; +EXE_EXPORT bool ExePackPart( int nId, double dXmin, double dYmin, double dXmax, double dOffs) ; // Machining EXE_EXPORT bool ExeInitMachMgr( const std::string& sMachinesDir) ;