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

eagle: Strip newlines from description 

Eeschema old format is line-terminated so the newlines in descriptions
will break the schematic file if saved.

Fixes: lp:1829707
* https://bugs.launchpad.net/kicad/+bug/1829707

(cherry picked from commit fb85612f81)
This commit is contained in:
Seth Hillbrand 2019-06-07 22:06:41 -07:00
parent 1a3b129d1e
commit 598b140112
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
eeschema/sch_eagle_plugin.cpp
View File

@ -676,6 +676,7 @@ void SCH_EAGLE_PLUGIN::loadSheet( wxXmlNode* aSheetNode, int aSheetIndex )
if( descriptionNode ) if( descriptionNode )
{ {
des = descriptionNode->GetContent(); des = descriptionNode->GetContent();
des.Replace( "\n", "_", true );
m_currentSheet->SetName( des ); m_currentSheet->SetName( des );
filename = des.ToStdString(); filename = des.ToStdString();
} }

9
eeschema/symbol_tree_synchronizing_adapter.cpp
View File

@ -222,7 +222,14 @@ void SYMBOL_TREE_SYNCHRONIZING_ADAPTER::GetValue( wxVariant& aVariant, wxDataVie
case 1: case 1:
if( node->LibId == m_libMgr->GetCurrentLibId() ) if( node->LibId == m_libMgr->GetCurrentLibId() )
aVariant = m_libMgr->GetAlias( node->Name, node->Parent->Name )->GetDescription(); {
auto alias = m_libMgr->GetAlias( node->Name, node->Parent->Name );
if( alias )
aVariant = alias->GetDescription();
else
aVariant = node->Desc;
}
else else
aVariant = node->Desc; aVariant = node->Desc;
break; break;