diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc index 10679e5..5dfb3b7 100644 Binary files a/EgtMachKernel.rc and b/EgtMachKernel.rc differ diff --git a/MachMgr.h b/MachMgr.h index 037c573..4d85459 100644 --- a/MachMgr.h +++ b/MachMgr.h @@ -58,7 +58,7 @@ class MachMgr : public IMachMgr virtual bool Update( void) ; virtual bool Insert( int nInsGrp) ; // MachGroups - virtual int GetMachGroupNbr( void) const ; + virtual int GetMachGroupCount( void) const ; virtual int GetFirstMachGroup( void) const ; virtual int GetNextMachGroup( int nId) const ; virtual bool GetMachGroupNewName( std::string& sName) const ; @@ -70,7 +70,7 @@ class MachMgr : public IMachMgr virtual bool ResetCurrMachGroup( void) ; virtual int GetCurrMachGroup( void) const ; // RawParts - virtual int GetRawPartNbr( void) const ; + virtual int GetRawPartCount( void) const ; virtual int GetFirstRawPart( void) const ; virtual int GetNextRawPart( int nId) const ; virtual int AddRawPart( const Point3d& ptOrig, double dWidth, double dLen, double dHeight, Color cCol) ; @@ -82,7 +82,7 @@ class MachMgr : public IMachMgr virtual bool MoveToCenterRawPart( int nRawId, const Point3d& ptCenter, int nFlag) ; virtual bool MoveRawPart( int nRawId, const Vector3d& vtMove) ; // Parts - virtual int GetPartInRawPartNbr( int nRawId) const ; + virtual int GetPartInRawPartCount( int nRawId) const ; virtual int GetFirstPartInRawPart( int nRawId) const ; virtual int GetNextPartInRawPart( int nId) const ; virtual bool AddPartToRawPart( int nPartId, const Point3d& ptPos, int nRawId) ; @@ -115,7 +115,7 @@ class MachMgr : public IMachMgr virtual bool SetMachiningGeometry( const SELVECTOR& vIds) ; virtual bool Apply( void) ; // Da verificare bene - virtual int GetOperationNbr( void) const ; + virtual int GetOperationCount( void) const ; virtual int GetFirstOperation( void) const ; virtual int GetNextOperation( int nId) const ; virtual bool GetOperationNewName( std::string& sName) const ; diff --git a/MachMgrMachGroups.cpp b/MachMgrMachGroups.cpp index 451d7c3..f83e716 100644 --- a/MachMgrMachGroups.cpp +++ b/MachMgrMachGroups.cpp @@ -25,7 +25,7 @@ using namespace std ; //---------------------------------------------------------------------------- int -MachMgr::GetMachGroupNbr( void) const +MachMgr::GetMachGroupCount( void) const { // verifica del gruppo base per le lavorazioni if ( ! VerifyMachBase()) diff --git a/MachMgrOperations.cpp b/MachMgrOperations.cpp index fbcf45c..835f367 100644 --- a/MachMgrOperations.cpp +++ b/MachMgrOperations.cpp @@ -29,7 +29,7 @@ using namespace std ; //---------------------------------------------------------------------------- int -MachMgr::GetOperationNbr( void) const +MachMgr::GetOperationCount( void) const { // recupero il gruppo delle operazioni nella macchinata corrente int nOperGrpId = GetCurrOperId() ; diff --git a/MachMgrParts.cpp b/MachMgrParts.cpp index 5b10699..022b916 100644 --- a/MachMgrParts.cpp +++ b/MachMgrParts.cpp @@ -23,7 +23,7 @@ using namespace std ; //---------------------------------------------------------------------------- int -MachMgr::GetPartInRawPartNbr( int nRawId) const +MachMgr::GetPartInRawPartCount( int nRawId) const { // verifica validità grezzo if ( ! VerifyRawPart( nRawId)) @@ -32,14 +32,14 @@ MachMgr::GetPartInRawPartNbr( int nRawId) const PtrOwner pIter( CreateGdbIterator( m_pGeomDB)) ; if ( IsNull( pIter)) return 0 ; - int nPartNbr = 0 ; + int nPartCount = 0 ; bool bIter = pIter->GoToFirstGroupInGroup( nRawId) ; while ( bIter) { - ++ nPartNbr ; + ++ nPartCount ; bIter = pIter->GoToNextGroup() ; } // ritorno numero dei pezzi nel grezzo - return nPartNbr ; + return nPartCount ; } //---------------------------------------------------------------------------- diff --git a/MachMgrRawParts.cpp b/MachMgrRawParts.cpp index a760b9b..1f02200 100644 --- a/MachMgrRawParts.cpp +++ b/MachMgrRawParts.cpp @@ -28,7 +28,7 @@ using namespace std ; //---------------------------------------------------------------------------- int -MachMgr::GetRawPartNbr( void) const +MachMgr::GetRawPartCount( void) const { // recupero il gruppo dei grezzi nella macchinata corrente int nRawGroupId = GetCurrRawGroupId() ; diff --git a/Milling.cpp b/Milling.cpp index 8aa1821..18357f3 100644 --- a/Milling.cpp +++ b/Milling.cpp @@ -213,7 +213,7 @@ Milling::VerifyGeometry( SelData Id, int& nSubs) if ( Id.nSub == SEL_SUB_ALL) { pCurve = ::GetCurve( m_pGeomDB->GetGeoObj( Id.nId)) ; if ( pCurve != nullptr && pCurve->GetType() == CRV_COMPO) - nSubs = ::GetCurveComposite( pCurve)->GetCurveNumber() ; + nSubs = ::GetCurveComposite( pCurve)->GetCurveCount() ; } // altrimenti sottocurva di composita else { @@ -348,7 +348,7 @@ Milling::Chain( int nGrpDestId) return false ; } // se non sono state inserite curve, vado oltre - if ( pCrvCompo->GetCurveNumber() == 0) + if ( pCrvCompo->GetCurveCount() == 0) continue ; // imposto estrusione e spessore pCrvCompo->SetExtrusion( vtExtr) ; diff --git a/Sawing.cpp b/Sawing.cpp index ec8f3f7..176ec29 100644 --- a/Sawing.cpp +++ b/Sawing.cpp @@ -376,7 +376,7 @@ Sawing::VerifyGeometry( SelData Id, int& nSubs) if ( Id.nSub == SEL_SUB_ALL) { pCurve = ::GetCurve( m_pGeomDB->GetGeoObj( Id.nId)) ; if ( pCurve != nullptr && pCurve->GetType() == CRV_COMPO) - nSubs = ::GetCurveComposite( pCurve)->GetCurveNumber() ; + nSubs = ::GetCurveComposite( pCurve)->GetCurveCount() ; } // altrimenti sottocurva di composita else { @@ -511,7 +511,7 @@ Sawing::Chain( int nGrpDestId) return false ; } // se non sono state inserite curve, vado oltre - if ( pCrvCompo->GetCurveNumber() == 0) + if ( pCrvCompo->GetCurveCount() == 0) continue ; // imposto estrusione e spessore pCrvCompo->SetExtrusion( vtExtr) ; @@ -624,7 +624,7 @@ Sawing::PathApply( int nPathId, int nClId) // ciclo sulle curve elementari bool bClosed = pCompo->IsClosed() ; - int nMaxInd = pCompo->GetCurveNumber() - 1 ; + int nMaxInd = pCompo->GetCurveCount() - 1 ; for ( int i = 0 ; i <= nMaxInd ; ++ i) { // curva precedente int j = (( i == 0 && bClosed) ? nMaxInd : i - 1) ;