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

Fix legacy (pre-sexpr) board importer. 

Fixes https://gitlab.com/kicad/code/kicad/issues/10025
This commit is contained in:
Jeff Young 2021-12-17 17:20:59 +00:00
parent fe148df57e
commit 699ba78b74
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1593,7 +1593,7 @@ void LEGACY_PLUGIN::loadFP_SHAPE( FOOTPRINT* aFootprint )
dwg->SetCenter0( wxPoint( center0_x, center0_y ) ); dwg->SetCenter0( wxPoint( center0_x, center0_y ) );
dwg->SetStart0( wxPoint( start0_x, start0_y ) ); dwg->SetStart0( wxPoint( start0_x, start0_y ) );
dwg->SetArcAngleAndEnd0( angle ); dwg->SetArcAngleAndEnd0( angle, true );
break; break;
} }
@ -1847,13 +1847,23 @@ 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->SetWidth( width ); dseg->SetWidth( width );
dseg->SetStart( wxPoint( start_x, start_y ) );
dseg->SetEnd( wxPoint( end_x, end_y ) ); if( dseg->GetShape() == SHAPE_T::ARC )
{
dseg->SetCenter( wxPoint( start_x, start_y ) );
dseg->SetStart( wxPoint( end_x, end_y ) );
}
else
{
dseg->SetStart( wxPoint( start_x, start_y ) );
dseg->SetEnd( wxPoint( end_x, end_y ) );
}
} }
else if( TESTLINE( "De" ) ) else if( TESTLINE( "De" ) )
{ {
BIU x = 0; BIU x = 0;
BIU y; BIU y;
double angle;
data = strtok_r( line + SZ( "De" ), delims, &saveptr ); data = strtok_r( line + SZ( "De" ), delims, &saveptr );
@ -1877,9 +1887,11 @@ void LEGACY_PLUGIN::loadPCB_LINE()
ignore_unused( intParse( data ) ); ignore_unused( intParse( data ) );
break; break;
case 2: case 2:
double angle;
angle = degParse( data ); angle = degParse( data );
dseg->SetArcAngleAndEnd( angle ); // m_Angle
if( dseg->GetShape() == SHAPE_T::ARC )
dseg->SetArcAngleAndEnd( angle, true ); // m_Angle
break; break;
case 3: case 3:
const_cast<KIID&>( dseg->m_Uuid ) = KIID( data ); const_cast<KIID&>( dseg->m_Uuid ) = KIID( data );
@ -2622,6 +2634,8 @@ void LEGACY_PLUGIN::loadZONE_CONTAINER()
void LEGACY_PLUGIN::loadDIMENSION() void LEGACY_PLUGIN::loadDIMENSION()
{ {
std::unique_ptr<PCB_DIM_ALIGNED> dim = std::make_unique<PCB_DIM_ALIGNED>( m_board ); std::unique_ptr<PCB_DIM_ALIGNED> dim = std::make_unique<PCB_DIM_ALIGNED>( m_board );
wxPoint crossBarO;
wxPoint crossBarF;
char* line; char* line;
@ -2631,6 +2645,8 @@ void LEGACY_PLUGIN::loadDIMENSION()
if( TESTLINE( "$endCOTATION" ) ) if( TESTLINE( "$endCOTATION" ) )
{ {
dim->UpdateHeight( crossBarF, crossBarO );
m_board->Add( dim.release(), ADD_MODE::APPEND ); m_board->Add( dim.release(), ADD_MODE::APPEND );
return; // preferred exit return; // preferred exit
} }
@ -2671,11 +2687,8 @@ void LEGACY_PLUGIN::loadDIMENSION()
double orient = degParse( data, &data ); double orient = degParse( data, &data );
char* mirror = strtok_r( (char*) data, delims, (char**) &data ); char* mirror = strtok_r( (char*) data, delims, (char**) &data );
// This sets both DIMENSION's position and internal m_Text's. dim->Text().SetTextPos( wxPoint( pos_x, pos_y ) );
// @todo: But why do we even know about internal m_Text? dim->Text().SetTextSize( wxSize( width, height ) );
dim->SetPosition( wxPoint( pos_x, pos_y ) );
dim->SetTextSize( wxSize( width, height ) );
dim->Text().SetMirrored( mirror && *mirror == '0' ); dim->Text().SetMirrored( mirror && *mirror == '0' );
dim->Text().SetTextThickness( thickn ); dim->Text().SetTextThickness( thickn );
dim->Text().SetTextAngle( orient ); dim->Text().SetTextAngle( orient );
@ -2690,8 +2703,8 @@ void LEGACY_PLUGIN::loadDIMENSION()
BIU width = biuParse( data ); BIU width = biuParse( data );
dim->SetLineThickness( width ); dim->SetLineThickness( width );
dim->UpdateHeight( wxPoint( crossBarFx, crossBarFy ), crossBarO = wxPoint( crossBarOx, crossBarOy );
wxPoint( crossBarOx, crossBarOy ) ); crossBarF = wxPoint( crossBarFx, crossBarFy );
} }
else if( TESTLINE( "Sd" ) ) else if( TESTLINE( "Sd" ) )
{ {