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

Push rendering portion of text cache generation down into CALLBACK_GAL.

This commit is contained in:
Jeff Young 2023-05-25 11:25:32 +01:00
parent 1518ddde74
commit 05fef51d81
1 changed files with 13 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
pcbnew/plugins/kicad/pcb_plugin.cpp
View File

@ -23,39 +23,35 @@
*/ */
#include <advanced_config.h> #include <advanced_config.h>
#include <base_units.h>
#include <board.h> #include <board.h>
#include <board_design_settings.h> #include <board_design_settings.h>
#include <confirm.h> #include <confirm.h>
#include <convert_basic_shapes_to_polygon.h> // for enum RECT_CHAMFER_POSITIONS definition #include <convert_basic_shapes_to_polygon.h> // for enum RECT_CHAMFER_POSITIONS definition
#include <core/arraydim.h>
#include <pcb_dimension.h>
#include <footprint.h>
#include <string_utils.h> #include <string_utils.h>
#include <kiface_base.h> #include <kiface_base.h>
#include <locale_io.h> #include <locale_io.h>
#include <macros.h> #include <macros.h>
#include <callback_gal.h>
#include <pad.h> #include <pad.h>
#include <footprint.h>
#include <pcb_group.h> #include <pcb_group.h>
#include <pcb_shape.h> #include <pcb_shape.h>
#include <pcb_dimension.h>
#include <pcb_bitmap.h> #include <pcb_bitmap.h>
#include <pcb_target.h> #include <pcb_target.h>
#include <pcb_text.h> #include <pcb_text.h>
#include <pcb_textbox.h> #include <pcb_textbox.h>
#include <pcb_track.h>
#include <zone.h>
#include <pcbnew_settings.h> #include <pcbnew_settings.h>
#include <pgm_base.h> #include <pgm_base.h>
#include <plugins/kicad/pcb_plugin.h> #include <plugins/kicad/pcb_plugin.h>
#include <plugins/kicad/pcb_parser.h> #include <plugins/kicad/pcb_parser.h>
#include <trace_helpers.h> #include <trace_helpers.h>
#include <pcb_track.h>
#include <progress_reporter.h> #include <progress_reporter.h>
#include <wildcards_and_files_ext.h> #include <wildcards_and_files_ext.h>
#include <wx/dir.h> #include <wx/dir.h>
#include <wx/log.h> #include <wx/log.h>
#include <zone.h>
#include <zones.h>
#include <kiplatform/io.h>
// For some reason wxWidgets is built with wxUSE_BASE64 unset so expose the wxWidgets // For some reason wxWidgets is built with wxUSE_BASE64 unset so expose the wxWidgets
// base64 code. Needed for PCB_BITMAP // base64 code. Needed for PCB_BITMAP
@ -493,54 +489,18 @@ void PCB_PLUGIN::formatRenderCache( const EDA_TEXT* aText, int aNestLevel ) cons
m_out->Quotew( resolvedText ).c_str(), m_out->Quotew( resolvedText ).c_str(),
EDA_UNIT_UTILS::FormatAngle( aText->GetDrawRotation() ).c_str() ); EDA_UNIT_UTILS::FormatAngle( aText->GetDrawRotation() ).c_str() );
for( const std::unique_ptr<KIFONT::GLYPH>& baseGlyph : *cache ) KIGFX::GAL_DISPLAY_OPTIONS empty_opts;
{
// A glyph is not aways a polygon. it can be a stroke (for instance a text with overbar)
// we save only polygons from cache
// So convert any stroke to a polygon
if( baseGlyph->IsStroke() )
{
const KIFONT::STROKE_GLYPH& strokeGlyph = static_cast<const KIFONT::STROKE_GLYPH&>( *baseGlyph );
for( const std::vector<VECTOR2D>& points : strokeGlyph ) CALLBACK_GAL callback_gal( empty_opts,
{ // Polygon callback
SHAPE_LINE_CHAIN outline; [&]( const SHAPE_LINE_CHAIN& aPoly )
for( size_t idx = 0; idx < points.size(); idx++ )
outline.Append( (int)points[idx].x, (int)points[idx].y );
for( int idx = 1; idx < outline.PointCount(); idx++ )
{
SHAPE_POLY_SET buffer;
TransformOvalToPolygon( buffer, outline.CPoint( idx-1 ), outline.CPoint( idx ),
aText->GetTextThickness(), ARC_LOW_DEF, ERROR_INSIDE );
m_out->Print( aNestLevel + 1, "(polygon\n" );
formatPolyPts( buffer.Outline(0), aNestLevel + 2, true );
m_out->Print( aNestLevel + 1, ")\n" );
}
}
continue;
}
KIFONT::OUTLINE_GLYPH* glyph = static_cast<KIFONT::OUTLINE_GLYPH*>( baseGlyph.get() );
if( glyph->OutlineCount() > 0 )
{
for( int ii = 0; ii < glyph->OutlineCount(); ++ii )
{ {
m_out->Print( aNestLevel + 1, "(polygon\n" ); m_out->Print( aNestLevel + 1, "(polygon\n" );
formatPolyPts( aPoly, aNestLevel + 1, true );
formatPolyPts( glyph->Outline( ii ), aNestLevel + 1, true );
for( int jj = 0; jj < glyph->HoleCount( ii ); ++jj )
formatPolyPts( glyph->Hole( ii, jj ), aNestLevel + 2, true );
m_out->Print( aNestLevel + 1, ")\n" ); m_out->Print( aNestLevel + 1, ")\n" );
} } );
}
} callback_gal.DrawGlyphs( *cache );
m_out->Print( aNestLevel, ")\n" ); m_out->Print( aNestLevel, ")\n" );
} }