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

EgtMachKernel 1.6f2 :

Browse Source 
- aggiunto UserObj CamData per rappresentare dati tipo CL in entità geometriche
- possibilità di ruotare i sottopezzi
- aggiunto calcolo percorsi di lavorazione di fori
- aggiunte prime versioni parziali di taglio con lama e fresatura.
This commit is contained in:
Dario Sassi
2015-06-16 07:43:02 +00:00
parent 64ed8babd1
commit b96b43e1ec
33 changed files with 2206 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Machine.cpp
+9 -9
View File
@@ -177,7 +177,7 @@ Machine::LoadMachineTable( const string& sName, const string& sParent, int nType
if ( pTab == nullptr)
return false ;
pTab->Set( sName, nType, ptRef1) ;
m_pGeomDB->SetObjUser( nLay, pTab) ;
m_pGeomDB->SetUserObj( nLay, pTab) ;
// aggiusto la posizione della tavola
if ( ! AdjustTablePos( nLay, ptRef1))
return false ;
@@ -257,7 +257,7 @@ Machine::LoadMachineAxis( const string& sName, const string& sParent, int nType,
if ( pAxis == nullptr)
return false ;
pAxis->Set( sName, nType, ptPos, vtDir, Stroke, dHome) ;
m_pGeomDB->SetObjUser( nLay, pAxis) ;
m_pGeomDB->SetUserObj( nLay, pAxis) ;
// verifico il vettore rappresentativo dell'asse
if ( ! AdjustAxisVector( nLay, sPart, sName, nType, ptPos, vtDir))
return false ;
@@ -360,7 +360,7 @@ Machine::LoadMachineStdHead( const string& sName, const string& sParent, const s
if ( pHead == nullptr)
return false ;
pHead->Set( sName, MCH_HT_STD, sHSet, vtADir) ;
m_pGeomDB->SetObjUser( nLay, pHead) ;
m_pGeomDB->SetUserObj( nLay, pHead) ;
// aggiorno la testa capostipite
if ( ! AddHeadToSet( sHSet, sName))
return false ;
@@ -402,7 +402,7 @@ Machine::LoadMachineMultiHead( const string& sName, const string& sParent, const
if ( pHead == nullptr)
return false ;
pHead->Set( sName, MCH_HT_MULTI, sHSet, vtADir) ;
m_pGeomDB->SetObjUser( nLay, pHead) ;
m_pGeomDB->SetUserObj( nLay, pHead) ;
// aggiorno la testa capostipite
if ( ! AddHeadToSet( sHSet, sName))
return false ;
@@ -425,28 +425,28 @@ Machine::GetGroup( const string& sGroup) const
Axis*
Machine::GetAxis( int nGroup) const
{
return ( dynamic_cast<Axis*>( m_pGeomDB->GetObjUser( nGroup))) ;
return ( dynamic_cast<Axis*>( m_pGeomDB->GetUserObj( nGroup))) ;
}
//----------------------------------------------------------------------------
Table*
Machine::GetTable( int nGroup) const
{
return ( dynamic_cast<Table*>( m_pGeomDB->GetObjUser( nGroup))) ;
return ( dynamic_cast<Table*>( m_pGeomDB->GetUserObj( nGroup))) ;
}
//----------------------------------------------------------------------------
Head*
Machine::GetHead( int nGroup) const
{
return ( dynamic_cast<Head*>( m_pGeomDB->GetObjUser( nGroup))) ;
return ( dynamic_cast<Head*>( m_pGeomDB->GetUserObj( nGroup))) ;
}
//----------------------------------------------------------------------------
Exit*
Machine::GetExit( int nGroup) const
{
return ( dynamic_cast<Exit*>( m_pGeomDB->GetObjUser( nGroup))) ;
return ( dynamic_cast<Exit*>( m_pGeomDB->GetUserObj( nGroup))) ;
}
//----------------------------------------------------------------------------
@@ -552,7 +552,7 @@ Machine::CreateExitGroups( int nLay, const MUEXITVECTOR& vMuExit)
if ( pExit == nullptr)
return false ;
pExit->Set( sName, vMuExit[i].ptPos, vMuExit[i].vtTDir) ;
m_pGeomDB->SetObjUser( nGT, pExit) ;
m_pGeomDB->SetUserObj( nGT, pExit) ;
}
else {
string sOut = " Error finding frame " + sName ;