diff --git a/API_MachMgr.cpp b/API_MachMgr.cpp index 110271a..5a05e38 100644 --- a/API_MachMgr.cpp +++ b/API_MachMgr.cpp @@ -128,6 +128,43 @@ __stdcall EgtGetCurrMachGroup( void) return ExeGetCurrMachGroup() ; } +//----------------------------------------------------------------------------- +// Phases +//----------------------------------------------------------------------------- +int +__stdcall EgtAddPhase( void) +{ + return ExeAddPhase() ; +} + +//----------------------------------------------------------------------------- +BOOL +__stdcall EgtSetCurrPhase( int nPhase) +{ + return ( ExeSetCurrPhase( nPhase) ? TRUE : FALSE) ; +} + +//----------------------------------------------------------------------------- +int +__stdcall EgtGetCurrPhase( void) +{ + return ExeGetCurrPhase() ; +} + +//----------------------------------------------------------------------------- +BOOL +__stdcall EgtRemoveLastPhase( void) +{ + return ( ExeRemoveLastPhase() ? TRUE : FALSE) ; +} + +//----------------------------------------------------------------------------- +int +__stdcall EgtGetPhaseCount( void) +{ + return ExeGetPhaseCount() ; +} + //----------------------------------------------------------------------------- // Raw Parts //----------------------------------------------------------------------------- @@ -181,6 +218,20 @@ __stdcall EgtModifyRawPartHeight( int nRawId, double dHeight) return ( ExeModifyRawPartHeight( nRawId, dHeight) ? TRUE : FALSE) ; } +//----------------------------------------------------------------------------- +BOOL +__stdcall EgtKeepRawPart( int nRawId) +{ + return ( ExeKeepRawPart( nRawId) ? TRUE : FALSE) ; +} + +//----------------------------------------------------------------------------- +BOOL +__stdcall EgtVerifyRawPartPhase( int nRawId, int nPhase) +{ + return ( ExeVerifyRawPartPhase( nRawId, nPhase) ? TRUE : FALSE) ; +} + //----------------------------------------------------------------------------- BOOL __stdcall EgtRemoveRawPart( int nRawId) @@ -202,6 +253,18 @@ __stdcall EgtMoveRawPart( int nRawId, const double vtMove[3]) return ( ExeMoveRawPart( nRawId, vtMove) ? TRUE : FALSE) ; } +//----------------------------------------------------------------------------- +int +__stdcall EgtSplitFlatRawPartWithMachinings( int nRawId, int nNumMchId, const int nMchIds[]) +{ + INTVECTOR vMchIds ; + vMchIds.reserve( nNumMchId) ; + for ( int i = 0 ; i < nNumMchId ; ++i) { + vMchIds.push_back( nMchIds[i]) ; + } + return ExeSplitFlatRawPartWithMachinings( nRawId, vMchIds) ; +} + //----------------------------------------------------------------------------- int __stdcall EgtGetPartInRawPartCount( int nRawId) @@ -684,6 +747,13 @@ __stdcall EgtGetOperationType( int nId) return ExeGetOperationType( nId) ; } +//----------------------------------------------------------------------------- +int +__stdcall EgtGetOperationPhase( int nId) +{ + return ExeGetOperationPhase( nId) ; +} + //----------------------------------------------------------------------------- BOOL __stdcall EgtRemoveOperation( int nId) @@ -691,6 +761,13 @@ __stdcall EgtRemoveOperation( int nId) return ( ExeRemoveOperation( nId) ? TRUE : FALSE) ; } +//----------------------------------------------------------------------------- +BOOL +__stdcall EgtRemoveAllPhaseOperations( int nPhase) +{ + return ( ExeRemoveAllPhaseOperations( nPhase) ? TRUE : FALSE) ; +} + //----------------------------------------------------------------------------- BOOL __stdcall EgtRemoveAllOperations( void) @@ -746,6 +823,20 @@ __stdcall EgtSetAllOperationsStatus( BOOL bShow) return ( ExeSetAllOperationsStatus( bShow != FALSE) ? TRUE : FALSE) ; } +//----------------------------------------------------------------------------- +BOOL +__stdcall EgtChangeOperationPhase( int nId, int nNewPhase) +{ + return ( ExeChangeOperationPhase( nId, nNewPhase) ? TRUE : FALSE) ; +} + +//----------------------------------------------------------------------------- +int +__stdcall EgtGetPhaseDisposition( int nPhase) +{ + return ExeGetPhaseDisposition( nPhase) ; +} + //----------------------------------------------------------------------------- // Machinings //----------------------------------------------------------------------------- diff --git a/API_Nesting.cpp b/API_Nesting.cpp index 1d290cd..ea67f4f 100644 --- a/API_Nesting.cpp +++ b/API_Nesting.cpp @@ -288,8 +288,8 @@ __stdcall EgtVerifyMachining( int nMchId, int* pnResult) } //----------------------------------------------------------------------------- -BOOL +int __stdcall EgtVerifyCutAsSplitting( int nMchId) { - return ( ExeVerifyCutAsSplitting( nMchId) ? TRUE : FALSE) ; -} \ No newline at end of file + return ExeVerifyCutAsSplitting( nMchId) ; +} diff --git a/EgtInterface.rc b/EgtInterface.rc index 51dfc27..a7c29c1 100644 Binary files a/EgtInterface.rc and b/EgtInterface.rc differ