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

Pcbnew: Fix memory leaks and fix inefficient code.

This commit is contained in:
jean-pierre charras 2021-03-14 20:12:25 +01:00
parent 52e2bf0000
commit cb451dc4b2
2 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pcbnew/tools/drawing_stackup_table_tool.cpp
View File

@ -497,8 +497,10 @@ std::vector<BOARD_ITEM*> DRAWING_TOOL::DrawBoardCharacteristics(
} }
int DRAWING_TOOL::InteractivePlaceWithPreview( const TOOL_EVENT& aEvent, std::vector<BOARD_ITEM*> aItems, int DRAWING_TOOL::InteractivePlaceWithPreview( const TOOL_EVENT& aEvent,
std::vector<BOARD_ITEM*> aPreview, LSET* aLayers ) std::vector<BOARD_ITEM*>& aItems,
std::vector<BOARD_ITEM*>& aPreview,
LSET* aLayers )
{ {
if( m_isFootprintEditor && !m_frame->GetModel() ) if( m_isFootprintEditor && !m_frame->GetModel() )
return -1; return -1;
@ -664,8 +666,8 @@ int DRAWING_TOOL::PlaceCharacteristics( const TOOL_EVENT& aEvent )
std::vector<BOARD_ITEM*> table = DrawBoardCharacteristics( std::vector<BOARD_ITEM*> table = DrawBoardCharacteristics(
wxPoint( 0, 0 ), m_frame->GetActiveLayer(), false, &tableSize ); wxPoint( 0, 0 ), m_frame->GetActiveLayer(), false, &tableSize );
std::vector<BOARD_ITEM*>* preview = new std::vector<BOARD_ITEM*>; std::vector<BOARD_ITEM*> preview;
std::vector<BOARD_ITEM*>* items = new std::vector<BOARD_ITEM*>; std::vector<BOARD_ITEM*> items;
PCB_SHAPE* line1 = new PCB_SHAPE; PCB_SHAPE* line1 = new PCB_SHAPE;
PCB_SHAPE* line2 = new PCB_SHAPE; PCB_SHAPE* line2 = new PCB_SHAPE;
@ -697,10 +699,10 @@ int DRAWING_TOOL::PlaceCharacteristics( const TOOL_EVENT& aEvent )
line3->SetLayer( m_frame->GetActiveLayer() ); line3->SetLayer( m_frame->GetActiveLayer() );
line4->SetLayer( m_frame->GetActiveLayer() ); line4->SetLayer( m_frame->GetActiveLayer() );
preview->push_back( line1 ); preview.push_back( line1 );
preview->push_back( line2 ); preview.push_back( line2 );
preview->push_back( line3 ); preview.push_back( line3 );
preview->push_back( line4 ); preview.push_back( line4 );
PCB_GROUP* group = new PCB_GROUP( m_board ); PCB_GROUP* group = new PCB_GROUP( m_board );
group->SetName("group-boardCharacteristics"); group->SetName("group-boardCharacteristics");
@ -708,9 +710,9 @@ int DRAWING_TOOL::PlaceCharacteristics( const TOOL_EVENT& aEvent )
for( auto item : table ) for( auto item : table )
group->AddItem( static_cast<BOARD_ITEM*>( item ) ); group->AddItem( static_cast<BOARD_ITEM*>( item ) );
items->push_back( static_cast<BOARD_ITEM*>( group ) ); items.push_back( static_cast<BOARD_ITEM*>( group ) );
if( InteractivePlaceWithPreview( aEvent, *items, *preview, &layerSet ) == -1 ) if( InteractivePlaceWithPreview( aEvent, items, preview, &layerSet ) == -1 )
m_frame->SetActiveLayer( savedLayer ); m_frame->SetActiveLayer( savedLayer );
else else
m_frame->SetActiveLayer( table.front()->GetLayer() ); m_frame->SetActiveLayer( table.front()->GetLayer() );
@ -737,8 +739,8 @@ int DRAWING_TOOL::PlaceStackup( const TOOL_EVENT& aEvent )
std::vector<BOARD_ITEM*> table = DrawSpecificationStackup( std::vector<BOARD_ITEM*> table = DrawSpecificationStackup(
wxPoint( 0, 0 ), m_frame->GetActiveLayer(), false, &tableSize ); wxPoint( 0, 0 ), m_frame->GetActiveLayer(), false, &tableSize );
std::vector<BOARD_ITEM*>* preview = new std::vector<BOARD_ITEM*>; std::vector<BOARD_ITEM*> preview;
std::vector<BOARD_ITEM*>* items = new std::vector<BOARD_ITEM*>; std::vector<BOARD_ITEM*> items;
PCB_SHAPE* line1 = new PCB_SHAPE; PCB_SHAPE* line1 = new PCB_SHAPE;
PCB_SHAPE* line2 = new PCB_SHAPE; PCB_SHAPE* line2 = new PCB_SHAPE;
@ -770,10 +772,10 @@ int DRAWING_TOOL::PlaceStackup( const TOOL_EVENT& aEvent )
line3->SetLayer( m_frame->GetActiveLayer() ); line3->SetLayer( m_frame->GetActiveLayer() );
line4->SetLayer( m_frame->GetActiveLayer() ); line4->SetLayer( m_frame->GetActiveLayer() );
preview->push_back( line1 ); preview.push_back( line1 );
preview->push_back( line2 ); preview.push_back( line2 );
preview->push_back( line3 ); preview.push_back( line3 );
preview->push_back( line4 ); preview.push_back( line4 );
PCB_GROUP* group = new PCB_GROUP( m_board ); PCB_GROUP* group = new PCB_GROUP( m_board );
group->SetName("group-boardStackUp"); group->SetName("group-boardStackUp");
@ -781,9 +783,9 @@ int DRAWING_TOOL::PlaceStackup( const TOOL_EVENT& aEvent )
for( auto item : table ) for( auto item : table )
group->AddItem( item ); group->AddItem( item );
items->push_back( static_cast<BOARD_ITEM*>( group ) ); items.push_back( static_cast<BOARD_ITEM*>( group ) );
if( InteractivePlaceWithPreview( aEvent, *items, *preview, &layerSet ) == -1 ) if( InteractivePlaceWithPreview( aEvent, items, preview, &layerSet ) == -1 )
m_frame->SetActiveLayer( savedLayer ); m_frame->SetActiveLayer( savedLayer );
else else
m_frame->SetActiveLayer( table.front()->GetLayer() ); m_frame->SetActiveLayer( table.front()->GetLayer() );

5
pcbnew/tools/drawing_tool.h
View File

@ -187,8 +187,9 @@ public:
* @param aLayers Set of allowed destination when asking the user. * @param aLayers Set of allowed destination when asking the user.
* If set to NULL, the user is not asked and all BOARD_ITEMs remain on their layers. * If set to NULL, the user is not asked and all BOARD_ITEMs remain on their layers.
*/ */
int InteractivePlaceWithPreview( const TOOL_EVENT& aEvent, std::vector<BOARD_ITEM*> aItems, int InteractivePlaceWithPreview( const TOOL_EVENT& aEvent,
std::vector<BOARD_ITEM*> aPreview, LSET* aLayers ); std::vector<BOARD_ITEM*>& aItems,
std::vector<BOARD_ITEM*>& aPreview, LSET* aLayers );
/** /**