From f9964a2f3c6501ef5005acdc764dae9b2c4b9775 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 30 Mar 2026 08:04:59 +0200 Subject: [PATCH] EgtMachKernel 3.1c8 : - piccola miglioria in simulatori per log di errori. --- EgtMachKernel.rc | Bin 11774 -> 11774 bytes SimulatorMP.cpp | 16 +++++++++++----- SimulatorSP.cpp | 18 ++++++++++++------ 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc index 4268282b90d9d6709e2d3e71e4a435d785734d2e..1fd1035452112641b24a405ae46414e2ef06f569 100644 GIT binary patch delta 97 zcmewt{V#gMFE&Pt&A-`fnHeo6Ka|wnoW?bQ1uSxrY4Qod0+^@}R1`^_2jk{d(jGv4 NK<#LXK~l;gTmUdVBe(zn delta 97 zcmewt{V#gMFE&Q=&A-`fnHkL|Ka|wnoW?bQ1uSxrY4Qod0+^@}R1`^_2jk{d(jGv4 NK<#LXK~l;gTmUYMBd`Df diff --git a/SimulatorMP.cpp b/SimulatorMP.cpp index fcacfde..851b1cf 100644 --- a/SimulatorMP.cpp +++ b/SimulatorMP.cpp @@ -2150,9 +2150,9 @@ SimulatorMP::OnMoveStart( const CamData* pCamData, const CamData* pNextCamData, bool bNeg = ( sLink.find( '-') != string::npos) ; string sMainAxis = sLink ; ReplaceString( sMainAxis, "-", "") ; int nInd = 0 ; - for ( int i = 0 ; nInd == 0 && i < int( m_AxesName.size()) ; ++ i) { - if ( m_AxesName[i] == sMainAxis) - nInd = i + 1 ; + for ( int j = 0 ; nInd == 0 && j < ssize( m_AxesName) ; ++ j) { + if ( m_AxesName[j] == sMainAxis) + nInd = j + 1 ; } // se trovato asse principale di riferimento if ( nInd > 0) { @@ -2185,11 +2185,17 @@ SimulatorMP::OnMoveStart( const CamData* pCamData, const CamData* pNextCamData, } } // altrimenti errore - else + else { bOk = false ; + string sErr = " Error in OnMoveStart : Wrong Move AuxAxis " + ToString( i) ; + LOG_ERROR( GetEMkLogger(), sErr.c_str()) + } } - else + else { bOk = false ; + string sErr = " Error in OnMoveStart : Wrong Name AuxAxis " + ToString( i) ; + LOG_ERROR( GetEMkLogger(), sErr.c_str()) + } } return bOk ; diff --git a/SimulatorSP.cpp b/SimulatorSP.cpp index 28380e8..d86904d 100644 --- a/SimulatorSP.cpp +++ b/SimulatorSP.cpp @@ -2229,9 +2229,9 @@ SimulatorSP::OnMoveStart( const CamData* pCamData, const CamData* pNextCamData, bool bNeg = ( sLink.find( '-') != string::npos) ; string sMainAxis = sLink ; ReplaceString( sMainAxis, "-", "") ; int nInd = 0 ; - for ( int i = 0 ; nInd == 0 && i < int( m_AxesName.size()) ; ++ i) { - if ( m_AxesName[i] == sMainAxis) - nInd = i + 1 ; + for ( int j = 0 ; nInd == 0 && j < ssize( m_AxesName) ; ++ j) { + if ( m_AxesName[j] == sMainAxis) + nInd = j + 1 ; } // se trovato asse principale di riferimento if ( nInd > 0) { @@ -2258,17 +2258,23 @@ SimulatorSP::OnMoveStart( const CamData* pCamData, const CamData* pNextCamData, m_AuxAxesEnd.emplace_back( dEnd) ; m_AuxAxesLink.emplace_back( 0) ; if ( ! m_pMachine->VerifyOutstroke( sName, dEnd)) { - nErr = 1 ; + nErr = ERR_OUTSTROKE ; bOk = false ; } } } // altrimenti errore - else + else { bOk = false ; + string sErr = " Error in OnMoveStart : Wrong Move AuxAxis " + ToString( i) ; + LOG_ERROR( GetEMkLogger(), sErr.c_str()) + } } - else + else { bOk = false ; + string sErr = " Error in OnMoveStart : Wrong Name AuxAxis " + ToString( i) ; + LOG_ERROR( GetEMkLogger(), sErr.c_str()) + } } return bOk ;