Egalware/EgtMachKernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EgtMachKernel :

Browse Source 
- aggiunta nuova VerifyFixture e vecchia rinominata VerifyFixtureInGroup.
This commit is contained in:
Dario Sassi
2016-10-29 15:47:22 +00:00
parent dbe150bb77
commit eb313337e4
3 changed files with 82 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disposition.cpp
+7 -7
View File
@@ -498,7 +498,7 @@ Disposition::GetFirstFixture( void)
// recupero il primo
int nId = m_vFixData.front().nId ;
// ne verifico la validità
if ( m_pMchMgr == nullptr || ! m_pMchMgr->VerifyFixture( nId, false))
if ( m_pMchMgr == nullptr || ! m_pMchMgr->VerifyFixtureInGroup( nId, false))
return GDB_ID_NULL ;
return nId ;
}
@@ -515,7 +515,7 @@ Disposition::GetNextFixture( int nId)
// se esiste successivo e valido
int j = i + 1 ;
if ( j < nFxtTot &&
m_pMchMgr != nullptr && m_pMchMgr->VerifyFixture( m_vFixData[j].nId, false))
m_pMchMgr != nullptr && m_pMchMgr->VerifyFixtureInGroup( m_vFixData[j].nId, false))
return m_vFixData[j].nId ;
else
return GDB_ID_NULL ;
@@ -529,7 +529,7 @@ bool
Disposition::MoveFixture( int nId, const Vector3d& vtMove)
{
// verifica validità sottopezzo
if ( m_pMchMgr == nullptr || ! m_pMchMgr->VerifyFixture( nId, false))
if ( m_pMchMgr == nullptr || ! m_pMchMgr->VerifyFixtureInGroup( nId, false))
return false ;
// verifico aggiornamento tavola
if ( ! m_bTabOk && ! SetTable( m_sTabName))
@@ -561,7 +561,7 @@ bool
Disposition::RotateFixture( int nId, double dDeltaAngDeg)
{
// verifica validità sottopezzo
if ( m_pMchMgr == nullptr || ! m_pMchMgr->VerifyFixture( nId, false))
if ( m_pMchMgr == nullptr || ! m_pMchMgr->VerifyFixtureInGroup( nId, false))
return false ;
// verifico aggiornamento tavola
if ( ! m_bTabOk && ! SetTable( m_sTabName))
@@ -583,7 +583,7 @@ bool
Disposition::MoveFixtureMobile( int nId, double dDeltaMov)
{
// verifica validità sottopezzo
if ( m_pMchMgr == nullptr || ! m_pMchMgr->VerifyFixture( nId, false))
if ( m_pMchMgr == nullptr || ! m_pMchMgr->VerifyFixtureInGroup( nId, false))
return false ;
// verifico aggiornamento tavola
if ( ! m_bTabOk && ! SetTable( m_sTabName))
@@ -613,7 +613,7 @@ bool
Disposition::PlaceFixture( int nId, const Point3d& ptPos, double dAngDeg, double dMov)
{
// verifica validità sottopezzo
if ( m_pMchMgr == nullptr || ! m_pMchMgr->VerifyFixture( nId, false))
if ( m_pMchMgr == nullptr || ! m_pMchMgr->VerifyFixtureInGroup( nId, false))
return false ;
// verifico aggiornamento tavola
if ( ! m_bTabOk && ! SetTable( m_sTabName))
@@ -664,7 +664,7 @@ bool
Disposition::RemoveFixture( int nId)
{
// verifica validità sottopezzo
if ( m_pMchMgr == nullptr || ! m_pMchMgr->VerifyFixture( nId, false))
if ( m_pMchMgr == nullptr || ! m_pMchMgr->VerifyFixtureInGroup( nId, false))
return false ;
// verifico aggiornamento tavola
if ( ! m_bTabOk && ! SetTable( m_sTabName))