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

EgtExecutor :

Browse Source 
- razionalizzazione della interfaccia di simulazione (aggiunta ExeSimInit e rinominata ExeSimStop in ExeSimExit).
This commit is contained in:
Dario Sassi
2018-08-17 07:39:51 +00:00
parent dafd9b313c
commit 565dbe8aee
2 changed files with 94 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EXE_MachMgr.cpp
+32 -22
View File
@@ -2483,6 +2483,16 @@ ExeUpdateAllMachinings( bool bStopOnFirstErr, string& sErrList)
//-----------------------------------------------------------------------------
// Simulazione
//-----------------------------------------------------------------------------
bool
ExeSimInit( void)
{
IMachMgr* pMachMgr = GetCurrMachMgr() ;
VERIFY_MACHMGR( pMachMgr, false)
// preparo la simulazione della macchinata corrente
return pMachMgr->SimInit() ;
}
//-----------------------------------------------------------------------------
bool
ExeSimStart( bool bFirst)
@@ -2513,6 +2523,26 @@ ExeSimHome( void)
return pMachMgr->SimGoHome() ;
}
//-----------------------------------------------------------------------------
bool
ExeSimSetStep( double dStep)
{
IMachMgr* pMachMgr = GetCurrMachMgr() ;
VERIFY_MACHMGR( pMachMgr, false)
// imposto lo step di riferimento per la simulazione della macchinata corrente
return pMachMgr->SimSetStep( dStep) ;
}
//-----------------------------------------------------------------------------
bool
ExeSimSetUiStatus( int nUiStatus)
{
IMachMgr* pMachMgr = GetCurrMachMgr() ;
VERIFY_MACHMGR( pMachMgr, false)
// imposto lo stato utente del simulatore
return pMachMgr->SimSetUiStatus( nUiStatus) ;
}
//-----------------------------------------------------------------------------
bool
ExeSimGetAxisInfoPos( int nI, string& sName, string& sToken, bool& bLinear, double& dVal)
@@ -2555,32 +2585,12 @@ ExeSimGetMoveInfo( int& nGmove, double& dFeed)
//-----------------------------------------------------------------------------
bool
ExeSimSetStep( double dStep)
{
IMachMgr* pMachMgr = GetCurrMachMgr() ;
VERIFY_MACHMGR( pMachMgr, false)
// imposto lo step di riferimento per la simulazione della macchinata corrente
return pMachMgr->SimSetStep( dStep) ;
}
//-----------------------------------------------------------------------------
bool
ExeSimSetUiStatus( int nUiStatus)
{
IMachMgr* pMachMgr = GetCurrMachMgr() ;
VERIFY_MACHMGR( pMachMgr, false)
// imposto lo stato utente del simulatore
return pMachMgr->SimSetUiStatus( nUiStatus) ;
}
//-----------------------------------------------------------------------------
bool
ExeSimStop( void)
ExeSimExit( void)
{
IMachMgr* pMachMgr = GetCurrMachMgr() ;
VERIFY_MACHMGR( pMachMgr, false)
// termino la simulazione della macchinata corrente
return pMachMgr->SimStop() ;
return pMachMgr->SimExit() ;
}
//-----------------------------------------------------------------------------
LUA_MachMgr.cpp
+62 -32
View File
@@ -2587,6 +2587,19 @@ LuaUpdateAllMachinings( lua_State* L)
//-------------------------------------------------------------------------------
// Simulation
//-------------------------------------------------------------------------------
static int
LuaSimInit( lua_State* L)
{
// nessuno
LuaClearStack( L) ;
// avvio la simulazione
bool bOk = ExeSimInit() ;
// restituisco il risultato
LuaSetParam( L, bOk) ;
return 1 ;
}
//-------------------------------------------------------------------------------
static int
LuaSimStart( lua_State* L)
@@ -2617,6 +2630,49 @@ LuaSimMove( lua_State* L)
return 2 ;
}
//-------------------------------------------------------------------------------
static int
LuaSimHome( lua_State* L)
{
// nessun parametro
LuaClearStack( L) ;
// porto la macchina in posizione home
bool bOk = ExeSimHome() ;
// restituisco il risultato
LuaSetParam( L, bOk) ;
return 1 ;
}
//-------------------------------------------------------------------------------
static int
LuaSimSetStep( lua_State* L)
{
// 1 parametro : dStep
double dStep ;
LuaCheckParam( L, 1, dStep)
LuaClearStack( L) ;
// imposto lo step di riferimento per la simulazione
bool bOk = ExeSimSetStep( dStep) ;
// restituisco il risultato
LuaSetParam( L, bOk) ;
return 1 ;
}
//-------------------------------------------------------------------------------
static int
LuaSimSetUiStatus( lua_State* L)
{
// 1 parametro : nUiStatus
int nUiStatus ;
LuaCheckParam( L, 1, nUiStatus)
LuaClearStack( L) ;
// imposto lo step di riferimento per la simulazione
bool bOk = ExeSimSetUiStatus( nUiStatus) ;
// restituisco il risultato
LuaSetParam( L, bOk) ;
return 1 ;
}
//-------------------------------------------------------------------------------
static int
LuaSimGetAxisInfoPos( lua_State* L)
@@ -2715,40 +2771,12 @@ LuaSimGetMoveInfo( lua_State* L)
//-------------------------------------------------------------------------------
static int
LuaSimHome( lua_State* L)
{
// nessun parametro
LuaClearStack( L) ;
// porto la macchina in posizione home
bool bOk = ExeSimHome() ;
// restituisco il risultato
LuaSetParam( L, bOk) ;
return 1 ;
}
//-------------------------------------------------------------------------------
static int
LuaSimSetStep( lua_State* L)
{
// 1 parametro : dStep
double dStep ;
LuaCheckParam( L, 1, dStep)
LuaClearStack( L) ;
// imposto lo step di riferimento per la simulazione
bool bOk = ExeSimSetStep( dStep) ;
// restituisco il risultato
LuaSetParam( L, bOk) ;
return 1 ;
}
//-------------------------------------------------------------------------------
static int
LuaSimStop( lua_State* L)
LuaSimExit( lua_State* L)
{
// nessun parametro
LuaClearStack( L) ;
// termino la simulazione
bool bOk = ExeSimStop() ;
bool bOk = ExeSimExit() ;
// restituisco il risultato
LuaSetParam( L, bOk) ;
return 1 ;
@@ -3532,15 +3560,17 @@ LuaInstallMachMgr( LuaMgr& luaMgr)
bOk = bOk && luaMgr.RegisterFunction( "EgtApplyAllMachinings", LuaApplyAllMachinings) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtUpdateAllMachinings", LuaUpdateAllMachinings) ;
// Simulation
bOk = bOk && luaMgr.RegisterFunction( "EgtSimInit", LuaSimInit) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtSimStart", LuaSimStart) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtSimMove", LuaSimMove) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtSimHome", LuaSimHome) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtSimSetStep", LuaSimSetStep) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtSimSetUiStatus", LuaSimSetUiStatus) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtSimGetAxisInfoPos", LuaSimGetAxisInfoPos) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtSimGetToolInfo", LuaSimGetToolInfo) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtSimGetOperationInfo", LuaSimGetOperationInfo) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtSimGetMoveInfo", LuaSimGetMoveInfo) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtSimSetStep", LuaSimSetStep) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtSimStop", LuaSimStop) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtSimExit", LuaSimExit) ;
// Generation & T&L estimation
bOk = bOk && luaMgr.RegisterFunction( "EgtGenerate", LuaGenerate) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtEstimate", LuaEstimate) ;