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

Pcbnew: Remove 180 deg rotation when flipping PCB_TEXT in some cases

This commit is contained in:
Mikolaj Wielgus 2021-03-18 22:09:45 +01:00 committed by Seth Hillbrand
parent 99fd872fce
commit 0a660c2364
1 changed files with 4 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
pcbnew/pcb_text.cpp
View File

@ -150,64 +150,17 @@ void PCB_TEXT::Rotate( const wxPoint& aRotCentre, double aAngle )
void PCB_TEXT::Flip( const wxPoint& aCentre, bool aFlipLeftRight ) void PCB_TEXT::Flip( const wxPoint& aCentre, bool aFlipLeftRight )
{ {
double angle = GetTextAngle();
bool vertical = KiROUND( angle ) % 1800 == 900;
if( KiROUND( angle ) != 0 )
{
Rotate( aCentre, -angle );
if( vertical )
aFlipLeftRight = !aFlipLeftRight;
}
// Flip the bounding box
EDA_RECT box = GetTextBox();
int left = box.GetLeft();
int right = box.GetRight();
int top = box.GetTop();
int bottom = box.GetBottom();
wxPoint pos = GetTextPos();
if( aFlipLeftRight ) if( aFlipLeftRight )
{ {
MIRROR( left, aCentre.x ); SetTextX( MIRRORVAL( GetTextPos().x, aCentre.x ) );
MIRROR( right, aCentre.x ); SetTextAngle( -GetTextAngle() );
std::swap( left, right );
MIRROR( pos.x, aCentre.x );
} }
else else
{ {
MIRROR( top, aCentre.y ); SetTextY( MIRRORVAL( GetTextPos().y, aCentre.y ) );
MIRROR( bottom, aCentre.y ); SetTextAngle( 1800 - GetTextAngle() );
std::swap( top, bottom );
MIRROR( pos.y, aCentre.y );
} }
// Now put the text back in its bounding box
switch( GetHorizJustify() )
{
case GR_TEXT_HJUSTIFY_LEFT: SetTextX( IsMirrored() ? left : right ); break;
case GR_TEXT_HJUSTIFY_CENTER: SetTextX( pos.x ); break;
case GR_TEXT_HJUSTIFY_RIGHT: SetTextX( IsMirrored() ? right : left ); break;
}
if( !aFlipLeftRight )
{
switch( GetVertJustify() )
{
case GR_TEXT_VJUSTIFY_TOP: SetTextY( bottom ); break;
case GR_TEXT_VJUSTIFY_CENTER: SetTextY( pos.y ); break;
case GR_TEXT_VJUSTIFY_BOTTOM: SetTextY( top ); break;
}
}
// And restore orientation
if( KiROUND( angle ) != 0 )
Rotate( aCentre, angle );
SetLayer( FlipLayer( GetLayer(), GetBoard()->GetCopperLayerCount() ) ); SetLayer( FlipLayer( GetLayer(), GetBoard()->GetCopperLayerCount() ) );
SetMirrored( !IsMirrored() ); SetMirrored( !IsMirrored() );
} }