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

Add sheet field layers to SCH_LAYER_ORDER. 

Fixes https://gitlab.com/kicad/code/kicad/issues/13518
This commit is contained in:
Jeff Young 2023-01-14 20:37:23 +00:00
parent ba6c23da00
commit 06a2e950fd
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eeschema/sch_painter.cpp
View File

@ -2248,8 +2248,7 @@ void SCH_PAINTER::draw( const SCH_SYMBOL* aSymbol, int aLayer )
tempPin->ClearFlags( IS_DANGLING ); tempPin->ClearFlags( IS_DANGLING );
} }
draw( &tempSymbol, aLayer, false, aSymbol->GetUnit(), aSymbol->GetConvert(), draw( &tempSymbol, aLayer, false, aSymbol->GetUnit(), aSymbol->GetConvert(), aSymbol->GetDNP() );
aSymbol->GetDNP() );
for( unsigned i = 0; i < tempPins.size(); ++i ) for( unsigned i = 0; i < tempPins.size(); ++i )
{ {
@ -2596,6 +2595,9 @@ void SCH_PAINTER::draw( const SCH_SHEET *aSheet, int aLayer )
draw( &field, aLayer, false ); draw( &field, aLayer, false );
} }
if( isFieldsLayer( aLayer ) )
return;
if( aLayer == LAYER_HIERLABEL || aLayer == LAYER_SELECTION_SHADOWS ) if( aLayer == LAYER_HIERLABEL || aLayer == LAYER_SELECTION_SHADOWS )
{ {
for( SCH_SHEET_PIN* sheetPin : aSheet->GetPins() ) for( SCH_SHEET_PIN* sheetPin : aSheet->GetPins() )

1
eeschema/sch_view.h
View File

@ -50,6 +50,7 @@ static const int SCH_LAYER_ORDER[] =
LAYER_INTERSHEET_REFS, LAYER_NETCLASS_REFS, LAYER_INTERSHEET_REFS, LAYER_NETCLASS_REFS,
LAYER_BUS_JUNCTION, LAYER_JUNCTION, LAYER_NOCONNECT, LAYER_BUS_JUNCTION, LAYER_JUNCTION, LAYER_NOCONNECT,
LAYER_HIERLABEL, LAYER_GLOBLABEL, LAYER_LOCLABEL, LAYER_HIERLABEL, LAYER_GLOBLABEL, LAYER_LOCLABEL,
LAYER_SHEETFILENAME, LAYER_SHEETNAME, LAYER_SHEETLABEL, LAYER_SHEETFIELDS,
LAYER_WIRE, LAYER_BUS, LAYER_WIRE, LAYER_BUS,
LAYER_DEVICE, LAYER_DEVICE,
LAYER_NOTES, LAYER_NOTES,