AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-04 22:25:30 +00:00
Files Issues Releases Activity

Remove (somewhat atrophied) manual pretty printing.

Browse Source 
Also fixes a bug where the pretty printer didn't insert
linebreaks for a forest (it assumed a single tree root).

Also further regularises bool and quote formatting.
This commit is contained in:
Jeff Young 2024-11-27 18:12:53 +00:00
parent dfbbb5afa1
commit 6686ade45b
36 changed files with 1268 additions and 1607 deletions

193
common/drawing_sheet/ds_data_model_io.cpp
View File

@ -56,17 +56,17 @@ public:
void Format( DS_DATA_MODEL* aSheet ) const;
void Format( DS_DATA_MODEL* aModel, std::vector<DS_DATA_ITEM*>& aItemsList ) const;
void Format( DS_DATA_MODEL* aModel, DS_DATA_ITEM* aItem, int aNestLevel ) const;
void Format( DS_DATA_MODEL* aModel, DS_DATA_ITEM* aItem ) const;
protected:
DS_DATA_MODEL_IO() { m_out = NULL; }
virtual ~DS_DATA_MODEL_IO() {}
private:
void format( DS_DATA_ITEM_TEXT* aItem, int aNestLevel ) const;
void format( DS_DATA_MODEL* aModel, DS_DATA_ITEM* aItem, int aNestLevel ) const;
void format( DS_DATA_ITEM_POLYGONS* aItem, int aNestLevel ) const;
void format( DS_DATA_ITEM_BITMAP* aItem, int aNestLevel ) const;
void format( DS_DATA_ITEM_TEXT* aItem ) const;
void format( DS_DATA_MODEL* aModel, DS_DATA_ITEM* aItem ) const;
void format( DS_DATA_ITEM_POLYGONS* aItem ) const;
void format( DS_DATA_ITEM_BITMAP* aItem ) const;
void formatCoordinate( const char* aToken, POINT_COORD& aCoord ) const;
void formatRepeatParameters( DS_DATA_ITEM* aItem ) const;
void formatOptions( DS_DATA_ITEM* aItem ) const;
@ -161,35 +161,36 @@ void DS_DATA_MODEL_IO::Format( DS_DATA_MODEL* aModel, std::vector<DS_DATA_ITEM*>
{
LOCALE_IO toggle; // switch on/off the locale "C" notation
m_out->Print( 0, "(kicad_wks (version %d) (generator \"pl_editor\") (generator_version \"%s\")\n",
SEXPR_WORKSHEET_FILE_VERSION, GetMajorMinorVersion().c_str().AsChar() );
m_out->Print( "(kicad_wks (version %d) (generator \"pl_editor\") (generator_version %s)",
SEXPR_WORKSHEET_FILE_VERSION,
m_out->Quotew( GetMajorMinorVersion() ).c_str() );
for( DS_DATA_ITEM* item : aItemsList )
Format( aModel, item, 1 );
Format( aModel, item );
m_out->Print( 0, ")\n" );
m_out->Print( ")" );
}
void DS_DATA_MODEL_IO::Format( DS_DATA_MODEL* aModel, DS_DATA_ITEM* aItem, int aNestLevel ) const
void DS_DATA_MODEL_IO::Format( DS_DATA_MODEL* aModel, DS_DATA_ITEM* aItem ) const
{
switch( aItem->GetType() )
{
case DS_DATA_ITEM::DS_TEXT:
format( (DS_DATA_ITEM_TEXT*) aItem, aNestLevel );
format( (DS_DATA_ITEM_TEXT*) aItem );
break;
case DS_DATA_ITEM::DS_SEGMENT:
case DS_DATA_ITEM::DS_RECT:
format( aModel, aItem, aNestLevel );
format( aModel, aItem );
break;
case DS_DATA_ITEM::DS_POLYPOLYGON:
format( (DS_DATA_ITEM_POLYGONS*) aItem, aNestLevel );
format( (DS_DATA_ITEM_POLYGONS*) aItem );
break;
case DS_DATA_ITEM::DS_BITMAP:
format( (DS_DATA_ITEM_BITMAP*) aItem, aNestLevel );
format( (DS_DATA_ITEM_BITMAP*) aItem );
break;
default:
@ -202,49 +203,49 @@ void DS_DATA_MODEL_IO::Format( DS_DATA_MODEL* aSheet ) const
{
LOCALE_IO toggle; // switch on/off the locale "C" notation
m_out->Print( 0, "(kicad_wks (version %d) (generator \"pl_editor\") (generator_version \"%s\")\n",
SEXPR_WORKSHEET_FILE_VERSION, GetMajorMinorVersion().c_str().AsChar() );
m_out->Print( "(kicad_wks (version %d) (generator \"pl_editor\") (generator_version %s)",
SEXPR_WORKSHEET_FILE_VERSION,
m_out->Quotew( GetMajorMinorVersion() ).c_str() );
// Setup
int nestLevel = 1;
// Write default values:
m_out->Print( nestLevel, "(setup " );
m_out->Print( 0, "(textsize %s %s)",
m_out->Print( "(setup" );
m_out->Print( "(textsize %s %s)",
FormatDouble2Str( aSheet->m_DefaultTextSize.x ).c_str(),
FormatDouble2Str( aSheet->m_DefaultTextSize.y ).c_str() );
m_out->Print( 0, "(linewidth %s)", FormatDouble2Str( aSheet->m_DefaultLineWidth ).c_str() );
m_out->Print( 0, "(textlinewidth %s)", FormatDouble2Str( aSheet->m_DefaultTextThickness ).c_str() );
m_out->Print( 0, "\n" );
m_out->Print( "(linewidth %s)", FormatDouble2Str( aSheet->m_DefaultLineWidth ).c_str() );
m_out->Print( "(textlinewidth %s)", FormatDouble2Str( aSheet->m_DefaultTextThickness ).c_str() );
// Write margin values
m_out->Print( nestLevel, "(left_margin %s)", FormatDouble2Str( aSheet->GetLeftMargin() ).c_str() );
m_out->Print( 0, "(right_margin %s)", FormatDouble2Str( aSheet->GetRightMargin() ).c_str() );
m_out->Print( 0, "(top_margin %s)", FormatDouble2Str( aSheet->GetTopMargin() ).c_str() );
m_out->Print( 0, "(bottom_margin %s)", FormatDouble2Str( aSheet->GetBottomMargin() ).c_str() );
m_out->Print( 0, ")\n" );
m_out->Print( "(left_margin %s)", FormatDouble2Str( aSheet->GetLeftMargin() ).c_str() );
m_out->Print( "(right_margin %s)", FormatDouble2Str( aSheet->GetRightMargin() ).c_str() );
m_out->Print( "(top_margin %s)", FormatDouble2Str( aSheet->GetTopMargin() ).c_str() );
m_out->Print( "(bottom_margin %s)", FormatDouble2Str( aSheet->GetBottomMargin() ).c_str() );
m_out->Print( ")" );
// Save the graphical items on the drawing sheet
for( unsigned ii = 0; ii < aSheet->GetCount(); ii++ )
{
DS_DATA_ITEM* item = aSheet->GetItem( ii );
Format( aSheet, item, nestLevel );
Format( aSheet, item );
}
m_out->Print( 0, ")\n" );
m_out->Print( ")" );
}
void DS_DATA_MODEL_IO::format( DS_DATA_ITEM_TEXT* aItem, int aNestLevel ) const
void DS_DATA_MODEL_IO::format( DS_DATA_ITEM_TEXT* aItem ) const
{
m_out->Print( aNestLevel, "(tbtext" );
m_out->Print( 0, " %s", m_out->Quotew( aItem->m_TextBase ).c_str() );
m_out->Print( 0, " (name %s)", m_out->Quotew( aItem->m_Name ).c_str() );
m_out->Print( "(tbtext %s", m_out->Quotew( aItem->m_TextBase ).c_str() );
m_out->Print( "(name %s)", m_out->Quotew( aItem->m_Name ).c_str() );
formatCoordinate( getTokenName( T_pos ), aItem->m_Pos );
formatOptions( aItem );
if( aItem->m_Orient )
m_out->Print( 0, " (rotate %s)", FormatDouble2Str( aItem->m_Orient ).c_str() );
m_out->Print( "(rotate %s)", FormatDouble2Str( aItem->m_Orient ).c_str() );
// Write font info, only if it is not the default setup
bool write_size = aItem->m_TextSize.x != 0.0 || aItem->m_TextSize.y != 0.0;
@ -254,172 +255,162 @@ void DS_DATA_MODEL_IO::format( DS_DATA_ITEM_TEXT* aItem, int aNestLevel ) const
if( write_thickness || write_size || aItem->m_Bold || aItem->m_Italic
|| write_face || aItem->m_TextColor != COLOR4D::UNSPECIFIED )
{
m_out->Print( 0, " (font" );
m_out->Print( "(font" );
if( write_face )
m_out->Print( 0, " (face \"%s\")", aItem->m_Font->NameAsToken() );
m_out->Print( "(face %s)", m_out->Quotew( aItem->m_Font->NameAsToken() ).c_str() );
if( write_thickness )
m_out->Print( 0, " (linewidth %s)", FormatDouble2Str( aItem->m_LineWidth ).c_str() );
m_out->Print( "(linewidth %s)", FormatDouble2Str( aItem->m_LineWidth ).c_str() );
if( write_size )
{
m_out->Print( 0, " (size %s %s)",
m_out->Print( "(size %s %s)",
FormatDouble2Str( aItem->m_TextSize.x ).c_str(),
FormatDouble2Str( aItem->m_TextSize.y ).c_str() );
}
if( aItem->m_Bold )
m_out->Print( 0, " bold" );
m_out->Print( " bold" );
if( aItem->m_Italic )
m_out->Print( 0, " italic" );
m_out->Print( " italic" );
if( aItem->m_TextColor != COLOR4D::UNSPECIFIED )
{
m_out->Print( 0, " (color %d %d %d %s)",
m_out->Print( "(color %d %d %d %s)",
KiROUND( aItem->m_TextColor.r * 255.0 ),
KiROUND( aItem->m_TextColor.g * 255.0 ),
KiROUND( aItem->m_TextColor.b * 255.0 ),
FormatDouble2Str( aItem->m_TextColor.a ).c_str() );
}
m_out->Print( 0, ")" );
m_out->Print( ")" );
}
// Write text justification
if( aItem->m_Hjustify != GR_TEXT_H_ALIGN_LEFT || aItem->m_Vjustify != GR_TEXT_V_ALIGN_CENTER )
{
m_out->Print( 0, " (justify" );
m_out->Print( "(justify" );
// Write T_center opt first, because it is
// also a center for both m_Hjustify and m_Vjustify
if( aItem->m_Hjustify == GR_TEXT_H_ALIGN_CENTER )
m_out->Print( 0, " center" );
m_out->Print( " center" );
else if( aItem->m_Hjustify == GR_TEXT_H_ALIGN_RIGHT )
m_out->Print( 0, " right" );
m_out->Print( " right" );
if( aItem->m_Vjustify == GR_TEXT_V_ALIGN_TOP )
m_out->Print( 0, " top" );
m_out->Print( " top" );
else if( aItem->m_Vjustify == GR_TEXT_V_ALIGN_BOTTOM )
m_out->Print( 0, " bottom" );
m_out->Print( " bottom" );
m_out->Print( 0, ")" );
m_out->Print( ")" );
}
// write constraints
if( aItem->m_BoundingBoxSize.x )
m_out->Print( 0, " (maxlen %s)", FormatDouble2Str( aItem->m_BoundingBoxSize.x ).c_str() );
m_out->Print( "(maxlen %s)", FormatDouble2Str( aItem->m_BoundingBoxSize.x ).c_str() );
if( aItem->m_BoundingBoxSize.y )
m_out->Print( 0, " (maxheight %s)", FormatDouble2Str(aItem->m_BoundingBoxSize.y ).c_str() );
m_out->Print( "(maxheight %s)", FormatDouble2Str(aItem->m_BoundingBoxSize.y ).c_str() );
formatRepeatParameters( aItem );
if( !aItem->m_Info.IsEmpty() )
m_out->Print( 0, " (comment %s)\n", m_out->Quotew( aItem->m_Info ).c_str() );
m_out->Print( "(comment %s)", m_out->Quotew( aItem->m_Info ).c_str() );
m_out->Print( 0, ")\n" );
m_out->Print( ")" );
}
void DS_DATA_MODEL_IO::format( DS_DATA_MODEL* aModel, DS_DATA_ITEM* aItem, int aNestLevel ) const
void DS_DATA_MODEL_IO::format( DS_DATA_MODEL* aModel, DS_DATA_ITEM* aItem ) const
{
if( aItem->GetType() == DS_DATA_ITEM::DS_RECT )
m_out->Print( aNestLevel, "(rect" );
m_out->Print( "(rect" );
else
m_out->Print( aNestLevel, "(line" );
m_out->Print( "(line" );
m_out->Print( 0, " (name %s)", m_out->Quotew( aItem->m_Name ).c_str() );
m_out->Print( "(name %s)", m_out->Quotew( aItem->m_Name ).c_str() );
formatCoordinate( getTokenName( T_start ), aItem->m_Pos );
formatCoordinate( getTokenName( T_end ), aItem->m_End );
formatOptions( aItem );
if( aItem->m_LineWidth && aItem->m_LineWidth != aModel->m_DefaultLineWidth )
m_out->Print( 0, " (linewidth %s)", FormatDouble2Str( aItem->m_LineWidth ).c_str() );
m_out->Print( "(linewidth %s)", FormatDouble2Str( aItem->m_LineWidth ).c_str() );
formatRepeatParameters( aItem );
if( !aItem->m_Info.IsEmpty() )
m_out->Print( 0, " (comment %s)\n", m_out->Quotew( aItem->m_Info ).c_str() );
m_out->Print( "(comment %s)", m_out->Quotew( aItem->m_Info ).c_str() );
m_out->Print( 0, ")\n" );
m_out->Print( ")" );
}
void DS_DATA_MODEL_IO::format( DS_DATA_ITEM_POLYGONS* aItem, int aNestLevel ) const
void DS_DATA_MODEL_IO::format( DS_DATA_ITEM_POLYGONS* aItem ) const
{
m_out->Print( aNestLevel, "(polygon" );
m_out->Print( 0, " (name %s)", m_out->Quotew( aItem->m_Name ).c_str() );
m_out->Print( "(polygon" );
m_out->Print( "(name %s)", m_out->Quotew( aItem->m_Name ).c_str() );
formatCoordinate( "pos", aItem->m_Pos );
formatOptions( aItem );
formatRepeatParameters( aItem );
if( !aItem->m_Orient.IsZero() )
m_out->Print( 0, " (rotate %s)", FormatDouble2Str( aItem->m_Orient.AsDegrees() ).c_str() );
m_out->Print( "(rotate %s)", FormatDouble2Str( aItem->m_Orient.AsDegrees() ).c_str() );
if( aItem->m_LineWidth )
m_out->Print( 0, " (linewidth %s)\n", FormatDouble2Str( aItem->m_LineWidth ).c_str() );
m_out->Print( "(linewidth %s)", FormatDouble2Str( aItem->m_LineWidth ).c_str() );
if( !aItem->m_Info.IsEmpty() )
m_out->Print( 0, " (comment %s)\n", m_out->Quotew( aItem->m_Info ).c_str() );
m_out->Print( "(comment %s)", m_out->Quotew( aItem->m_Info ).c_str() );
// Write polygon corners list
for( int kk = 0; kk < aItem->GetPolyCount(); kk++ )
{
m_out->Print( aNestLevel+1, "(pts" );
m_out->Print( "(pts" );
// Create current polygon corners list
unsigned ist = aItem->GetPolyIndexStart( kk );
unsigned iend = aItem->GetPolyIndexEnd( kk );
int ii = 0;
while( ist <= iend )
{
VECTOR2D pos = aItem->m_Corners[ist++];
int nestLevel = 0;
if( ii++ > 4)
{
m_out->Print( 0, "\n" );
nestLevel = aNestLevel+2;
ii = 0;
}
m_out->Print( nestLevel, " (xy %s %s)",
m_out->Print( "(xy %s %s)",
FormatDouble2Str( pos.x ).c_str(),
FormatDouble2Str( pos.y ).c_str() );
}
m_out->Print( 0, ")\n" );
m_out->Print( ")" );
}
m_out->Print( aNestLevel, ")\n" );
m_out->Print( ")" );
}
void DS_DATA_MODEL_IO::format( DS_DATA_ITEM_BITMAP* aItem, int aNestLevel ) const
void DS_DATA_MODEL_IO::format( DS_DATA_ITEM_BITMAP* aItem ) const
{
// Don't save empty images
if( !aItem->m_ImageBitmap->GetOriginalImageData() )
return;
m_out->Print( aNestLevel, "(bitmap" );
m_out->Print( 0, " (name %s)", m_out->Quotew( aItem->m_Name ).c_str() );
m_out->Print( "(bitmap" );
m_out->Print( "(name %s)", m_out->Quotew( aItem->m_Name ).c_str() );
formatCoordinate( "pos", aItem->m_Pos );
formatOptions( aItem );
m_out->Print( 0, " (scale %s)", FormatDouble2Str( aItem->m_ImageBitmap->GetScale() ).c_str() );
m_out->Print( "(scale %s)", FormatDouble2Str( aItem->m_ImageBitmap->GetScale() ).c_str() );
formatRepeatParameters( aItem );
m_out->Print( 0,"\n");
if( !aItem->m_Info.IsEmpty() )
m_out->Print( 0, " (comment %s)\n", m_out->Quotew( aItem->m_Info ).c_str() );
m_out->Print( "(comment %s)", m_out->Quotew( aItem->m_Info ).c_str() );
// Write image in png readable format
m_out->Print( aNestLevel, "(data" );
m_out->Print( "(data" );
wxString out = wxBase64Encode( aItem->m_ImageBitmap->GetImageDataBuffer() );
@ -431,32 +422,30 @@ void DS_DATA_MODEL_IO::format( DS_DATA_ITEM_BITMAP* aItem, int aNestLevel ) cons
while( first < out.Length() )
{
m_out->Print( 0, "\n" );
m_out->Print( aNestLevel + 1, "\"%s\"", TO_UTF8( out( first, MIME_BASE64_LENGTH ) ) );
m_out->Print( "\n\"%s\"", TO_UTF8( out( first, MIME_BASE64_LENGTH ) ) );
first += MIME_BASE64_LENGTH;
}
m_out->Print( 0, "\n" );
m_out->Print( aNestLevel, ")\n" ); // Closes data token.
m_out->Print( aNestLevel, ")\n" ); // Closes bitmap token.
m_out->Print( ")" ); // Closes data token.
m_out->Print( ")" ); // Closes bitmap token.
}
void DS_DATA_MODEL_IO::formatCoordinate( const char * aToken, POINT_COORD & aCoord ) const
{
m_out->Print( 0, " (%s %s %s", aToken,
m_out->Print( "(%s %s %s", aToken,
FormatDouble2Str( aCoord.m_Pos.x ).c_str(),
FormatDouble2Str( aCoord.m_Pos.y ).c_str() );
switch( aCoord.m_Anchor )
{
case RB_CORNER: break;
case LT_CORNER: m_out->Print( 0, " ltcorner" ); break;
case LB_CORNER: m_out->Print( 0, " lbcorner" ); break;
case RT_CORNER: m_out->Print( 0, " rtcorner" ); break;
case LT_CORNER: m_out->Print( " ltcorner" ); break;
case LB_CORNER: m_out->Print( " lbcorner" ); break;
case RT_CORNER: m_out->Print( " rtcorner" ); break;
}
m_out->Print( 0, ")" );
m_out->Print( ")" );
}
@ -465,23 +454,23 @@ void DS_DATA_MODEL_IO::formatRepeatParameters( DS_DATA_ITEM* aItem ) const
if( aItem->m_RepeatCount <= 1 )
return;
m_out->Print( 0, " (repeat %d)", aItem->m_RepeatCount );
m_out->Print( "(repeat %d)", aItem->m_RepeatCount );
if( aItem->m_IncrementVector.x )
m_out->Print( 0, " (incrx %s)", FormatDouble2Str( aItem->m_IncrementVector.x ).c_str() );
m_out->Print( "(incrx %s)", FormatDouble2Str( aItem->m_IncrementVector.x ).c_str() );
if( aItem->m_IncrementVector.y )
m_out->Print( 0, " (incry %s)", FormatDouble2Str( aItem->m_IncrementVector.y ).c_str() );
m_out->Print( "(incry %s)", FormatDouble2Str( aItem->m_IncrementVector.y ).c_str() );
if( aItem->m_IncrementLabel != 1 && aItem->GetType() == DS_DATA_ITEM::DS_TEXT )
m_out->Print( 0, " (incrlabel %d)", aItem->m_IncrementLabel );
m_out->Print( "(incrlabel %d)", aItem->m_IncrementLabel );
}
void DS_DATA_MODEL_IO::formatOptions( DS_DATA_ITEM* aItem ) const
{
if( aItem->GetPage1Option() == FIRST_PAGE_ONLY )
m_out->Print( 0, " (option page1only)" );
m_out->Print( "(option page1only)" );
else if( aItem->GetPage1Option() == SUBSEQUENT_PAGES )
m_out->Print( 0, " (option notonpage1)" );
m_out->Print( "(option notonpage1)" );
}

40
common/eda_text.cpp
View File

@ -53,12 +53,12 @@
#include <wx/debug.h> // for wxASSERT
#include <wx/string.h>
#include <wx/url.h> // for wxURL
#include <io/kicad/kicad_io_utils.h>
#include "font/kicad_font_name.h"
#include "font/fontconfig.h"
#include "pgm_base.h"
class OUTPUTFORMATTER;
class wxFindReplaceData;
GR_TEXT_H_ALIGN_T EDA_TEXT::MapHorizJustify( int aHorizJustify )
@ -948,75 +948,75 @@ bool EDA_TEXT::IsDefaultFormatting() const
}
void EDA_TEXT::Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const
void EDA_TEXT::Format( OUTPUTFORMATTER* aFormatter, int aControlBits ) const
{
aFormatter->Print( aNestLevel + 1, "(effects" );
aFormatter->Print( "(effects" );
aFormatter->Print( 0, " (font" );
aFormatter->Print( "(font" );
if( GetFont() && !GetFont()->GetName().IsEmpty() )
aFormatter->Print( 0, " (face \"%s\")", GetFont()->NameAsToken() );
aFormatter->Print( "(face %s)", aFormatter->Quotew( GetFont()->NameAsToken() ).c_str() );
// Text size
aFormatter->Print( 0, " (size %s %s)",
aFormatter->Print( "(size %s %s)",
EDA_UNIT_UTILS::FormatInternalUnits( m_IuScale, GetTextHeight() ).c_str(),
EDA_UNIT_UTILS::FormatInternalUnits( m_IuScale, GetTextWidth() ).c_str() );
if( GetLineSpacing() != 1.0 )
{
aFormatter->Print( 0, " (line_spacing %s)",
aFormatter->Print( "(line_spacing %s)",
FormatDouble2Str( GetLineSpacing() ).c_str() );
}
if( GetTextThickness() )
{
aFormatter->Print( 0, " (thickness %s)",
aFormatter->Print( "(thickness %s)",
EDA_UNIT_UTILS::FormatInternalUnits( m_IuScale, GetTextThickness() ).c_str() );
}
if( IsBold() )
aFormatter->Print( 0, " (bold yes)" );
KICAD_FORMAT::FormatBool( aFormatter, "bold", true );
if( IsItalic() )
aFormatter->Print( 0, " (italic yes)" );
KICAD_FORMAT::FormatBool( aFormatter, "italic", true );
if( !( aControlBits & CTL_OMIT_COLOR ) && GetTextColor() != COLOR4D::UNSPECIFIED )
{
aFormatter->Print( 0, " (color %d %d %d %s)",
aFormatter->Print( "(color %d %d %d %s)",
KiROUND( GetTextColor().r * 255.0 ),
KiROUND( GetTextColor().g * 255.0 ),
KiROUND( GetTextColor().b * 255.0 ),
FormatDouble2Str( GetTextColor().a ).c_str() );
}
aFormatter->Print( 0, ")"); // (font
aFormatter->Print( ")"); // (font
if( IsMirrored() || GetHorizJustify() != GR_TEXT_H_ALIGN_CENTER
|| GetVertJustify() != GR_TEXT_V_ALIGN_CENTER )
{
aFormatter->Print( 0, " (justify");
aFormatter->Print( "(justify");
if( GetHorizJustify() != GR_TEXT_H_ALIGN_CENTER )
aFormatter->Print( 0, GetHorizJustify() == GR_TEXT_H_ALIGN_LEFT ? " left" : " right" );
aFormatter->Print( GetHorizJustify() == GR_TEXT_H_ALIGN_LEFT ? " left" : " right" );
if( GetVertJustify() != GR_TEXT_V_ALIGN_CENTER )
aFormatter->Print( 0, GetVertJustify() == GR_TEXT_V_ALIGN_TOP ? " top" : " bottom" );
aFormatter->Print( GetVertJustify() == GR_TEXT_V_ALIGN_TOP ? " top" : " bottom" );
if( IsMirrored() )
aFormatter->Print( 0, " mirror" );
aFormatter->Print( " mirror" );
aFormatter->Print( 0, ")" ); // (justify
aFormatter->Print( ")" ); // (justify
}
if( !( aControlBits & CTL_OMIT_HIDE ) && !IsVisible() )
aFormatter->Print( 0, " (hide yes)" );
KICAD_FORMAT::FormatBool( aFormatter, "hide", true );
if( !( aControlBits & CTL_OMIT_HYPERLINK ) && HasHyperlink() )
{
aFormatter->Print( 0, " (href %s)", aFormatter->Quotew( GetHyperlink() ).c_str() );
aFormatter->Print( "(href %s)", aFormatter->Quotew( GetHyperlink() ).c_str() );
}
aFormatter->Print( 0, ")\n" ); // (effects
aFormatter->Print( ")" ); // (effects
}

44
common/embedded_files.cpp
View File

@ -22,7 +22,6 @@
#include <wx/base64.h>
#include <wx/debug.h>
#include <wx/file.h>
#include <wx/filename.h>
#include <wx/log.h>
#include <wx/mstream.h>
@ -146,45 +145,34 @@ void EMBEDDED_FILES::ClearEmbeddedFonts()
// Write the collection of files to a disk file in the specified format
void EMBEDDED_FILES::WriteEmbeddedFiles( OUTPUTFORMATTER& aOut, int aNestLevel,
bool aWriteData ) const
void EMBEDDED_FILES::WriteEmbeddedFiles( OUTPUTFORMATTER& aOut, bool aWriteData ) const
{
ssize_t MIME_BASE64_LENGTH = 76;
aOut.Print( aNestLevel, "(embedded_files\n" );
aOut.Print( "(embedded_files " );
for( const auto& [name, entry] : m_files )
{
const EMBEDDED_FILE& file = *entry;
aOut.Print( aNestLevel + 1, "(file\n" );
aOut.Print( aNestLevel + 2, "(name \"%s\")\n", file.name.c_str().AsChar() );
aOut.Print( "(file " );
aOut.Print( "(name %s)", aOut.Quotew( file.name ).c_str() );
const char* type = nullptr;
switch( file.type )
{
case EMBEDDED_FILE::FILE_TYPE::DATASHEET:
type = "datasheet";
break;
case EMBEDDED_FILE::FILE_TYPE::FONT:
type = "font";
break;
case EMBEDDED_FILE::FILE_TYPE::MODEL:
type = "model";
break;
case EMBEDDED_FILE::FILE_TYPE::WORKSHEET:
type = "worksheet";
break;
default:
type = "other";
break;
case EMBEDDED_FILE::FILE_TYPE::DATASHEET: type = "datasheet"; break;
case EMBEDDED_FILE::FILE_TYPE::FONT: type = "font"; break;
case EMBEDDED_FILE::FILE_TYPE::MODEL: type = "model"; break;
case EMBEDDED_FILE::FILE_TYPE::WORKSHEET: type = "worksheet"; break;
default: type = "other"; break;
}
aOut.Print( aNestLevel + 2, "(type %s)\n", type );
aOut.Print( "(type %s)", type );
if( aWriteData )
{
aOut.Print( 2, "(data\n" );
aOut.Print( "(data" );
size_t first = 0;
@ -195,18 +183,18 @@ void EMBEDDED_FILES::WriteEmbeddedFiles( OUTPUTFORMATTER& aOut, int aNestLevel,
std::string_view view( file.compressedEncodedData.data() + first, length );
aOut.Print( aNestLevel + 3, "%1s%.*s%s\n", first ? "" : "|", length, view.data(),
aOut.Print( "\n%1s%.*s%s\n", first ? "" : "|", length, view.data(),
remaining == length ? "|" : "" );
first += MIME_BASE64_LENGTH;
}
aOut.Print( aNestLevel + 2, ")\n" ); // Close data
aOut.Print( ")" ); // Close data
}
aOut.Print( aNestLevel + 2, "(checksum \"%s\")\n", file.data_hash.c_str() );
aOut.Print( aNestLevel + 1, ")\n" ); // Close file
aOut.Print( "(checksum %s)", aOut.Quotew( file.data_hash ).c_str() );
aOut.Print( ")" ); // Close file
}
aOut.Print( aNestLevel, ")\n" ); // Close embedded_files
aOut.Print( ")" ); // Close embedded_files
}
// Compress and Base64 encode data

78
common/io/kicad/kicad_io_utils.cpp
View File

@ -26,28 +26,15 @@
namespace KICAD_FORMAT {
void FormatBool( OUTPUTFORMATTER* aOut, int aNestLevel, const wxString& aKey, bool aValue,
char aSuffix )
void FormatBool( OUTPUTFORMATTER* aOut, const wxString& aKey, bool aValue )
{
if( aNestLevel )
aOut->Print( aNestLevel, "(%ls %s)", aKey.wc_str(), aValue ? "yes" : "no" );
else
aOut->Print( 0, " (%ls %s)", aKey.wc_str(), aValue ? "yes" : "no" );
if( aSuffix )
aOut->Print( 0, "%c", aSuffix );
aOut->Print( "(%ls %s)", aKey.wc_str(), aValue ? "yes" : "no" );
}
void FormatUuid( OUTPUTFORMATTER* aOut, int aNestLevel, const KIID& aUuid, char aSuffix )
void FormatUuid( OUTPUTFORMATTER* aOut, const KIID& aUuid )
{
if( aNestLevel )
aOut->Print( aNestLevel, "(uuid \"%s\")", TO_UTF8( aUuid.AsString() ) );
else
aOut->Print( 0, " (uuid \"%s\")", TO_UTF8( aUuid.AsString() ) );
if( aSuffix )
aOut->Print( 0, "%c", aSuffix );
aOut->Print( "(uuid %s)", aOut->Quotew( aUuid.AsString() ).c_str() );
}
/*
@ -70,9 +57,10 @@ void FormatUuid( OUTPUTFORMATTER* aOut, int aNestLevel, const KIID& aUuid, char
* )
* )
*/
void Prettify( std::string& aSource, char aQuoteChar )
void Prettify( std::string& aSource, bool aCompactSave )
{
// Configuration
const char quoteChar = '"';
const char indentChar = '\t';
const int indentSize = 1;
@ -97,6 +85,8 @@ void Prettify( std::string& aSource, char aQuoteChar )
bool hasInsertedSpace = false;
bool inMultiLineList = false;
bool inXY = false;
bool inShortForm = false;
int shortFormDepth = 0;
int column = 0;
int backslashCount = 0; // Count of successive backslash read since any other char
@ -136,6 +126,19 @@ void Prettify( std::string& aSource, char aQuoteChar )
return true;
};
auto isShortForm =
[&]( std::string::iterator aIt )
{
seek = aIt;
std::string token;
while( ++seek != aSource.end() && isalpha( *seek ) )
token += *seek;
return token == "font" || token == "stroke" || token == "fill"
|| token == "offset" || token == "rotate" || token == "scale";
};
while( cursor != aSource.end() )
{
char next = nextNonWhitespace( cursor );
@ -150,11 +153,15 @@ void Prettify( std::string& aSource, char aQuoteChar )
{
if( inXY || column < consecutiveTokenWrapThreshold )
{
// Note that we only insert spaces here, no matter what kind of whitespace is in
// the input. Newlines will be inserted as needed by the logic below.
// Note that we only insert spaces here, no matter what kind of whitespace is
// in the input. Newlines will be inserted as needed by the logic below.
formatted.push_back( ' ' );
column++;
}
else if( inShortForm )
{
formatted.push_back( ' ' );
}
else
{
formatted += fmt::format( "\n{}",
@ -173,8 +180,9 @@ void Prettify( std::string& aSource, char aQuoteChar )
if( *cursor == '(' && !inQuote )
{
bool currentIsXY = isXY( cursor );
bool currentIsShortForm = aCompactSave && isShortForm( cursor );
if( listDepth == 0 )
if( formatted.empty() )
{
formatted.push_back( '(' );
column++;
@ -184,7 +192,11 @@ void Prettify( std::string& aSource, char aQuoteChar )
// List-of-points special case
formatted += " (";
column += 2;
inXY = true;
}
else if( inShortForm )
{
formatted += " (";
column += 2;
}
else
{
@ -194,6 +206,13 @@ void Prettify( std::string& aSource, char aQuoteChar )
}
inXY = currentIsXY;
if( currentIsShortForm )
{
inShortForm = true;
shortFormDepth = listDepth;
}
listDepth++;
}
else if( *cursor == ')' && !inQuote )
@ -201,7 +220,12 @@ void Prettify( std::string& aSource, char aQuoteChar )
if( listDepth > 0 )
listDepth--;
if( lastNonWhitespace == ')' || inMultiLineList )
if( inShortForm )
{
formatted.push_back( ')' );
column++;
}
else if( lastNonWhitespace == ')' || inMultiLineList )
{
formatted += fmt::format( "\n{})",
std::string( listDepth * indentSize, indentChar ) );
@ -213,6 +237,12 @@ void Prettify( std::string& aSource, char aQuoteChar )
formatted.push_back( ')' );
column++;
}
if( shortFormDepth == listDepth )
{
inShortForm = false;
shortFormDepth = 0;
}
}
else
{
@ -221,7 +251,7 @@ void Prettify( std::string& aSource, char aQuoteChar )
// therefore a '\' is attached to a '"' if a odd number of '\' is detected
if( *cursor == '\\' )
backslashCount++;
else if( *cursor == aQuoteChar && ( backslashCount & 1 ) == 0 )
else if( *cursor == quoteChar && ( backslashCount & 1 ) == 0 )
inQuote = !inQuote;
if( *cursor != '\\' )

14
common/page_info.cpp
View File

@ -22,8 +22,6 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <common.h>
#include <page_info.h>
#include <macros.h>
#include <eda_units.h>
@ -272,19 +270,21 @@ void PAGE_INFO::SetHeightMils( double aHeightInMils )
}
void PAGE_INFO::Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const
void PAGE_INFO::Format( OUTPUTFORMATTER* aFormatter ) const
{
aFormatter->Print( aNestLevel, "(paper %s", aFormatter->Quotew( GetType() ).c_str() );
aFormatter->Print( "(paper %s", aFormatter->Quotew( GetType() ).c_str() );
// The page dimensions are only required for user defined page sizes.
// Internally, the page size is in mils
if( GetType() == PAGE_INFO::Custom )
aFormatter->Print( 0, " %g %g",
{
aFormatter->Print( " %g %g",
GetWidthMils() * 25.4 / 1000.0,
GetHeightMils() * 25.4 / 1000.0 );
}
if( !IsCustom() && IsPortrait() )
aFormatter->Print( 0, " portrait" );
aFormatter->Print( " portrait" );
aFormatter->Print( 0, ")\n" );
aFormatter->Print( ")" );
}

21
common/richio.cpp
View File

@ -30,9 +30,9 @@
#include <core/ignore.h>
#include <richio.h>
#include <errno.h>
#include <advanced_config.h>
#include <io/kicad/kicad_io_utils.h>
#include <wx/file.h>
#include <wx/translation.h>
@ -484,6 +484,23 @@ int OUTPUTFORMATTER::Print( int nestLevel, const char* fmt, ... )
}
int OUTPUTFORMATTER::Print( const char* fmt, ... )
{
va_list args;
va_start( args, fmt );
int result = 0;
// no error checking needed, an exception indicates an error.
result = vprint( fmt, args );
va_end( args );
return result;
}
std::string OUTPUTFORMATTER::Quotes( const std::string& aWrapee ) const
{
std::string ret;
@ -611,7 +628,7 @@ bool PRETTIFIED_FILE_OUTPUTFORMATTER::Finish()
if( !m_fp )
return false;
KICAD_FORMAT::Prettify( m_buf );
KICAD_FORMAT::Prettify( m_buf, ADVANCED_CFG::GetCfg().m_CompactSave );
if( fwrite( m_buf.c_str(), m_buf.length(), 1, m_fp ) != 1 )
THROW_IO_ERROR( strerror( errno ) );

17
common/stroke_params.cpp
View File

@ -276,20 +276,19 @@ void STROKE_PARAMS::GetMsgPanelInfo( UNITS_PROVIDER* aUnitsProvider,
}
void STROKE_PARAMS::Format( OUTPUTFORMATTER* aFormatter, const EDA_IU_SCALE& aIuScale,
int aNestLevel ) const
void STROKE_PARAMS::Format( OUTPUTFORMATTER* aFormatter, const EDA_IU_SCALE& aIuScale ) const
{
wxASSERT( aFormatter != nullptr );
if( GetColor() == KIGFX::COLOR4D::UNSPECIFIED )
{
aFormatter->Print( aNestLevel, "(stroke (width %s) (type %s))",
aFormatter->Print( "(stroke (width %s) (type %s))",
EDA_UNIT_UTILS::FormatInternalUnits( aIuScale, GetWidth() ).c_str(),
TO_UTF8( GetLineStyleToken( GetLineStyle() ) ) );
}
else
{
aFormatter->Print( aNestLevel, "(stroke (width %s) (type %s) (color %d %d %d %s))",
aFormatter->Print( "(stroke (width %s) (type %s) (color %d %d %d %s))",
EDA_UNIT_UTILS::FormatInternalUnits( aIuScale, GetWidth() ).c_str(),
TO_UTF8( GetLineStyleToken( GetLineStyle() ) ),
KiROUND( GetColor().r * 255.0 ),
@ -322,12 +321,12 @@ void STROKE_PARAMS_PARSER::ParseStroke( STROKE_PARAMS& aStroke )
switch( token )
{
case T_dash: aStroke.SetLineStyle( LINE_STYLE::DASH ); break;
case T_dot: aStroke.SetLineStyle( LINE_STYLE::DOT ); break;
case T_dash_dot: aStroke.SetLineStyle( LINE_STYLE::DASHDOT ); break;
case T_dash: aStroke.SetLineStyle( LINE_STYLE::DASH ); break;
case T_dot: aStroke.SetLineStyle( LINE_STYLE::DOT ); break;
case T_dash_dot: aStroke.SetLineStyle( LINE_STYLE::DASHDOT ); break;
case T_dash_dot_dot: aStroke.SetLineStyle( LINE_STYLE::DASHDOTDOT ); break;
case T_solid: aStroke.SetLineStyle( LINE_STYLE::SOLID ); break;
case T_default: aStroke.SetLineStyle( LINE_STYLE::DEFAULT ); break;
case T_solid: aStroke.SetLineStyle( LINE_STYLE::SOLID ); break;
case T_default: aStroke.SetLineStyle( LINE_STYLE::DEFAULT ); break;
default:
Expecting( "solid, dash, dash_dot, dash_dot_dot, dot or default" );
}

19
common/template_fieldnames.cpp
View File

@ -27,7 +27,6 @@
#include <mutex>
#include <template_fieldnames_lexer.h>
#include <pgm_base.h>
#include <string_utils.h>
using namespace TFIELD_T;
@ -80,17 +79,17 @@ const wxString TEMPLATE_FIELDNAME::GetDefaultFieldName( int aFieldNdx, bool aTra
}
void TEMPLATE_FIELDNAME::Format( OUTPUTFORMATTER* out, int nestLevel ) const
void TEMPLATE_FIELDNAME::Format( OUTPUTFORMATTER* out ) const
{
out->Print( nestLevel, "(field (name %s)", out->Quotew( m_Name ).c_str() );
out->Print( "(field (name %s)", out->Quotew( m_Name ).c_str() );
if( m_Visible )
out->Print( 0, " visible" );
out->Print( " visible" );
if( m_URL )
out->Print( 0, " url" );
out->Print( " url" );
out->Print( 0, ")\n" );
out->Print( ")" );
}
@ -139,21 +138,21 @@ void TEMPLATE_FIELDNAME::Parse( TEMPLATE_FIELDNAMES_LEXER* in )
}
void TEMPLATES::Format( OUTPUTFORMATTER* out, int nestLevel, bool aGlobal ) const
void TEMPLATES::Format( OUTPUTFORMATTER* out, bool aGlobal ) const
{
// We'll keep this general, and include the \n, even though the only known
// use at this time will not want the newlines or the indentation.
out->Print( nestLevel, "(templatefields" );
out->Print( "(templatefields" );
const TEMPLATE_FIELDNAMES& source = aGlobal ? m_globals : m_project;
for( const TEMPLATE_FIELDNAME& temp : source )
{
if( !temp.m_Name.IsEmpty() )
temp.Format( out, nestLevel+1 );
temp.Format( out );
}
out->Print( 0, ")\n" );
out->Print( ")" );
}

25
common/title_block.cpp
View File

@ -27,7 +27,7 @@
#include <title_block.h>
#include <core/kicad_algo.h>
void TITLE_BLOCK::Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const
void TITLE_BLOCK::Format( OUTPUTFORMATTER* aFormatter ) const
{
// Don't write the title block information if there is nothing to write.
bool isempty = true;
@ -42,32 +42,31 @@ void TITLE_BLOCK::Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aCont
if( !isempty )
{
aFormatter->Print( aNestLevel, "(title_block\n" );
aFormatter->Print( "(title_block" );
if( !GetTitle().IsEmpty() )
aFormatter->Print( aNestLevel+1, "(title %s)\n",
aFormatter->Quotew( GetTitle() ).c_str() );
aFormatter->Print( "(title %s)", aFormatter->Quotew( GetTitle() ).c_str() );
if( !GetDate().IsEmpty() )
aFormatter->Print( aNestLevel+1, "(date %s)\n",
aFormatter->Quotew( GetDate() ).c_str() );
aFormatter->Print( "(date %s)", aFormatter->Quotew( GetDate() ).c_str() );
if( !GetRevision().IsEmpty() )
aFormatter->Print( aNestLevel+1, "(rev %s)\n",
aFormatter->Quotew( GetRevision() ).c_str() );
aFormatter->Print( "(rev %s)", aFormatter->Quotew( GetRevision() ).c_str() );
if( !GetCompany().IsEmpty() )
aFormatter->Print( aNestLevel+1, "(company %s)\n",
aFormatter->Quotew( GetCompany() ).c_str() );
aFormatter->Print( "(company %s)", aFormatter->Quotew( GetCompany() ).c_str() );
for( int ii = 0; ii < 9; ii++ )
{
if( !GetComment(ii).IsEmpty() )
aFormatter->Print( aNestLevel+1, "(comment %d %s)\n", ii+1,
aFormatter->Quotew( GetComment(ii) ).c_str() );
{
aFormatter->Print( "(comment %d %s)",
ii+1,
aFormatter->Quotew( GetComment(ii) ).c_str() );
}
}
aFormatter->Print( aNestLevel, ")\n\n" );
aFormatter->Print( ")" );
}
}

3
eeschema/dialogs/panel_template_fieldnames.cpp
View File

@ -235,10 +235,9 @@ bool PANEL_TEMPLATE_FIELDNAMES::TransferDataFromWindow()
{
// Save global fieldname templates
STRING_FORMATTER sf;
m_templateMgr->Format( &sf, 0, true );
m_templateMgr->Format( &sf, true );
wxString record = From_UTF8( sf.GetString().c_str() );
record.Replace( wxT("\n"), wxT(""), true ); // strip all newlines
record.Replace( wxT(" "), wxT(" "), true ); // double space to single
cfg->m_Drawing.field_names = record.ToStdString();

521
eeschema/sch_io/kicad_sexpr/sch_io_kicad_sexpr.cpp
View File

File diff suppressed because it is too large Load Diff

32
eeschema/sch_io/kicad_sexpr/sch_io_kicad_sexpr.h
View File

@ -142,22 +142,22 @@ private:
void loadFile( const wxString& aFileName, SCH_SHEET* aSheet );
void saveSymbol( SCH_SYMBOL* aSymbol, const SCHEMATIC& aSchematic,
const SCH_SHEET_LIST& aSheetList, int aNestLevel,
bool aForClipboard, const SCH_SHEET_PATH* aRelativePath = nullptr );
void saveField( SCH_FIELD* aField, int aNestLevel );
void saveBitmap( const SCH_BITMAP& aBitmap, int aNestLevel );
void saveSheet( SCH_SHEET* aSheet, const SCH_SHEET_LIST& aSheetList, int aNestLevel );
void saveJunction( SCH_JUNCTION* aJunction, int aNestLevel );
void saveNoConnect( SCH_NO_CONNECT* aNoConnect, int aNestLevel );
void saveBusEntry( SCH_BUS_ENTRY_BASE* aBusEntry, int aNestLevel );
void saveLine( SCH_LINE* aLine, int aNestLevel );
void saveShape( SCH_SHAPE* aShape, int aNestLevel );
void saveRuleArea( SCH_RULE_AREA* aRuleArea, int aNestLevel );
void saveText( SCH_TEXT* aText, int aNestLevel );
void saveTextBox( SCH_TEXTBOX* aText, int aNestLevel );
void saveTable( SCH_TABLE* aTable, int aNestLevel );
void saveBusAlias( std::shared_ptr<BUS_ALIAS> aAlias, int aNestLevel );
void saveInstances( const std::vector<SCH_SHEET_INSTANCE>& aSheets, int aNestLevel );
const SCH_SHEET_LIST& aSheetList, bool aForClipboard,
const SCH_SHEET_PATH* aRelativePath = nullptr );
void saveField( SCH_FIELD* aField );
void saveBitmap( const SCH_BITMAP& aBitmap );
void saveSheet( SCH_SHEET* aSheet, const SCH_SHEET_LIST& aSheetList );
void saveJunction( SCH_JUNCTION* aJunction );
void saveNoConnect( SCH_NO_CONNECT* aNoConnect );
void saveBusEntry( SCH_BUS_ENTRY_BASE* aBusEntry );
void saveLine( SCH_LINE* aLine );
void saveShape( SCH_SHAPE* aShape );
void saveRuleArea( SCH_RULE_AREA* aRuleArea );
void saveText( SCH_TEXT* aText );
void saveTextBox( SCH_TEXTBOX* aText );
void saveTable( SCH_TABLE* aTable );
void saveBusAlias( std::shared_ptr<BUS_ALIAS> aAlias );
void saveInstances( const std::vector<SCH_SHEET_INSTANCE>& aSheets );
void cacheLib( const wxString& aLibraryFileName, const std::map<std::string, UTF8>* aProperties );
bool isBuffering( const std::map<std::string, UTF8>* aProperties );

141
eeschema/sch_io/kicad_sexpr/sch_io_kicad_sexpr_common.cpp
View File

@ -17,7 +17,6 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <advanced_config.h>
#include <base_units.h>
#include <macros.h>
#include <schematic_lexer.h>
@ -31,8 +30,7 @@ using namespace TSCHEMATIC_T;
static const char* emptyString = "";
void formatFill( OUTPUTFORMATTER* aFormatter, int aNestLevel, FILL_T aFillMode,
const COLOR4D& aFillColor )
void formatFill( OUTPUTFORMATTER* aFormatter, FILL_T aFillMode, const COLOR4D& aFillColor )
{
const char* fillType;
@ -47,7 +45,7 @@ void formatFill( OUTPUTFORMATTER* aFormatter, int aNestLevel, FILL_T aFillMode,
if( aFillMode == FILL_T::FILLED_WITH_COLOR )
{
aFormatter->Print( aNestLevel, "(fill (type %s) (color %d %d %d %s))",
aFormatter->Print( "(fill (type %s) (color %d %d %d %s))",
fillType,
KiROUND( aFillColor.r * 255.0 ),
KiROUND( aFillColor.g * 255.0 ),
@ -56,7 +54,7 @@ void formatFill( OUTPUTFORMATTER* aFormatter, int aNestLevel, FILL_T aFillMode,
}
else
{
aFormatter->Print( aNestLevel, "(fill (type %s))",
aFormatter->Print( "(fill (type %s))",
fillType );
}
}
@ -221,140 +219,105 @@ std::string formatIU( const VECTOR2I& aPt, bool aInvertY )
}
void formatArc( OUTPUTFORMATTER* aFormatter, int aNestLevel, EDA_SHAPE* aArc,
bool aIsPrivate, const STROKE_PARAMS& aStroke, FILL_T aFillMode,
const COLOR4D& aFillColor, bool aInvertY, const KIID& aUuid )
void formatArc( OUTPUTFORMATTER* aFormatter, EDA_SHAPE* aArc, bool aIsPrivate,
const STROKE_PARAMS& aStroke, FILL_T aFillMode, const COLOR4D& aFillColor,
bool aInvertY, const KIID& aUuid )
{
aFormatter->Print( aNestLevel, "(arc%s (start %s) (mid %s) (end %s)\n",
aIsPrivate ? " private" : "",
aFormatter->Print( "(arc %s (start %s) (mid %s) (end %s)",
aIsPrivate ? "private" : "",
formatIU( aArc->GetStart(), aInvertY ).c_str(),
formatIU( aArc->GetArcMid(), aInvertY ).c_str(),
formatIU( aArc->GetEnd(), aInvertY ).c_str() );
aStroke.Format( aFormatter, schIUScale, aNestLevel + 1 );
aFormatter->Print( 0, "\n" );
formatFill( aFormatter, aNestLevel + 1, aFillMode, aFillColor );
aFormatter->Print( 0, "\n" );
aStroke.Format( aFormatter, schIUScale );
formatFill( aFormatter, aFillMode, aFillColor );
if( aUuid != niluuid )
aFormatter->Print( aNestLevel + 1, "(uuid %s)\n", TO_UTF8( aUuid.AsString() ) );
aFormatter->Print( "(uuid %s)", TO_UTF8( aUuid.AsString() ) );
aFormatter->Print( aNestLevel, ")\n" );
aFormatter->Print( ")" );
}
void formatCircle( OUTPUTFORMATTER* aFormatter, int aNestLevel, EDA_SHAPE* aCircle,
bool aIsPrivate, const STROKE_PARAMS& aStroke, FILL_T aFillMode,
const COLOR4D& aFillColor, bool aInvertY, const KIID& aUuid )
void formatCircle( OUTPUTFORMATTER* aFormatter, EDA_SHAPE* aCircle, bool aIsPrivate,
const STROKE_PARAMS& aStroke, FILL_T aFillMode, const COLOR4D& aFillColor,
bool aInvertY, const KIID& aUuid )
{
aFormatter->Print( aNestLevel, "(circle%s (center %s) (radius %s)\n",
aIsPrivate ? " private" : "",
aFormatter->Print( "(circle %s (center %s) (radius %s)",
aIsPrivate ? "private" : "",
formatIU( aCircle->GetStart(), aInvertY ).c_str(),
formatIU( aCircle->GetRadius() ).c_str() );
aStroke.Format( aFormatter, schIUScale, aNestLevel + 1 );
aFormatter->Print( 0, "\n" );
formatFill( aFormatter, aNestLevel + 1, aFillMode, aFillColor );
aFormatter->Print( 0, "\n" );
aStroke.Format( aFormatter, schIUScale );
formatFill( aFormatter, aFillMode, aFillColor );
if( aUuid != niluuid )
aFormatter->Print( aNestLevel + 1, "(uuid %s)\n", TO_UTF8( aUuid.AsString() ) );
aFormatter->Print( "(uuid %s)", TO_UTF8( aUuid.AsString() ) );
aFormatter->Print( aNestLevel, ")\n" );
aFormatter->Print( ")" );
}
void formatRect( OUTPUTFORMATTER* aFormatter, int aNestLevel, EDA_SHAPE* aRect,
bool aIsPrivate, const STROKE_PARAMS& aStroke, FILL_T aFillMode,
const COLOR4D& aFillColor, bool aInvertY, const KIID& aUuid )
void formatRect( OUTPUTFORMATTER* aFormatter, EDA_SHAPE* aRect, bool aIsPrivate,
const STROKE_PARAMS& aStroke, FILL_T aFillMode, const COLOR4D& aFillColor,
bool aInvertY, const KIID& aUuid )
{
aFormatter->Print( aNestLevel, "(rectangle%s (start %s) (end %s)\n",
aIsPrivate ? " private" : "",
aFormatter->Print( "(rectangle %s (start %s) (end %s)",
aIsPrivate ? "private" : "",
formatIU( aRect->GetStart(), aInvertY ).c_str(),
formatIU( aRect->GetEnd(), aInvertY ).c_str() );
aStroke.Format( aFormatter, schIUScale, aNestLevel + 1 );
aFormatter->Print( 0, "\n" );
formatFill( aFormatter, aNestLevel + 1, aFillMode, aFillColor );
aFormatter->Print( 0, "\n" );
aStroke.Format( aFormatter, schIUScale );
formatFill( aFormatter, aFillMode, aFillColor );
if( aUuid != niluuid )
aFormatter->Print( aNestLevel + 1, "(uuid %s)\n", TO_UTF8( aUuid.AsString() ) );
aFormatter->Print( "(uuid %s)", TO_UTF8( aUuid.AsString() ) );
aFormatter->Print( aNestLevel, ")\n" );
aFormatter->Print( ")" );
}
void formatBezier( OUTPUTFORMATTER* aFormatter, int aNestLevel, EDA_SHAPE* aBezier,
bool aIsPrivate, const STROKE_PARAMS& aStroke, FILL_T aFillMode,
const COLOR4D& aFillColor, bool aInvertY, const KIID& aUuid )
void formatBezier( OUTPUTFORMATTER* aFormatter, EDA_SHAPE* aBezier, bool aIsPrivate,
const STROKE_PARAMS& aStroke, FILL_T aFillMode, const COLOR4D& aFillColor,
bool aInvertY, const KIID& aUuid )
{
aFormatter->Print( aNestLevel, "(bezier%s (pts ",
aIsPrivate ? " private" : "" );
aFormatter->Print( "(bezier %s (pts ",
aIsPrivate ? "private" : "" );
for( const VECTOR2I& pt : { aBezier->GetStart(), aBezier->GetBezierC1(),
aBezier->GetBezierC2(), aBezier->GetEnd() } )
{
aFormatter->Print( 0, " (xy %s)",
formatIU( pt, aInvertY ).c_str() );
aFormatter->Print( "(xy %s)", formatIU( pt, aInvertY ).c_str() );
}
aFormatter->Print( 0, ")\n" ); // Closes pts token on same line.
aFormatter->Print( ")" ); // Closes pts token
aStroke.Format( aFormatter, schIUScale, aNestLevel + 1 );
aFormatter->Print( 0, "\n" );
formatFill( aFormatter, aNestLevel + 1, aFillMode, aFillColor );
aFormatter->Print( 0, "\n" );
aStroke.Format( aFormatter, schIUScale );
formatFill( aFormatter, aFillMode, aFillColor );
if( aUuid != niluuid )
aFormatter->Print( aNestLevel + 1, "(uuid %s)\n", TO_UTF8( aUuid.AsString() ) );
aFormatter->Print( "(uuid %s)", TO_UTF8( aUuid.AsString() ) );
aFormatter->Print( aNestLevel, ")\n" );
aFormatter->Print( ")" );
}
void formatPoly( OUTPUTFORMATTER* aFormatter, int aNestLevel, EDA_SHAPE* aPolyLine,
bool aIsPrivate, const STROKE_PARAMS& aStroke, FILL_T aFillMode,
const COLOR4D& aFillColor, bool aInvertY, const KIID& aUuid )
void formatPoly( OUTPUTFORMATTER* aFormatter, EDA_SHAPE* aPolyLine, bool aIsPrivate,
const STROKE_PARAMS& aStroke, FILL_T aFillMode, const COLOR4D& aFillColor,
bool aInvertY, const KIID& aUuid )
{
int newLine = 0;
int lineCount = 1;
aFormatter->Print( aNestLevel, "(polyline%s\n", aIsPrivate ? " private" : "" );
aFormatter->Print( aNestLevel + 1, "(pts" );
aFormatter->Print( "(polyline %s (pts ",
aIsPrivate ? "private" : "" );
for( const VECTOR2I& pt : aPolyLine->GetPolyShape().Outline( 0 ).CPoints() )
{
if( newLine == 4 || !ADVANCED_CFG::GetCfg().m_CompactSave )
{
aFormatter->Print( 0, "\n" );
aFormatter->Print( aNestLevel + 2, "(xy %s)", formatIU( pt, aInvertY ).c_str() );
newLine = 0;
lineCount += 1;
}
else
{
aFormatter->Print( 0, " (xy %s)", formatIU( pt, aInvertY ).c_str() );
}
aFormatter->Print( "(xy %s)", formatIU( pt, aInvertY ).c_str() );
newLine += 1;
}
aFormatter->Print( ")" ); // Closes pts token
if( lineCount == 1 )
{
aFormatter->Print( 0, ")\n" ); // Closes pts token on same line.
}
else
{
aFormatter->Print( 0, "\n" );
aFormatter->Print( aNestLevel + 1, ")\n" ); // Closes pts token with multiple lines.
}
aStroke.Format( aFormatter, schIUScale, aNestLevel + 1 );
aFormatter->Print( 0, "\n" );
formatFill( aFormatter, aNestLevel + 1, aFillMode, aFillColor );
aFormatter->Print( 0, "\n" );
aStroke.Format( aFormatter, schIUScale );
formatFill( aFormatter, aFillMode, aFillColor );
if( aUuid != niluuid )
aFormatter->Print( aNestLevel + 1, "(uuid %s)\n", TO_UTF8( aUuid.AsString() ) );
aFormatter->Print( "(uuid %s)", TO_UTF8( aUuid.AsString() ) );
aFormatter->Print( aNestLevel, ")\n" );
aFormatter->Print( ")" );
}

33
eeschema/sch_io/kicad_sexpr/sch_io_kicad_sexpr_common.h
View File

@ -36,8 +36,7 @@ class STROKE_PARAMS;
/**
* Fill token formatting helper.
*/
extern void formatFill( OUTPUTFORMATTER* aFormatter, int aNestLevel, FILL_T aFillMode,
const COLOR4D& aFillColor );
extern void formatFill( OUTPUTFORMATTER* aFormatter, FILL_T aFillMode, const COLOR4D& aFillColor );
extern const char* getPinElectricalTypeToken( ELECTRICAL_PINTYPE aType );
@ -51,24 +50,24 @@ extern EDA_ANGLE getSheetPinAngle( SHEET_SIDE aSide );
extern const char* getTextTypeToken( KICAD_T aType );
extern void formatArc( OUTPUTFORMATTER* aFormatter, int aNestLevel, EDA_SHAPE* aArc,
bool aIsPrivate, const STROKE_PARAMS& aStroke, FILL_T aFillMode,
const COLOR4D& aFillColor, bool aInvertY, const KIID& aUuid = niluuid );
extern void formatArc( OUTPUTFORMATTER* aFormatter, EDA_SHAPE* aArc, bool aIsPrivate,
const STROKE_PARAMS& aStroke, FILL_T aFillMode, const COLOR4D& aFillColor,
bool aInvertY, const KIID& aUuid = niluuid );
extern void formatCircle( OUTPUTFORMATTER* aFormatter, int aNestLevel, EDA_SHAPE* aCircle,
bool aIsPrivate, const STROKE_PARAMS& aStroke, FILL_T aFillMode,
const COLOR4D& aFillColor, bool aInvertY, const KIID& aUuid = niluuid );
extern void formatCircle( OUTPUTFORMATTER* aFormatter, EDA_SHAPE* aCircle, bool aIsPrivate,
const STROKE_PARAMS& aStroke, FILL_T aFillMode, const COLOR4D& aFillColor,
bool aInvertY, const KIID& aUuid = niluuid );
extern void formatRect( OUTPUTFORMATTER* aFormatter, int aNestLevel, EDA_SHAPE* aRect,
bool aIsPrivate, const STROKE_PARAMS& aStroke, FILL_T aFillMode,
const COLOR4D& aFillColor, bool aInvertY, const KIID& aUuid = niluuid );
extern void formatRect( OUTPUTFORMATTER* aFormatter, EDA_SHAPE* aRect, bool aIsPrivate,
const STROKE_PARAMS& aStroke, FILL_T aFillMode, const COLOR4D& aFillColor,
bool aInvertY, const KIID& aUuid = niluuid );
extern void formatBezier( OUTPUTFORMATTER* aFormatter, int aNestLevel, EDA_SHAPE* aBezier,
bool aIsPrivate, const STROKE_PARAMS& aStroke, FILL_T aFillMode,
const COLOR4D& aFillColor, bool aInvertY, const KIID& aUuid = niluuid );
extern void formatBezier( OUTPUTFORMATTER* aFormatter, EDA_SHAPE* aBezier, bool aIsPrivate,
const STROKE_PARAMS& aStroke, FILL_T aFillMode, const COLOR4D& aFillColor,
bool aInvertY, const KIID& aUuid = niluuid );
extern void formatPoly( OUTPUTFORMATTER* aFormatter, int aNestLevel, EDA_SHAPE* aPolyLine,
bool aIsPrivate, const STROKE_PARAMS& aStroke, FILL_T aFillMode,
const COLOR4D& aFillColor, bool aInvertY, const KIID& aUuid = niluuid );
extern void formatPoly( OUTPUTFORMATTER* aFormatter, EDA_SHAPE* aPolyLine, bool aIsPrivate,
const STROKE_PARAMS& aStroke, FILL_T aFillMode, const COLOR4D& aFillColor,
bool aInvertY, const KIID& aUuid = niluuid );
#endif // SCH_IO_KICAD_SEXPR_COMMON_H_

154
eeschema/sch_io/kicad_sexpr/sch_io_kicad_sexpr_lib_cache.cpp
View File

@ -33,6 +33,7 @@
#include "sch_io_kicad_sexpr_parser.h"
#include <string_utils.h>
#include <trace_helpers.h>
#include <io/kicad/kicad_io_utils.h>
SCH_IO_KICAD_SEXPR_LIB_CACHE::SCH_IO_KICAD_SEXPR_LIB_CACHE( const wxString& aFullPathAndFileName ) :
@ -92,9 +93,10 @@ void SCH_IO_KICAD_SEXPR_LIB_CACHE::Save( const std::optional<bool>& aOpt )
auto formatter = std::make_unique<PRETTIFIED_FILE_OUTPUTFORMATTER>( fn.GetFullPath() );
formatter->Print( 0, "(kicad_symbol_lib (version %d) (generator \"kicad_symbol_editor\") "
"(generator_version \"%s\")\n",
SEXPR_SYMBOL_LIB_FILE_VERSION, GetMajorMinorVersion().c_str().AsChar() );
formatter->Print( "(kicad_symbol_lib (version %d) (generator \"kicad_symbol_editor\") "
"(generator_version \"%s\")",
SEXPR_SYMBOL_LIB_FILE_VERSION,
GetMajorMinorVersion().c_str().AsChar() );
std::vector<LIB_SYMBOL*> orderedSymbols;
@ -118,9 +120,9 @@ void SCH_IO_KICAD_SEXPR_LIB_CACHE::Save( const std::optional<bool>& aOpt )
} );
for( LIB_SYMBOL* symbol : orderedSymbols )
SaveSymbol( symbol, *formatter.get(), 1 );
SaveSymbol( symbol, *formatter.get() );
formatter->Print( 0, ")\n" );
formatter->Print( ")" );
formatter.reset();
@ -130,7 +132,7 @@ void SCH_IO_KICAD_SEXPR_LIB_CACHE::Save( const std::optional<bool>& aOpt )
void SCH_IO_KICAD_SEXPR_LIB_CACHE::SaveSymbol( LIB_SYMBOL* aSymbol, OUTPUTFORMATTER& aFormatter,
int aNestLevel, const wxString& aLibName, bool aIncludeData )
const wxString& aLibName, bool aIncludeData )
{
wxCHECK_RET( aSymbol, "Invalid LIB_SYMBOL pointer." );
@ -165,51 +167,48 @@ void SCH_IO_KICAD_SEXPR_LIB_CACHE::SaveSymbol( LIB_SYMBOL* aSymbol, OUTPUTFORMAT
if( aSymbol->IsRoot() )
{
aFormatter.Print( aNestLevel, "(symbol %s", name.c_str() );
aFormatter.Print( "(symbol %s", name.c_str() );
if( aSymbol->IsPower() )
aFormatter.Print( 0, " (power)" );
aFormatter.Print( "(power)" );
// TODO: add uuid token here.
// TODO: add anchor position token here.
if( !aSymbol->GetShowPinNumbers() )
aFormatter.Print( 0, " (pin_numbers (hide yes))" );
aFormatter.Print( "(pin_numbers (hide yes))" );
if( aSymbol->GetPinNameOffset() != schIUScale.MilsToIU( DEFAULT_PIN_NAME_OFFSET )
|| !aSymbol->GetShowPinNames() )
{
aFormatter.Print( 0, " (pin_names" );
aFormatter.Print( "(pin_names" );
if( aSymbol->GetPinNameOffset() != schIUScale.MilsToIU( DEFAULT_PIN_NAME_OFFSET ) )
{
aFormatter.Print( 0, " (offset %s)",
aFormatter.Print( "(offset %s)",
EDA_UNIT_UTILS::FormatInternalUnits( schIUScale,
aSymbol->GetPinNameOffset() ).c_str() );
}
if( !aSymbol->GetShowPinNames() )
aFormatter.Print( 0, " (hide yes)" );
KICAD_FORMAT::FormatBool( &aFormatter, "hide", true );
aFormatter.Print( 0, ")" );
aFormatter.Print( ")" );
}
aFormatter.Print( 0, " (exclude_from_sim %s)",
( aSymbol->GetExcludedFromSim() ) ? "yes" : "no" );
aFormatter.Print( 0, " (in_bom %s)", ( aSymbol->GetExcludedFromBOM() ) ? "no" : "yes" );
aFormatter.Print( 0, " (on_board %s)", ( aSymbol->GetExcludedFromBoard() ) ? "no" : "yes" );
KICAD_FORMAT::FormatBool( &aFormatter, "exclude_from_sim", aSymbol->GetExcludedFromSim() );
KICAD_FORMAT::FormatBool( &aFormatter, "in_bom", !aSymbol->GetExcludedFromBOM() );
KICAD_FORMAT::FormatBool( &aFormatter, "on_board", !aSymbol->GetExcludedFromBoard() );
// TODO: add atomic token here.
// TODO: add required token here."
aFormatter.Print( 0, "\n" );
aSymbol->GetFields( fields );
for( SCH_FIELD* field : fields )
saveField( field, aFormatter, aNestLevel + 1 );
saveField( field, aFormatter );
nextFreeFieldId = aSymbol->GetNextAvailableFieldId();
@ -219,11 +218,11 @@ void SCH_IO_KICAD_SEXPR_LIB_CACHE::SaveSymbol( LIB_SYMBOL* aSymbol, OUTPUTFORMAT
if( aSymbol->UnitsLocked() )
{
SCH_FIELD locked( nullptr, nextFreeFieldId, "ki_locked" );
saveField( &locked, aFormatter, aNestLevel + 1 );
saveField( &locked, aFormatter );
nextFreeFieldId += 1;
}
saveDcmInfoAsFields( aSymbol, aFormatter, nextFreeFieldId, aNestLevel );
saveDcmInfoAsFields( aSymbol, aFormatter, nextFreeFieldId );
// Save the draw items grouped by units.
std::vector<LIB_SYMBOL_UNIT> units = aSymbol->GetUnitDrawItems();
@ -242,7 +241,7 @@ void SCH_IO_KICAD_SEXPR_LIB_CACHE::SaveSymbol( LIB_SYMBOL* aSymbol, OUTPUTFORMAT
name = aFormatter.Quotes( unitName );
name.pop_back(); // Remove last char: the quote ending the string.
aFormatter.Print( aNestLevel + 1, "(symbol %s_%d_%d\"\n",
aFormatter.Print( "(symbol %s_%d_%d\"",
name.c_str(),
unit.m_unit,
unit.m_bodyStyle );
@ -251,9 +250,9 @@ void SCH_IO_KICAD_SEXPR_LIB_CACHE::SaveSymbol( LIB_SYMBOL* aSymbol, OUTPUTFORMAT
if( aSymbol->HasUnitDisplayName( unit.m_unit ) )
{
name = aSymbol->GetUnitDisplayName( unit.m_unit );
aFormatter.Print( aNestLevel + 2, "(unit_name %s)\n",
aFormatter.Quotes( name ).c_str() );
aFormatter.Print( "(unit_name %s)", aFormatter.Quotes( name ).c_str() );
}
// Enforce item ordering
auto cmp =
[]( const SCH_ITEM* a, const SCH_ITEM* b )
@ -267,16 +266,15 @@ void SCH_IO_KICAD_SEXPR_LIB_CACHE::SaveSymbol( LIB_SYMBOL* aSymbol, OUTPUTFORMAT
save_map.insert( item );
for( SCH_ITEM* item : save_map )
saveSymbolDrawItem( item, aFormatter, aNestLevel + 2 );
saveSymbolDrawItem( item, aFormatter );
aFormatter.Print( aNestLevel + 1, ")\n" );
aFormatter.Print( ")" );
}
aFormatter.Print( aNestLevel + 1, "(embedded_fonts %s)\n",
aSymbol->GetAreFontsEmbedded() ? "yes" : "no" );
KICAD_FORMAT::FormatBool( &aFormatter, "embedded_fonts", aSymbol->GetAreFontsEmbedded() );
if( !aSymbol->EmbeddedFileMap().empty() )
aSymbol->WriteEmbeddedFiles( aFormatter, aNestLevel + 1, aIncludeData );
aSymbol->WriteEmbeddedFiles( aFormatter, aIncludeData );
}
else
{
@ -284,27 +282,27 @@ void SCH_IO_KICAD_SEXPR_LIB_CACHE::SaveSymbol( LIB_SYMBOL* aSymbol, OUTPUTFORMAT
wxASSERT( parent );
aFormatter.Print( aNestLevel, "(symbol %s (extends %s)\n",
aFormatter.Print( "(symbol %s (extends %s)",
name.c_str(),
aFormatter.Quotew( parent->GetName() ).c_str() );
aSymbol->GetFields( fields );
for( SCH_FIELD* field : fields )
saveField( field, aFormatter, aNestLevel + 1 );
saveField( field, aFormatter );
nextFreeFieldId = aSymbol->GetNextAvailableFieldId();
saveDcmInfoAsFields( aSymbol, aFormatter, nextFreeFieldId, aNestLevel );
saveDcmInfoAsFields( aSymbol, aFormatter, nextFreeFieldId );
}
aFormatter.Print( aNestLevel, ")\n" );
aFormatter.Print( ")" );
}
void SCH_IO_KICAD_SEXPR_LIB_CACHE::saveDcmInfoAsFields( LIB_SYMBOL* aSymbol,
OUTPUTFORMATTER& aFormatter,
int& aNextFreeFieldId, int aNestLevel )
int& aNextFreeFieldId )
{
wxCHECK_RET( aSymbol, "Invalid LIB_SYMBOL pointer." );
@ -313,7 +311,7 @@ void SCH_IO_KICAD_SEXPR_LIB_CACHE::saveDcmInfoAsFields( LIB_SYMBOL* aSymbol,
SCH_FIELD keywords( nullptr, aNextFreeFieldId, wxString( "ki_keywords" ) );
keywords.SetVisible( false );
keywords.SetText( aSymbol->GetKeyWords() );
saveField( &keywords, aFormatter, aNestLevel + 1 );
saveField( &keywords, aFormatter );
aNextFreeFieldId += 1;
}
@ -337,14 +335,13 @@ void SCH_IO_KICAD_SEXPR_LIB_CACHE::saveDcmInfoAsFields( LIB_SYMBOL* aSymbol,
SCH_FIELD description( nullptr, aNextFreeFieldId, wxString( "ki_fp_filters" ) );
description.SetVisible( false );
description.SetText( tmp );
saveField( &description, aFormatter, aNestLevel + 1 );
saveField( &description, aFormatter );
aNextFreeFieldId += 1;
}
}
void SCH_IO_KICAD_SEXPR_LIB_CACHE::saveSymbolDrawItem( SCH_ITEM* aItem, OUTPUTFORMATTER& aFormatter,
int aNestLevel )
void SCH_IO_KICAD_SEXPR_LIB_CACHE::saveSymbolDrawItem( SCH_ITEM* aItem, OUTPUTFORMATTER& aFormatter )
{
wxCHECK_RET( aItem, "Invalid SCH_ITEM pointer." );
@ -361,23 +358,23 @@ void SCH_IO_KICAD_SEXPR_LIB_CACHE::saveSymbolDrawItem( SCH_ITEM* aItem, OUTPUTFO
switch( shape->GetShape() )
{
case SHAPE_T::ARC:
formatArc( &aFormatter, aNestLevel, shape, isPrivate, stroke, fillMode, fillColor, true );
formatArc( &aFormatter, shape, isPrivate, stroke, fillMode, fillColor, true );
break;
case SHAPE_T::CIRCLE:
formatCircle( &aFormatter, aNestLevel, shape, isPrivate, stroke, fillMode, fillColor, true );
formatCircle( &aFormatter, shape, isPrivate, stroke, fillMode, fillColor, true );
break;
case SHAPE_T::RECTANGLE:
formatRect( &aFormatter, aNestLevel, shape, isPrivate, stroke, fillMode, fillColor, true );
formatRect( &aFormatter, shape, isPrivate, stroke, fillMode, fillColor, true );
break;
case SHAPE_T::BEZIER:
formatBezier(&aFormatter, aNestLevel, shape, isPrivate, stroke, fillMode, fillColor, true );
formatBezier(&aFormatter, shape, isPrivate, stroke, fillMode, fillColor, true );
break;
case SHAPE_T::POLY:
formatPoly( &aFormatter, aNestLevel, shape, isPrivate, stroke, fillMode, fillColor, true );
formatPoly( &aFormatter, shape, isPrivate, stroke, fillMode, fillColor, true );
break;
default:
@ -388,15 +385,15 @@ void SCH_IO_KICAD_SEXPR_LIB_CACHE::saveSymbolDrawItem( SCH_ITEM* aItem, OUTPUTFO
}
case SCH_PIN_T:
savePin( static_cast<SCH_PIN*>( aItem ), aFormatter, aNestLevel );
savePin( static_cast<SCH_PIN*>( aItem ), aFormatter );
break;
case SCH_TEXT_T:
saveText( static_cast<SCH_TEXT*>( aItem ), aFormatter, aNestLevel );
saveText( static_cast<SCH_TEXT*>( aItem ), aFormatter );
break;
case SCH_TEXTBOX_T:
saveTextBox( static_cast<SCH_TEXTBOX*>( aItem ), aFormatter, aNestLevel );
saveTextBox( static_cast<SCH_TEXTBOX*>( aItem ), aFormatter );
break;
default:
@ -405,8 +402,7 @@ void SCH_IO_KICAD_SEXPR_LIB_CACHE::saveSymbolDrawItem( SCH_ITEM* aItem, OUTPUTFO
}
void SCH_IO_KICAD_SEXPR_LIB_CACHE::saveField( SCH_FIELD* aField, OUTPUTFORMATTER& aFormatter,
int aNestLevel )
void SCH_IO_KICAD_SEXPR_LIB_CACHE::saveField( SCH_FIELD* aField, OUTPUTFORMATTER& aFormatter )
{
wxCHECK_RET( aField && aField->Type() == SCH_FIELD_T, "Invalid SCH_FIELD object." );
@ -415,7 +411,7 @@ void SCH_IO_KICAD_SEXPR_LIB_CACHE::saveField( SCH_FIELD* aField, OUTPUTFORMATTER
if( aField->IsMandatory() )
fieldName = GetCanonicalFieldName( aField->GetId() );
aFormatter.Print( aNestLevel, "(property %s %s (at %s %s %g)",
aFormatter.Print( "(property %s %s (at %s %s %g)",
aFormatter.Quotew( fieldName ).c_str(),
aFormatter.Quotew( aField->GetText() ).c_str(),
EDA_UNIT_UTILS::FormatInternalUnits( schIUScale,
@ -425,25 +421,23 @@ void SCH_IO_KICAD_SEXPR_LIB_CACHE::saveField( SCH_FIELD* aField, OUTPUTFORMATTER
aField->GetTextAngle().AsDegrees() );
if( aField->IsNameShown() )
aFormatter.Print( 0, " (show_name)" );
aFormatter.Print( "(show_name)" );
if( !aField->CanAutoplace() )
aFormatter.Print( 0, " (do_not_autoplace)" );
aFormatter.Print( "(do_not_autoplace)" );
aFormatter.Print( 0, "\n" );
aField->Format( &aFormatter, aNestLevel, 0 );
aFormatter.Print( aNestLevel, ")\n" );
aField->Format( &aFormatter, 0 );
aFormatter.Print( ")" );
}
void SCH_IO_KICAD_SEXPR_LIB_CACHE::savePin( SCH_PIN* aPin, OUTPUTFORMATTER& aFormatter,
int aNestLevel )
void SCH_IO_KICAD_SEXPR_LIB_CACHE::savePin( SCH_PIN* aPin, OUTPUTFORMATTER& aFormatter )
{
wxCHECK_RET( aPin && aPin->Type() == SCH_PIN_T, "Invalid SCH_PIN object." );
aPin->ClearFlags( IS_CHANGED );
aFormatter.Print( aNestLevel, "(pin %s %s (at %s %s %s) (length %s)",
aFormatter.Print( "(pin %s %s (at %s %s %s) (length %s)",
getPinElectricalTypeToken( aPin->GetType() ),
getPinShapeToken( aPin->GetShape() ),
EDA_UNIT_UTILS::FormatInternalUnits( schIUScale,
@ -455,19 +449,17 @@ void SCH_IO_KICAD_SEXPR_LIB_CACHE::savePin( SCH_PIN* aPin, OUTPUTFORMATTER& aFor
aPin->GetLength() ).c_str() );
if( !aPin->IsVisible() )
aFormatter.Print( 0, " (hide yes)\n" );
else
aFormatter.Print( 0, "\n" );
KICAD_FORMAT::FormatBool( &aFormatter, "hide", true );
// This follows the EDA_TEXT effects formatting for future expansion.
aFormatter.Print( aNestLevel + 1, "(name %s (effects (font (size %s %s))))\n",
aFormatter.Print( "(name %s (effects (font (size %s %s))))",
aFormatter.Quotew( aPin->GetName() ).c_str(),
EDA_UNIT_UTILS::FormatInternalUnits( schIUScale,
aPin->GetNameTextSize() ).c_str(),
EDA_UNIT_UTILS::FormatInternalUnits( schIUScale,
aPin->GetNameTextSize() ).c_str() );
aFormatter.Print( aNestLevel + 1, "(number %s (effects (font (size %s %s))))\n",
aFormatter.Print( "(number %s (effects (font (size %s %s))))",
aFormatter.Quotew( aPin->GetNumber() ).c_str(),
EDA_UNIT_UTILS::FormatInternalUnits( schIUScale,
aPin->GetNumberTextSize() ).c_str(),
@ -477,23 +469,22 @@ void SCH_IO_KICAD_SEXPR_LIB_CACHE::savePin( SCH_PIN* aPin, OUTPUTFORMATTER& aFor
for( const std::pair<const wxString, SCH_PIN::ALT>& alt : aPin->GetAlternates() )
{
aFormatter.Print( aNestLevel + 1, "(alternate %s %s %s)\n",
aFormatter.Print( "(alternate %s %s %s)",
aFormatter.Quotew( alt.second.m_Name ).c_str(),
getPinElectricalTypeToken( alt.second.m_Type ),
getPinShapeToken( alt.second.m_Shape ) );
}
aFormatter.Print( aNestLevel, ")\n" );
aFormatter.Print( ")" );
}
void SCH_IO_KICAD_SEXPR_LIB_CACHE::saveText( SCH_TEXT* aText, OUTPUTFORMATTER& aFormatter,
int aNestLevel )
void SCH_IO_KICAD_SEXPR_LIB_CACHE::saveText( SCH_TEXT* aText, OUTPUTFORMATTER& aFormatter )
{
wxCHECK_RET( aText && aText->Type() == SCH_TEXT_T, "Invalid SCH_TEXT object." );
aFormatter.Print( aNestLevel, "(text%s %s (at %s %s %g)\n",
aText->IsPrivate() ? " private" : "",
aFormatter.Print( "(text %s %s (at %s %s %g)",
aText->IsPrivate() ? "private" : "",
aFormatter.Quotew( aText->GetText() ).c_str(),
EDA_UNIT_UTILS::FormatInternalUnits( schIUScale,
aText->GetPosition().x ).c_str(),
@ -501,24 +492,23 @@ void SCH_IO_KICAD_SEXPR_LIB_CACHE::saveText( SCH_TEXT* aText, OUTPUTFORMATTER& a
-aText->GetPosition().y ).c_str(),
(double) aText->GetTextAngle().AsTenthsOfADegree() );
aText->EDA_TEXT::Format( &aFormatter, aNestLevel, 0 );
aFormatter.Print( aNestLevel, ")\n" );
aText->EDA_TEXT::Format( &aFormatter, 0 );
aFormatter.Print( ")" );
}
void SCH_IO_KICAD_SEXPR_LIB_CACHE::saveTextBox( SCH_TEXTBOX* aTextBox, OUTPUTFORMATTER& aFormatter,
int aNestLevel )
void SCH_IO_KICAD_SEXPR_LIB_CACHE::saveTextBox( SCH_TEXTBOX* aTextBox, OUTPUTFORMATTER& aFormatter )
{
wxCHECK_RET( aTextBox && aTextBox->Type() == SCH_TEXTBOX_T, "Invalid SCH_TEXTBOX object." );
aFormatter.Print( aNestLevel, "(text_box%s %s\n",
aTextBox->IsPrivate() ? " private" : "",
aFormatter.Print( "(text_box %s %s",
aTextBox->IsPrivate() ? "private" : "",
aFormatter.Quotew( aTextBox->GetText() ).c_str() );
VECTOR2I pos = aTextBox->GetStart();
VECTOR2I size = aTextBox->GetEnd() - pos;
aFormatter.Print( aNestLevel + 1, "(at %s %s %s) (size %s %s) (margins %s %s %s %s)\n",
aFormatter.Print( "(at %s %s %s) (size %s %s) (margins %s %s %s %s)",
EDA_UNIT_UTILS::FormatInternalUnits( schIUScale, pos.x ).c_str(),
EDA_UNIT_UTILS::FormatInternalUnits( schIUScale, -pos.y ).c_str(),
EDA_UNIT_UTILS::FormatAngle( aTextBox->GetTextAngle() ).c_str(),
@ -529,14 +519,10 @@ void SCH_IO_KICAD_SEXPR_LIB_CACHE::saveTextBox( SCH_TEXTBOX* aTextBox, OUTPUTFOR
EDA_UNIT_UTILS::FormatInternalUnits( schIUScale, aTextBox->GetMarginRight() ).c_str(),
EDA_UNIT_UTILS::FormatInternalUnits( schIUScale, aTextBox->GetMarginBottom() ).c_str() );
aTextBox->GetStroke().Format( &aFormatter, schIUScale, aNestLevel + 1 );
aFormatter.Print( 0, "\n" );
formatFill( &aFormatter, aNestLevel + 1, aTextBox->GetFillMode(), aTextBox->GetFillColor() );
aFormatter.Print( 0, "\n" );
aTextBox->EDA_TEXT::Format( &aFormatter, aNestLevel, 0 );
aFormatter.Print( aNestLevel, ")\n" );
aTextBox->GetStroke().Format( &aFormatter, schIUScale );
formatFill( &aFormatter, aTextBox->GetFillMode(), aTextBox->GetFillColor() );
aTextBox->EDA_TEXT::Format( &aFormatter, 0 );
aFormatter.Print( ")" );
}

16
eeschema/sch_io/kicad_sexpr/sch_io_kicad_sexpr_lib_cache.h
View File

@ -51,7 +51,7 @@ public:
void DeleteSymbol( const wxString& aName ) override;
static void SaveSymbol( LIB_SYMBOL* aSymbol, OUTPUTFORMATTER& aFormatter, int aNestLevel = 0,
static void SaveSymbol( LIB_SYMBOL* aSymbol, OUTPUTFORMATTER& aFormatter,
const wxString& aLibName = wxEmptyString, bool aIncludeData = true );
void SetFileFormatVersionAtLoad( int aVersion ) { m_fileFormatVersionAtLoad = aVersion; }
@ -62,16 +62,14 @@ private:
int m_fileFormatVersionAtLoad;
static void saveSymbolDrawItem( SCH_ITEM* aItem, OUTPUTFORMATTER& aFormatter,
int aNestLevel );
static void saveField( SCH_FIELD* aField, OUTPUTFORMATTER& aFormatter, int aNestLevel );
static void savePin( SCH_PIN* aPin, OUTPUTFORMATTER& aFormatter, int aNestLevel = 0 );
static void saveText( SCH_TEXT* aText, OUTPUTFORMATTER& aFormatter, int aNestLevel = 0 );
static void saveTextBox( SCH_TEXTBOX* aTextBox, OUTPUTFORMATTER& aFormatter,
int aNestLevel = 0 );
static void saveSymbolDrawItem( SCH_ITEM* aItem, OUTPUTFORMATTER& aFormatter );
static void saveField( SCH_FIELD* aField, OUTPUTFORMATTER& aFormatter );
static void savePin( SCH_PIN* aPin, OUTPUTFORMATTER& aFormatter );
static void saveText( SCH_TEXT* aText, OUTPUTFORMATTER& aFormatter );
static void saveTextBox( SCH_TEXTBOX* aTextBox, OUTPUTFORMATTER& aFormatter );
static void saveDcmInfoAsFields( LIB_SYMBOL* aSymbol, OUTPUTFORMATTER& aFormatter,
int& aNextFreeFieldId, int aNestLevel );
int& aNextFreeFieldId );
};
#endif // SCH_IO_KICAD_SEXPR_LIB_CACHE_H_

2
eeschema/symbol_editor/symbol_editor.cpp
View File

@ -1215,7 +1215,7 @@ void SYMBOL_EDIT_FRAME::CopySymbolToClipboard()
}
std::string prettyData = formatter.GetString();
KICAD_FORMAT::Prettify( prettyData );
KICAD_FORMAT::Prettify( prettyData, true );
wxLogNull doNotLog; // disable logging of failed clipboard actions

2
eeschema/tools/sch_editor_control.cpp
View File

@ -1343,7 +1343,7 @@ bool SCH_EDITOR_CONTROL::doCopy( bool aUseDuplicateClipboard )
plugin.Format( &selection, &selPath, schematic, &formatter, true );
std::string prettyData = formatter.GetString();
KICAD_FORMAT::Prettify( prettyData );
KICAD_FORMAT::Prettify( prettyData, true );
if( selection.IsHover() )
m_toolMgr->RunAction( EE_ACTIONS::clearSelection );

2
eeschema/tools/symbol_editor_edit_tool.cpp
View File

@ -921,7 +921,7 @@ int SYMBOL_EDITOR_EDIT_TOOL::Copy( const TOOL_EVENT& aEvent )
item.ClearFlags( STRUCT_DELETED );
std::string prettyData = formatter.GetString();
KICAD_FORMAT::Prettify( prettyData );
KICAD_FORMAT::Prettify( prettyData, true );
if( SaveClipboard( prettyData ) )
return 0;

3
include/eda_text.h
View File

@ -350,11 +350,10 @@ public:
* Output the object to \a aFormatter in s-expression form.
*
* @param aFormatter The #OUTPUTFORMATTER object to write to.
* @param aNestLevel The indentation next level.
* @param aControlBits The control bit definition for object specific formatting.
* @throw IO_ERROR on write error.
*/
virtual void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const;
virtual void Format( OUTPUTFORMATTER* aFormatter, int aControlBits ) const;
virtual EDA_ANGLE GetDrawRotation() const { return GetTextAngle(); }
virtual VECTOR2I GetDrawPos() const { return GetTextPos(); }

8
include/embedded_files.h
View File

@ -121,11 +121,11 @@ public:
/**
* Output formatter for the embedded files.
* @param aOut is the output formatter.
* @param aNestLevel is the current indentation level.
* @param aWriteData is true if the actual data should be written. This is false when writing an element
* that is already embedded in a file that itself has embedded files (boards, schematics, etc.)
* @param aWriteData is true if the actual data should be written. This is false when writing
* an element that is already embedded in a file that itself has embedded
* files (boards, schematics, etc.)
*/
void WriteEmbeddedFiles( OUTPUTFORMATTER& aOut, int aNestLevel, bool aWriteData ) const;
void WriteEmbeddedFiles( OUTPUTFORMATTER& aOut, bool aWriteData ) const;
/**
* Returns the link for an embedded file.

10
include/io/kicad/kicad_io_utils.h
View File

@ -31,18 +31,14 @@ namespace KICAD_FORMAT {
* Writes a boolean to the formatter, in the style (aKey [yes|no])
*
* @param aOut is the output formatter to write to
* @param aNestLevel is passed to the output formatter to control indentation
* @param aKey is the name of the boolean flag
* @param aValue is the value to write
* @param aSuffix is the character to format after the end of the boolean (after the close paren)
*/
KICOMMON_API void FormatBool( OUTPUTFORMATTER* aOut, int aNestLevel, const wxString& aKey,
bool aValue, char aSuffix = 0 );
KICOMMON_API void FormatBool( OUTPUTFORMATTER* aOut, const wxString& aKey, bool aValue );
KICOMMON_API void FormatUuid( OUTPUTFORMATTER* aOut, int aNestLevel, const KIID& aUuid,
char aSuffix = 0 );
KICOMMON_API void FormatUuid( OUTPUTFORMATTER* aOut, const KIID& aUuid );
KICOMMON_API void Prettify( std::string& aSource, char aQuoteChar = '"' );
KICOMMON_API void Prettify( std::string& aSource, bool aCompactSave );
} // namespace KICAD_FORMAT

4
include/page_info.h
View File

@ -199,11 +199,9 @@ public:
* Output the page class to \a aFormatter in s-expression form.
*
* @param aFormatter The #OUTPUTFORMATTER object to write to.
* @param aNestLevel The indentation next level.
* @param aControlBits The control bit definition for object specific formatting.
* @throw IO_ERROR on write error.
*/
void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const;
void Format( OUTPUTFORMATTER* aFormatter ) const;
protected:
// only the class implementation(s) may use this constructor

17
include/richio.h
View File

@ -355,8 +355,10 @@ protected:
// so increase the STRING-INDEX and FIRST-TO_CHECK by one.
// See http://docs.freebsd.org/info/gcc/gcc.info.Function_Attributes.html
// Then to get format checking during the compile, compile with -Wall or -Wformat
#define PRINTF_FUNC __attribute__( ( format( printf, 3, 4 ) ) )
#define PRINTF_FUNC_N __attribute__( ( format( printf, 3, 4 ) ) )
#define PRINTF_FUNC __attribute__( ( format( printf, 2, 3 ) ) )
#else
#define PRINTF_FUNC_N // nothing
#define PRINTF_FUNC // nothing
#endif
@ -376,7 +378,18 @@ public:
* @return int - the number of characters output.
* @throw IO_ERROR, if there is a problem outputting, such as a full disk.
*/
int PRINTF_FUNC Print( int nestLevel, const char* fmt, ... );
int PRINTF_FUNC_N Print( int nestLevel, const char* fmt, ... );
/**
* Format and write text to the output stream.
*
* @param fmt A printf() style format string.
* @param ... a variable list of parameters that will get blended into
* the output under control of the format string.
* @return int - the number of characters output.
* @throw IO_ERROR, if there is a problem outputting, such as a full disk.
*/
int PRINTF_FUNC Print( const char* fmt, ... );
/**
* Perform quote character need determination.

2
include/stroke_params.h
View File

@ -102,7 +102,7 @@ public:
|| m_color != aOther.m_color;
}
void Format( OUTPUTFORMATTER* out, const EDA_IU_SCALE& aIuScale, int nestLevel ) const;
void Format( OUTPUTFORMATTER* out, const EDA_IU_SCALE& aIuScale ) const;
void GetMsgPanelInfo( UNITS_PROVIDER* aUnitsProvider, std::vector<MSG_PANEL_ITEM>& aList,
bool aIncludeStyle = true, bool aIncludeWidth = true );

Some files were not shown because too many files have changed in this diff Show More