Egalware/EgtMachKernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Merge commit '994658da167a7ac3f607f4b535a65febe8f308d1' into svuotature"

Browse Source 
This reverts commit e96f467b56, reversing
changes made to ec1ee961be.
This commit is contained in:
Riccardo Elitropi
2023-06-23 08:38:57 +02:00
parent e96f467b56
commit e04a05831e
7 changed files with 118 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Operation.cpp
+2 -2
View File
@@ -1837,7 +1837,7 @@ Operation::SetBlockedRotAxis( const string& sBlockedAxis) const
for ( int i = 0 ; i < nRotAxes && ! bFound ; ++ i) {
string sAxToken ;
if ( m_pMchMgr->GetCurrMachine()->GetCurrAxisToken( i + nLinAxes, sAxToken) &&
sKey == Trim( sAxToken, " \t\r\n=")) {
sKey == Trim( sAxToken)) {
string sAxis ;
m_pMchMgr->GetCurrMachine()->GetCurrAxisName( i + nLinAxes, sAxis) ;
m_pMchMgr->SetRotAxisBlock( sAxis, dVal) ;
@@ -1915,7 +1915,7 @@ Operation::CalculateAxesValues( const string& sHint, bool bRotContOnNext, bool b
for ( int i = 0 ; i < nRotAxes ; ++ i) {
string sAxToken ;
if ( m_pMchMgr->GetCurrMachine()->GetCurrAxisToken( nLinAxes + i, sAxToken) &&
szKey == Trim( sAxToken, " \t\r\n=")) {
szKey == Trim( sAxToken)) {
double dVal ;
if ( FromString( szVal, dVal)) {
double dOffset = 0 ;