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

Fix KiCad2Step virtual keyword handling. 

The "virtual" keyword has been deprecated from the board file format so
use "exclude_from_bom" as the flag for the old virtual behavior.  This
is only a partial fix.  Full support for the "exclude_from_bom" will be
added later for V7.

Fixes: https://gitlab.com/kicad/code/kicad/-/issues/10563
This commit is contained in:
Wayne Stambaugh 2022-07-05 08:58:59 -04:00
parent 16667717a2
commit 497061de35
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
utils/kicad2step/pcb/kicadfootprint.cpp
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2016 Cirilo Bernardo <cirilo.bernardo@gmail.com> * Copyright (C) 2016 Cirilo Bernardo <cirilo.bernardo@gmail.com>
* Copyright 2018-2021 KiCad Developers, see AUTHORS.txt for contributors. * Copyright 2018-2022 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -290,12 +290,17 @@ bool KICADFOOTPRINT::parseAttribute( SEXPR::SEXPR* data )
else if( child->IsString() ) else if( child->IsString() )
text = child->GetString(); text = child->GetString();
// The "virtual" attribute token is obsolete but kicad2step can still be run against older
// board files. It has been replaced with "exclude_from_bom" so any footprint with this
// attribute will behave the same as the "virtual" attribute.
if( text == "smd" ) if( text == "smd" )
m_smd = true; m_smd = true;
else if( text == "through_hole" ) else if( text == "through_hole" )
m_tht = true; m_tht = true;
else if( text == "virtual" ) else if( text == "virtual" )
m_virtual = true; m_virtual = true;
else if( text == "exclude_from_bom" )
m_virtual = true;
return true; return true;
} }
@ -396,7 +401,6 @@ bool KICADFOOTPRINT::ComposePCB( class PCBMODEL* aPCB, S3D_RESOLVER* resolver,
if( aPCB->AddOutlineSegment( &lcurve ) ) if( aPCB->AddOutlineSegment( &lcurve ) )
hasdata = true; hasdata = true;
} }
for( KICADPAD* i : m_pads ) for( KICADPAD* i : m_pads )
@ -420,7 +424,6 @@ bool KICADFOOTPRINT::ComposePCB( class PCBMODEL* aPCB, S3D_RESOLVER* resolver,
if( aPCB->AddPadHole( &lpad ) ) if( aPCB->AddPadHole( &lpad ) )
hasdata = true; hasdata = true;
} }
if( m_virtual && !aComposeVirtual ) if( m_virtual && !aComposeVirtual )
@ -470,7 +473,7 @@ bool KICADFOOTPRINT::ComposePCB( class PCBMODEL* aPCB, S3D_RESOLVER* resolver,
{ {
ReportMessage( wxString::Format( wxT( "Could not add 3D model to %s.\n" ReportMessage( wxString::Format( wxT( "Could not add 3D model to %s.\n"
"OpenCASCADE error: %s\n" ), "OpenCASCADE error: %s\n" ),
m_refdes, m_refdes,
e.GetMessageString() ) ); e.GetMessageString() ) );
} }
} }