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

Make sure Cleanup handles shapes other than segments. 

Fixes https://gitlab.com/kicad/code/kicad/issues/10955
This commit is contained in:
Jeff Young 2022-03-02 14:18:46 +00:00
parent 0ea559e3b8
commit 354c320329
5 changed files with 58 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/eda_shape.h
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2018 Jean-Pierre Charras jp.charras at wanadoo.fr
* Copyright (C) 1992-2021 KiCad Developers, see AUTHORS.txt for contributors.
* Copyright (C) 1992-2022 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
@ -214,11 +214,11 @@ public:
void SetPolyShape( const SHAPE_POLY_SET& aShape ) { m_poly = aShape; }
void SetBezierPoints( const std::vector<wxPoint>& aPoints ) { m_bezierPoints = aPoints; }
void SetPolyPoints( const std::vector<wxPoint>& aPoints );
/**
* Rebuild the m_BezierPoints vertex list that approximate the Bezier curve
* by a list of segments.
* Rebuild the m_bezierPoints vertex list that approximate the Bezier curve by a list of
* segments.
*
* Has meaning only for BEZIER shape.
*
@ -228,8 +228,6 @@ public:
*/
void RebuildBezierToSegmentsPointsList( int aMinSegLen );
void SetPolyPoints( const std::vector<wxPoint>& aPoints );
/**
* Make a set of SHAPE objects representing the EDA_SHAPE. Caller owns the objects.
*/

6
pcbnew/board_commit.cpp
View File

@ -66,6 +66,12 @@ BOARD_COMMIT::~BOARD_COMMIT()
}
BOARD* BOARD_COMMIT::GetBoard() const
{
return static_cast<BOARD*>( m_toolMgr->GetModel() );
}
COMMIT& BOARD_COMMIT::Stage( EDA_ITEM* aItem, CHANGE_TYPE aChangeType )
{
// if aItem belongs a footprint, the full footprint will be saved

3
pcbnew/board_commit.h
View File

@ -28,6 +28,7 @@
#include <commit.h>
class BOARD_ITEM;
class BOARD;
class PICKED_ITEMS_LIST;
class PCB_TOOL_BASE;
class TOOL_MANAGER;
@ -43,6 +44,8 @@ public:
virtual ~BOARD_COMMIT();
BOARD* GetBoard() const;
virtual void Push( const wxString& aMessage = wxT( "A commit" ),
bool aCreateUndoEntry = true, bool aSetDirtyBit = true ) override;

62
pcbnew/graphics_cleaner.cpp
View File

@ -3,7 +3,7 @@
*
* 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.
* Copyright (C) 1992-2022 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
@ -30,6 +30,7 @@
#include <pcb_shape.h>
#include <fp_shape.h>
#include <graphics_cleaner.h>
#include <board_design_settings.h>
GRAPHICS_CLEANER::GRAPHICS_CLEANER( DRAWINGS& aDrawings, FOOTPRINT* aParentFootprint,
@ -50,22 +51,30 @@ void GRAPHICS_CLEANER::CleanupBoard( bool aDryRun,
m_dryRun = aDryRun;
m_itemsList = aItemsList;
// Clear the flag used to mark some segments as deleted, in dry run:
m_epsilon = m_commit.GetBoard()->GetDesignSettings().m_MaxError;
// Clear the flag used to mark some shapes as deleted, in dry run:
for( BOARD_ITEM* drawing : m_drawings )
drawing->ClearFlags( IS_DELETED );
if( aDeleteRedundant )
cleanupSegments();
cleanupShapes();
if( aMergeRects )
mergeRects();
// Clear the flag used to mark some segments:
// Clear the flag used to mark some shapes:
for( BOARD_ITEM* drawing : m_drawings )
drawing->ClearFlags( IS_DELETED );
}
bool equivalent( const VECTOR2I& a, const VECTOR2I& b, int epsilon )
{
return abs( a.x - b.x ) < epsilon && abs( a.y - b.y ) < epsilon;
};
bool GRAPHICS_CLEANER::isNullShape( PCB_SHAPE* aShape )
{
switch( aShape->GetShape() )
@ -73,7 +82,7 @@ bool GRAPHICS_CLEANER::isNullShape( PCB_SHAPE* aShape )
case SHAPE_T::SEGMENT:
case SHAPE_T::RECT:
case SHAPE_T::ARC:
return aShape->GetStart() == aShape->GetEnd();
return equivalent( aShape->GetStart(), aShape->GetEnd(), m_epsilon );
case SHAPE_T::CIRCLE:
return aShape->GetRadius() == 0;
@ -106,22 +115,23 @@ bool GRAPHICS_CLEANER::areEquivalent( PCB_SHAPE* aShape1, PCB_SHAPE* aShape2 )
case SHAPE_T::SEGMENT:
case SHAPE_T::RECT:
case SHAPE_T::CIRCLE:
return aShape1->GetStart() == aShape2->GetStart()
&& aShape1->GetEnd() == aShape2->GetEnd();
return equivalent( aShape1->GetStart(), aShape2->GetStart(), m_epsilon )
&& equivalent( aShape1->GetEnd(), aShape2->GetEnd(), m_epsilon );
case SHAPE_T::ARC:
return aShape1->GetCenter() == aShape2->GetCenter()
&& aShape1->GetStart() == aShape2->GetStart()
&& aShape1->GetArcAngle() == aShape2->GetArcAngle();
return equivalent( aShape1->GetCenter(), aShape2->GetCenter(), m_epsilon )
&& equivalent( aShape1->GetStart(), aShape2->GetStart(), m_epsilon )
&& equivalent( aShape1->GetEnd(), aShape2->GetEnd(), m_epsilon );
case SHAPE_T::POLY:
// TODO
return false;
case SHAPE_T::BEZIER:
return aShape1->GetBezierC1() == aShape2->GetBezierC1()
&& aShape1->GetBezierC2() == aShape2->GetBezierC2()
&& aShape1->GetBezierPoints() == aShape2->GetBezierPoints();
return equivalent( aShape1->GetStart(), aShape2->GetStart(), m_epsilon )
&& equivalent( aShape1->GetEnd(), aShape2->GetEnd(), m_epsilon )
&& equivalent( aShape1->GetBezierC1(), aShape2->GetBezierC1(), m_epsilon )
&& equivalent( aShape1->GetBezierC2(), aShape2->GetBezierC2(), m_epsilon );
default:
wxFAIL_MSG( wxT( "GRAPHICS_CLEANER::areEquivalent unimplemented for " )
@ -131,45 +141,45 @@ bool GRAPHICS_CLEANER::areEquivalent( PCB_SHAPE* aShape1, PCB_SHAPE* aShape2 )
}
void GRAPHICS_CLEANER::cleanupSegments()
void GRAPHICS_CLEANER::cleanupShapes()
{
// Remove duplicate segments (2 superimposed identical segments):
// Remove duplicate shapes (2 superimposed identical shapes):
for( auto it = m_drawings.begin(); it != m_drawings.end(); it++ )
{
PCB_SHAPE* segment = dynamic_cast<PCB_SHAPE*>( *it );
PCB_SHAPE* shape = dynamic_cast<PCB_SHAPE*>( *it );
if( !segment || segment->GetShape() != SHAPE_T::SEGMENT || segment->HasFlag( IS_DELETED ) )
if( !shape || shape->HasFlag( IS_DELETED ) )
continue;
if( isNullShape( segment ) )
if( isNullShape( shape ) )
{
std::shared_ptr<CLEANUP_ITEM> item = std::make_shared<CLEANUP_ITEM>( CLEANUP_NULL_GRAPHIC );
item->SetItems( segment );
item->SetItems( shape );
m_itemsList->push_back( item );
if( !m_dryRun )
m_commit.Remove( segment );
m_commit.Remove( shape );
continue;
}
for( auto it2 = it + 1; it2 != m_drawings.end(); it2++ )
{
PCB_SHAPE* segment2 = dynamic_cast<PCB_SHAPE*>( *it2 );
PCB_SHAPE* shape2 = dynamic_cast<PCB_SHAPE*>( *it2 );
if( !segment2 || segment2->HasFlag( IS_DELETED ) )
if( !shape2 || shape2->HasFlag( IS_DELETED ) )
continue;
if( areEquivalent( segment, segment2 ) )
if( areEquivalent( shape, shape2 ) )
{
std::shared_ptr<CLEANUP_ITEM> item = std::make_shared<CLEANUP_ITEM>( CLEANUP_DUPLICATE_GRAPHIC );
item->SetItems( segment2 );
item->SetItems( shape2 );
m_itemsList->push_back( item );
segment2->SetFlags( IS_DELETED );
shape2->SetFlags(IS_DELETED );
if( !m_dryRun )
m_commit.Remove( segment2 );
m_commit.Remove( shape2 );
}
}
}

8
pcbnew/graphics_cleaner.h
View File

@ -1,7 +1,7 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2019 KiCad Developers, see AUTHORS.txt for contributors.
* Copyright (C) 2019-2022 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
@ -49,7 +49,7 @@ private:
bool isNullShape( PCB_SHAPE* aShape );
bool areEquivalent( PCB_SHAPE* aShape1, PCB_SHAPE* aShape2 );
void cleanupSegments();
void cleanupShapes();
void mergeRects();
private:
@ -57,7 +57,9 @@ private:
FOOTPRINT* m_parentFootprint; // nullptr if not in Footprint Editor
BOARD_COMMIT& m_commit;
bool m_dryRun;
std::vector<std::shared_ptr<CLEANUP_ITEM> >* m_itemsList;
int m_epsilon;
std::vector<std::shared_ptr<CLEANUP_ITEM>>* m_itemsList;
};