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

fabmaster: Fix graphic handling in geometry section

This commit is contained in:
Seth Hillbrand 2021-01-19 12:16:40 -08:00
parent 4da28cf8f4
commit 060635b14c
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pcbnew/plugins/fabmaster/import_fabmaster.cpp
View File

@ -1148,9 +1148,9 @@ size_t FABMASTER::processGeometry( size_t aRow )
if( !gr_item ) if( !gr_item )
{ {
wxLogError( wxString::Format( _( "Invalid graphic item " wxLogError( wxString::Format( _( "Unhandled graphic item '%s' "
"in Geometric definition row %zu" ), "in Geometric definition row %zu" ),
geo_tag.c_str(), rownum ) ); gr_data.graphic_dataname.c_str(), geo_tag.c_str(), rownum ) );
continue; continue;
} }
@ -1164,9 +1164,10 @@ size_t FABMASTER::processGeometry( size_t aRow )
{ {
GEOM_GRAPHIC new_gr; GEOM_GRAPHIC new_gr;
new_gr.subclass = row[geo_subclass_col]; new_gr.subclass = row[geo_subclass_col];
new_gr.refdes = row[geo_refdes_col]; new_gr.refdes = row[geo_refdes_col];
new_gr.name = row[geo_sym_name_col]; new_gr.name = row[geo_sym_name_col];
new_gr.id = id; new_gr.id = id;
new_gr.elements = std::make_unique<graphic_element>();
board_graphics.push_back( std::move( new_gr ) ); board_graphics.push_back( std::move( new_gr ) );
} }
@ -1183,9 +1184,10 @@ size_t FABMASTER::processGeometry( size_t aRow )
if( map_it.second ) if( map_it.second )
{ {
gr->second.subclass = row[geo_subclass_col]; gr->second.subclass = row[geo_subclass_col];
gr->second.refdes = row[geo_refdes_col]; gr->second.refdes = row[geo_refdes_col];
gr->second.name = row[geo_sym_name_col]; gr->second.name = row[geo_sym_name_col];
gr->second.id = id; gr->second.id = id;
gr->second.elements = std::make_unique<graphic_element>();
} }
auto result = gr->second.elements->emplace( std::move( gr_item ) ); auto result = gr->second.elements->emplace( std::move( gr_item ) );
@ -1320,8 +1322,9 @@ size_t FABMASTER::processTraces( size_t aRow )
if( !gr_item ) if( !gr_item )
{ {
wxLogError( wxString::Format( _( "Invalid graphic item " wxLogError( wxString::Format( _( "Unhandled graphic item '%s' "
"in Traces definition row %zu" ), rownum ) ); "in Traces definition row %zu" ),
gr_data.graphic_dataname.c_str(), rownum ) );
continue; continue;
} }