diff --git a/API_MachMgr.cpp b/API_MachMgr.cpp index f59bf7d..a8f8585 100644 --- a/API_MachMgr.cpp +++ b/API_MachMgr.cpp @@ -159,6 +159,14 @@ __stdcall EgtAddRawPart( const double ptOrig[3], return ExeAddRawPart( ptOrig, dLength, dWidth, dHeight, vCol) ; } +//----------------------------------------------------------------------------- +BOOL +__stdcall EgtModifyRawPart( int nRawId, const double ptOrig[3], + double dLength, double dWidth, double dHeight, const int vCol[4]) +{ + return ( ExeModifyRawPart( nRawId, ptOrig, dLength, dWidth, dHeight, vCol) ? TRUE : FALSE) ; +} + //----------------------------------------------------------------------------- BOOL __stdcall EgtModifyRawPartSize( int nRawId, double dLength, double dWidth, double dHeight) @@ -596,6 +604,22 @@ __stdcall EgtMdbGetCurrMachiningParamString( int nType, wchar_t*& wsVal) return (( wsVal == nullptr) ? FALSE : TRUE) ; } +//----------------------------------------------------------------------------- +BOOL +__stdcall EgtMdbSetSafeZ( double dSafeZ) +{ + return ( ExeMdbSetSafeZ( dSafeZ) ? TRUE : FALSE) ; +} + +//----------------------------------------------------------------------------- +BOOL +__stdcall EgtMdbGetSafeZ( double* pdSafeZ) +{ + if ( pdSafeZ == nullptr) + return FALSE ; + return ( ExeMdbGetSafeZ( *pdSafeZ) ? TRUE : FALSE) ; +} + //----------------------------------------------------------------------------- BOOL __stdcall EgtMdbSave( void) @@ -665,6 +689,28 @@ __stdcall EgtSimGetAxisInfoPos( int nI, wchar_t*& wsName, double* pdVal) return (( wsName == nullptr) ? FALSE : TRUE) ; } +//----------------------------------------------------------------------------- +BOOL +__stdcall EgtSimGetToolInfo( wchar_t*& wsTool, double* pdSpeed) +{ + if ( &wsTool == nullptr || pdSpeed == nullptr) + return FALSE ; + string sTool ; + if ( ! ExeSimGetToolInfo( sTool, *pdSpeed)) + return FALSE ; + wsTool = _wcsdup( stringtoW( sTool)) ; + return (( wsTool == nullptr) ? FALSE : TRUE) ; +} + +//----------------------------------------------------------------------------- +BOOL +__stdcall EgtSimGetMoveInfo( int* pnGmove, double* pdFeed) +{ + if ( pnGmove == nullptr || pdFeed == nullptr) + return FALSE ; + return ( ExeSimGetMoveInfo( *pnGmove, *pdFeed) ? TRUE : FALSE) ; +} + //----------------------------------------------------------------------------- BOOL __stdcall EgtSimSetStep( double dStep) @@ -690,6 +736,13 @@ __stdcall EgtGenerate( const wchar_t* wsCncFile, const wchar_t* wsInfo) //----------------------------------------------------------------------------- // Machine Calc +//----------------------------------------------------------------------------- +BOOL +__stdcall EgtSetCalcTool( const wchar_t* wsTool, const wchar_t* wsHead, int nExit) +{ + return ( ExeSetCalcTool( wstrztoA( wsTool), wstrztoA( wsHead), nExit) ? TRUE : FALSE) ; +} + //----------------------------------------------------------------------------- BOOL __stdcall EgtGetCalcTipFromPositions( double dX, double dY, double dZ, double dAngA, double dAngB, diff --git a/EgtInterface.rc b/EgtInterface.rc index 6222adc..fcf790a 100644 Binary files a/EgtInterface.rc and b/EgtInterface.rc differ