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

Revert "Allow netlisting for multi-unit parts"

Browse Source 
Breaks QA.  need to debug before re-committing

This reverts commit 635445c096c8624a47c9e0fdd6c1ebefa668e973.
This commit is contained in:
Seth Hillbrand 2025-08-26 22:07:40 -07:00
parent 8bd6da3ec9
commit 2f21414186
2 changed files with 22 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
eeschema/netlist_exporters/netlist_exporter_spice.cpp
View File

@ -180,22 +180,23 @@ bool NETLIST_EXPORTER_SPICE::ReadSchematicAndLibraries( unsigned aNetlistOptions
if( !symbol || symbol->ResolveExcludedFromSim() ) if( !symbol || symbol->ResolveExcludedFromSim() )
continue; continue;
wxString ref = symbol->GetRef( &sheet );
if( !refNames.insert( ref.ToStdString() ).second )
continue;
try try
{ {
SPICE_ITEM spiceItem; SPICE_ITEM spiceItem;
std::vector<PIN_INFO> pins = CreatePinList( symbol, sheet, true ); std::vector<PIN_INFO> pins = CreatePinList( symbol, sheet, true );
std::vector<SCH_FIELD> fields = collectSimFields( *symbol, sheet );
for( SCH_FIELD& field : fields ) for( const SCH_FIELD& field : symbol->GetFields() )
spiceItem.fields.push_back( field ); {
spiceItem.fields.emplace_back( symbol, FIELD_T::USER, field.GetName() );
readRefName( sheet, *symbol, spiceItem ); if( field.GetId() == FIELD_T::REFERENCE )
readModel( fields, *symbol, spiceItem, aReporter ); spiceItem.fields.back().SetText( symbol->GetRef( &sheet ) );
else
spiceItem.fields.back().SetText( field.GetShownText( &sheet, false ) );
}
readRefName( sheet, *symbol, spiceItem, refNames );
readModel( sheet, *symbol, spiceItem, aReporter );
readPinNumbers( *symbol, spiceItem, pins ); readPinNumbers( *symbol, spiceItem, pins );
readPinNetNames( *symbol, spiceItem, pins, ncCounter ); readPinNetNames( *symbol, spiceItem, pins, ncCounter );
readNodePattern( spiceItem ); readNodePattern( spiceItem );
@ -214,94 +215,6 @@ bool NETLIST_EXPORTER_SPICE::ReadSchematicAndLibraries( unsigned aNetlistOptions
} }
std::vector<SCH_FIELD> NETLIST_EXPORTER_SPICE::collectSimFields( SCH_SYMBOL& aSymbol,
const SCH_SHEET_PATH& aSheet )
{
std::vector<SCH_FIELD> fields;
SCH_FIELD* pinsFieldPtr = nullptr;
std::vector<std::pair<wxString, wxString>> pinList;
std::set<wxString> pinNames;
for( const SCH_FIELD& field : aSymbol.GetFields() )
{
fields.emplace_back( &aSymbol, FIELD_T::USER, field.GetName() );
if( field.GetId() == FIELD_T::REFERENCE )
fields.back().SetText( aSymbol.GetRef( &aSheet ) );
else
fields.back().SetText( field.GetShownText( &aSheet, false ) );
if( field.GetName() == SIM_PINS_FIELD )
pinsFieldPtr = &fields.back();
}
auto parsePins = [&]( const wxString& aPins )
{
wxStringTokenizer tokenizer( aPins, wxS( " \t\r\n" ), wxTOKEN_STRTOK );
while( tokenizer.HasMoreTokens() )
{
wxString token = tokenizer.GetNextToken();
int pos = token.Find( wxS( '=' ) );
if( pos == wxNOT_FOUND )
continue;
wxString name = token.Left( pos );
wxString node = token.Mid( pos + 1 );
if( pinNames.insert( name ).second )
pinList.emplace_back( name, node );
}
};
if( pinsFieldPtr )
parsePins( pinsFieldPtr->GetText() );
wxString ref = aSymbol.GetRef( &aSheet );
for( const SCH_SHEET_PATH& sheet : m_schematic->Hierarchy() )
{
for( SCH_ITEM* item : sheet.LastScreen()->Items().OfType( SCH_SYMBOL_T ) )
{
SCH_SYMBOL* other = static_cast<SCH_SYMBOL*>( item );
if( other == &aSymbol )
continue;
if( other->GetRef( &sheet ) != ref )
continue;
if( SCH_FIELD* pinsField = other->GetField( SIM_PINS_FIELD ) )
parsePins( pinsField->GetShownText( &sheet, false ) );
}
}
if( !pinList.empty() )
{
wxString merged;
for( const auto& pin : pinList )
{
if( !merged.IsEmpty() )
merged += wxS( " " );
merged += pin.first + wxS( "=" ) + pin.second;
}
if( pinsFieldPtr )
pinsFieldPtr->SetText( merged );
else
{
fields.emplace_back( &aSymbol, FIELD_T::USER, SIM_PINS_FIELD );
fields.back().SetText( merged );
}
}
return fields;
}
void NETLIST_EXPORTER_SPICE::ConvertToSpiceMarkup( wxString* aNetName ) void NETLIST_EXPORTER_SPICE::ConvertToSpiceMarkup( wxString* aNetName )
{ {
MARKUP::MARKUP_PARSER markupParser( aNetName->ToStdString() ); MARKUP::MARKUP_PARSER markupParser( aNetName->ToStdString() );
@ -496,17 +409,19 @@ void NETLIST_EXPORTER_SPICE::ReadDirectives( unsigned aNetlistOptions )
void NETLIST_EXPORTER_SPICE::readRefName( SCH_SHEET_PATH& aSheet, SCH_SYMBOL& aSymbol, void NETLIST_EXPORTER_SPICE::readRefName( SCH_SHEET_PATH& aSheet, SCH_SYMBOL& aSymbol,
SPICE_ITEM& aItem ) SPICE_ITEM& aItem, std::set<std::string>& aRefNames )
{ {
aItem.refName = aSymbol.GetRef( &aSheet ); aItem.refName = aSymbol.GetRef( &aSheet );
if( !aRefNames.insert( aItem.refName ).second )
wxASSERT( wxT( "Duplicate refdes encountered; what happened to ReadyToNetlist()?" ) );
} }
void NETLIST_EXPORTER_SPICE::readModel( const std::vector<SCH_FIELD>& aFields, SCH_SYMBOL& aSymbol, void NETLIST_EXPORTER_SPICE::readModel( SCH_SHEET_PATH& aSheet, SCH_SYMBOL& aSymbol,
SPICE_ITEM& aItem, REPORTER& aReporter ) SPICE_ITEM& aItem, REPORTER& aReporter )
{ {
const SIM_LIBRARY::MODEL& libModel = const SIM_LIBRARY::MODEL& libModel = m_libMgr.CreateModel( &aSheet, aSymbol, true, 0, aReporter );
m_libMgr.CreateModel( aFields, true, 0, aSymbol.GetAllLibPins(), aReporter );
aItem.baseModelName = libModel.name; aItem.baseModelName = libModel.name;
aItem.model = &libModel.model; aItem.model = &libModel.model;
@ -529,7 +444,7 @@ void NETLIST_EXPORTER_SPICE::readModel( const std::vector<SCH_FIELD>& aFields, S
wxFileName cacheFn; wxFileName cacheFn;
cacheFn.AssignDir( PATHS::GetUserCachePath() ); cacheFn.AssignDir( PATHS::GetUserCachePath() );
cacheFn.AppendDir( wxT( "ibis" ) ); cacheFn.AppendDir( wxT( "ibis" ) );
cacheFn.SetFullName( aItem.refName + wxT( ".cache" ) ); cacheFn.SetFullName( aSymbol.GetRef( &aSheet ) + wxT( ".cache" ) );
wxFile cacheFile( cacheFn.GetFullPath(), wxFile::write ); wxFile cacheFile( cacheFn.GetFullPath(), wxFile::write );

8
eeschema/netlist_exporters/netlist_exporter_spice.h
View File

@ -145,10 +145,10 @@ protected:
SCH_SHEET_LIST BuildSheetList( unsigned aNetlistOptions = 0 ) const; SCH_SHEET_LIST BuildSheetList( unsigned aNetlistOptions = 0 ) const;
private: private:
void readRefName( SCH_SHEET_PATH& aSheet, SCH_SYMBOL& aSymbol, SPICE_ITEM& aItem ); void readRefName( SCH_SHEET_PATH& aSheet, SCH_SYMBOL& aSymbol, SPICE_ITEM& aItem,
std::vector<SCH_FIELD> collectSimFields( SCH_SYMBOL& aSymbol, const SCH_SHEET_PATH& aSheet ); std::set<std::string>& aRefNames );
void readModel( const std::vector<SCH_FIELD>& aFields, SCH_SYMBOL& aSymbol, void readModel( SCH_SHEET_PATH& aSheet, SCH_SYMBOL& aSymbol, SPICE_ITEM& aItem,
SPICE_ITEM& aItem, REPORTER& aReporter ); REPORTER& aReporter );
void readPinNumbers( SCH_SYMBOL& aSymbol, SPICE_ITEM& aItem, void readPinNumbers( SCH_SYMBOL& aSymbol, SPICE_ITEM& aItem,
const std::vector<PIN_INFO>& aPins ); const std::vector<PIN_INFO>& aPins );
void readPinNetNames( SCH_SYMBOL& aSymbol, SPICE_ITEM& aItem, void readPinNetNames( SCH_SYMBOL& aSymbol, SPICE_ITEM& aItem,