haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Memoize SHAPE_LINE_CHAIN bounding box computation" 

This reverts commit 30566de69a, which
caused some issues in PNS.
This commit is contained in:
Chris Pavlina 2016-09-01 12:09:06 -04:00
parent fcedef836a
commit 4b6d28333e
2 changed files with 11 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/geometry/shape_line_chain.cpp
View File

@ -2,7 +2,6 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2013 CERN
* Copyright (C) 2016 KiCad Developers, see AUTHORS.txt for contributors.
* @author Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
*
* This program is free software; you can redistribute it and/or
@ -96,8 +95,6 @@ void SHAPE_LINE_CHAIN::Replace( int aStartIndex, int aEndIndex, const VECTOR2I&
m_points.erase( m_points.begin() + aStartIndex + 1, m_points.begin() + aEndIndex + 1 );
m_points[aStartIndex] = aP;
}
m_bbox_memo_valid = false;
}
@ -111,8 +108,6 @@ void SHAPE_LINE_CHAIN::Replace( int aStartIndex, int aEndIndex, const SHAPE_LINE
m_points.erase( m_points.begin() + aStartIndex, m_points.begin() + aEndIndex + 1 );
m_points.insert( m_points.begin() + aStartIndex, aLine.m_points.begin(), aLine.m_points.end() );
m_bbox_memo_valid = false;
}
@ -125,7 +120,6 @@ void SHAPE_LINE_CHAIN::Remove( int aStartIndex, int aEndIndex )
aStartIndex += PointCount();
m_points.erase( m_points.begin() + aStartIndex, m_points.begin() + aEndIndex + 1 );
m_bbox_memo_valid = false;
}
@ -145,8 +139,6 @@ int SHAPE_LINE_CHAIN::Distance( const VECTOR2I& aP ) const
int SHAPE_LINE_CHAIN::Split( const VECTOR2I& aP )
{
m_bbox_memo_valid = false;
int ii = -1;
int min_dist = 2;

61
include/geometry/shape_line_chain.h
View File

@ -2,7 +2,6 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2013 CERN
* Copyright (C) 2016 KiCad Developers, see AUTHORS.txt for contributors.
* @author Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
*
* This program is free software; you can redistribute it and/or
@ -50,12 +49,6 @@ private:
typedef std::vector<VECTOR2I>::iterator point_iter;
typedef std::vector<VECTOR2I>::const_iterator point_citer;
// SHAPE_LINE_CHAIN::BBox is a hotspot for loading data.
// Here we memoize it to avoid having to recompute the bounding box too many times
BOX2I m_bbox_memo;
int m_bbox_clearance_memo;
bool m_bbox_memo_valid;
public:
/**
* Struct INTERSECTION
@ -79,17 +72,14 @@ public:
* Initializes an empty line chain.
*/
SHAPE_LINE_CHAIN() :
SHAPE( SH_LINE_CHAIN ), m_bbox_memo_valid( false ), m_closed( false )
SHAPE( SH_LINE_CHAIN ), m_closed( false )
{}
/**
* Copy Constructor
*/
SHAPE_LINE_CHAIN( const SHAPE_LINE_CHAIN& aShape ) :
SHAPE( SH_LINE_CHAIN ),
m_bbox_memo( aShape.m_bbox_memo ), m_bbox_clearance_memo( aShape.m_bbox_clearance_memo ),
m_bbox_memo_valid( aShape.m_bbox_memo_valid ), m_points( aShape.m_points ),
m_closed( false )
SHAPE( SH_LINE_CHAIN ), m_points( aShape.m_points ), m_closed( aShape.m_closed )
{}
/**
@ -97,8 +87,7 @@ public:
* Initializes a 2-point line chain (a single segment)
*/
SHAPE_LINE_CHAIN( const VECTOR2I& aA, const VECTOR2I& aB ) :
SHAPE( SH_LINE_CHAIN ),
m_bbox_memo_valid( false ), m_closed( false )
SHAPE( SH_LINE_CHAIN ), m_closed( false )
{
m_points.resize( 2 );
m_points[0] = aA;
@ -106,7 +95,7 @@ public:
}
SHAPE_LINE_CHAIN( const VECTOR2I& aA, const VECTOR2I& aB, const VECTOR2I& aC ) :
SHAPE( SH_LINE_CHAIN ), m_bbox_memo_valid( false ), m_closed( false )
SHAPE( SH_LINE_CHAIN ), m_closed( false )
{
m_points.resize( 3 );
m_points[0] = aA;
@ -115,7 +104,7 @@ public:
}
SHAPE_LINE_CHAIN( const VECTOR2I& aA, const VECTOR2I& aB, const VECTOR2I& aC, const VECTOR2I& aD ) :
SHAPE( SH_LINE_CHAIN ), m_bbox_memo_valid( false ), m_closed( false )
SHAPE( SH_LINE_CHAIN ), m_closed( false )
{
m_points.resize( 4 );
m_points[0] = aA;
@ -127,7 +116,7 @@ public:
SHAPE_LINE_CHAIN( const VECTOR2I* aV, int aCount ) :
SHAPE( SH_LINE_CHAIN ),
m_bbox_memo_valid( false ), m_closed( false )
m_closed( false )
{
m_points.resize( aCount );
@ -148,7 +137,6 @@ public:
{
m_points.clear();
m_closed = false;
m_bbox_memo_valid = false;
}
/**
@ -275,34 +263,13 @@ public:
/// @copydoc SHAPE::BBox()
const BOX2I BBox( int aClearance = 0 ) const
{
// Sorry for const-stripping, if you have a prettier way to memoize this
// feel free.
return const_cast<SHAPE_LINE_CHAIN *>( this )->BBoxMemoized( aClearance );
}
BOX2I bbox;
bbox.Compute( m_points );
/**
* Compute the bounding box if necessary, or return a memoized copy if not.
*/
const BOX2I BBoxMemoized( int aClearance = 0 )
{
if( m_bbox_memo_valid && m_bbox_clearance_memo == aClearance )
{
return m_bbox_memo;
}
else
{
BOX2I bbox;
bbox.Compute( m_points );
if( aClearance != 0 )
bbox.Inflate( aClearance );
if( aClearance != 0 )
bbox.Inflate( aClearance );
m_bbox_memo = bbox;
m_bbox_clearance_memo = aClearance;
m_bbox_memo_valid = true;
return bbox;
}
return bbox;
}
/**
@ -361,7 +328,6 @@ public:
{
VECTOR2I v( aX, aY );
Append( v, aAllowDuplication );
m_bbox_memo_valid = false;
}
/**
@ -406,14 +372,11 @@ public:
m_points.push_back( p );
m_bbox.Merge( p );
}
m_bbox_memo_valid = false;
}
void Insert( int aVertex, const VECTOR2I& aP )
{
m_points.insert( m_points.begin() + aVertex, aP );
m_bbox_memo_valid = false;
}
/**
@ -614,8 +577,6 @@ public:
{
for( std::vector<VECTOR2I>::iterator i = m_points.begin(); i != m_points.end(); ++i )
(*i) += aVector;
m_bbox_memo_valid = false;
}
bool IsSolid() const