Merge commit '96d7edc513e9ce3f5923259a764b49ffc88b8278' into feature/Svuotature
This commit is contained in:
+2
-2
@@ -171,7 +171,7 @@ Processor::VerifySetup( void)
|
||||
string sErr = "Error with setup :" ;
|
||||
for ( const auto& sTmp : vsErr)
|
||||
sErr += " " + sTmp ;
|
||||
m_pMchMgr->SetLastError( 1001, sErr) ;
|
||||
m_pMchMgr->SetLastError( 1002, sErr) ;
|
||||
return false ;
|
||||
}
|
||||
|
||||
@@ -581,7 +581,7 @@ Processor::OnProgramStart( const string& sMachName, const string& sCncFile, cons
|
||||
// apro il file di output
|
||||
bool bOk = m_pMachine->WriterOpen( sCncFile) ;
|
||||
if ( ! bOk)
|
||||
m_pMchMgr->SetLastError( 1002, "Error opening Cnc file") ;
|
||||
m_pMchMgr->SetLastError( 1003, "Error opening Cnc file") ;
|
||||
// assegno nome macchina
|
||||
bOk = bOk && m_pMachine->LuaSetGlobVar( GLOB_VAR + GVAR_MACHNAME, sMachName) ;
|
||||
// assegno nome file
|
||||
|
||||
+1
-1
@@ -296,7 +296,7 @@ SimulatorMP::VerifySetup( void)
|
||||
string sErr = "Error with setup :" ;
|
||||
for ( const auto& sTmp : vsErr)
|
||||
sErr += " " + sTmp ;
|
||||
m_pMchMgr->SetLastError( 1001, sErr) ;
|
||||
m_pMchMgr->SetLastError( 1002, sErr) ;
|
||||
return false ;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -286,7 +286,7 @@ SimulatorSP::VerifySetup( void)
|
||||
string sErr = "Error with setup :" ;
|
||||
for ( const auto& sTmp : vsErr)
|
||||
sErr += " " + sTmp ;
|
||||
m_pMchMgr->SetLastError( 1001, sErr) ;
|
||||
m_pMchMgr->SetLastError( 1002, sErr) ;
|
||||
return false ;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user