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

Make local overrides higher priority than netclass widths. 

Fixes https://gitlab.com/kicad/code/kicad/issues/5249
This commit is contained in:
Jeff Young 2020-08-18 16:51:45 +01:00
parent 8a4b7bd9c8
commit 1558e63c0e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
eeschema/sch_line.cpp
View File

@ -283,24 +283,24 @@ int SCH_LINE::GetPenWidth() const
return DEFAULT_LINE_THICKNESS; return DEFAULT_LINE_THICKNESS;
case LAYER_WIRE: case LAYER_WIRE:
if( netclass )
return netclass->GetWireWidth();
if( m_stroke.GetWidth() > 0 ) if( m_stroke.GetWidth() > 0 )
return m_stroke.GetWidth(); return m_stroke.GetWidth();
if( netclass )
return netclass->GetWireWidth();
if( Schematic() ) if( Schematic() )
return Schematic()->Settings().m_DefaultWireThickness; return Schematic()->Settings().m_DefaultWireThickness;
return DEFAULT_WIRE_THICKNESS; return DEFAULT_WIRE_THICKNESS;
case LAYER_BUS: case LAYER_BUS:
if( netclass )
return netclass->GetBusWidth();
if( m_stroke.GetWidth() > 0 ) if( m_stroke.GetWidth() > 0 )
return m_stroke.GetWidth(); return m_stroke.GetWidth();
if( netclass )
return netclass->GetBusWidth();
if( Schematic() ) if( Schematic() )
return Schematic()->Settings().m_DefaultBusThickness; return Schematic()->Settings().m_DefaultBusThickness;