realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 02:03:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Pretty-print cross references in Symbol Fields Table.

Browse Source 
Fixes https://gitlab.com/kicad/code/kicad/-/issues/19941
This commit is contained in:
Jeff Young 2025-02-15 14:21:28 +00:00
parent d921a4e916
commit f65d260961
3 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
eeschema/dialogs/dialog_symbol_fields_table.cpp
View File

@ -38,7 +38,6 @@
#include <sch_commit.h>
#include <sch_edit_frame.h>
#include <sch_reference_list.h>
#include <schematic.h>
#include <tools/sch_editor_control.h>
#include <kiplatform/ui.h>
#include <widgets/grid_text_button_helpers.h>
@ -628,13 +627,7 @@ bool DIALOG_SYMBOL_FIELDS_TABLE::TransferDataFromWindow()
SCH_COMMIT commit( m_parent );
SCH_SHEET_PATH currentSheet = m_parent->GetCurrentSheet();
std::function<void( SCH_SYMBOL&, SCH_SHEET_PATH & aPath )> changeHandler =
[&commit]( SCH_SYMBOL& aSymbol, SCH_SHEET_PATH& aPath ) -> void
{
commit.Modify( &aSymbol, aPath.LastScreen() );
};
m_dataModel->ApplyData( changeHandler );
m_dataModel->ApplyData( commit );
commit.Push( wxS( "Symbol Fields Table Edit" ) );

51
eeschema/fields_data_model.cpp
View File

@ -23,7 +23,8 @@
#include <common.h>
#include <widgets/wx_grid.h>
#include <sch_reference_list.h>
#include <schematic_settings.h>
#include <sch_commit.h>
#include <sch_screen.h>
#include "string_utils.h"
#include "fields_data_model.h"
@ -60,9 +61,13 @@ void FIELDS_EDITOR_GRID_DATA_MODEL::updateDataStoreSymbolField( const SCH_SYMBOL
else if( const SCH_FIELD* field = aSymbol.GetFieldByName( aFieldName ) )
{
if( field->IsPrivate() )
{
m_dataStore[aSymbol.m_Uuid][aFieldName] = wxEmptyString;
else
m_dataStore[aSymbol.m_Uuid][aFieldName] = field->GetText();
return;
}
wxString value = aSymbol.Schematic()->ConvertKIIDsToRefs( field->GetText() );
m_dataStore[aSymbol.m_Uuid][aFieldName] = value;
}
else if( IsTextVar( aFieldName ) )
{
@ -757,22 +762,18 @@ void FIELDS_EDITOR_GRID_DATA_MODEL::ExpandAfterSort()
}
void FIELDS_EDITOR_GRID_DATA_MODEL::ApplyData(
std::function<void( SCH_SYMBOL&, SCH_SHEET_PATH& )> symbolChangeHandler )
void FIELDS_EDITOR_GRID_DATA_MODEL::ApplyData( SCH_COMMIT& aCommit )
{
for( unsigned i = 0; i < m_symbolsList.GetCount(); ++i )
{
SCH_SYMBOL& symbol = *m_symbolsList[i].GetSymbol();
symbolChangeHandler( symbol, m_symbolsList[i].GetSheetPath() );
aCommit.Modify( &symbol, m_symbolsList[i].GetSheetPath().LastScreen() );
const std::map<wxString, wxString>& fieldStore = m_dataStore[symbol.m_Uuid];
for( const std::pair<wxString, wxString> srcData : fieldStore )
for( const auto& [srcName, srcValue] : fieldStore )
{
const wxString& srcName = srcData.first;
const wxString& srcValue = srcData.second;
// Attributes bypass the field logic, so handle them first
if( isAttribute( srcName ) )
{
@ -813,24 +814,19 @@ void FIELDS_EDITOR_GRID_DATA_MODEL::ApplyData(
if( destField->GetId() == REFERENCE_FIELD )
{
// Reference is not editable from this dialog
continue;
}
else if( destField->GetId() == VALUE_FIELD )
{
// Value field cannot be empty
if( !srcValue.IsEmpty() )
symbol.SetValueFieldText( srcValue );
}
else if( destField->GetId() == FOOTPRINT_FIELD )
{
symbol.SetFootprintFieldText( srcValue );
}
else
{
destField->SetText( srcValue );
if( srcValue.IsEmpty() )
continue;
}
destField->SetText( symbol.Schematic()->ConvertRefsToKIIDs( srcValue ) );
}
for( int ii = symbol.GetFields().size() - 1; ii >= 0; ii-- )
for( int ii = (int) symbol.GetFields().size() - 1; ii >= 0; ii-- )
{
if( symbol.GetFields()[ii].IsMandatory() || symbol.GetFields()[ii].IsPrivate() )
continue;
@ -978,8 +974,10 @@ wxString FIELDS_EDITOR_GRID_DATA_MODEL::Export( const BOM_FMT_PRESET& settings )
}
if( !settings.stringDelimiter.IsEmpty() )
{
field.Replace( settings.stringDelimiter,
settings.stringDelimiter + settings.stringDelimiter );
}
return settings.stringDelimiter + field + settings.stringDelimiter
+ ( last ? wxString( wxS( "\n" ) ) : settings.fieldDelimiter );
@ -1023,13 +1021,20 @@ void FIELDS_EDITOR_GRID_DATA_MODEL::AddReferences( const SCH_REFERENCE_LIST& aRe
{
if( !m_symbolsList.Contains( ref ) )
{
SCH_SYMBOL* symbol = ref.GetSymbol();
m_symbolsList.AddItem( ref );
// Update the fields of every reference
for( const SCH_FIELD& field : ref.GetSymbol()->GetFields() )
for( const SCH_FIELD& field : symbol->GetFields() )
{
if( !field.IsPrivate() )
m_dataStore[ref.GetSymbol()->m_Uuid][field.GetCanonicalName()] = field.GetText();
{
wxString name = field.GetCanonicalName();
wxString value = symbol->Schematic()->ConvertKIIDsToRefs( field.GetText() );
m_dataStore[symbol->m_Uuid][name] = value;
}
}
}
}

2
eeschema/fields_data_model.h
View File

@ -204,7 +204,7 @@ public:
void CollapseForSort();
void ExpandAfterSort();
void ApplyData( std::function<void( SCH_SYMBOL&, SCH_SHEET_PATH& )> symbolChangeHandler );
void ApplyData( SCH_COMMIT& aCommit );
bool IsEdited() { return m_edited; }