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

Gerbview: small fix to speed up switching to opengl canvas. 

* workaround to speed up switching canvas from legacy or Cairo to opengl (this is a workaround, not a fix)
This commit is contained in:
jean-pierre charras 2018-12-03 13:10:55 +01:00
parent 7975e05446
commit 2cb4187f52
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gerbview/gerbview_draw_panel_gal.cpp
View File

@ -1,7 +1,7 @@
/* /*
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2017 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 2018 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software: you can redistribute it and/or modify it * This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the * under the terms of the GNU General Public License as published by the
@ -28,6 +28,9 @@
#include <gbr_display_options.h> #include <gbr_display_options.h>
#include <gal/graphics_abstraction_layer.h> #include <gal/graphics_abstraction_layer.h>
#include <gerber_file_image.h>
#include <gerber_file_image_list.h>
#include <functional> #include <functional>
using namespace std::placeholders; using namespace std::placeholders;
@ -116,6 +119,32 @@ void GERBVIEW_DRAW_PANEL_GAL::OnShow()
bool GERBVIEW_DRAW_PANEL_GAL::SwitchBackend( GAL_TYPE aGalType ) bool GERBVIEW_DRAW_PANEL_GAL::SwitchBackend( GAL_TYPE aGalType )
{ {
bool rv = EDA_DRAW_PANEL_GAL::SwitchBackend( aGalType ); bool rv = EDA_DRAW_PANEL_GAL::SwitchBackend( aGalType );
// The next onPaint event will call m_view->UpdateItems() that is very time consumming
// after switching to opengl. Clearing m_view and rebuild it is much faster
if( aGalType == GAL_TYPE_OPENGL )
{
GERBVIEW_FRAME* frame = dynamic_cast<GERBVIEW_FRAME*>( GetParent() );
if( frame )
{
m_view->Clear();
for( int layer = GERBER_DRAWLAYERS_COUNT-1; layer>= 0; --layer )
{
GERBER_FILE_IMAGE* gerber = frame->GetImagesList()->GetGbrImage( layer );
if( gerber == NULL ) // Graphic layer not yet used
continue;
for( GERBER_DRAW_ITEM* item = gerber->GetItemsList(); item; item = item->Next() )
{
m_view->Add (item );
}
}
}
}
setDefaultLayerDeps(); setDefaultLayerDeps();
GetGAL()->SetWorldUnitLength( 1.0/IU_PER_MM /* 10 nm */ / 25.4 /* 1 inch in mm */ ); GetGAL()->SetWorldUnitLength( 1.0/IU_PER_MM /* 10 nm */ / 25.4 /* 1 inch in mm */ );

1
gerbview/gerbview_painter.cpp
View File

@ -264,6 +264,7 @@ void GERBVIEW_PAINTER::draw( /*const*/ GERBER_DRAW_ITEM* aItem, int aLayer )
m_gal->DrawPolyline( absolutePolygon.COutline( 0 ) ); m_gal->DrawPolyline( absolutePolygon.COutline( 0 ) );
else else
m_gal->DrawPolygon( absolutePolygon ); m_gal->DrawPolygon( absolutePolygon );
break; break;
} }