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

EgtMachKernel 1.6v9 :

Browse Source 
- modifiche per emettere anche TCPOS in generazione e simulazione.
This commit is contained in:
Dario Sassi
2016-10-26 16:02:40 +00:00
parent d4e4ea3871
commit dbe150bb77
8 changed files with 43 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disposition.cpp
+9 -4
View File
@@ -995,6 +995,7 @@ Disposition::SpecialApply( bool bRecalc)
static const string EVAR_ERROR = ".ERR" ; // OUT (int) codice di errore ( 0 = ok)
static const string EVAR_HEAD = ".HEAD" ; // OUT (string) nome della testa
static const string EVAR_EXIT = ".EXIT" ; // OUT (int) indice dell'uscita
static const string EVAR_TCPOS = ".TCPOS" ; // OUT (string) nome della posizione nel TC
static const string EVAR_SHIFTS = ".SHIFTS" ; // OUT (int) numero di movimenti eseguiti
static const string EVAR_SBH = ".SBH" ; // OUT (bool) flag presenza operazioni manuali
static const string ON_SPECIAL_APPLY = "OnSpecialApplyDisposition" ;
@@ -1009,12 +1010,16 @@ Disposition::SpecialApply( bool bRecalc)
bOk = bOk && pMch->LuaSetGlobVar( EMC_VAR + EVAR_DISPID, m_nOwnerId) ;
// eseguo
bOk = bOk && pMch->LuaCallFunction( ON_SPECIAL_APPLY) ;
// recupero valori parametri
// recupero valori parametri obbligatori
bOk = bOk && pMch->LuaGetGlobVar( EMC_VAR + EVAR_ERROR, nErr) ;
bOk = bOk && pMch->LuaGetGlobVar( EMC_VAR + EVAR_HEAD, m_sHead) ;
bOk = bOk && pMch->LuaGetGlobVar( EMC_VAR + EVAR_EXIT, m_nExit) ;
bOk = bOk && pMch->LuaGetGlobVar( EMC_VAR + EVAR_SHIFTS, m_nShifts) ;
bOk = bOk && pMch->LuaGetGlobVar( EMC_VAR + EVAR_SBH, m_bSomeByHand) ;
// recupero valori parametri opzionali
if ( ! pMch->LuaGetGlobVar( EMC_VAR + EVAR_TCPOS, m_sTcPos))
m_sTcPos.clear() ;
// reset
bOk = bOk && pMch->LuaResetGlobVar( EMC_VAR) ;
// segnalo errori
if ( nErr != 0) {
@@ -1038,11 +1043,12 @@ Disposition::SpecialApply( bool bRecalc)
//----------------------------------------------------------------------------
bool
Disposition::GetToolData( string& sName, string& sHead, int& nExit) const
Disposition::GetToolData( string& sName, string& sHead, int& nExit, string& sTcPos) const
{
sName = "" ;
sHead = m_sHead ;
nExit = m_nExit ;
sTcPos = m_sTcPos ;
return true ;
}
@@ -1072,8 +1078,7 @@ Disposition::GetExitNbr( void) const
const string&
Disposition::GetToolTcPos( void) const
{
static string sDummy = "" ;
return sDummy ;
return m_sTcPos ;
}
//----------------------------------------------------------------------------