|
|
|
@ -16,10 +16,7 @@ void FIELDS_EDITOR_GRID_DATA_MODEL::AddColumn( const wxString& aFieldName, const |
|
|
|
if( GetFieldNameCol( aFieldName ) != -1 ) |
|
|
|
return; |
|
|
|
|
|
|
|
m_cols.push_back((struct DATA_MODEL_COL) { |
|
|
|
.m_fieldName = aFieldName, |
|
|
|
.m_label = aLabel, |
|
|
|
.m_userAdded = aAddedByUser }); |
|
|
|
m_cols.push_back( ( struct DATA_MODEL_COL ){ aFieldName, aLabel, aAddedByUser, false, false } ); |
|
|
|
|
|
|
|
for( unsigned i = 0; i < m_symbolsList.GetCount(); ++i ) |
|
|
|
{ |
|
|
|
@ -83,10 +80,8 @@ const std::vector<BOM_FIELD> FIELDS_EDITOR_GRID_DATA_MODEL::GetFieldsOrdered() |
|
|
|
std::vector<BOM_FIELD> fields; |
|
|
|
|
|
|
|
for( auto col : m_cols ) |
|
|
|
fields.emplace_back( ( struct BOM_FIELD ){ .name = col.m_fieldName, |
|
|
|
.label = col.m_label, |
|
|
|
.show = col.m_show, |
|
|
|
.groupBy = col.m_group } ); |
|
|
|
fields.emplace_back( |
|
|
|
( struct BOM_FIELD ){ col.m_fieldName, col.m_label, col.m_show, col.m_group } ); |
|
|
|
|
|
|
|
return fields; |
|
|
|
} |
|
|
|
@ -696,7 +691,7 @@ wxString FIELDS_EDITOR_GRID_DATA_MODEL::Export( const BOM_FMT_PRESET& settings ) |
|
|
|
settings.stringDelimiter + settings.stringDelimiter ); |
|
|
|
|
|
|
|
return settings.stringDelimiter + field + settings.stringDelimiter |
|
|
|
+ ( last ? wxS( "\r\n" ) : settings.fieldDelimiter ); |
|
|
|
+ wxString( last ? wxS( "\r\n" ) : settings.fieldDelimiter ); |
|
|
|
}; |
|
|
|
|
|
|
|
// Column names
|
|
|
|
|