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

Don't assert when getting line width for sheets

This commit is contained in:
Jon Evans 2020-05-29 15:24:58 -04:00
parent 5250215d97
commit b0ebc476d2
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
eeschema/sch_painter.cpp
View File

@ -313,22 +313,19 @@ float SCH_PAINTER::getLineWidth( const LIB_ITEM* aItem, bool aDrawingShadows )
float SCH_PAINTER::getLineWidth( const SCH_ITEM* aItem, bool aDrawingShadows ) float SCH_PAINTER::getLineWidth( const SCH_ITEM* aItem, bool aDrawingShadows )
{ {
wxCHECK( aItem && aItem->Type() == SCH_LINE_T, wxCHECK( aItem, static_cast<float>( m_schSettings.m_DefaultWireThickness ) );
static_cast<float>( m_schSettings.m_DefaultWireThickness ) );
float width; float width;
const SCH_LINE* line = dynamic_cast<const SCH_LINE*>( aItem ); const SCH_LINE* line = dynamic_cast<const SCH_LINE*>( aItem );
wxCHECK( line, static_cast<float>( m_schSettings.m_DefaultWireThickness ) ); if( line && aItem->GetLayer() == LAYER_WIRE )
if( aItem->GetLayer() == LAYER_WIRE )
{ {
if( line->GetLineSize() != 0 ) if( line->GetLineSize() != 0 )
width = (float) line->GetLineSize(); width = (float) line->GetLineSize();
else else
width = (float) m_schSettings.m_DefaultWireThickness; width = (float) m_schSettings.m_DefaultWireThickness;
} }
else if( aItem->GetLayer() == LAYER_BUS ) else if( line && aItem->GetLayer() == LAYER_BUS )
{ {
if( line->GetLineSize() != 0 ) if( line->GetLineSize() != 0 )
width = (float) line->GetLineSize(); width = (float) line->GetLineSize();