EgtExecutor 2.7e2 :
- modifiche per gestione lavorazioni con percorsi utensile vuoti.
This commit is contained in:
+13
-13
@@ -559,7 +559,7 @@ ExeModifyRawPart( int nRawId, Point3d ptOrig, double dLength, double dWidth, dou
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
bool
|
||||
ExeModifyRawPart( int nRawId, int nCrvId, double dOverMat, double dZmin, double dHeight, Color cCol)
|
||||
ExeModifyRawPart( int nRawId, int nCrvId, double dOverMat, double dHeight, Color cCol)
|
||||
{
|
||||
IMachMgr* pMachMgr = GetCurrMachMgr() ;
|
||||
VERIFY_MACHMGR( pMachMgr, false)
|
||||
@@ -2106,42 +2106,42 @@ ExeGetPrevOperation( int nId)
|
||||
}
|
||||
//-----------------------------------------------------------------------------
|
||||
int
|
||||
ExeGetFirstActiveOperation( void)
|
||||
ExeGetFirstActiveOperation( bool bNeedMachNotEmpty)
|
||||
{
|
||||
IMachMgr* pMachMgr = GetCurrMachMgr() ;
|
||||
VERIFY_MACHMGR( pMachMgr, GDB_ID_NULL)
|
||||
// recupero la prima operazione attiva della macchinata corrente
|
||||
return pMachMgr->GetFirstActiveOperation() ;
|
||||
return pMachMgr->GetFirstActiveOperation( bNeedMachNotEmpty) ;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
int
|
||||
ExeGetNextActiveOperation( int nId)
|
||||
ExeGetNextActiveOperation( int nId, bool bNeedMachNotEmpty)
|
||||
{
|
||||
IMachMgr* pMachMgr = GetCurrMachMgr() ;
|
||||
VERIFY_MACHMGR( pMachMgr, GDB_ID_NULL)
|
||||
// recupero la successiva operazione attiva della macchinata corrente
|
||||
return pMachMgr->GetNextActiveOperation( nId) ;
|
||||
return pMachMgr->GetNextActiveOperation( nId, bNeedMachNotEmpty) ;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
int
|
||||
ExeGetLastActiveOperation( void)
|
||||
ExeGetLastActiveOperation( bool bNeedMachNotEmpty)
|
||||
{
|
||||
IMachMgr* pMachMgr = GetCurrMachMgr() ;
|
||||
VERIFY_MACHMGR( pMachMgr, false)
|
||||
// recupero l'ultima operazione attiva della macchinata corrente
|
||||
return pMachMgr->GetLastActiveOperation() ;
|
||||
return pMachMgr->GetLastActiveOperation( bNeedMachNotEmpty) ;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
int
|
||||
ExeGetPrevActiveOperation( int nId)
|
||||
ExeGetPrevActiveOperation( int nId, bool bNeedMachNotEmpty)
|
||||
{
|
||||
IMachMgr* pMachMgr = GetCurrMachMgr() ;
|
||||
VERIFY_MACHMGR( pMachMgr, GDB_ID_NULL)
|
||||
// recupero la precedente operazione attiva della macchinata corrente
|
||||
return pMachMgr->GetPrevActiveOperation( nId) ;
|
||||
return pMachMgr->GetPrevActiveOperation( nId, bNeedMachNotEmpty) ;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
@@ -2206,12 +2206,12 @@ ExeGetOperationId( const string& sName)
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
bool
|
||||
ExeIsOperationEmpty( int nId)
|
||||
ExeIsOperationEmpty( int nId, int nEmptyType)
|
||||
{
|
||||
IMachMgr* pMachMgr = GetCurrMachMgr() ;
|
||||
VERIFY_MACHMGR( pMachMgr, false)
|
||||
// recupero lo stato dell'operazione indicata della macchinata corrente
|
||||
return pMachMgr->IsOperationEmpty( nId) ;
|
||||
return pMachMgr->IsOperationEmpty( nId, nEmptyType) ;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
@@ -2840,12 +2840,12 @@ ExeGetMachiningSkippedGeometry( SELVECTOR& vIds)
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
bool
|
||||
ExeIsMachiningEmpty( void)
|
||||
ExeIsMachiningEmpty( int nEmptyType)
|
||||
{
|
||||
IMachMgr* pMachMgr = GetCurrMachMgr() ;
|
||||
VERIFY_MACHMGR( pMachMgr, false)
|
||||
// restituisco lo stato della lavorazione corrente
|
||||
return pMachMgr->IsMachiningEmpty() ;
|
||||
return pMachMgr->IsMachiningEmpty( nEmptyType) ;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user