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

Symbol editor: fix incorrect position of fields when loading a symbol from schematic. 

In symbol editor, symbols are always shown not mirrored, not rotated.
So if the loaded symbol from schematic was rotated/mirrored, the position
of fields must be recalculated for the rotation 0, no mirror.
From master branch
This commit is contained in:
jean-pierre charras 2023-03-15 18:03:11 +01:00
parent e8fa2cbc4d
commit 25f40566ed
1 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
eeschema/symbol_editor/symbol_edit_frame.cpp
View File

@ -1420,6 +1420,11 @@ void SYMBOL_EDIT_FRAME::LoadSymbolFromSchematic( SCH_SYMBOL* aSymbol )
std::unique_ptr<LIB_SYMBOL> symbol = aSymbol->GetLibSymbolRef()->Flatten(); std::unique_ptr<LIB_SYMBOL> symbol = aSymbol->GetLibSymbolRef()->Flatten();
wxCHECK( symbol, /* void */ ); wxCHECK( symbol, /* void */ );
// Take in account the symbol orientation and mirroring. to calculate the field
// positions in symbol editor (i.e. no rotation, no mirroring)
int orientation = aSymbol->GetOrientation() & ~( SYM_MIRROR_X | SYM_MIRROR_Y );
int mirror = aSymbol->GetOrientation() & ( SYM_MIRROR_X | SYM_MIRROR_Y );
std::vector<LIB_FIELD> fullSetOfFields; std::vector<LIB_FIELD> fullSetOfFields;
for( int i = 0; i < (int) aSymbol->GetFields().size(); ++i ) for( int i = 0; i < (int) aSymbol->GetFields().size(); ++i )
@ -1433,6 +1438,33 @@ void SYMBOL_EDIT_FRAME::LoadSymbolFromSchematic( SCH_SYMBOL* aSymbol )
libField.SetText( field.GetText() ); libField.SetText( field.GetText() );
libField.SetAttributes( field ); libField.SetAttributes( field );
// The inverse transform is mirroring before, rotate after
switch( mirror )
{
default:; break;
case SYM_MIRROR_X: pos.y = -pos.y; break;
case SYM_MIRROR_Y: pos.x = -pos.x; break;
}
switch( orientation )
{
default:
case SYM_ORIENT_0: break;
case SYM_ORIENT_90:
std::swap( pos.x, pos.y );
pos.x = - pos.x;
break;
case SYM_ORIENT_270:
std::swap( pos.x, pos.y );
pos.y = - pos.y;
break;
case SYM_ORIENT_180:
pos.x = - pos.x;
pos.y = - pos.y;
break;
}
libField.SetPosition( wxPoint( pos.x, -pos.y ) ); libField.SetPosition( wxPoint( pos.x, -pos.y ) );
fullSetOfFields.emplace_back( std::move( libField ) ); fullSetOfFields.emplace_back( std::move( libField ) );