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

Fix bad merge between EDA_ANGLE and wxPoint changes. 

Fixes https://gitlab.com/kicad/code/kicad/issues/10514
This commit is contained in:
Jeff Young 2022-01-19 22:44:52 +00:00
parent 3ba89f50ef
commit 3e7e35343a
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pcbnew/plugins/legacy/legacy_plugin.cpp
View File

@ -1815,8 +1815,17 @@ void LEGACY_PLUGIN::loadPCB_LINE()
dseg->SetShape( static_cast<SHAPE_T>( shape ) ); dseg->SetShape( static_cast<SHAPE_T>( shape ) );
dseg->SetFilled( false ); dseg->SetFilled( false );
dseg->SetStroke( STROKE_PARAMS( width, PLOT_DASH_TYPE::SOLID ) ); dseg->SetStroke( STROKE_PARAMS( width, PLOT_DASH_TYPE::SOLID ) );
dseg->SetStart( VECTOR2I( start_x, start_y ) );
dseg->SetEnd( VECTOR2I( end_x, end_y ) ); if( dseg->GetShape() == SHAPE_T::ARC )
{
dseg->SetCenter( VECTOR2I( start_x, start_y ) );
dseg->SetStart( VECTOR2I( end_x, end_y ) );
}
else
{
dseg->SetStart( VECTOR2I( start_x, start_y ) );
dseg->SetEnd( VECTOR2I( end_x, end_y ) );
}
} }
else if( TESTLINE( "De" ) ) else if( TESTLINE( "De" ) )
{ {
@ -1849,7 +1858,7 @@ void LEGACY_PLUGIN::loadPCB_LINE()
EDA_ANGLE angle = degParse( data ); EDA_ANGLE angle = degParse( data );
if( dseg->GetShape() == SHAPE_T::ARC ) if( dseg->GetShape() == SHAPE_T::ARC )
dseg->SetArcAngleAndEnd( angle, true ); // m_Angle dseg->SetArcAngleAndEnd( angle );
break; break;
} }