Merge commit 'df86ffdee340b33c359d7e6b57598a70c1a1c006' into svuotature

2023-06-05 08:33:45 +02:00
parent fee74d47f8 df86ffdee3
commit e4983d5276
9 changed files with 124 additions and 24 deletions
@@ -1917,8 +1917,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 ;
            }
         }