2020-06-17 12:46:50 +00:00
|
|
|
/*
|
|
|
|
* This program source code file is part of KiCad, a free EDA CAD application.
|
|
|
|
*
|
|
|
|
* Copyright (C) 2004-2018 Jean-Pierre Charras, jp.charras at wanadoo.fr
|
|
|
|
* Copyright (C) 2011 Wayne Stambaugh <stambaughw@verizon.net>
|
|
|
|
* Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors.
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version 2
|
|
|
|
* of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, you may find one here:
|
|
|
|
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
|
|
|
|
* or you may search the http://www.gnu.org website for the version 2 license,
|
|
|
|
* or you may write to the Free Software Foundation, Inc.,
|
|
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <reporter.h>
|
2021-07-17 19:56:18 +00:00
|
|
|
#include <macros.h>
|
2020-06-17 12:46:50 +00:00
|
|
|
#include <board_commit.h>
|
|
|
|
#include <cleanup_item.h>
|
2020-10-04 23:34:59 +00:00
|
|
|
#include <pcb_shape.h>
|
|
|
|
#include <fp_shape.h>
|
2020-06-17 12:46:50 +00:00
|
|
|
#include <graphics_cleaner.h>
|
|
|
|
|
|
|
|
|
2020-11-13 15:15:52 +00:00
|
|
|
GRAPHICS_CLEANER::GRAPHICS_CLEANER( DRAWINGS& aDrawings, FOOTPRINT* aParentFootprint,
|
2020-06-17 12:46:50 +00:00
|
|
|
BOARD_COMMIT& aCommit ) :
|
|
|
|
m_drawings( aDrawings ),
|
2020-11-13 15:15:52 +00:00
|
|
|
m_parentFootprint( aParentFootprint ),
|
2020-06-17 12:46:50 +00:00
|
|
|
m_commit( aCommit ),
|
|
|
|
m_dryRun( true ),
|
|
|
|
m_itemsList( nullptr )
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2020-11-13 15:15:52 +00:00
|
|
|
void GRAPHICS_CLEANER::CleanupBoard( bool aDryRun,
|
|
|
|
std::vector<std::shared_ptr<CLEANUP_ITEM>>* aItemsList,
|
2020-06-17 12:46:50 +00:00
|
|
|
bool aMergeRects, bool aDeleteRedundant )
|
|
|
|
{
|
|
|
|
m_dryRun = aDryRun;
|
|
|
|
m_itemsList = aItemsList;
|
|
|
|
|
|
|
|
// Clear the flag used to mark some segments as deleted, in dry run:
|
|
|
|
for( BOARD_ITEM* drawing : m_drawings )
|
|
|
|
drawing->ClearFlags( IS_DELETED );
|
|
|
|
|
|
|
|
if( aDeleteRedundant )
|
|
|
|
cleanupSegments();
|
|
|
|
|
|
|
|
if( aMergeRects )
|
|
|
|
mergeRects();
|
|
|
|
|
|
|
|
// Clear the flag used to mark some segments:
|
|
|
|
for( BOARD_ITEM* drawing : m_drawings )
|
|
|
|
drawing->ClearFlags( IS_DELETED );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2021-07-21 18:31:25 +00:00
|
|
|
bool GRAPHICS_CLEANER::isNullShape( PCB_SHAPE* aShape )
|
2020-06-17 12:46:50 +00:00
|
|
|
{
|
2021-07-21 18:31:25 +00:00
|
|
|
switch( aShape->GetShape() )
|
2020-06-17 12:46:50 +00:00
|
|
|
{
|
2021-07-21 18:31:25 +00:00
|
|
|
case SHAPE_T::SEGMENT:
|
|
|
|
case SHAPE_T::RECT:
|
2021-07-17 19:56:18 +00:00
|
|
|
case SHAPE_T::ARC:
|
2021-07-21 18:31:25 +00:00
|
|
|
return aShape->GetStart() == aShape->GetEnd();
|
2020-06-17 12:46:50 +00:00
|
|
|
|
2021-07-21 18:31:25 +00:00
|
|
|
case SHAPE_T::CIRCLE:
|
|
|
|
return aShape->GetRadius() == 0;
|
2020-06-17 12:46:50 +00:00
|
|
|
|
2021-07-21 18:31:25 +00:00
|
|
|
case SHAPE_T::POLY:
|
|
|
|
return aShape->GetPointCount() == 0;
|
2020-06-17 12:46:50 +00:00
|
|
|
|
2021-07-21 18:31:25 +00:00
|
|
|
case SHAPE_T::BEZIER:
|
|
|
|
aShape->RebuildBezierToSegmentsPointsList( aShape->GetWidth() );
|
|
|
|
return aShape->GetBezierPoints().empty();
|
2020-06-17 12:46:50 +00:00
|
|
|
|
|
|
|
default:
|
2021-07-17 19:56:18 +00:00
|
|
|
UNIMPLEMENTED_FOR( aShape->SHAPE_T_asString() );
|
2020-06-17 12:46:50 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2020-10-04 23:34:59 +00:00
|
|
|
bool GRAPHICS_CLEANER::areEquivalent( PCB_SHAPE* aShape1, PCB_SHAPE* aShape2 )
|
2020-06-17 12:46:50 +00:00
|
|
|
{
|
2020-10-04 23:34:59 +00:00
|
|
|
if( aShape1->GetShape() != aShape2->GetShape()
|
|
|
|
|| aShape1->GetLayer() != aShape2->GetLayer()
|
|
|
|
|| aShape1->GetWidth() != aShape2->GetWidth() )
|
2020-06-17 12:46:50 +00:00
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2020-10-04 23:34:59 +00:00
|
|
|
switch( aShape1->GetShape() )
|
2020-06-17 12:46:50 +00:00
|
|
|
{
|
2021-07-21 18:31:25 +00:00
|
|
|
case SHAPE_T::SEGMENT:
|
|
|
|
case SHAPE_T::RECT:
|
|
|
|
case SHAPE_T::CIRCLE:
|
2020-10-04 23:34:59 +00:00
|
|
|
return aShape1->GetStart() == aShape2->GetStart()
|
|
|
|
&& aShape1->GetEnd() == aShape2->GetEnd();
|
2020-06-17 12:46:50 +00:00
|
|
|
|
2021-07-21 18:31:25 +00:00
|
|
|
case SHAPE_T::ARC:
|
2020-10-04 23:34:59 +00:00
|
|
|
return aShape1->GetCenter() == aShape2->GetCenter()
|
2021-07-17 19:56:18 +00:00
|
|
|
&& aShape1->GetStart() == aShape2->GetStart()
|
|
|
|
&& aShape1->GetArcAngle() == aShape2->GetArcAngle();
|
2020-06-17 12:46:50 +00:00
|
|
|
|
2021-07-21 18:31:25 +00:00
|
|
|
case SHAPE_T::POLY:
|
2020-06-17 12:46:50 +00:00
|
|
|
// TODO
|
|
|
|
return false;
|
|
|
|
|
2021-07-21 18:31:25 +00:00
|
|
|
case SHAPE_T::BEZIER:
|
2021-07-18 12:31:56 +00:00
|
|
|
return aShape1->GetBezierC1() == aShape2->GetBezierC1()
|
|
|
|
&& aShape1->GetBezierC2() == aShape2->GetBezierC2()
|
2020-10-04 23:34:59 +00:00
|
|
|
&& aShape1->GetBezierPoints() == aShape2->GetBezierPoints();
|
2020-06-17 12:46:50 +00:00
|
|
|
|
|
|
|
default:
|
2021-07-17 18:52:13 +00:00
|
|
|
wxFAIL_MSG( "GRAPHICS_CLEANER::areEquivalent unimplemented for "
|
2021-07-14 20:03:32 +00:00
|
|
|
+ aShape1->SHAPE_T_asString() );
|
2020-06-17 12:46:50 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void GRAPHICS_CLEANER::cleanupSegments()
|
|
|
|
{
|
|
|
|
// Remove duplicate segments (2 superimposed identical segments):
|
|
|
|
for( auto it = m_drawings.begin(); it != m_drawings.end(); it++ )
|
|
|
|
{
|
2020-10-04 23:34:59 +00:00
|
|
|
PCB_SHAPE* segment = dynamic_cast<PCB_SHAPE*>( *it );
|
2020-06-17 12:46:50 +00:00
|
|
|
|
2021-07-21 18:31:25 +00:00
|
|
|
if( !segment || segment->GetShape() != SHAPE_T::SEGMENT || segment->HasFlag( IS_DELETED ) )
|
2020-06-17 12:46:50 +00:00
|
|
|
continue;
|
|
|
|
|
2021-07-21 18:31:25 +00:00
|
|
|
if( isNullShape( segment ) )
|
2020-06-17 12:46:50 +00:00
|
|
|
{
|
2020-10-26 23:49:11 +00:00
|
|
|
std::shared_ptr<CLEANUP_ITEM> item = std::make_shared<CLEANUP_ITEM>( CLEANUP_NULL_GRAPHIC );
|
2020-06-17 12:46:50 +00:00
|
|
|
item->SetItems( segment );
|
|
|
|
m_itemsList->push_back( item );
|
|
|
|
|
2020-06-29 21:58:05 +00:00
|
|
|
if( !m_dryRun )
|
2021-09-13 17:03:48 +00:00
|
|
|
m_commit.Remove( segment );
|
2020-06-29 21:58:05 +00:00
|
|
|
|
2020-06-17 12:46:50 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
for( auto it2 = it + 1; it2 != m_drawings.end(); it2++ )
|
|
|
|
{
|
2020-10-04 23:34:59 +00:00
|
|
|
PCB_SHAPE* segment2 = dynamic_cast<PCB_SHAPE*>( *it2 );
|
2020-06-17 12:46:50 +00:00
|
|
|
|
|
|
|
if( !segment2 || segment2->HasFlag( IS_DELETED ) )
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if( areEquivalent( segment, segment2 ) )
|
|
|
|
{
|
2020-10-26 23:49:11 +00:00
|
|
|
std::shared_ptr<CLEANUP_ITEM> item = std::make_shared<CLEANUP_ITEM>( CLEANUP_DUPLICATE_GRAPHIC );
|
2020-06-17 12:46:50 +00:00
|
|
|
item->SetItems( segment2 );
|
|
|
|
m_itemsList->push_back( item );
|
|
|
|
|
|
|
|
segment2->SetFlags( IS_DELETED );
|
2020-06-29 21:58:05 +00:00
|
|
|
|
|
|
|
if( !m_dryRun )
|
2021-09-13 17:03:48 +00:00
|
|
|
m_commit.Remove( segment2 );
|
2020-06-17 12:46:50 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void GRAPHICS_CLEANER::mergeRects()
|
|
|
|
{
|
|
|
|
struct SIDE_CANDIDATE
|
|
|
|
{
|
2020-10-04 23:34:59 +00:00
|
|
|
SIDE_CANDIDATE( PCB_SHAPE* aShape ) :
|
|
|
|
start( aShape->GetStart() ),
|
|
|
|
end( aShape->GetEnd() ),
|
|
|
|
shape( aShape )
|
2020-06-17 12:46:50 +00:00
|
|
|
{
|
|
|
|
if( start.x > end.x || start.y > end.y )
|
|
|
|
std::swap( start, end );
|
|
|
|
}
|
|
|
|
|
2020-10-04 23:34:59 +00:00
|
|
|
wxPoint start;
|
|
|
|
wxPoint end;
|
|
|
|
PCB_SHAPE* shape;
|
2020-06-17 12:46:50 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
std::vector<SIDE_CANDIDATE*> sides;
|
|
|
|
std::map<wxPoint, std::vector<SIDE_CANDIDATE*>> ptMap;
|
|
|
|
|
|
|
|
// First load all the candidates into the side vector and layer maps
|
|
|
|
for( BOARD_ITEM* item : m_drawings )
|
|
|
|
{
|
2020-10-04 23:34:59 +00:00
|
|
|
PCB_SHAPE* shape = dynamic_cast<PCB_SHAPE*>( item );
|
2020-06-17 12:46:50 +00:00
|
|
|
|
2021-09-13 17:03:48 +00:00
|
|
|
if( !shape || isNullShape( shape ) || shape->GetShape() != SHAPE_T::SEGMENT )
|
2020-06-17 12:46:50 +00:00
|
|
|
continue;
|
|
|
|
|
2020-10-04 23:34:59 +00:00
|
|
|
if( shape->GetStart().x == shape->GetEnd().x || shape->GetStart().y == shape->GetEnd().y )
|
2020-06-17 12:46:50 +00:00
|
|
|
{
|
2020-10-04 23:34:59 +00:00
|
|
|
sides.emplace_back( new SIDE_CANDIDATE( shape ) );
|
2020-06-17 12:46:50 +00:00
|
|
|
ptMap[ sides.back()->start ].push_back( sides.back() );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Now go through the sides and try and match lines into rectangles
|
|
|
|
for( SIDE_CANDIDATE* side : sides )
|
|
|
|
{
|
2020-10-04 23:34:59 +00:00
|
|
|
if( side->shape->HasFlag( IS_DELETED ) )
|
2020-06-17 12:46:50 +00:00
|
|
|
continue;
|
|
|
|
|
|
|
|
SIDE_CANDIDATE* left = nullptr;
|
|
|
|
SIDE_CANDIDATE* top = nullptr;
|
|
|
|
SIDE_CANDIDATE* right = nullptr;
|
|
|
|
SIDE_CANDIDATE* bottom = nullptr;
|
|
|
|
|
|
|
|
auto viable = [&]( SIDE_CANDIDATE* aCandidate ) -> bool
|
|
|
|
{
|
2020-10-04 23:34:59 +00:00
|
|
|
return aCandidate->shape->GetLayer() == side->shape->GetLayer()
|
|
|
|
&& aCandidate->shape->GetWidth() == side->shape->GetWidth()
|
|
|
|
&& !aCandidate->shape->HasFlag( IS_DELETED );
|
2020-06-17 12:46:50 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
if( side->start.x == side->end.x )
|
|
|
|
{
|
|
|
|
// We've found a possible left; see if we have a top
|
|
|
|
//
|
|
|
|
left = side;
|
|
|
|
|
|
|
|
for( SIDE_CANDIDATE* candidate : ptMap[ left->start ] )
|
|
|
|
{
|
|
|
|
if( candidate != left && viable( candidate ) )
|
|
|
|
{
|
|
|
|
top = candidate;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if( side->start.y == side->end.y )
|
|
|
|
{
|
|
|
|
// We've found a possible top; see if we have a left
|
|
|
|
//
|
|
|
|
top = side;
|
|
|
|
|
|
|
|
for( SIDE_CANDIDATE* candidate : ptMap[ top->start ] )
|
|
|
|
{
|
|
|
|
if( candidate != top && viable( candidate ) )
|
|
|
|
{
|
|
|
|
left = candidate;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if( top && left )
|
|
|
|
{
|
|
|
|
// See if we can fill in the other two sides
|
|
|
|
//
|
|
|
|
for( SIDE_CANDIDATE* candidate : ptMap[ top->end ] )
|
|
|
|
{
|
2021-09-13 17:03:48 +00:00
|
|
|
if( candidate != top && candidate != left && viable( candidate ) )
|
2020-06-17 12:46:50 +00:00
|
|
|
{
|
|
|
|
right = candidate;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for( SIDE_CANDIDATE* candidate : ptMap[ left->end ] )
|
|
|
|
{
|
2021-09-13 17:03:48 +00:00
|
|
|
if( candidate != top && candidate != left && viable( candidate ) )
|
2020-06-17 12:46:50 +00:00
|
|
|
{
|
|
|
|
bottom = candidate;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-06-30 20:01:23 +00:00
|
|
|
if( right && bottom && right->end == bottom->end )
|
2020-06-17 12:46:50 +00:00
|
|
|
{
|
2020-10-04 23:34:59 +00:00
|
|
|
left->shape->SetFlags( IS_DELETED );
|
|
|
|
top->shape->SetFlags( IS_DELETED );
|
|
|
|
right->shape->SetFlags( IS_DELETED );
|
|
|
|
bottom->shape->SetFlags( IS_DELETED );
|
2020-06-17 12:46:50 +00:00
|
|
|
|
2020-10-26 23:49:11 +00:00
|
|
|
std::shared_ptr<CLEANUP_ITEM> item = std::make_shared<CLEANUP_ITEM>( CLEANUP_LINES_TO_RECT );
|
2020-10-04 23:34:59 +00:00
|
|
|
item->SetItems( left->shape, top->shape, right->shape, bottom->shape );
|
2020-06-17 12:46:50 +00:00
|
|
|
m_itemsList->push_back( item );
|
|
|
|
|
|
|
|
if( !m_dryRun )
|
|
|
|
{
|
2020-10-04 23:34:59 +00:00
|
|
|
PCB_SHAPE* rect;
|
2020-06-17 12:46:50 +00:00
|
|
|
|
2020-11-13 15:15:52 +00:00
|
|
|
if( m_parentFootprint )
|
|
|
|
rect = new FP_SHAPE( m_parentFootprint );
|
2020-06-17 12:46:50 +00:00
|
|
|
else
|
2020-10-04 23:34:59 +00:00
|
|
|
rect = new PCB_SHAPE();
|
2020-06-17 12:46:50 +00:00
|
|
|
|
2021-07-21 18:31:25 +00:00
|
|
|
rect->SetShape( SHAPE_T::RECT );
|
2020-11-14 01:16:02 +00:00
|
|
|
rect->SetFilled( false );
|
2020-06-17 12:46:50 +00:00
|
|
|
rect->SetStart( top->start );
|
|
|
|
rect->SetEnd( bottom->end );
|
2020-10-04 23:34:59 +00:00
|
|
|
rect->SetLayer( top->shape->GetLayer() );
|
2021-07-17 19:56:18 +00:00
|
|
|
rect->SetStroke( top->shape->GetStroke() );
|
2020-06-17 12:46:50 +00:00
|
|
|
|
|
|
|
m_commit.Add( rect );
|
2020-10-04 23:34:59 +00:00
|
|
|
m_commit.Remove( left->shape );
|
|
|
|
m_commit.Remove( top->shape );
|
|
|
|
m_commit.Remove( right->shape );
|
|
|
|
m_commit.Remove( bottom->shape );
|
2020-06-17 12:46:50 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for( SIDE_CANDIDATE* side : sides )
|
|
|
|
delete side;
|
|
|
|
}
|
|
|
|
|