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

EgtMachKernel 1.6h3 :

Browse Source 
- piccoli adattamenti
- Count invece di Num o Nbr.
This commit is contained in:
Dario Sassi
2015-08-18 07:32:29 +00:00
parent 09a9dcf526
commit e2a7280a07
8 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtMachKernel.rc
BIN
View File
Binary file not shown.
MachMgr.h
+4 -4
View File
@@ -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 ;
MachMgrMachGroups.cpp
+1 -1
View File
@@ -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())
MachMgrOperations.cpp
+1 -1
View File
@@ -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() ;
MachMgrParts.cpp
+4 -4
View File
@@ -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<IGdbIterator> 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 ;
}
//----------------------------------------------------------------------------
MachMgrRawParts.cpp
+1 -1
View File
@@ -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() ;
Milling.cpp
+2 -2
View File
@@ -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) ;
Sawing.cpp
+3 -3
View File
@@ -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) ;