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

Fix botched merge.

This commit is contained in:
Jeff Young 2021-09-24 20:08:29 +01:00
parent bf145dd633
commit fad385785d
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
eeschema/sch_painter.cpp
View File

@ -810,17 +810,33 @@ void SCH_PAINTER::draw( LIB_PIN *aPin, int aLayer )
} }
} }
VECTOR2I p0( aPin->GetPinRoot() ); VECTOR2I p0;
VECTOR2I dir; VECTOR2I dir;
int len = aPin->GetLength(); int len = aPin->GetLength();
int orient = aPin->GetOrientation();
switch( aPin->GetOrientation() ) switch( orient )
{ {
case PIN_UP:
p0 = VECTOR2I( pos.x, pos.y - len );
dir = VECTOR2I( 0, 1 );
break;
case PIN_DOWN:
p0 = VECTOR2I( pos.x, pos.y + len );
dir = VECTOR2I( 0, -1 );
break;
case PIN_LEFT:
p0 = VECTOR2I( pos.x - len, pos.y );
dir = VECTOR2I( 1, 0 );
break;
default: default:
case PIN_RIGHT: dir = VECTOR2I( -1, 0 ); break; case PIN_RIGHT:
case PIN_LEFT: dir = VECTOR2I( 1, 0 ); break; p0 = VECTOR2I( pos.x + len, pos.y );
case PIN_UP: dir = VECTOR2I( 0, 1 ); break; dir = VECTOR2I( -1, 0 );
case PIN_DOWN: dir = VECTOR2I( 0, -1 ); break; break;
} }
VECTOR2D pc; VECTOR2D pc;
@ -1072,7 +1088,7 @@ void SCH_PAINTER::draw( LIB_PIN *aPin, int aLayer )
strokeText( aText, aPos, aAngle ); strokeText( aText, aPos, aAngle );
}; };
switch( aPin->GetOrientation() ) switch( orient )
{ {
case PIN_LEFT: case PIN_LEFT:
if( size[INSIDE] ) if( size[INSIDE] )