Honour template fieldname vis flag when adding fields.

Fixes https://gitlab.com/kicad/code/kicad/-/issues/20575
This commit is contained in:
Jeff Young
2025-04-28 17:39:54 +01:00
parent d5cf541974
commit 66bacb3ea5
3 changed files with 9 additions and 4 deletions
@@ -644,7 +644,7 @@ bool DIALOG_SYMBOL_FIELDS_TABLE::TransferDataFromWindow()
SCH_COMMIT commit( m_parent );
SCH_SHEET_PATH currentSheet = m_parent->GetCurrentSheet();
m_dataModel->ApplyData( commit );
m_dataModel->ApplyData( commit, m_schSettings.m_TemplateFieldNames );
commit.Push( wxS( "Symbol Fields Table Edit" ) );
+7 -2
View File
@@ -798,7 +798,7 @@ void FIELDS_EDITOR_GRID_DATA_MODEL::ExpandAfterSort()
}
void FIELDS_EDITOR_GRID_DATA_MODEL::ApplyData( SCH_COMMIT& aCommit )
void FIELDS_EDITOR_GRID_DATA_MODEL::ApplyData( SCH_COMMIT& aCommit, TEMPLATES& aTemplateFieldnames )
{
for( const SCH_REFERENCE& instance : m_symbolsList )
@@ -843,7 +843,12 @@ void FIELDS_EDITOR_GRID_DATA_MODEL::ApplyData( SCH_COMMIT& aCommit )
{
destField = symbol.AddField( SCH_FIELD( &symbol, FIELD_T::USER, srcName ) );
destField->SetTextAngle( symbol.GetField( FIELD_T::REFERENCE )->GetTextAngle() );
destField->SetVisible( false );
if( const TEMPLATE_FIELDNAME* srcTemplate = aTemplateFieldnames.GetFieldName( srcName ) )
destField->SetVisible( srcTemplate->m_Visible );
else
destField->SetVisible( false );
destField->SetTextPos( symbol.GetPosition() );
}
+1 -1
View File
@@ -215,7 +215,7 @@ public:
void CollapseForSort();
void ExpandAfterSort();
void ApplyData( SCH_COMMIT& aCommit );
void ApplyData( SCH_COMMIT& aCommit, TEMPLATES& aTemplateFieldnames );
bool IsEdited() { return m_edited; }