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

EasyEDA Pro: deduplicate footprint 3D model fields.

This commit is contained in:
Alex Shvartzkop 2023-09-29 12:16:44 +03:00
parent b592a6634e
commit e34d95bb45
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcbnew/plugins/easyedapro/pcb_easyedapro_parser.cpp
View File

@ -209,7 +209,7 @@ void PCB_EASYEDAPRO_PARSER::fillFootprintModelInfo( FOOTPRINT* footprint, const
VECTOR3D kmodelOffset; VECTOR3D kmodelOffset;
VECTOR3D kmodelRotation; VECTOR3D kmodelRotation;
if( !modelUuid.IsEmpty() ) if( !modelUuid.IsEmpty() && !footprint->GetFieldByName( QUERY_MODEL_UUID_KEY ) )
{ {
PCB_FIELD field( footprint, footprint->GetFieldCount(), QUERY_MODEL_UUID_KEY ); PCB_FIELD field( footprint, footprint->GetFieldCount(), QUERY_MODEL_UUID_KEY );
field.SetLayer( Cmts_User ); field.SetLayer( Cmts_User );
@ -218,7 +218,7 @@ void PCB_EASYEDAPRO_PARSER::fillFootprintModelInfo( FOOTPRINT* footprint, const
footprint->AddField( field ); footprint->AddField( field );
} }
if( !modelTransform.IsEmpty() ) if( !modelTransform.IsEmpty() && !footprint->GetFieldByName( MODEL_SIZE_KEY ) )
{ {
wxArrayString arr = wxSplit( modelTransform, ',', '\0' ); wxArrayString arr = wxSplit( modelTransform, ',', '\0' );
@ -243,7 +243,7 @@ void PCB_EASYEDAPRO_PARSER::fillFootprintModelInfo( FOOTPRINT* footprint, const
kmodelOffset.z = pcbIUScale.IUTomm( ScaleSize( Convert( arr[8] ) ) ); kmodelOffset.z = pcbIUScale.IUTomm( ScaleSize( Convert( arr[8] ) ) );
} }
if( !modelTitle.IsEmpty() ) if( !modelTitle.IsEmpty() && footprint->Models().empty() )
{ {
FP_3DMODEL model; FP_3DMODEL model;
model.m_Filename = kicadModelPrefix model.m_Filename = kicadModelPrefix