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

EgtMachKernel 2.3b5 :

Browse Source 
- aggiunto Flag2 a CamData per secondo flag dei movimenti
- nei movimenti Genera e Simula ora definito EMT.FLAG2
- in Simula possibilità di visualizzare quote assi principali anche se disabilitati come movimento EMT.ShowAxes.
This commit is contained in:
Dario Sassi
2021-02-25 14:45:25 +00:00
parent eddf28b0c4
commit cb77d0c2aa
12 changed files with 115 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Simulator.cpp
+7 -1
View File
@@ -70,6 +70,7 @@ Simulator::Simulator( void)
m_dVmAdOffs = 0 ;
m_dSafeDist = SAFEDIST_STD ;
m_bEnabAxes = true ;
m_bShowAxes = true ;
m_AxesName.reserve( 8) ;
m_AxesToken.reserve( 8) ;
m_AxesLinear.reserve( 8) ;
@@ -206,6 +207,7 @@ Simulator::ResetInterpolation( void)
m_dVmAdOffs = 0 ;
m_dSafeDist = SAFEDIST_STD ;
m_bEnabAxes = true ;
m_bShowAxes = true ;
return true ;
}
@@ -287,7 +289,7 @@ Simulator::GetAxisInfoPos( int nI, string& sName, string& sToken, bool& bLinear,
if ( m_pMchMgr == nullptr || m_pGeomDB == nullptr)
return false ;
// numero assi di calcolo e ausiliari
int nAxisCount = ( m_bEnabAxes ? int( m_AxesName.size()) : 0) ;
int nAxisCount = ( m_bShowAxes ? int( m_AxesName.size()) : 0) ;
int nAuxAxisCount = int( m_AuxAxesName.size()) ;
// recupero i dati dell'asse
if ( nI < 0 || nI >= nAxisCount + nAuxAxisCount)
@@ -578,6 +580,7 @@ Simulator::ResetAuxAxes( void)
m_AuxAxesEnd.clear() ;
// abilito assi principali
m_bEnabAxes = true ;
m_bShowAxes = true ;
return true ;
}
@@ -1598,6 +1601,7 @@ Simulator::OnMoveStart( const CamData* pCamData, int& nErr)
bOk = bOk && m_pMachine->LuaSetGlobVar( GLOB_VAR + GVAR_MOVEIND, m_nEntInd) ;
bOk = bOk && m_pMachine->LuaSetGlobVar( GLOB_VAR + GVAR_MOVE, pCamData->GetMoveType()) ;
bOk = bOk && m_pMachine->LuaSetGlobVar( GLOB_VAR + GVAR_FLAG, pCamData->GetFlag()) ;
bOk = bOk && m_pMachine->LuaSetGlobVar( GLOB_VAR + GVAR_FLAG2, pCamData->GetFlag2()) ;
bOk = bOk && m_pMachine->LuaSetGlobVar( GLOB_VAR + GVAR_INDEX, pCamData->GetIndex()) ;
bOk = bOk && m_pMachine->LuaSetGlobVar( GLOB_VAR + GVAR_ERR, nErr) ;
// valore degli assi all'inizio e alla fine del movimento
@@ -1649,6 +1653,8 @@ Simulator::OnMoveStart( const CamData* pCamData, int& nErr)
// recupero i dati di ritorno
if ( ! m_pMachine->LuaGetGlobVar( GLOB_VAR + GVAR_ENABAXES, m_bEnabAxes))
m_bEnabAxes = true ;
if ( ! m_pMachine->LuaGetGlobVar( GLOB_VAR + GVAR_SHOWAXES, m_bShowAxes))
m_bShowAxes = m_bEnabAxes ;
int nNumAuxAxes = 0 ;
if ( ! m_pMachine->LuaGetGlobVar( GLOB_VAR + GVAR_AUXAXES, nNumAuxAxes) || nNumAuxAxes == 0)
return true ;