EgtMachKernel :
- piccoli aggiustamenti.
This commit is contained in:
+8
-8
@@ -2214,8 +2214,8 @@ Operation::MyCalculateClPathMcentAxesValues( int nClPathId, double dAngDeltaMinF
|
||||
double dCoeff = double( i) / nNumStep ;
|
||||
Point3d ptCurr = Media( ptPrec, ptP, dCoeff) ;
|
||||
DBLVECTOR vAng( vAxRot.size()) ;
|
||||
for ( int i = 0 ; i < int( vAxRot.size()) ; ++ i)
|
||||
vAng[i] = vAxRotPrec[i] * ( 1 - dCoeff) + vAxRot[i] * dCoeff ;
|
||||
for ( int j = 0 ; j < ssize( vAxRot) ; ++ j)
|
||||
vAng[j] = vAxRotPrec[j] * ( 1 - dCoeff) + vAxRot[j] * dCoeff ;
|
||||
int nStat = 0 ;
|
||||
bool bPaOk = pMachine->VerifyProtectedAreas( ptCurr.x, ptCurr.y, ptCurr.z, vAng, nStat) ;
|
||||
if ( ! bPaOk || nStat != 0) {
|
||||
@@ -2240,8 +2240,8 @@ Operation::MyCalculateClPathMcentAxesValues( int nClPathId, double dAngDeltaMinF
|
||||
ptMid.Rotate( ptCen, vtN, - dAngCen / 2) ;
|
||||
// determino i valori degli assi al punto medio
|
||||
DBLVECTOR vAngMid( vAxRot.size()) ;
|
||||
for ( size_t i = 0 ; i < vAxRot.size() ; ++ i)
|
||||
vAngMid[i] = ( vAxRotPrec[i] + vAxRot[i]) / 2 ;
|
||||
for ( int j = 0 ; j < ssize( vAxRot) ; ++ j)
|
||||
vAngMid[j] = ( vAxRotPrec[j] + vAxRot[j]) / 2 ;
|
||||
double dXmid, dYmid, dZmid ;
|
||||
bool bLmidOk = m_pMchMgr->GetCalcPositions( ptMid, vAngMid, dXmid, dYmid, dZmid) ;
|
||||
if ( ! bLmidOk) {
|
||||
@@ -2253,8 +2253,8 @@ Operation::MyCalculateClPathMcentAxesValues( int nClPathId, double dAngDeltaMinF
|
||||
Point3d ptEnd = ptP - dDeltaN * vtN ;
|
||||
// determino i valori degli assi al punto finale
|
||||
DBLVECTOR vAngEnd( vAxRot.size()) ;
|
||||
for ( size_t i = 0 ; i < vAxRot.size() ; ++ i)
|
||||
vAngEnd[i] = vAxRot[i] ;
|
||||
for ( int j = 0 ; j < ssize( vAxRot) ; ++ j)
|
||||
vAngEnd[j] = vAxRot[j] ;
|
||||
double dXend, dYend, dZend ;
|
||||
bool bLendOk = m_pMchMgr->GetCalcPositions( ptEnd, vAngEnd, dXend, dYend, dZend) ;
|
||||
if ( ! bLendOk) {
|
||||
@@ -2312,8 +2312,8 @@ Operation::MyCalculateClPathMcentAxesValues( int nClPathId, double dAngDeltaMinF
|
||||
double dCoeff = double( i) / NUM_VERIF_STEP ;
|
||||
Point3d ptCurr = ptCen + vtCurr + vtN * dDeltaN * dCoeff ;
|
||||
DBLVECTOR vAng( vAxRot.size()) ;
|
||||
for ( size_t i = 0 ; i < vAxRot.size() ; ++ i)
|
||||
vAng[i] = vAxRotPrec[i] * ( 1 - dCoeff) + vAxRot[i] * dCoeff ;
|
||||
for ( int j = 0 ; j < ssize( vAxRot) ; ++ j)
|
||||
vAng[j] = vAxRotPrec[j] * ( 1 - dCoeff) + vAxRot[j] * dCoeff ;
|
||||
int nStat ;
|
||||
bool bOsOk = m_pMchMgr->VerifyOutstroke( ptCurr.x, ptCurr.y, ptCurr.z, vAng, false, nStat) ;
|
||||
if ( ! bOsOk || nStat != 0) {
|
||||
|
||||
Reference in New Issue
Block a user