EgtMachKernel 1.8d8 :

- miglioria a SimGetAxisInfoPos per evitare di ripetere assi tra attivi e ausiliari.
2017-04-26 16:30:01 +00:00
parent d75a5fdde8
commit 3660ddbf5a
2 changed files with 18 additions and 0 deletions
@@ -178,6 +178,24 @@ Simulator::GetAxisInfoPos( int nI, string& sName, string& sToken, bool& bLinear,
  // recupero i dati dell'asse
   if ( nI < 0  ||  nI >= nAxisCount + nAuxAxisCount)
      return false ;
+  // se asse ausiliario, verifico non coincida con uno attivo
+   if ( nI >= nAxisCount) {
+      while ( nI < nAxisCount + nAuxAxisCount) {
+         bool bFound = false ;
+         for ( int j = 0 ; j < nAxisCount ; ++ j) {
+            if ( m_AuxAxesName[ nI - nAxisCount] == m_AxesName[j]) {
+               bFound = true ;
+               break ;
+            }
+         }
+         if ( bFound)
+            ++ nI ;
+         else
+            break ;
+      }
+      if ( nI >= nAxisCount + nAuxAxisCount)
+         return false ;
+   }
   if ( nI < nAxisCount) {
      sName = m_AxesName[nI] ;
      sToken = m_AxesToken[nI] ;