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

CADSTAR Schematic Archive Importer: Fix positioning of global labels 

Previous calculation did not take into account rotation of the labels
when calculating the final position.
This commit is contained in:
Roberto Fernandez Bautista 2021-02-04 17:51:27 +00:00 committed by Wayne Stambaugh
parent 0841f3ae25
commit 49bf957c48
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
eeschema/sch_plugins/cadstar/cadstar_sch_archive_loader.cpp
View File

@ -507,8 +507,14 @@ void CADSTAR_SCH_ARCHIVE_LOADER::loadSchematicSymbolInstances()
else if( sym.SymbolVariant.Type == SYMBOLVARIANT::TYPE::SIGNALREF ) else if( sym.SymbolVariant.Type == SYMBOLVARIANT::TYPE::SIGNALREF )
{ {
// There should only be one pin and we'll use that to set the position // There should only be one pin and we'll use that to set the position
TERMINAL& symbolTerminal = libSymDef.Terminals.begin()->second; TERMINAL& symbolTerminal = libSymDef.Terminals.begin()->second;
wxPoint terminalPosOffset = symbolTerminal.Position - libSymDef.Origin; wxPoint terminalPosOffset = symbolTerminal.Position - libSymDef.Origin;
double rotateDeciDegree = getAngleTenthDegree( sym.OrientAngle );
if( sym.Mirror )
rotateDeciDegree += 1800.0;
RotatePoint( &terminalPosOffset, -rotateDeciDegree );
SCH_GLOBALLABEL* netLabel = new SCH_GLOBALLABEL; SCH_GLOBALLABEL* netLabel = new SCH_GLOBALLABEL;
netLabel->SetPosition( getKiCadPoint( sym.Origin + terminalPosOffset ) ); netLabel->SetPosition( getKiCadPoint( sym.Origin + terminalPosOffset ) );
@ -2230,11 +2236,11 @@ LABEL_SPIN_STYLE CADSTAR_SCH_ARCHIVE_LOADER::getSpinStyleDeciDeg(
if( oDeg >= -450 && oDeg <= 450 ) if( oDeg >= -450 && oDeg <= 450 )
spinStyle = LABEL_SPIN_STYLE::RIGHT; // 0deg spinStyle = LABEL_SPIN_STYLE::RIGHT; // 0deg
else if( oDeg >= 450 && oDeg <= 1350 ) else if( oDeg >= 450 && oDeg <= 1350 )
spinStyle = LABEL_SPIN_STYLE::BOTTOM; // 90deg spinStyle = LABEL_SPIN_STYLE::UP; // 90deg
else if( oDeg >= 1350 || oDeg <= -1350 ) else if( oDeg >= 1350 || oDeg <= -1350 )
spinStyle = LABEL_SPIN_STYLE::LEFT; // 180deg spinStyle = LABEL_SPIN_STYLE::LEFT; // 180deg
else else
spinStyle = LABEL_SPIN_STYLE::UP; // 270deg spinStyle = LABEL_SPIN_STYLE::BOTTOM; // 270deg
return spinStyle; return spinStyle;
} }