From 63f34925669a600aa870bef5a446df21fa64e84b Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Tue, 9 Feb 2016 09:49:26 +0000 Subject: [PATCH] =?UTF-8?q?EgtMachKernel=201.6n2=20:=20-=20la=20funzione?= =?UTF-8?q?=20IsNotEmpty=20=C3=A8=20stata=20sostituita=20dalla=20IsEmpty.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Drilling.h | 4 ++-- EgtMachKernel.rc | Bin 11782 -> 11782 bytes Generator.cpp | 2 +- MachMgr.h | 2 +- MachMgrOperations.cpp | 4 ++-- Machining.cpp | 4 ++-- Machining.h | 2 +- Milling.h | 4 ++-- Sawing.h | 4 ++-- Simulator.cpp | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Drilling.h b/Drilling.h index 7534321..b37d457 100644 --- a/Drilling.h +++ b/Drilling.h @@ -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) ; diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc index 9da9e71df901f444e510b3dfce823f340689b782..10c71755880a62c1a59532ea86d6533e305893d0 100644 GIT binary patch delta 97 zcmZpRX^YwLhmFx_^ItYwW=5mQj>5W|vxM9jH?QON0rG*u7nvrX5iEd9O=7{OSQ@Kh Hr8(RHP01iS delta 97 zcmZpRX^YwLhmFy2^ItYwW=6xwj>5W|vxM9jH?QON0rG*u7nvrX5iEd9O=7{OSQ@Kh Hr8(RHOf?`f diff --git a/Generator.cpp b/Generator.cpp index 3e0557a..b21393c 100644 --- a/Generator.cpp +++ b/Generator.cpp @@ -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 diff --git a/MachMgr.h b/MachMgr.h index a99b06a..9b58f4b 100644 --- a/MachMgr.h +++ b/MachMgr.h @@ -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 ; diff --git a/MachMgrOperations.cpp b/MachMgrOperations.cpp index 650ed41..6452390 100644 --- a/MachMgrOperations.cpp +++ b/MachMgrOperations.cpp @@ -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() ; } diff --git a/Machining.cpp b/Machining.cpp index 1eaff08..febeb3e 100644 --- a/Machining.cpp +++ b/Machining.cpp @@ -534,7 +534,7 @@ Machining::CalculateAxesValues( void) int nPrevOpId = m_pMchMgr->GetPrevActiveOperation( m_nOwnerId) ; Machining* pPrevMch = dynamic_cast( 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( m_pGeomDB->GetUserObj( nPrevOpId)) ; while ( pPrevMch != nullptr) { - if ( pPrevMch->IsNotEmpty()) + if ( ! pPrevMch->IsEmpty()) break ; else { nPrevOpId = m_pMchMgr->GetPrevActiveOperation( nPrevOpId) ; diff --git a/Machining.h b/Machining.h index ce7ce43..11f25b2 100644 --- a/Machining.h +++ b/Machining.h @@ -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) ; diff --git a/Milling.h b/Milling.h index fc8e1d4..947dccd 100644 --- a/Milling.h +++ b/Milling.h @@ -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) ; diff --git a/Sawing.h b/Sawing.h index 8aa0c96..e3414d1 100644 --- a/Sawing.h +++ b/Sawing.h @@ -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) ; diff --git a/Simulator.cpp b/Simulator.cpp index 7a0722d..2e556f7 100644 --- a/Simulator.cpp +++ b/Simulator.cpp @@ -73,7 +73,7 @@ Simulator::Start( void) Machining* pMch = dynamic_cast( 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( m_pGeomDB->GetUserObj( nOpId)) ; @@ -128,7 +128,7 @@ Simulator::Move( int& nStatus) Machining* pMch = dynamic_cast( 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( m_pGeomDB->GetUserObj( m_nOpId)) ;