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

EgtMachKernel 1.6j3 :

Browse Source 
- aggiunta gestione DB utensili
- migliorata simulazione
- aggiunta impostazione macchina corrente anche senza macchinata.
This commit is contained in:
Dario Sassi
2015-10-27 10:12:13 +00:00
parent 2de785c6ce
commit 2c89d112fa
32 changed files with 904 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Machine.cpp
+4 -18
View File
@@ -335,7 +335,7 @@ Machine::AdjustAxisVector( int nLay, const string& sPart, const string& sName,
bool
Machine::LoadMachineStdHead( const string& sName, const string& sParent, const std::string& sHSet,
const Point3d& ptPos, const Vector3d& vtTDir,
const Vector3d& vtADir, const string& sGeo)
const Vector3d& vtADir, double dRot1W, const string& sGeo)
{
// recupero pezzo e layer della geometria originale dell'asse
string sPart, sLay ;
@@ -359,7 +359,7 @@ Machine::LoadMachineStdHead( const string& sName, const string& sParent, const s
Head* pHead = new(nothrow) Head ;
if ( pHead == nullptr)
return false ;
pHead->Set( sName, MCH_HT_STD, sHSet, vtADir) ;
pHead->Set( sName, MCH_HT_STD, sHSet, vtADir, dRot1W) ;
m_pGeomDB->SetUserObj( nLay, pHead) ;
// aggiorno la testa capostipite
if ( ! AddHeadToSet( sHSet, sName))
@@ -377,7 +377,7 @@ Machine::LoadMachineStdHead( const string& sName, const string& sParent, const s
bool
Machine::LoadMachineMultiHead( const string& sName, const string& sParent, const std::string& sHSet,
const MUEXITVECTOR& vMuExit,
const Vector3d& vtADir, const string& sGeo)
const Vector3d& vtADir, double dRot1W, const string& sGeo)
{
// recupero pezzo e layer della geometria originale dell'asse
string sPart, sLay ;
@@ -401,7 +401,7 @@ Machine::LoadMachineMultiHead( const string& sName, const string& sParent, const
Head* pHead = new(nothrow) Head ;
if ( pHead == nullptr)
return false ;
pHead->Set( sName, MCH_HT_MULTI, sHSet, vtADir) ;
pHead->Set( sName, MCH_HT_MULTI, sHSet, vtADir, dRot1W) ;
m_pGeomDB->SetUserObj( nLay, pHead) ;
// aggiorno la testa capostipite
if ( ! AddHeadToSet( sHSet, sName))
@@ -562,17 +562,3 @@ Machine::CreateExitGroups( int nLay, const MUEXITVECTOR& vMuExit)
}
return true ;
}
//----------------------------------------------------------------------------
bool
Machine::ResetAllAxesPos( void)
{
// ciclo sugi gruppi della macchina
for ( auto Iter = m_mapGroups.cbegin() ; Iter != m_mapGroups.cend() ; ++ Iter) {
if ( IsAxisGroup( Iter->second)) {
if ( ! ResetAxisPos( Iter->first))
return false ;
}
}
return true ;
}