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

Don't use the RTREE in UpdateAllLayersOrder() / UpdateAllLayersColor() 

Since we are going to inspect every item for these calls, we don't
need to use the RTREE search, which is expensive with high item count.

This results in ~50% improvement in layer switching time in GerbView
when working with a set of large Gerber files.
This commit is contained in:
Jon Evans 2018-02-25 15:38:05 -05:00 committed by Wayne Stambaugh
parent 4ec7a02ccd
commit e21f18a176
1 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
common/view/view.cpp
View File

@ -671,21 +671,26 @@ void VIEW::UpdateLayerColor( int aLayer )
void VIEW::UpdateAllLayersColor() void VIEW::UpdateAllLayersColor()
{ {
BOX2I r;
r.SetMaximum();
m_gal->BeginUpdate(); m_gal->BeginUpdate();
for( LAYER_MAP_ITER i = m_layers.begin(); i != m_layers.end(); ++i ) for( VIEW_ITEM* item : m_allItems )
{ {
VIEW_LAYER* l = &( ( *i ).second ); auto viewData = item->viewPrivData();
// There is no point in updating non-cached layers if( !viewData )
if( !IsCached( l->id ) )
continue; continue;
updateItemsColor visitor( l->id, m_painter, m_gal ); int layers[VIEW::VIEW_MAX_LAYERS], layers_count;
l->items->Query( r, visitor ); viewData->getLayers( layers, layers_count );
for( int i = 0; i < layers_count; ++i )
{
const COLOR4D color = m_painter->GetSettings()->GetColor( item, layers[i] );
int group = viewData->getGroup( layers[i] );
if( group >= 0 )
m_gal->ChangeGroupColor( group, color );
}
} }
m_gal->EndUpdate(); m_gal->EndUpdate();
@ -793,17 +798,26 @@ void VIEW::ClearTopLayers()
void VIEW::UpdateAllLayersOrder() void VIEW::UpdateAllLayersOrder()
{ {
BOX2I r;
r.SetMaximum();
sortLayers(); sortLayers();
m_gal->BeginUpdate(); m_gal->BeginUpdate();
for( LAYER_MAP::value_type& l : m_layers ) for( VIEW_ITEM* item : m_allItems )
{ {
int layer = l.first; auto viewData = item->viewPrivData();
changeItemsDepth visitor( layer, l.second.renderingOrder, m_gal );
m_layers[layer].items->Query( r, visitor ); if( !viewData )
continue;
int layers[VIEW::VIEW_MAX_LAYERS], layers_count;
viewData->getLayers( layers, layers_count );
for( int i = 0; i < layers_count; ++i )
{
int group = viewData->getGroup( layers[i] );
if( group >= 0 )
m_gal->ChangeGroupDepth( group, m_layers[layers[i]].renderingOrder );
}
} }
m_gal->EndUpdate(); m_gal->EndUpdate();