diff --git a/EXE_GdbModifyCurve.cpp b/EXE_GdbModifyCurve.cpp index 27933b1..f483892 100644 --- a/EXE_GdbModifyCurve.cpp +++ b/EXE_GdbModifyCurve.cpp @@ -154,7 +154,7 @@ ExeApproxCurve( int nId, int nApprType, double dLinTol) const double LIN_FEA_LEN_STD = 20 ; PtrOwner pCC( CreateCurveComposite()) ; bOk = bOk && ! IsNull( pCC) ; - if ( nApprType == APP_LINES || + if ( nApprType == APP_LINES || nApprType == APP_SPECIAL_LINES || nApprType == APP_LEFT_LINES || nApprType == APP_LEFT_CONVEX_LINES || nApprType == APP_RIGHT_LINES || nApprType == APP_RIGHT_CONVEX_LINES) { PolyLine PL ; diff --git a/EXE_MachMgr.cpp b/EXE_MachMgr.cpp index 7a18d97..5b2c167 100644 --- a/EXE_MachMgr.cpp +++ b/EXE_MachMgr.cpp @@ -1909,7 +1909,7 @@ int ExeGetBaseId( const string& sBase) { GseContext* pGseCtx = GetCurrGseContext() ; - VERIFY_CTX_MACHMGR( pGseCtx, false) + VERIFY_CTX_MACHMGR( pGseCtx, GDB_ID_NULL) // restituisco identificativo della base indicata nella macchina della macchinata corrente return pGseCtx->m_pMachMgr->GetBaseId( sBase) ; } @@ -1919,7 +1919,7 @@ int ExeGetTableId( const string& sTable) { GseContext* pGseCtx = GetCurrGseContext() ; - VERIFY_CTX_MACHMGR( pGseCtx, false) + VERIFY_CTX_MACHMGR( pGseCtx, GDB_ID_NULL) // restituisco identificativo della tavola indicata nella macchina della macchinata corrente return pGseCtx->m_pMachMgr->GetTableId( sTable) ; } @@ -1929,7 +1929,7 @@ int ExeGetAxisId( const string& sAxis) { GseContext* pGseCtx = GetCurrGseContext() ; - VERIFY_CTX_MACHMGR( pGseCtx, false) + VERIFY_CTX_MACHMGR( pGseCtx, GDB_ID_NULL) // restituisco identificativo dell'asse indicato nella macchina della macchinata corrente return pGseCtx->m_pMachMgr->GetAxisId( sAxis) ; } @@ -1939,7 +1939,7 @@ int ExeGetHeadId( const string& sHead) { GseContext* pGseCtx = GetCurrGseContext() ; - VERIFY_CTX_MACHMGR( pGseCtx, false) + VERIFY_CTX_MACHMGR( pGseCtx, GDB_ID_NULL) // restituisco identificativo della testa indicata nella macchina della macchinata corrente return pGseCtx->m_pMachMgr->GetHeadId( sHead) ; } diff --git a/EgtExecutor.rc b/EgtExecutor.rc index 14beaa1..6900f61 100644 Binary files a/EgtExecutor.rc and b/EgtExecutor.rc differ