haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Back out changes which updated the eeschema file format. 

We'll wait until we have the new eeschema format to turn on UUID
generation for Eeschema.  Right now only Pcnbew generates full UUIDs.
This commit is contained in:
Jeff Young 2020-02-20 23:40:30 +00:00
parent 490f39a671
commit e69c82f45f
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/common.cpp
View File

@ -58,6 +58,18 @@ UUID::UUID() :
m_uuid( randomGenerator() ), m_uuid( randomGenerator() ),
m_cached_timestamp( 0 ) m_cached_timestamp( 0 )
{ {
#if defined(EESCHEMA)
// JEY TODO: use legacy timestamps until new EEschema file format is in
static timestamp_t oldTimeStamp;
timestamp_t newTimeStamp = time( NULL );
if( newTimeStamp <= oldTimeStamp )
newTimeStamp = oldTimeStamp + 1;
oldTimeStamp = newTimeStamp;
*this = UUID( wxString::Format( "%8.8X", newTimeStamp ) );
#endif
} }

26
eeschema/sch_legacy_plugin.cpp
View File

@ -993,27 +993,19 @@ SCH_SHEET* SCH_LEGACY_PLUGIN::loadSheet( LINE_READER& aReader )
wxString text; wxString text;
int size; int size;
int fieldId = parseInt( aReader, line, &line ); int fieldId = parseInt( aReader, line, &line );
bool visible = true;
if( fieldId == 0 || fieldId == 1 ) // Sheet name and file name. if( fieldId == 0 || fieldId == 1 ) // Sheet name and file name.
{ {
parseQuotedString( text, aReader, line, &line ); parseQuotedString( text, aReader, line, &line );
size = Mils2Iu( parseInt( aReader, line, &line ) ); size = Mils2Iu( parseInt( aReader, line, &line ) );
if( strCompare( "V", line, &line ) )
visible = true;
else if( strCompare( "I", line, &line ) )
visible = false;
if( fieldId == 0 ) if( fieldId == 0 )
{ {
sheet->SetShowSheetName( visible );
sheet->SetName( text ); sheet->SetName( text );
sheet->SetSheetNameSize( size ); sheet->SetSheetNameSize( size );
} }
else else
{ {
sheet->SetShowFileName( visible );
sheet->SetFileName( text ); sheet->SetFileName( text );
sheet->SetFileNameSize( size ); sheet->SetFileNameSize( size );
} }
@ -2003,11 +1995,11 @@ void SCH_LEGACY_PLUGIN::saveComponent( SCH_COMPONENT* aComponent )
m_out->Print( 0, "$Comp\n" ); m_out->Print( 0, "$Comp\n" );
m_out->Print( 0, "L %s %s\n", name2.c_str(), name1.c_str() ); m_out->Print( 0, "L %s %s\n", name2.c_str(), name1.c_str() );
// Generate unit number, conversion and UUID (including legacy timestamp if present) // Generate unit number, conversion and timestamp
m_out->Print( 0, "U %d %d %s\n", m_out->Print( 0, "U %d %d %8.8X\n",
aComponent->GetUnit(), aComponent->GetUnit(),
aComponent->GetConvert(), aComponent->GetConvert(),
TO_UTF8( aComponent->m_Uuid.AsString() ) ); aComponent->m_Uuid.AsLegacyTimestamp() );
// Save the position // Save the position
m_out->Print( 0, "P %d %d\n", m_out->Print( 0, "P %d %d\n",
@ -2161,19 +2153,17 @@ void SCH_LEGACY_PLUGIN::saveSheet( SCH_SHEET* aSheet )
Iu2Mils( aSheet->GetSize().x ), Iu2Mils( aSheet->GetSize().x ),
Iu2Mils( aSheet->GetSize().y ) ); Iu2Mils( aSheet->GetSize().y ) );
m_out->Print( 0, "U %s\n", TO_UTF8( aSheet->m_Uuid.AsString() ) ); m_out->Print( 0, "U %8.8X\n", aSheet->m_Uuid.AsLegacyTimestamp() );
if( !aSheet->GetName().IsEmpty() ) if( !aSheet->GetName().IsEmpty() )
m_out->Print( 0, "F0 %s %d %c\n", m_out->Print( 0, "F0 %s %d\n",
EscapedUTF8( aSheet->GetName() ).c_str(), EscapedUTF8( aSheet->GetName() ).c_str(),
Iu2Mils( aSheet->GetSheetNameSize() ), Iu2Mils( aSheet->GetSheetNameSize() ) );
aSheet->GetShowSheetName() ? 'V' : 'I' );
if( !aSheet->GetFileName().IsEmpty() ) if( !aSheet->GetFileName().IsEmpty() )
m_out->Print( 0, "F1 %s %d %c\n", m_out->Print( 0, "F1 %s %d\n",
EscapedUTF8( aSheet->GetFileName() ).c_str(), EscapedUTF8( aSheet->GetFileName() ).c_str(),
Iu2Mils( aSheet->GetFileNameSize() ), Iu2Mils( aSheet->GetFileNameSize() ) );
aSheet->GetShowFileName() ? 'V' : 'I' );
for( const SCH_SHEET_PIN* pin : aSheet->GetPins() ) for( const SCH_SHEET_PIN* pin : aSheet->GetPins() )
{ {