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

Don't use last-resolved caches for graphic lines. 

Fixes https://gitlab.com/kicad/code/kicad/issues/11127
This commit is contained in:
Jeff Young 2022-03-14 00:17:37 +00:00
parent 32fdab8902
commit 38cde901b0
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
eeschema/sch_line.cpp
View File

@ -241,13 +241,20 @@ COLOR4D SCH_LINE::GetLineColor() const
{ {
m_lastResolvedColor = m_stroke.GetColor(); m_lastResolvedColor = m_stroke.GetColor();
} }
else if( IsConnectable() && !IsConnectivityDirty() ) else if( IsConnectable() )
{
if( !IsConnectivityDirty() )
{ {
NETCLASSPTR netclass = NetClass(); NETCLASSPTR netclass = NetClass();
if( netclass ) if( netclass )
m_lastResolvedColor = netclass->GetSchematicColor(); m_lastResolvedColor = netclass->GetSchematicColor();
} }
}
else
{
m_lastResolvedColor = COLOR4D::UNSPECIFIED;
}
return m_lastResolvedColor; return m_lastResolvedColor;
} }
@ -292,13 +299,20 @@ PLOT_DASH_TYPE SCH_LINE::GetEffectiveLineStyle() const
{ {
m_lastResolvedLineStyle = m_stroke.GetPlotStyle(); m_lastResolvedLineStyle = m_stroke.GetPlotStyle();
} }
else if( IsConnectable() && !IsConnectivityDirty() ) else if( IsConnectable() )
{
if( !IsConnectivityDirty() )
{ {
NETCLASSPTR netclass = NetClass(); NETCLASSPTR netclass = NetClass();
if( netclass ) if( netclass )
m_lastResolvedLineStyle = static_cast<PLOT_DASH_TYPE>( netclass->GetLineStyle() ); m_lastResolvedLineStyle = static_cast<PLOT_DASH_TYPE>( netclass->GetLineStyle() );
} }
}
else
{
m_lastResolvedLineStyle = PLOT_DASH_TYPE::DASH;
}
return m_lastResolvedLineStyle; return m_lastResolvedLineStyle;
} }