diff --git a/MachMgr.h b/MachMgr.h index 7442ada..4aa8569 100644 --- a/MachMgr.h +++ b/MachMgr.h @@ -328,9 +328,9 @@ class MachMgr : public IMachMgr bool GetClEntAxesStatus( int nEntId, int& nStatus) const override ; bool GetClEntAxesMask( int nEntId, int& nMask) const override ; bool GetClEntAxesVal( int nEntId, DBLVECTOR& vAxes) const override ; - bool GetClEntTDir( int nEntId, Vector3d& vTDir) const override ; - bool GetClEntCDir( int nEntId, Vector3d& vCDir) const override ; - bool GetClEntADir( int nEntId, Vector3d& vADir) const override ; + bool GetClEntTDir( int nEntId, Vector3d& vtTDir) const override ; + bool GetClEntCDir( int nEntId, Vector3d& vtCDir) const override ; + bool GetClEntADir( int nEntId, Vector3d& vtADir) const override ; // Simulation bool SimInit( void) override ; bool SimStart( bool bFirst) override ; diff --git a/MachMgrClEntities.cpp b/MachMgrClEntities.cpp index 290605e..78c75f1 100644 --- a/MachMgrClEntities.cpp +++ b/MachMgrClEntities.cpp @@ -150,10 +150,10 @@ MachMgr::GetClEntAxesVal( int nEntId, DBLVECTOR& vAxes) const //---------------------------------------------------------------------------- bool -MachMgr::GetClEntTDir( int nEntId, Vector3d& vTDir) const +MachMgr::GetClEntTDir( int nEntId, Vector3d& vtTDir) const { // default - vTDir = V_NULL ; + vtTDir = V_NULL ; // verifico validità GeomBD if ( m_pGeomDB == nullptr) return false ; @@ -161,17 +161,17 @@ MachMgr::GetClEntTDir( int nEntId, Vector3d& vTDir) const const CamData* pCamData = GetCamData( m_pGeomDB->GetUserObj( nEntId)) ; if ( pCamData == nullptr) return false ; - // recupero vTDir - vTDir = pCamData->GetToolDir() ; + // recupero TDir + vtTDir = pCamData->GetToolDir() ; return true ; } //---------------------------------------------------------------------------- bool -MachMgr::GetClEntCDir( int nEntId, Vector3d& vCDir) const +MachMgr::GetClEntCDir( int nEntId, Vector3d& vtCDir) const { // default - vCDir = V_NULL ; + vtCDir = V_NULL ; // verifico validità GeomDB if ( m_pGeomDB == nullptr) return false ; @@ -179,17 +179,17 @@ MachMgr::GetClEntCDir( int nEntId, Vector3d& vCDir) const const CamData* pCamData = GetCamData( m_pGeomDB->GetUserObj( nEntId)) ; if ( pCamData == nullptr) return false ; - // recupero vCDir - vCDir = pCamData->GetCorrDir() ; + // recupero CDir + vtCDir = pCamData->GetCorrDir() ; return true ; } //---------------------------------------------------------------------------- bool -MachMgr::GetClEntADir( int nEntId, Vector3d& vADir) const +MachMgr::GetClEntADir( int nEntId, Vector3d& vtADir) const { // default - vADir = V_NULL ; + vtADir = V_NULL ; // verifico validità GeomDB if ( m_pGeomDB == nullptr) return false ; @@ -198,6 +198,6 @@ MachMgr::GetClEntADir( int nEntId, Vector3d& vADir) const if ( pCamData == nullptr) return false ; // recupero ADir - vADir = pCamData->GetAuxDir() ; + vtADir = pCamData->GetAuxDir() ; return true ; } diff --git a/Operation.cpp b/Operation.cpp index 12a79bb..5feeadf 100644 --- a/Operation.cpp +++ b/Operation.cpp @@ -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) {