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

Eeschema Eagle Import: Better conversion between ! and ~ in text and pin names

This commit is contained in:
Russell Oliver 2017-07-24 23:49:38 +10:00 committed by Maciej Suminski
parent a6f7cdc949
commit e379329ee6
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
eeschema/sch_eagle_plugin.cpp
View File

@ -869,6 +869,7 @@ SCH_TEXT* SCH_EAGLE_PLUGIN::loadLabel( wxXmlNode* aLabelNode, const wxString& aN
wxPoint elabelpos( elabel.x * EUNIT_TO_MIL, -elabel.y * EUNIT_TO_MIL ); wxPoint elabelpos( elabel.x * EUNIT_TO_MIL, -elabel.y * EUNIT_TO_MIL );
wxString netname = elabel.netname; wxString netname = elabel.netname;
netname.Replace("~", "~~");
netname.Replace("!", "~"); netname.Replace("!", "~");
if(m_NetCounts[aNetName.ToStdString()]>1){ if(m_NetCounts[aNetName.ToStdString()]>1){
@ -1307,11 +1308,10 @@ void SCH_EAGLE_PLUGIN::loadSymbol( wxXmlNode* aSymbolNode,
pin->SetUnit( gateNumber ); pin->SetUnit( gateNumber );
string pinname = pin->GetName().ToStdString(); wxString pinname = pin->GetName();
if(pinname[0] == '!'){ pinname.Replace("~", "~~");
pinname[0] = '~'; pinname.Replace("!", "~");
pin->SetName( pinname ); pin->SetName( pinname );
}
aPart->AddDrawItem( pin ); aPart->AddDrawItem( pin );
break; break;
@ -1601,7 +1601,10 @@ SCH_TEXT* SCH_EAGLE_PLUGIN::loadplaintext( wxXmlNode* aSchText )
schtext->SetItalic( false ); schtext->SetItalic( false );
schtext->SetPosition( wxPoint( etext.x * EUNIT_TO_MIL, -etext.y * EUNIT_TO_MIL ) ); schtext->SetPosition( wxPoint( etext.x * EUNIT_TO_MIL, -etext.y * EUNIT_TO_MIL ) );
schtext->SetText( aSchText->GetNodeContent() ); wxString thetext = aSchText->GetNodeContent();
thetext.Replace("~", "~~");
thetext.Replace("!", "~");
schtext->SetText( thetext );
if( etext.ratio ) if( etext.ratio )
{ {