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

Parse bus definitions as a single term. 

Fixes: lp:1841043
* https://bugs.launchpad.net/kicad/+bug/1841043
This commit is contained in:
Jeff Young 2019-08-22 12:49:58 +01:00
parent 13b7dd354c
commit de74590279
1 changed files with 43 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
eeschema/edit_label.cpp
View File

@ -45,15 +45,15 @@ static int lastTextOrientation = 0;
static bool lastTextBold = false; static bool lastTextBold = false;
static bool lastTextItalic = false; static bool lastTextItalic = false;
static std::deque<std::unique_ptr<SCH_TEXT>> queuedTexts; static std::deque<std::unique_ptr<SCH_TEXT>> s_queuedTexts;
SCH_TEXT* SCH_EDIT_FRAME::GetNextNewText() SCH_TEXT* SCH_EDIT_FRAME::GetNextNewText()
{ {
if( queuedTexts.empty() ) if( s_queuedTexts.empty() )
return nullptr; return nullptr;
auto next_text = std::move( queuedTexts.front() ); auto next_text = std::move( s_queuedTexts.front() );
queuedTexts.pop_front(); s_queuedTexts.pop_front();
return next_text.release(); return next_text.release();
} }
@ -64,7 +64,7 @@ SCH_TEXT* SCH_EDIT_FRAME::CreateNewText( int aType )
wxPoint cursorPos = (wxPoint) GetCanvas()->GetViewControls()->GetCursorPosition(); wxPoint cursorPos = (wxPoint) GetCanvas()->GetViewControls()->GetCursorPosition();
SCH_TEXT* textItem = nullptr; SCH_TEXT* textItem = nullptr;
queuedTexts.clear(); s_queuedTexts.clear();
switch( aType ) switch( aType )
{ {
@ -105,15 +105,49 @@ SCH_TEXT* SCH_EDIT_FRAME::CreateNewText( int aType )
if( aType != LAYER_NOTES ) if( aType != LAYER_NOTES )
{ {
wxStringTokenizer tok( textItem->GetText(), wxDEFAULT_DELIMITERS, wxTOKEN_STRTOK ); wxString delimiters = wxT( " {}[]\t\r\n" );
textItem->SetText( tok.GetNextToken() ); wxStringTokenizer tok( textItem->GetText(), delimiters, wxTOKEN_STRTOK );
while( tok.HasMoreTokens() ) while( tok.HasMoreTokens() )
{ {
wxString term = tok.GetNextToken();
// Consume bus definitions as single terms
if( tok.GetLastDelimiter() == L'{' )
{
term << tok.GetLastDelimiter();
while( tok.HasMoreTokens() )
{
term << tok.GetNextToken() << tok.GetLastDelimiter();
if( tok.GetLastDelimiter() == L'}' )
break;
}
}
else if( tok.GetLastDelimiter() == L'[' )
{
term << tok.GetLastDelimiter();
while( tok.HasMoreTokens() )
{
term << tok.GetNextToken() << tok.GetLastDelimiter();
if( tok.GetLastDelimiter() == L']' )
break;
}
}
std::unique_ptr<SCH_TEXT> nextitem( static_cast<SCH_TEXT*>( textItem->Clone() ) ); std::unique_ptr<SCH_TEXT> nextitem( static_cast<SCH_TEXT*>( textItem->Clone() ) );
nextitem->SetText( tok.GetNextToken() ); nextitem->SetText( term );
queuedTexts.push_back( std::move( nextitem ) ); s_queuedTexts.push_back( std::move( nextitem ) );
} }
delete textItem;
textItem = GetNextNewText();
if( !textItem )
return nullptr;
} }
lastTextBold = textItem->IsBold(); lastTextBold = textItem->IsBold();