EgtMachKernel 2.5e4 :

- negli angoli macchina suggeriti ora si tiene conto di Invert e di Offset (quindi per l'utente sono i valori che vede in simulazione e sul CN).
2023-05-26 08:43:48 +02:00
parent 90dbb068a9
commit 8f7fdc3a80
4 changed files with 58 additions and 1 deletions
@@ -1632,8 +1632,17 @@ Operation::CalculateAxesValues( const string& sHint, bool bRotContOnNext, bool b
            if ( m_pMchMgr->GetCurrMachine()->GetCurrAxisToken( nLinAxes + i, sAxToken)  &&
                 szKey == Trim( sAxToken)) {
               double dVal ;
-               if ( FromString( szVal, dVal))
+               if ( FromString( szVal, dVal)) {
+                  double dOffset = 0 ;
+                  m_pMchMgr->GetCurrMachine()->GetCurrAxisOffset( nLinAxes + i, dOffset) ;
+                  if ( abs( dOffset) > EPS_ANG_SMALL)
+                     dVal -= dOffset ;
+                  bool bInvert = false ;
+                  m_pMchMgr->GetCurrMachine()->GetCurrAxisInvert( nLinAxes + i, bInvert) ;
+                  if ( bInvert)
+                     dVal = -dVal ;
                  vAxRotPrec[i] = dVal ;
+               }
               break ;
            }
         }