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

Eeschema Eagle: Created convertTextSize function.

This commit is contained in:
Russell Oliver 2017-08-19 17:34:22 +10:00 committed by Maciej Suminski
parent 857f9f3216
commit cec76c4de2
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
eeschema/sch_eagle_plugin.cpp
View File

@ -1728,8 +1728,7 @@ LIB_TEXT* SCH_EAGLE_PLUGIN::loadSymboltext( std::unique_ptr< LIB_PART >& aPart,
libtext->SetUnit( gateNumber ); libtext->SetUnit( gateNumber );
libtext->SetPosition( wxPoint( etext.x * EUNIT_TO_MIL, etext.y * EUNIT_TO_MIL ) ); libtext->SetPosition( wxPoint( etext.x * EUNIT_TO_MIL, etext.y * EUNIT_TO_MIL ) );
libtext->SetText( aLibText->GetNodeContent() ); libtext->SetText( aLibText->GetNodeContent() );
libtext->SetTextSize( wxSize( etext.size * EUNIT_TO_MIL*0.95, libtext->SetTextSize( convertTextSize( etext ) );
etext.size * EUNIT_TO_MIL*0.95 ) );
if( etext.ratio ) if( etext.ratio )
{ {
@ -1753,6 +1752,29 @@ LIB_TEXT* SCH_EAGLE_PLUGIN::loadSymboltext( std::unique_ptr< LIB_PART >& aPart,
return libtext.release(); return libtext.release();
} }
wxSize SCH_EAGLE_PLUGIN::convertTextSize(ETEXT& etext ) {
wxSize textsize;
if(etext.font){
wxString font = etext.font.Get();
if(font == "vector")
{
textsize = wxSize( etext.size * EUNIT_TO_MIL, etext.size * EUNIT_TO_MIL );
}
else if ( font == "fixed")
{
textsize = wxSize( etext.size * EUNIT_TO_MIL, etext.size * EUNIT_TO_MIL*0.80 );
}
}
else
{
textsize = wxSize( etext.size * EUNIT_TO_MIL*0.85, etext.size * EUNIT_TO_MIL );
}
return textsize;
}
SCH_TEXT* SCH_EAGLE_PLUGIN::loadplaintext( wxXmlNode* aSchText ) SCH_TEXT* SCH_EAGLE_PLUGIN::loadplaintext( wxXmlNode* aSchText )
{ {
@ -1763,6 +1785,7 @@ 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 ) );
wxString thetext = aSchText->GetNodeContent(); wxString thetext = aSchText->GetNodeContent();
thetext.Replace("~", "~~"); thetext.Replace("~", "~~");
thetext.Replace("!", "~"); thetext.Replace("!", "~");
@ -1777,8 +1800,8 @@ SCH_TEXT* SCH_EAGLE_PLUGIN::loadplaintext( wxXmlNode* aSchText )
} }
} }
schtext->SetTextSize( wxSize( int(etext.size * EUNIT_TO_MIL), schtext->SetTextSize( convertTextSize ( etext ) );
int(etext.size * EUNIT_TO_MIL) ) );
int align = etext.align ? *etext.align : ETEXT::BOTTOM_LEFT; int align = etext.align ? *etext.align : ETEXT::BOTTOM_LEFT;

1
eeschema/sch_eagle_plugin.h
View File

@ -142,6 +142,7 @@ private:
void moveLabels( SCH_ITEM* wire, wxPoint newendpoint); void moveLabels( SCH_ITEM* wire, wxPoint newendpoint);
void addBusEntries(); void addBusEntries();
static wxString fixNetName( const wxString& aNetName ); static wxString fixNetName( const wxString& aNetName );
static wxSize convertTextSize(ETEXT& etext );
SCH_LAYER_ID kicadLayer( int aEagleLayer ); SCH_LAYER_ID kicadLayer( int aEagleLayer );
wxPoint findNearestLinePoint(wxPoint aPoint, const DLIST< SCH_LINE >& lines); wxPoint findNearestLinePoint(wxPoint aPoint, const DLIST< SCH_LINE >& lines);