Mirrors
/
kicad
mirror of https://github.com/KiCad/kicad-source-mirror
3
0
Fork 0
Code Releases Activity
Browse Source

Add auto-generation of placement rules areas from component classes

pcb_db
JamesJCode 1 year ago
parent
feeb4f3638
commit
231fa952fb
8 changed files with 233 additions and 111 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 136
      pcbnew/dialogs/dialog_multichannel_generate_rule_areas.cpp
  2. 4
      pcbnew/dialogs/dialog_multichannel_generate_rule_areas.h
  3. 32
      pcbnew/dialogs/dialog_multichannel_generate_rule_areas_base.cpp
  4. 41
      pcbnew/dialogs/dialog_multichannel_generate_rule_areas_base.fbp
  5. 8
      pcbnew/dialogs/dialog_multichannel_generate_rule_areas_base.h
  6. 110
      pcbnew/tools/multichannel_tool.cpp
  7. 11
      pcbnew/tools/multichannel_tool.h
  8. 2
      qa/tests/pcbnew/test_multichannel.cpp

136
pcbnew/dialogs/dialog_multichannel_generate_rule_areas.cpp
View File

@ -34,34 +34,119 @@ DIALOG_MULTICHANNEL_GENERATE_RULE_AREAS::DIALOG_MULTICHANNEL_GENERATE_RULE_AREAS
DIALOG_MULTICHANNEL_GENERATE_RULE_AREAS_BASE( aFrame ),
m_parentTool( aParentTool )
{
int i = 0;
// Generate the sheet source grid
m_sheetGrid = new WX_GRID( m_sourceNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
m_sheetGrid->CreateGrid( 0, 3 );
m_sheetGrid->EnableEditing( false );
m_sheetGrid->EnableGridLines( true );
m_sheetGrid->EnableDragGridSize( false );
m_sheetGrid->SetMargins( 0, 0 );
m_sheetGrid->SetColSize( 0, 100 );
m_sheetGrid->SetColSize( 1, 300 );
m_sheetGrid->SetColSize( 2, 100 );
m_sheetGrid->AutoSizeColumns();
m_sheetGrid->EnableDragColMove( true );
m_sheetGrid->EnableDragColSize( true );
m_sheetGrid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
m_sheetGrid->AutoSizeRows();
m_sheetGrid->EnableDragRowSize( true );
m_sheetGrid->SetRowLabelSize( wxGRID_AUTOSIZE );
m_sheetGrid->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
m_sheetGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
m_sheetGrid->EnableEditing( true );
m_sheetGrid->HideRowLabels();
m_sheetGrid->SetColLabelValue( 0, wxT( "Generate" ) );
m_sheetGrid->SetColLabelValue( 1, wxT( "Sheet Path" ) );
m_sheetGrid->SetColLabelValue( 2, wxT( "Sheet Name" ) );
m_sheetGrid->AutoSizeColumn( 1 );
m_sourceNotebook->AddPage( m_sheetGrid, _( "Sheets" ) );
// Generate the component class source grid
m_componentClassGrid =
new WX_GRID( m_sourceNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
m_componentClassGrid->CreateGrid( 0, 2 );
m_componentClassGrid->EnableEditing( false );
m_componentClassGrid->EnableGridLines( true );
m_componentClassGrid->EnableDragGridSize( false );
m_componentClassGrid->SetMargins( 0, 0 );
m_componentClassGrid->SetColSize( 0, 100 );
m_componentClassGrid->SetColSize( 1, 300 );
m_componentClassGrid->AutoSizeColumns();
m_componentClassGrid->EnableDragColMove( true );
m_componentClassGrid->EnableDragColSize( true );
m_componentClassGrid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
m_componentClassGrid->AutoSizeRows();
m_componentClassGrid->EnableDragRowSize( true );
m_componentClassGrid->SetRowLabelSize( wxGRID_AUTOSIZE );
m_componentClassGrid->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
m_componentClassGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
m_componentClassGrid->EnableEditing( true );
m_componentClassGrid->HideRowLabels();
m_componentClassGrid->SetColLabelValue( 0, wxT( "Generate" ) );
m_componentClassGrid->SetColLabelValue( 1, wxT( "Component Class" ) );
m_componentClassGrid->AutoSizeColumn( 1 );
m_sourceNotebook->AddPage( m_componentClassGrid, _( "Component Classes" ) );
RULE_AREAS_DATA* raData = m_parentTool->GetData();
m_sheetsGrid->EnableEditing( true );
m_sheetsGrid->HideRowLabels();
m_sheetsGrid->SetColLabelValue( 0, wxT("Generate") );
m_sheetsGrid->SetColLabelValue( 1, wxT("Sheet Path") );
m_sheetsGrid->SetColLabelValue( 2, wxT("Sheet Name") );
m_sheetsGrid->AppendRows( raData->m_areas.size() - 1 );
m_sheetsGrid->AutoSizeColumn( 1 );
int sheetRowIdx = 0;
int componentClassRowIdx = 0;
for( RULE_AREA& ruleArea : raData->m_areas )
{
if( ruleArea.m_sourceType == RULE_AREA_PLACEMENT_SOURCE_TYPE::SHEETNAME )
sheetRowIdx++;
else
componentClassRowIdx++;
}
if( sheetRowIdx > 0 )
m_sheetGrid->AppendRows( sheetRowIdx );
if( componentClassRowIdx > 0 )
m_componentClassGrid->AppendRows( componentClassRowIdx );
for( RULE_AREA& sheet : raData->m_areas )
sheetRowIdx = 0;
componentClassRowIdx = 0;
for( RULE_AREA& ruleArea : raData->m_areas )
{
m_sheetsGrid->SetCellValue( i, 1, sheet.m_sheetPath );
m_sheetsGrid->SetCellValue( i, 2, sheet.m_sheetName );
m_sheetsGrid->SetCellRenderer( i, 0, new wxGridCellBoolRenderer );
m_sheetsGrid->SetCellEditor( i, 0, new wxGridCellBoolEditor );
m_sheetsGrid->SetCellValue( i, 0, sheet.m_generateEnabled ? wxT("1") : wxT( "" ) );
i++;
if( ruleArea.m_sourceType == RULE_AREA_PLACEMENT_SOURCE_TYPE::SHEETNAME )
{
m_sheetGrid->SetCellValue( sheetRowIdx, 1, ruleArea.m_sheetPath );
m_sheetGrid->SetCellValue( sheetRowIdx, 2, ruleArea.m_sheetName );
m_sheetGrid->SetCellRenderer( sheetRowIdx, 0, new wxGridCellBoolRenderer );
m_sheetGrid->SetCellEditor( sheetRowIdx, 0, new wxGridCellBoolEditor );
m_sheetGrid->SetCellValue( sheetRowIdx, 0,
ruleArea.m_generateEnabled ? wxT( "1" ) : wxT( "" ) );
sheetRowIdx++;
}
else
{
m_componentClassGrid->SetCellValue( componentClassRowIdx, 1,
ruleArea.m_componentClass );
m_componentClassGrid->SetCellRenderer( componentClassRowIdx, 0,
new wxGridCellBoolRenderer );
m_componentClassGrid->SetCellEditor( componentClassRowIdx, 0,
new wxGridCellBoolEditor );
m_componentClassGrid->SetCellValue(
componentClassRowIdx, 0, ruleArea.m_generateEnabled ? wxT( "1" ) : wxT( "" ) );
componentClassRowIdx++;
}
}
m_sheetsGrid->SetMaxSize( wxSize( -1, 800 ) );
m_sheetsGrid->Fit();
m_sheetGrid->SetMaxSize( wxSize( -1, 800 ) );
m_sheetGrid->Fit();
m_componentClassGrid->SetMaxSize( wxSize( -1, 800 ) );
m_componentClassGrid->Fit();
m_cbGroupItems->SetValue( raData->m_options.m_groupItems );
m_cbReplaceExisting->SetValue( raData->m_replaceExisting );
Layout();
if( m_sheetGrid->GetNumberRows() == 1 && m_componentClassGrid->GetNumberRows() > 0 )
m_sourceNotebook->SetSelection( 1 );
SetupStandardButtons();
finishDialogSettings();
}
@ -71,9 +156,24 @@ bool DIALOG_MULTICHANNEL_GENERATE_RULE_AREAS::TransferDataFromWindow()
{
RULE_AREAS_DATA* raData = m_parentTool->GetData();
int sheetRowIdx = 0;
int componentClassRowIdx = 0;
for( size_t i = 0; i < raData->m_areas.size(); i++ )
{
wxString enabled = m_sheetsGrid->GetCellValue( i, 0 );
wxString enabled;
if( raData->m_areas[i].m_sourceType == RULE_AREA_PLACEMENT_SOURCE_TYPE::SHEETNAME )
{
enabled = m_sheetGrid->GetCellValue( sheetRowIdx, 0 );
sheetRowIdx++;
}
else
{
enabled = m_componentClassGrid->GetCellValue( componentClassRowIdx, 0 );
componentClassRowIdx++;
}
raData->m_areas[i].m_generateEnabled = ( !enabled.CompareTo( wxT( "1" ) ) ) ? true : false;
}

4
pcbnew/dialogs/dialog_multichannel_generate_rule_areas.h
View File

@ -26,6 +26,7 @@
#include <vector>
#include <widgets/unit_binder.h>
#include <wx/grid.h>
#include <dialogs/dialog_multichannel_generate_rule_areas_base.h>
@ -46,6 +47,9 @@ public:
private:
MULTICHANNEL_TOOL* m_parentTool;
wxGrid* m_sheetGrid;
wxGrid* m_componentClassGrid;
};
#endif

32
pcbnew/dialogs/dialog_multichannel_generate_rule_areas_base.cpp
View File

@ -22,35 +22,9 @@ DIALOG_MULTICHANNEL_GENERATE_RULE_AREAS_BASE::DIALOG_MULTICHANNEL_GENERATE_RULE_
fgSizer3->SetFlexibleDirection( wxBOTH );
fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
m_sheetsGrid = new wxGrid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
// Grid
m_sheetsGrid->CreateGrid( 1, 3 );
m_sheetsGrid->EnableEditing( false );
m_sheetsGrid->EnableGridLines( true );
m_sheetsGrid->EnableDragGridSize( false );
m_sheetsGrid->SetMargins( 0, 0 );
// Columns
m_sheetsGrid->SetColSize( 0, 100 );
m_sheetsGrid->SetColSize( 1, 300 );
m_sheetsGrid->SetColSize( 2, 100 );
m_sheetsGrid->AutoSizeColumns();
m_sheetsGrid->EnableDragColMove( true );
m_sheetsGrid->EnableDragColSize( true );
m_sheetsGrid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
// Rows
m_sheetsGrid->AutoSizeRows();
m_sheetsGrid->EnableDragRowSize( true );
m_sheetsGrid->SetRowLabelSize( wxGRID_AUTOSIZE );
m_sheetsGrid->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
// Label Appearance
// Cell Defaults
m_sheetsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
fgSizer3->Add( m_sheetsGrid, 1, wxALL|wxEXPAND, 5 );
m_sourceNotebook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
fgSizer3->Add( m_sourceNotebook, 1, wxEXPAND | wxALL, 5 );
wxBoxSizer* bSizer13;
bSizer13 = new wxBoxSizer( wxVERTICAL );

41
pcbnew/dialogs/dialog_multichannel_generate_rule_areas_base.fbp
View File

@ -82,11 +82,11 @@
<property name="permission">none</property>
<property name="rows">3</property>
<property name="vgap">0</property>
<object class="sizeritem" expanded="false">
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="flag">wxEXPAND | wxALL</property>
<property name="proportion">1</property>
<object class="wxGrid" expanded="false">
<object class="wxNotebook" expanded="true">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
@ -95,25 +95,13 @@
<property name="aui_name"></property>
<property name="aui_position">0</property>
<property name="aui_row">0</property>
<property name="autosize_cols">1</property>
<property name="autosize_rows">1</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="bitmapsize"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="cell_bg"></property>
<property name="cell_font"></property>
<property name="cell_horiz_alignment">wxALIGN_LEFT</property>
<property name="cell_text"></property>
<property name="cell_vert_alignment">wxALIGN_TOP</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
<property name="col_label_size"></property>
<property name="col_label_values"></property>
<property name="col_label_vert_alignment">wxALIGN_CENTER</property>
<property name="cols">3</property>
<property name="column_sizes">100,300,100</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
@ -121,25 +109,13 @@
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="drag_accept_files">0</property>
<property name="drag_col_move">1</property>
<property name="drag_col_size">1</property>
<property name="drag_grid_size">0</property>
<property name="drag_row_size">1</property>
<property name="editing">0</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="grid_line_color"></property>
<property name="grid_lines">1</property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label_bg"></property>
<property name="label_font"></property>
<property name="label_text"></property>
<property name="margin_height">0</property>
<property name="margin_width">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
@ -147,7 +123,7 @@
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_sheetsGrid</property>
<property name="name">m_sourceNotebook</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
@ -155,14 +131,9 @@
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="row_label_horiz_alignment">wxALIGN_CENTER</property>
<property name="row_label_size">wxGRID_AUTOSIZE</property>
<property name="row_label_values"></property>
<property name="row_label_vert_alignment">wxALIGN_CENTER</property>
<property name="row_sizes"></property>
<property name="rows">1</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>

8
pcbnew/dialogs/dialog_multichannel_generate_rule_areas_base.h
View File

@ -11,12 +11,12 @@
#include <wx/xrc/xmlres.h>
#include <wx/intl.h>
#include "dialog_shim.h"
#include <wx/gdicmn.h>
#include <wx/notebook.h>
#include <wx/font.h>
#include <wx/colour.h>
#include <wx/settings.h>
#include <wx/string.h>
#include <wx/font.h>
#include <wx/grid.h>
#include <wx/gdicmn.h>
#include <wx/checkbox.h>
#include <wx/sizer.h>
#include <wx/button.h>
@ -33,7 +33,7 @@ class DIALOG_MULTICHANNEL_GENERATE_RULE_AREAS_BASE : public DIALOG_SHIM
wxBoxSizer* m_GeneralBoxSizer;
protected:
wxGrid* m_sheetsGrid;
wxNotebook* m_sourceNotebook;
wxCheckBox* m_cbReplaceExisting;
wxCheckBox* m_cbGroupItems;
wxStdDialogButtonSizer* m_sdbSizerStdButtons;

110
pcbnew/tools/multichannel_tool.cpp
View File

@ -39,6 +39,7 @@
#include <connectivity/topo_match.h>
#include <optional>
#include <algorithm>
#include <pcbnew_scripting_helpers.h>
#include <random>
#include <core/profile.h>
#include <wx/log.h>
@ -127,7 +128,7 @@ bool MULTICHANNEL_TOOL::identifyComponentsInRuleArea( ZONE* aRul
}
std::set<FOOTPRINT*> MULTICHANNEL_TOOL::queryComponentsInSheet( wxString aSheetName )
std::set<FOOTPRINT*> MULTICHANNEL_TOOL::queryComponentsInSheet( wxString aSheetName ) const
{
std::set<FOOTPRINT*> rv;
if( aSheetName.EndsWith( wxT( "/" ) ) )
@ -149,6 +150,21 @@ std::set<FOOTPRINT*> MULTICHANNEL_TOOL::queryComponentsInSheet( wxString aSheetN
}
std::set<FOOTPRINT*>
MULTICHANNEL_TOOL::queryComponentsInComponentClass( const wxString& aComponentClassName ) const
{
std::set<FOOTPRINT*> rv;
for( auto& fp : board()->Footprints() )
{
if( fp->GetComponentClass()->ContainsClassName( aComponentClassName ) )
rv.insert( fp );
}
return rv;
}
const SHAPE_LINE_CHAIN MULTICHANNEL_TOOL::buildRAOutline( std::set<FOOTPRINT*>& aFootprints,
int aMargin )
{
@ -192,31 +208,52 @@ const SHAPE_LINE_CHAIN MULTICHANNEL_TOOL::buildRAOutline( std::set<FOOTPRINT*>&
}
void MULTICHANNEL_TOOL::QuerySheets()
void MULTICHANNEL_TOOL::QuerySheetsAndComponentClasses()
{
using PathAndName = std::pair<wxString, wxString>;
std::set<PathAndName> uniqueSheets;
std::set<wxString> uniqueComponentClasses;
m_areas.m_areas.clear();
for( FOOTPRINT* fp : board()->Footprints() )
for( const FOOTPRINT* fp : board()->Footprints() )
{
uniqueSheets.insert( PathAndName( fp->GetSheetname(), fp->GetSheetfile() ) );
const COMPONENT_CLASS* compClass = fp->GetComponentClass();
for( const COMPONENT_CLASS* singleClass : compClass->GetConstituentClasses() )
uniqueComponentClasses.insert( singleClass->GetName() );
}
for( const PathAndName& sheet : uniqueSheets )
{
RULE_AREA ent;
ent.m_sourceType = RULE_AREA_PLACEMENT_SOURCE_TYPE::SHEETNAME;
ent.m_generateEnabled = false;
ent.m_sheetPath = sheet.first;
ent.m_sheetName = sheet.second;
ent.m_sheetComponents = queryComponentsInSheet( ent.m_sheetPath );
ent.m_components = queryComponentsInSheet( ent.m_sheetPath );
m_areas.m_areas.push_back( ent );
wxLogTrace( traceMultichannelTool, wxT("found sheet '%s' @ '%s' s %d\n"),
ent.m_sheetName, ent.m_sheetPath, (int)m_areas.m_areas.size() );
}
for( const wxString& compClass : uniqueComponentClasses )
{
RULE_AREA ent;
ent.m_sourceType = RULE_AREA_PLACEMENT_SOURCE_TYPE::COMPONENT_CLASS;
ent.m_generateEnabled = false;
ent.m_componentClass = compClass;
ent.m_components = queryComponentsInComponentClass( ent.m_componentClass );
m_areas.m_areas.push_back( ent );
wxLogTrace( traceMultichannelTool, wxT( "found component class '%s' s %d\n" ),
ent.m_componentClass, static_cast<int>( m_areas.m_areas.size() ) );
}
}
@ -694,13 +731,14 @@ int MULTICHANNEL_TOOL::AutogenerateRuleAreas( const TOOL_EVENT& aEvent )
{
if( Pgm().IsGUI() )
{
QuerySheets();
QuerySheetsAndComponentClasses();
if( m_areas.m_areas.size() <= 1 )
{
frame()->ShowInfoBarError( _( "Cannot auto-generate any placement areas because the "
"schematic has only one or no hierarchical sheet(s)." ),
true );
"schematic has only one or no hierarchical sheet(s) or "
"component classes." ),
true );
return 0;
}
@ -727,11 +765,23 @@ int MULTICHANNEL_TOOL::AutogenerateRuleAreas( const TOOL_EVENT& aEvent )
for( auto& ra : m_areas.m_areas )
{
if( components == ra.m_sheetComponents )
if( components == ra.m_components )
{
wxLogTrace( traceMultichannelTool,
wxT( "Placement rule area for sheet '%s' already exists as '%s'\n" ),
ra.m_sheetPath, zone->GetZoneName() );
if( zone->GetRuleAreaPlacementSourceType()
== RULE_AREA_PLACEMENT_SOURCE_TYPE::SHEETNAME )
{
wxLogTrace(
traceMultichannelTool,
wxT( "Placement rule area for sheet '%s' already exists as '%s'\n" ),
ra.m_sheetPath, zone->GetZoneName() );
}
else
{
wxLogTrace( traceMultichannelTool,
wxT( "Placement rule area for component class '%s' already exists "
"as '%s'\n" ),
ra.m_componentClass, zone->GetZoneName() );
}
ra.m_oldArea = zone;
ra.m_existsAlready = true;
@ -751,16 +801,23 @@ int MULTICHANNEL_TOOL::AutogenerateRuleAreas( const TOOL_EVENT& aEvent )
if( ra.m_existsAlready && !m_areas.m_replaceExisting )
continue;
auto raOutline = buildRAOutline( ra.m_sheetComponents, 100000 );
auto raOutline = buildRAOutline( ra.m_components, 100000 );
std::unique_ptr<ZONE> newZone( new ZONE( board() ) );
newZone->SetZoneName( wxString::Format( wxT( "auto-placement-area-%s" ), ra.m_sheetPath ) );
if( ra.m_sourceType == RULE_AREA_PLACEMENT_SOURCE_TYPE::SHEETNAME )
{
newZone->SetZoneName(
wxString::Format( wxT( "auto-placement-area-%s" ), ra.m_sheetPath ) );
}
else
{
newZone->SetZoneName(
wxString::Format( wxT( "auto-placement-area-%s" ), ra.m_componentClass ) );
}
wxLogTrace( traceMultichannelTool,
wxT( "Generated rule area '%s' (%d components)\n" ),
newZone->GetZoneName(),
(int) ra.m_sheetComponents.size() );
wxLogTrace( traceMultichannelTool, wxT( "Generated rule area '%s' (%d components)\n" ),
newZone->GetZoneName(), (int) ra.m_components.size() );
newZone->SetIsRuleArea( true );
newZone->SetLayerSet( LSET::AllCuMask() );
@ -770,8 +827,19 @@ int MULTICHANNEL_TOOL::AutogenerateRuleAreas( const TOOL_EVENT& aEvent )
newZone->SetDoNotAllowTracks( false );
newZone->SetDoNotAllowPads( false );
newZone->SetDoNotAllowFootprints( false );
newZone->SetRuleAreaPlacementSourceType( RULE_AREA_PLACEMENT_SOURCE_TYPE::SHEETNAME );
newZone->SetRuleAreaPlacementSource( ra.m_sheetPath );
if( ra.m_sourceType == RULE_AREA_PLACEMENT_SOURCE_TYPE::SHEETNAME )
{
newZone->SetRuleAreaPlacementSourceType( RULE_AREA_PLACEMENT_SOURCE_TYPE::SHEETNAME );
newZone->SetRuleAreaPlacementSource( ra.m_sheetPath );
}
else
{
newZone->SetRuleAreaPlacementSourceType(
RULE_AREA_PLACEMENT_SOURCE_TYPE::COMPONENT_CLASS );
newZone->SetRuleAreaPlacementSource( ra.m_componentClass );
}
newZone->AddPolygon( raOutline );
newZone->SetHatchStyle( ZONE_BORDER_DISPLAY_STYLE::NO_HATCH );
@ -804,7 +872,7 @@ int MULTICHANNEL_TOOL::AutogenerateRuleAreas( const TOOL_EVENT& aEvent )
std::unordered_set<BOARD_ITEM*> toPrune;
std::copy( ra.m_sheetComponents.begin(), ra.m_sheetComponents.end(),
std::copy( ra.m_components.begin(), ra.m_components.end(),
std::inserter( toPrune, toPrune.begin() ) );
if( ra.m_existsAlready )
@ -817,7 +885,7 @@ int MULTICHANNEL_TOOL::AutogenerateRuleAreas( const TOOL_EVENT& aEvent )
grpCommit.Add( grp );
grpCommit.Stage( ra.m_area, CHT_GROUP );
for( auto fp : ra.m_sheetComponents )
for( auto fp : ra.m_components )
{
grpCommit.Stage( fp, CHT_GROUP );
}

11
pcbnew/tools/multichannel_tool.h
View File

@ -35,6 +35,7 @@
#include <pad.h>
#include <footprint.h>
#include <reporter.h>
#include <zone_settings.h>
enum class REPEAT_LAYOUT_EDGE_MODE
{
@ -69,15 +70,17 @@ struct RULE_AREA_COMPAT_DATA
struct RULE_AREA
{
RULE_AREA_PLACEMENT_SOURCE_TYPE m_sourceType = RULE_AREA_PLACEMENT_SOURCE_TYPE::SHEETNAME;
ZONE* m_oldArea = nullptr;
ZONE* m_area = nullptr;
std::set<FOOTPRINT*> m_raFootprints;
std::set<FOOTPRINT*> m_sheetComponents;
std::set<FOOTPRINT*> m_components;
bool m_existsAlready = false;
bool m_generateEnabled = false;
wxString m_sheetPath;
wxString m_sheetName;
wxString m_ruleName;
wxString m_componentClass;
VECTOR2I m_center;
};
@ -110,7 +113,7 @@ public:
RULE_AREAS_DATA* GetData() { return &m_areas; }
int AutogenerateRuleAreas( const TOOL_EVENT& aEvent );
int RepeatLayout( const TOOL_EVENT& aEvent, ZONE* aRefZone );
void QuerySheets();
void QuerySheetsAndComponentClasses();
void FindExistingRuleAreas();
int CheckRACompatibility( ZONE *aRefZone );
@ -121,7 +124,9 @@ private:
wxString stripComponentIndex( wxString aRef ) const;
bool identifyComponentsInRuleArea( ZONE* aRuleArea, std::set<FOOTPRINT*>& aComponents );
const SHAPE_LINE_CHAIN buildRAOutline( std::set<FOOTPRINT*>& aFootprints, int aMargin );
std::set<FOOTPRINT*> queryComponentsInSheet( wxString aSheetName );
std::set<FOOTPRINT*> queryComponentsInSheet( wxString aSheetName ) const;
std::set<FOOTPRINT*>
queryComponentsInComponentClass( const wxString& aComponentClassName ) const;
RULE_AREA* findRAByName( const wxString& aName );
bool resolveConnectionTopology( RULE_AREA* aRefArea, RULE_AREA* aTargetArea,
RULE_AREA_COMPAT_DATA& aMatches );

2
qa/tests/pcbnew/test_multichannel.cpp
View File

@ -85,7 +85,7 @@ BOOST_FIXTURE_TEST_CASE( MultichannelToolRegressions, MULTICHANNEL_TEST_FIXTURE
//RULE_AREAS_DATA* raData = m_parentTool->GetData();
mtTool->QuerySheets();
mtTool->QuerySheetsAndComponentClasses();
auto ruleData = mtTool->GetData();

Write Preview
Loading…
Cancel
Save