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

EgtMachKernel 1.6r9 :

Browse Source 
- separato nome da token per gli assi macchina e gestito il tutto
- in milling aggiunta gestione punto start e estrusione di path per piano locale di interpolazione in part-program
- migliorata gestione deselezione utensile in simulazione.
This commit is contained in:
Dario Sassi
2016-06-14 06:34:46 +00:00
parent fe0cbd0191
commit bce7e1353c
13 changed files with 222 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Machine.cpp
+4 -4
View File
@@ -262,9 +262,9 @@ Machine::AdjustTable( int nLay, const Point3d& ptRef1)
//----------------------------------------------------------------------------
bool
Machine::LoadMachineAxis( const string& sName, const string& sParent, int nType,
const Point3d& ptPos, const Vector3d& vtDir, const STROKE& Stroke, double dHome,
bool bAdjustAux, const string& sGeo, const STRVECTOR& vsAux)
Machine::LoadMachineAxis( const string& sName, const string& sParent, const string& sToken,
int nType, const Point3d& ptPos, const Vector3d& vtDir, const STROKE& Stroke,
double dHome, bool bAdjustAux, const string& sGeo, const STRVECTOR& vsAux)
{
// verifico sia di tipo ammesso
if ( nType != MCH_AT_LINEAR && nType != MCH_AT_ROTARY) {
@@ -304,7 +304,7 @@ Machine::LoadMachineAxis( const string& sName, const string& sParent, int nType,
Axis* pAxis = new(nothrow) Axis ;
if ( pAxis == nullptr)
return false ;
pAxis->Set( sName, nType, ptPos, vtDir, Stroke, dHome) ;
pAxis->Set( sName, sToken, nType, ptPos, vtDir, Stroke, dHome) ;
m_pGeomDB->SetUserObj( nLay, pAxis) ;
// verifico il vettore rappresentativo dell'asse
if ( ! AdjustAxis( nLay, sPart, sName, nType, ptPos, vtDir, bAdjustAux))