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

Optimize CADSTAR library parsing. 

-60% loading time.
This commit is contained in:
Alex Shvartzkop 2023-11-09 17:12:39 +03:00
parent cc721c4907
commit f8095fd31a
2 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
common/plugins/cadstar/cadstar_archive_parser.cpp
View File

@ -2,7 +2,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) 2020-2021 Roberto Fernandez Bautista <roberto.fer.bau@gmail.com> * Copyright (C) 2020-2021 Roberto Fernandez Bautista <roberto.fer.bau@gmail.com>
* Copyright (C) 2020-2021 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 2020-2023 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
@ -2421,20 +2421,28 @@ void CADSTAR_ARCHIVE_PARSER::PARTNAMECOL::Parse( XNODE* aNode, PARSER_CONTEXT* a
void CADSTAR_ARCHIVE_PARSER::InsertAttributeAtEnd( XNODE* aNode, wxString aValue ) void CADSTAR_ARCHIVE_PARSER::InsertAttributeAtEnd( XNODE* aNode, wxString aValue )
{ {
wxString result; static const wxString c_numAttributes = wxT( "numAttributes" );
int numAttributes = 0;
if( aNode->GetAttribute( wxT( "numAttributes" ), &result ) ) wxString result;
long numAttributes = 0;
if( aNode->GetAttribute( c_numAttributes, &result ) )
{ {
numAttributes = wxAtoi( result ); numAttributes = wxAtol( result );
aNode->DeleteAttribute( wxT( "numAttributes" ) ); aNode->DeleteAttribute( c_numAttributes );
++numAttributes; ++numAttributes;
} }
aNode->AddAttribute( wxT( "numAttributes" ), wxString::Format( wxT( "%i" ), numAttributes ) ); #if wxUSE_UNICODE_WCHAR
std::wstring numAttrStr = std::to_wstring( numAttributes );
#else
std::string numAttrStr = std::to_string( numAttributes );
#endif
aNode->AddAttribute( c_numAttributes, numAttrStr );
wxString paramName = wxT( "attr" ); wxString paramName = wxT( "attr" );
paramName << numAttributes; paramName << numAttrStr;
aNode->AddAttribute( paramName, aValue ); aNode->AddAttribute( paramName, aValue );
} }
@ -2574,9 +2582,16 @@ bool CADSTAR_ARCHIVE_PARSER::IsValidAttribute( wxXmlAttribute* aAttribute )
wxString CADSTAR_ARCHIVE_PARSER::GetXmlAttributeIDString( XNODE* aNode, unsigned int aID, wxString CADSTAR_ARCHIVE_PARSER::GetXmlAttributeIDString( XNODE* aNode, unsigned int aID,
bool aIsRequired ) bool aIsRequired )
{ {
wxString attrName, retVal; #if wxUSE_UNICODE_WCHAR
attrName = "attr"; std::wstring idStr = std::to_wstring( aID );
attrName << aID; #else
std::string idStr = std::to_string( aID );
#endif
wxString attrName = wxS( "attr" );
attrName << idStr;
wxString retVal;
if( !aNode->GetAttribute( attrName, &retVal ) ) if( !aNode->GetAttribute( attrName, &retVal ) )
{ {

4
eeschema/sch_plugins/cadstar/cadstar_sch_archive_loader.cpp
View File

@ -2051,10 +2051,12 @@ void CADSTAR_SCH_ARCHIVE_LOADER::loadLibrarySymbolShapeVertices( const std::vect
shape->SetUnit( aGateNumber ); shape->SetUnit( aGateNumber );
shape->SetStroke( STROKE_PARAMS( aLineThickness, PLOT_DASH_TYPE::SOLID ) ); shape->SetStroke( STROKE_PARAMS( aLineThickness, PLOT_DASH_TYPE::SOLID ) );
aSymbol->AddDrawItem( shape ); aSymbol->AddDrawItem( shape, false );
prev = cur; prev = cur;
} }
aSymbol->GetDrawItems().sort();
} }