EgtMachKernel 1.8b7 :

- corretta gestione disposizioni con spostamento pezzi consecutive e con teste diverse
- aggiunta GetRotAxisBlocked
- aggiunto controllo validità nome su utensili.
This commit is contained in:
Dario Sassi
2017-03-02 07:56:39 +00:00
parent 0941600e08
commit 284525c926
8 changed files with 63 additions and 8 deletions
+18 -3
View File
@@ -210,9 +210,12 @@ Machine::SetCurrTool( const string& sTool, const string& sHead, int nExit)
double dTOvLen = 0 ;
double dTOvDiam = 0 ;
// se definito
if ( ! sTool.empty()) {
if ( ! LoadTool( sHead, nExit, sTool))
if ( ! sTool.empty() && sTool.front() != '*') {
if ( ! LoadTool( sHead, nExit, sTool)) {
string sOut = "Missing tool " + sTool ;
LOG_INFO( GetEMkLogger(), sOut.c_str())
return false ;
}
nToolId = m_pGeomDB->GetFirstNameInGroup( nExitId, sTool) ;
if ( nToolId == GDB_ID_NULL || m_pGeomDB->GetGdbType( nToolId) != GDB_TY_GROUP)
return false ;
@@ -233,7 +236,7 @@ Machine::SetCurrTool( const string& sTool, const string& sHead, int nExit)
dTDiam = 0 ;
dTOvLen = 0 ;
dTOvDiam = 0 ;
m_pMchMgr->TdbSetCurrTool( sTool) ;
m_pMchMgr->TdbSetCurrTool( "") ;
}
// assegno tutti i dati
m_nCalcHeadId = nHeadId ;
@@ -531,6 +534,18 @@ Machine::IsKinematicRotAxisBlocked( int nInd) const
return m_vCalcRotAx[nInd].bFixed ;
}
//----------------------------------------------------------------------------
bool
Machine::GetKinematicRotAxisBlocked( int nInd, string& sName, double& dVal) const
{
int nRotAxTot = int( m_vCalcRotAx.size()) ;
if ( nInd < 0 || nInd >= nRotAxTot || ! m_vCalcRotAx[nInd].bFixed)
return false ;
m_pGeomDB->GetName( m_vCalcRotAx[nInd].nGrpId, sName) ;
dVal = m_vCalcRotAx[nInd].dFixVal ;
return true ;
}
//----------------------------------------------------------------------------
bool
Machine::SetSolCh( int nScc)