Mirrors
/
kicad
mirror of https://github.com/KiCad/kicad-source-mirror
3
0
Fork 0
Code Releases Activity
Browse Source

Footprints: rename properties to fields for consistency with symbols

newinvert
Mike Williams 3 years ago
parent
40abb013ec
commit
028f500cd9
13 changed files with 26 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      pcbnew/dialogs/dialog_footprint_properties_base.cpp
  2. 2
      pcbnew/dialogs/dialog_footprint_properties_base.fbp
  3. 2
      pcbnew/dialogs/dialog_footprint_properties_fp_editor_base.cpp
  4. 2
      pcbnew/dialogs/dialog_footprint_properties_fp_editor_base.fbp
  5. 12
      pcbnew/footprint.cpp
  6. 14
      pcbnew/footprint.h
  7. 4
      pcbnew/netlist_reader/board_netlist_updater.cpp
  8. 2
      pcbnew/netlist_reader/pcb_netlist.cpp
  9. 2
      pcbnew/pcb_edit_frame.cpp
  10. 4
      pcbnew/pcb_expr_functions.cpp
  11. 2
      pcbnew/plot_board_layers.cpp
  12. 2
      pcbnew/plugins/kicad/pcb_parser.cpp
  13. 2
      pcbnew/plugins/kicad/pcb_plugin.cpp

2
pcbnew/dialogs/dialog_footprint_properties_base.cpp
View File

@ -25,7 +25,7 @@ DIALOG_FOOTPRINT_PROPERTIES_BASE::DIALOG_FOOTPRINT_PROPERTIES_BASE( wxWindow* pa
m_PanelPropertiesBoxSizer = new wxBoxSizer( wxVERTICAL );
wxStaticBoxSizer* sbSizerTexts;
sbSizerTexts = new wxStaticBoxSizer( new wxStaticBox( m_PanelGeneral, wxID_ANY, wxEmptyString ), wxVERTICAL );
sbSizerTexts = new wxStaticBoxSizer( new wxStaticBox( m_PanelGeneral, wxID_ANY, _("Fields") ), wxVERTICAL );
m_itemsGrid = new WX_GRID( sbSizerTexts->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), 0 );

2
pcbnew/dialogs/dialog_footprint_properties_base.fbp
View File

@ -187,7 +187,7 @@
<property name="proportion">1</property>
<object class="wxStaticBoxSizer" expanded="1">
<property name="id">wxID_ANY</property>
<property name="label"></property>
<property name="label">Fields</property>
<property name="minimum_size"></property>
<property name="name">sbSizerTexts</property>
<property name="orient">wxVERTICAL</property>

2
pcbnew/dialogs/dialog_footprint_properties_fp_editor_base.cpp
View File

@ -25,7 +25,7 @@ DIALOG_FOOTPRINT_PROPERTIES_FP_EDITOR_BASE::DIALOG_FOOTPRINT_PROPERTIES_FP_EDITO
m_PanelPropertiesBoxSizer = new wxBoxSizer( wxVERTICAL );
wxStaticBoxSizer* sbSizerTexts;
sbSizerTexts = new wxStaticBoxSizer( new wxStaticBox( m_PanelGeneral, wxID_ANY, wxEmptyString ), wxVERTICAL );
sbSizerTexts = new wxStaticBoxSizer( new wxStaticBox( m_PanelGeneral, wxID_ANY, _("Fields") ), wxVERTICAL );
m_itemsGrid = new WX_GRID( sbSizerTexts->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), 0 );

2
pcbnew/dialogs/dialog_footprint_properties_fp_editor_base.fbp
View File

@ -186,7 +186,7 @@
<property name="proportion">1</property>
<object class="wxStaticBoxSizer" expanded="1">
<property name="id">wxID_ANY</property>
<property name="label"></property>
<property name="label">Fields</property>
<property name="minimum_size"></property>
<property name="name">sbSizerTexts</property>
<property name="orient">wxVERTICAL</property>

12
pcbnew/footprint.cpp
View File

@ -180,7 +180,7 @@ FOOTPRINT::FOOTPRINT( const FOOTPRINT& aFootprint ) :
m_3D_Drawings = aFootprint.m_3D_Drawings;
m_doc = aFootprint.m_doc;
m_keywords = aFootprint.m_keywords;
m_properties = aFootprint.m_properties;
m_fields = aFootprint.m_fields;
m_privateLayers = aFootprint.m_privateLayers;
m_arflag = 0;
@ -354,7 +354,7 @@ FOOTPRINT& FOOTPRINT::operator=( FOOTPRINT&& aOther )
m_3D_Drawings = aOther.m_3D_Drawings;
m_doc = aOther.m_doc;
m_keywords = aOther.m_keywords;
m_properties = aOther.m_properties;
m_fields = aOther.m_fields;
m_privateLayers = aOther.m_privateLayers;
m_initial_comments = aOther.m_initial_comments;
@ -462,7 +462,7 @@ FOOTPRINT& FOOTPRINT::operator=( const FOOTPRINT& aOther )
m_3D_Drawings = aOther.m_3D_Drawings;
m_doc = aOther.m_doc;
m_keywords = aOther.m_keywords;
m_properties = aOther.m_properties;
m_fields = aOther.m_fields;
m_privateLayers = aOther.m_privateLayers;
m_initial_comments = aOther.m_initial_comments ?
@ -543,9 +543,9 @@ bool FOOTPRINT::ResolveTextVar( wxString* token, int aDepth ) const
}
}
}
else if( m_properties.count( *token ) )
else if( m_fields.count( *token ) )
{
*token = m_properties.at( *token );
*token = m_fields.at( *token );
return true;
}
@ -2811,7 +2811,7 @@ static struct FOOTPRINT_DESC
&FOOTPRINT::SetOrientationDegrees, &FOOTPRINT::GetOrientationDegrees,
PROPERTY_DISPLAY::PT_DEGREE ) );
const wxString groupFootprint = _HKI( "Footprint Properties" );
const wxString groupFootprint = _HKI( "Fields" );
propMgr.AddProperty( new PROPERTY<FOOTPRINT, wxString>( _HKI( "Reference" ),
&FOOTPRINT::SetReference, &FOOTPRINT::GetReferenceAsString ),

14
pcbnew/footprint.h
View File

@ -573,14 +573,14 @@ public:
PCB_TEXT& Value() const { return *m_value; }
PCB_TEXT& Reference() const { return *m_reference; }
const std::map<wxString, wxString>& GetProperties() const { return m_properties; }
void SetProperties( const std::map<wxString, wxString>& aProps ) { m_properties = aProps; }
const wxString& GetProperty( const wxString& aKey) { return m_properties[ aKey ]; }
bool HasProperty( const wxString& aKey)
const std::map<wxString, wxString>& GetFields() const { return m_fields; }
void SetFields( const std::map<wxString, wxString>& aFields ) { m_fields = aFields; }
const wxString& GetField( const wxString& aKey) { return m_fields[ aKey ]; }
bool HasField( const wxString& aKey)
{
return m_properties.find( aKey ) != m_properties.end();
return m_fields.find( aKey ) != m_fields.end();
}
void SetProperty( const wxString& aKey, const wxString& aVal ) { m_properties[ aKey ] = aVal; }
void SetField( const wxString& aKey, const wxString& aVal ) { m_fields[ aKey ] = aVal; }
bool IsBoardOnly() const { return m_attributes & FP_BOARD_ONLY; }
void SetBoardOnly( bool aIsBoardOnly = true )
@ -888,7 +888,7 @@ private:
LSET m_privateLayers; // Layers visible only in the footprint editor
std::vector<FP_3DMODEL> m_3D_Drawings; // 3D models.
std::map<wxString, wxString> m_properties;
std::map<wxString, wxString> m_fields;
wxArrayString* m_initial_comments; // s-expression comments in the footprint,
// lazily allocated only if needed for speed

4
pcbnew/netlist_reader/board_netlist_updater.cpp
View File

@ -343,7 +343,7 @@ bool BOARD_NETLIST_UPDATER::updateFootprintParameters( FOOTPRINT* aPcbFootprint,
m_reporter->Report( msg, RPT_SEVERITY_ACTION );
}
if( aPcbFootprint->GetProperties() != aNetlistComponent->GetProperties() )
if( aPcbFootprint->GetFields() != aNetlistComponent->GetProperties() )
{
if( m_isDryRun )
{
@ -356,7 +356,7 @@ bool BOARD_NETLIST_UPDATER::updateFootprintParameters( FOOTPRINT* aPcbFootprint,
aPcbFootprint->GetReference() );
changed = true;
aPcbFootprint->SetProperties( aNetlistComponent->GetProperties() );
aPcbFootprint->SetFields( aNetlistComponent->GetProperties() );
}
m_reporter->Report( msg, RPT_SEVERITY_ACTION );

2
pcbnew/netlist_reader/pcb_netlist.cpp
View File

@ -52,7 +52,7 @@ void COMPONENT::SetFootprint( FOOTPRINT* aFootprint )
aFootprint->SetValue( m_value );
aFootprint->SetFPID( m_fpid );
aFootprint->SetPath( path );
aFootprint->SetProperties( m_properties );
aFootprint->SetFields( m_properties );
}

2
pcbnew/pcb_edit_frame.cpp
View File

@ -2309,7 +2309,7 @@ void PCB_EDIT_FRAME::ExchangeFootprint( FOOTPRINT* aExisting, FOOTPRINT* aNew,
// Updating other parameters
const_cast<KIID&>( aNew->m_Uuid ) = aExisting->m_Uuid;
aNew->SetProperties( aExisting->GetProperties() );
aNew->SetFields( aExisting->GetFields() );
aNew->SetPath( aExisting->GetPath() );
aCommit.Remove( aExisting );

4
pcbnew/pcb_expr_functions.cpp
View File

@ -993,8 +993,8 @@ static void getFieldFunc( LIBEVAL::CONTEXT* aCtx, void* self )
{
FOOTPRINT* fp = static_cast<FOOTPRINT*>( item );
if( fp->HasProperty( arg->AsString() ) )
return fp->GetProperty( arg->AsString() );
if( fp->HasField( arg->AsString() ) )
return fp->GetField( arg->AsString() );
}
return "";

2
pcbnew/plot_board_layers.cpp
View File

@ -95,7 +95,7 @@ void PlotInteractiveLayer( BOARD* aBoard, PLOTTER* aPlotter, const PCB_PLOT_PARA
_( "Value" ),
fp->Value().GetShownText( false ) ) );
for( const auto& [ name, value ] : fp->GetProperties() )
for( const auto& [name, value] : fp->GetFields() )
properties.emplace_back( wxString::Format( wxT( "!%s = %s" ), name, value ) );
properties.emplace_back( wxString::Format( wxT( "!%s = %s" ),

2
pcbnew/plugins/kicad/pcb_parser.cpp
View File

@ -4067,7 +4067,7 @@ FOOTPRINT* PCB_PARSER::parseFOOTPRINT_unchecked( wxArrayString* aInitialComments
footprint->SetAttributes( attributes );
footprint->SetFPID( fpid );
footprint->SetProperties( properties );
footprint->SetFields( properties );
return footprint.release();
}

2
pcbnew/plugins/kicad/pcb_plugin.cpp
View File

@ -1118,7 +1118,7 @@ void PCB_PLUGIN::format( const FOOTPRINT* aFootprint, int aNestLevel ) const
m_out->Quotew( aFootprint->GetKeywords() ).c_str() );
}
const std::map<wxString, wxString>& props = aFootprint->GetProperties();
const std::map<wxString, wxString>& props = aFootprint->GetFields();
for( const std::pair<const wxString, wxString>& prop : props )
{

Write Preview
Loading…
Cancel
Save