diff --git a/OutputConst.h b/OutputConst.h index 69d62eb..cf8f24f 100644 --- a/OutputConst.h +++ b/OutputConst.h @@ -24,6 +24,7 @@ static const std::string GVAR_VER = ".VER" ; // (string) versione d static const std::string GVAR_ERR = ".ERR" ; // (int) codice di errore (0=ok) static const std::string GVAR_USETO1 = ".USETO1" ; // (bool) flag per utilizzo origine tavola static const std::string GVAR_MODAL = ".MODAL" ; // (bool) flag per emissione modale dei valori +static const std::string GVAR_INCHES = ".INCHES" ; // (bool) flag unità di misura (true=inches, false=mm) static const std::string GVAR_NUM = ".NUM" ; // (bool) flag numerazione static const std::string GVAR_NUMTOK = ".Nt" ; // (string) token per numerazione static const std::string GVAR_LINENBR = ".LINENBR" ; // (int) numero progressivo di linea diff --git a/Processor.cpp b/Processor.cpp index 0bc8901..8317366 100644 --- a/Processor.cpp +++ b/Processor.cpp @@ -519,6 +519,7 @@ Processor::OnStart( void) // assegno valori di default bOk = bOk && m_pMachine->LuaSetGlobVar( GLOB_VAR + GVAR_USETO1, false) ; bOk = bOk && m_pMachine->LuaSetGlobVar( GLOB_VAR + GVAR_MODAL, false) ; + bOk = bOk && m_pMachine->LuaSetGlobVar( GLOB_VAR + GVAR_INCHES, ! ExeUiUnitsAreMM()) ; bOk = bOk && m_pMachine->LuaSetGlobVar( GLOB_VAR + GVAR_NUM, false) ; bOk = bOk && m_pMachine->LuaSetGlobVar( GLOB_VAR + GVAR_NUMTOK, "N") ; bOk = bOk && m_pMachine->LuaSetGlobVar( GLOB_VAR + GVAR_LINENBR, 0) ; diff --git a/Simulator.cpp b/Simulator.cpp index 003301b..83c749a 100644 --- a/Simulator.cpp +++ b/Simulator.cpp @@ -125,6 +125,7 @@ Simulator::Start( bool bFirst) // Definisco tabella variabili globali if ( ! m_pMachine->LuaCreateGlobTable( GLOB_VAR)) bOk = false ; + m_pMachine->LuaSetGlobVar( GLOB_VAR + GVAR_INCHES, ! ExeUiUnitsAreMM(), true) ; m_pMachine->LuaSetGlobVar( GLOB_VAR + GVAR_SIMSTEP, m_dStep, true) ; // Richiamo funzione su avvio simulazione