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

EgtMachKernel 1.6n2 :

Browse Source 
- la funzione IsNotEmpty è stata sostituita dalla IsEmpty.
This commit is contained in:
Dario Sassi
2016-02-09 09:49:26 +00:00
parent 6cfdb4d22b
commit 63f3492566
10 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Drilling.h
+2 -2
View File
@@ -48,8 +48,8 @@ class Drilling : public Machining
const ToolData& GetToolData( void) const override ;
bool GetGeometry( SELVECTOR& vIds) const override ;
bool AdjustPositionForAxesCalc( const CamData* pCamData, Point3d& ptP) override ;
bool IsNotEmpty( void) const override
{ return ( m_nDrillings > 0) ; }
bool IsEmpty( void) const override
{ return ( m_nDrillings == 0) ; }
public :
Drilling( void) ;
EgtMachKernel.rc
BIN
View File
Binary file not shown.
Generator.cpp
+1 -1
View File
@@ -280,7 +280,7 @@ Generator::ProcessMachining( int nOpId, int nOpInd)
return false ;
// Verifico non sia vuota
if ( ! m_pMchMgr->IsNotEmpty())
if ( m_pMchMgr->IsEmpty())
return true ;
// Recupero l'utensile della lavorazione corrente
MachMgr.h
+1 -1
View File
@@ -185,7 +185,7 @@ class MachMgr : public IMachMgr
bool GetMachiningParam( int nType, double& dVal) const override ;
bool GetMachiningParam( int nType, std::string& sVal) const override ;
bool GetMachiningGeometry( SELVECTOR& vIds) const override ;
bool IsNotEmpty( void) const override ;
bool IsEmpty( void) const override ;
// Simulation
bool SimStart( void) override ;
bool SimMove( int& nStatus) override ;
MachMgrOperations.cpp
+2 -2
View File
@@ -693,7 +693,7 @@ MachMgr::GetMachiningGeometry( SELVECTOR& vIds) const
//----------------------------------------------------------------------------
bool
MachMgr::IsNotEmpty( void) const
MachMgr::IsEmpty( void) const
{
// recupero la lavorazione corrente
int nCurrMchId = GetCurrMachining() ;
@@ -704,5 +704,5 @@ MachMgr::IsNotEmpty( void) const
if ( pMch == nullptr)
return false ;
// restituisco lo stato
return pMch->IsNotEmpty() ;
return pMch->IsEmpty() ;
}
Machining.cpp
+2 -2
View File
@@ -534,7 +534,7 @@ Machining::CalculateAxesValues( void)
int nPrevOpId = m_pMchMgr->GetPrevActiveOperation( m_nOwnerId) ;
Machining* pPrevMch = dynamic_cast<Machining*>( m_pGeomDB->GetUserObj( nPrevOpId)) ;
while ( pPrevMch != nullptr) {
if ( pPrevMch->IsNotEmpty())
if ( ! pPrevMch->IsEmpty())
break ;
else {
nPrevOpId = m_pMchMgr->GetPrevActiveOperation( nPrevOpId) ;
@@ -703,7 +703,7 @@ Machining::AdjustStartEndMovements(void)
int nPrevOpId = m_pMchMgr->GetPrevActiveOperation( m_nOwnerId) ;
Machining* pPrevMch = dynamic_cast<Machining*>( m_pGeomDB->GetUserObj( nPrevOpId)) ;
while ( pPrevMch != nullptr) {
if ( pPrevMch->IsNotEmpty())
if ( ! pPrevMch->IsEmpty())
break ;
else {
nPrevOpId = m_pMchMgr->GetPrevActiveOperation( nPrevOpId) ;
Machining.h
+1 -1
View File
@@ -48,7 +48,7 @@ class Machining : public IUserObj
virtual const ToolData& GetToolData( void) const = 0 ;
virtual bool GetGeometry( SELVECTOR& vIds) const = 0 ;
virtual bool AdjustPositionForAxesCalc( const CamData* pCamData, Point3d& ptP) = 0 ;
virtual bool IsNotEmpty( void) const = 0 ;
virtual bool IsEmpty( void) const = 0 ;
protected :
Machining( void) ;
Milling.h
+2 -2
View File
@@ -47,8 +47,8 @@ class Milling : public Machining
const ToolData& GetToolData( void) const ;
bool GetGeometry( SELVECTOR& vIds) const override ;
bool AdjustPositionForAxesCalc( const CamData* pCamData, Point3d& ptP) override ;
bool IsNotEmpty( void) const override
{ return false ; }
bool IsEmpty( void) const override
{ return true ; }
public :
Milling( void) ;
Sawing.h
+2 -2
View File
@@ -48,8 +48,8 @@ class Sawing : public Machining
const ToolData& GetToolData( void) const override ;
bool GetGeometry( SELVECTOR& vIds) const override ;
bool AdjustPositionForAxesCalc( const CamData* pCamData, Point3d& ptP) override ;
bool IsNotEmpty( void) const override
{ return ( m_nCuts > 0) ; }
bool IsEmpty( void) const override
{ return ( m_nCuts == 0) ; }
public :
Sawing( void) ;
Simulator.cpp
+2 -2
View File
@@ -73,7 +73,7 @@ Simulator::Start( void)
Machining* pMch = dynamic_cast<Machining*>( m_pGeomDB->GetUserObj( nOpId)) ;
while ( nOpId != GDB_ID_NULL) {
if ( IsValidMachiningType( m_pMchMgr->GetOperationType( nOpId)) &&
pMch != nullptr && pMch->IsNotEmpty())
pMch != nullptr && ! pMch->IsEmpty())
break ;
nOpId = m_pMchMgr->GetNextActiveOperation( m_nOpId) ;
pMch = dynamic_cast<Machining*>( m_pGeomDB->GetUserObj( nOpId)) ;
@@ -128,7 +128,7 @@ Simulator::Move( int& nStatus)
Machining* pMch = dynamic_cast<Machining*>( m_pGeomDB->GetUserObj( m_nOpId)) ;
while ( m_nOpId != GDB_ID_NULL) {
if ( IsValidMachiningType( m_pMchMgr->GetOperationType( m_nOpId)) &&
pMch != nullptr && pMch->IsNotEmpty())
pMch != nullptr && ! pMch->IsEmpty())
break ;
m_nOpId = m_pMchMgr->GetNextActiveOperation( m_nOpId) ;
pMch = dynamic_cast<Machining*>( m_pGeomDB->GetUserObj( m_nOpId)) ;