From dbe90e163e0ece429b2c385e6512553e44a3c44f Mon Sep 17 00:00:00 2001 From: Tomasz Wlostowski Date: Wed, 19 Feb 2020 18:21:56 +0100 Subject: [PATCH] router: use one global logger object --- pcbnew/router/pns_algo_base.h | 12 ++++++++++-- pcbnew/router/pns_dragger.cpp | 9 --------- pcbnew/router/pns_dragger.h | 3 --- pcbnew/router/pns_router.cpp | 2 +- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/pcbnew/router/pns_algo_base.h b/pcbnew/router/pns_algo_base.h index a3d43372c7..b960a35e7c 100644 --- a/pcbnew/router/pns_algo_base.h +++ b/pcbnew/router/pns_algo_base.h @@ -40,7 +40,9 @@ class ALGO_BASE { public: ALGO_BASE( ROUTER* aRouter ) : - m_debugDecorator( nullptr ), m_router( aRouter ) + m_debugDecorator( nullptr ), + m_router( aRouter ), + m_logger( nullptr ) {} virtual ~ALGO_BASE() {} @@ -57,6 +59,11 @@ public: ///> Returns the logger object, allowing to dump geometry to a file. virtual LOGGER* Logger(); + void SetLogger( LOGGER* aLogger ) + { + m_logger = aLogger; + } + /** * Function SetDebugDecorator * @@ -72,9 +79,10 @@ public: return m_debugDecorator; } -private: +protected: DEBUG_DECORATOR *m_debugDecorator; ROUTER* m_router; + LOGGER* m_logger; }; } diff --git a/pcbnew/router/pns_dragger.cpp b/pcbnew/router/pns_dragger.cpp index 299c163d2c..009b0d0f62 100644 --- a/pcbnew/router/pns_dragger.cpp +++ b/pcbnew/router/pns_dragger.cpp @@ -397,13 +397,4 @@ const ITEM_SET DRAGGER::Traces() return m_draggedItems; } - -LOGGER* DRAGGER::Logger() -{ - if( m_shove ) - return m_shove->Logger(); - - return NULL; -} - } diff --git a/pcbnew/router/pns_dragger.h b/pcbnew/router/pns_dragger.h index 1d71dcfa2c..2a79cb10ea 100644 --- a/pcbnew/router/pns_dragger.h +++ b/pcbnew/router/pns_dragger.h @@ -97,9 +97,6 @@ public: */ const ITEM_SET Traces(); - /// @copydoc ALGO_BASE::Logger() - virtual LOGGER* Logger() override; - void SetMode( int aDragMode ); private: diff --git a/pcbnew/router/pns_router.cpp b/pcbnew/router/pns_router.cpp index 8b6884b983..7e3deb5e9e 100644 --- a/pcbnew/router/pns_router.cpp +++ b/pcbnew/router/pns_router.cpp @@ -178,7 +178,7 @@ bool ROUTER::isStartingPointRoutable( const VECTOR2I& aWhere, int aLayer ) } bool ROUTER::StartRouting( const VECTOR2I& aP, ITEM* aStartItem, int aLayer ) -{ +{ if( ! isStartingPointRoutable( aP, aLayer ) ) {