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

Merge commit '6e6050ab13deb8c705f816102619f1d172992446' into feature/Svuotature

Browse Source
This commit is contained in:
Riccardo Elitropi
2025-03-13 12:34:15 +01:00
parent c513cd7440 6e6050ab13
commit 866c4dde45
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FiveAxisMilling.cpp
+1
View File
@@ -219,6 +219,7 @@ FiveAxisMilling::FiveAxisMilling( void)
m_TParams.m_sHead = "*" ;
m_nStatus = MCH_ST_TO_VERIFY ;
m_nMills = 0 ;
m_bRunning = false ;
}
//----------------------------------------------------------------------------
Operation.cpp
+11 -9
View File
@@ -1994,7 +1994,8 @@ Operation::CalculateClPathAxesValues( int nClPathId, int nLinAxes, int nRotAxes,
if ( ! VerifyLineMidPoint( ptPrec, vtDirPrec, vtAuxPrec, vtCorrPrec, vAxPrec,
ptP, vtDir, vtAux, vtCorr, vAxVal,
0, nEntId, dRot1W, nMoveType, bMidAdded, bAxesError)) {
LOG_ERROR( GetEMkLogger(), "Error : VerifyLineMidPoint of CalculateClPathAxesValues failed")
string sOut = "Error : VerifyLineMidPoint of CalculateClPathAxesValues failed (EntId=" + ToString( nEntId) + ")" ;
LOG_ERROR( GetEMkLogger(), sOut.c_str())
return false ;
}
if ( bAxesError) {
@@ -2367,15 +2368,16 @@ Operation::VerifyLineMidPoint( const Point3d& ptPrec, const Vector3d& vtDirPrec,
}
Vector3d vtCorrMid = Media( vtCorrPrec, vtCorr) ;
if ( ! vtCorrPrec.IsSmall() && ! vtCorr.IsSmall() && ! vtCorrMid.Normalize()) {
// riferimenti precedente e sul medio da direzioni fresa (Z) e ausiliaria (X)
// assegno il versore correzione precedente
vtCorrMid = vtCorrPrec ;
// se possibile, cerco di migliorarlo considerando i rif. prec. e sul medio da direzioni fresa (Z) e ausiliaria (X)
Frame3d refPrec, refMid ;
if ( ! refPrec.Set( ORIG, vtDirPrec, vtAuxPrec) ||
! refMid.Set( ORIG, vtDirMid, vtAuxMid))
return ( nMoveType == 0) ;
// versore correzione in locale al precente coincide con quello in locale al corrente
vtCorrMid = vtCorrPrec ;
vtCorrMid.ToLoc( refPrec) ;
vtCorrMid.ToGlob( refMid) ;
if ( refPrec.Set( ORIG, vtDirPrec, vtAuxPrec) &&
refMid.Set( ORIG, vtDirMid, vtAuxMid)) {
// versore correzione in locale al precente coincide con quello in locale al corrente
vtCorrMid.ToLoc( refPrec) ;
vtCorrMid.ToGlob( refMid) ;
}
}
// inserisco nuova entità e modifico vecchia
int nMidEntId = m_pGeomDB->Copy( nEntId, GDB_ID_NULL, nEntId, GDB_BEFORE) ;