diff --git a/gerbview/gerber_collectors.cpp b/gerbview/gerber_collectors.cpp index 13c4504275..9d9a62a8a7 100644 --- a/gerbview/gerber_collectors.cpp +++ b/gerbview/gerber_collectors.cpp @@ -62,8 +62,6 @@ void GERBER_COLLECTOR::Collect( EDA_ITEM* aItem, const KICAD_T aScanList[], aItem->Visit( m_inspector, NULL, m_ScanTypes ); - SetTimeNow(); // when snapshot was taken - // record the length of the primary list before concatenating on to it. m_PrimaryLength = m_List.size(); } diff --git a/include/collector.h b/include/collector.h index 219109681e..8ad43518b6 100644 --- a/include/collector.h +++ b/include/collector.h @@ -62,8 +62,6 @@ protected: wxPoint m_RefPos; // Reference position used to generate the collection. EDA_RECT m_RefBox; // Selection rectangle used to generate the collection. - timestamp_t m_TimeAtCollection; // The time at which the collection was made. - public: int m_Threshold; // Hit-test threshold in internal units. @@ -75,7 +73,6 @@ public: m_ScanTypes( 0 ), // Inspect() is virtual so calling it from a class common inspector preserves polymorphism. m_inspector( [=] ( EDA_ITEM* aItem, void* aTestData ) { return this->Inspect( aItem, aTestData ); } ), - m_TimeAtCollection( 0 ), m_Threshold( 0 ), m_MenuCancelled( false ) { @@ -96,19 +93,6 @@ public: CITER begin() const { return m_List.cbegin(); } CITER end() const { return m_List.cend(); } - /** - * Function IsValidIndex - * tests if \a aIndex is with the limits of the list of collected items. - * - * @param aIndex The index to test. - * @return True if \a aIndex is with the limits of the list of collected items, - * otherwise false. - */ - bool IsValidIndex( int aIndex ) - { - return ( (unsigned) aIndex < m_List.size() ); - } - /** * Function GetCount * returns the number of objects in the list @@ -219,45 +203,10 @@ public: m_ScanTypes = scanTypes; } - void SetTimeNow() - { - m_TimeAtCollection = GetNewTimeStamp(); - } - - timestamp_t GetTime() - { - return m_TimeAtCollection; - } - void SetRefPos( const wxPoint& aRefPos ) { m_RefPos = aRefPos; } - const wxPoint& GetRefPos() const { return m_RefPos; } - void SetBoundingBox( const EDA_RECT& aRefBox ) { m_RefBox = aRefBox; } const EDA_RECT& GetBoundingBox() const { return m_RefBox; } - /** - * Function IsSimilarPointAndTime - * returns true if the given reference point is "similar" (defined here) - * to the internal reference point and the current time is within a few - * seconds of the internal m_TimeAtCollection. - * - * @param aRefPos A wxPoint to compare to. - * @return bool - true if the point and time are similar, else false. - */ - bool IsSimilarPointAndTime( const wxPoint& aRefPos ) - { - const int distMax = 2; // adjust these here - const timestamp_t timeMax = 3; // seconds - - int dx = abs( aRefPos.x - m_RefPos.x ); - int dy = abs( aRefPos.y - m_RefPos.y ); - - if( dx <= distMax && dy <= distMax && - GetNewTimeStamp() - m_TimeAtCollection <= timeMax ) - return true; - else - return false; - } /** * Function CountType * counts the number of items matching aType diff --git a/pcbnew/collectors.cpp b/pcbnew/collectors.cpp index 4dce183550..6bb8ce107d 100644 --- a/pcbnew/collectors.cpp +++ b/pcbnew/collectors.cpp @@ -541,8 +541,6 @@ void GENERAL_COLLECTOR::Collect( BOARD_ITEM* aItem, const KICAD_T aScanList[], aItem->Visit( m_inspector, NULL, m_ScanTypes ); - SetTimeNow(); // when snapshot was taken - // record the length of the primary list before concatenating on to it. m_PrimaryLength = m_List.size();