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

Revert "Add project name to symbol instance data." 

This reverts commit 4b276b339a.
This commit is contained in:
Wayne Stambaugh 2022-09-29 15:16:54 -04:00
parent ed42f95794
commit a60ed99510
7 changed files with 42 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
eeschema/sch_plugins/kicad/sch_sexpr_parser.cpp
View File

@ -2634,20 +2634,6 @@ SCH_SYMBOL* SCH_SEXPR_PARSER::parseSchematicSymbol()
case T_instances: case T_instances:
{ {
for( token = NextTok(); token != T_RIGHT; token = NextTok() )
{
if( token != T_LEFT )
Expecting( T_LEFT );
token = NextTok();
if( token != T_project )
Expecting( "project" );
NeedSYMBOL();
wxString projectName = FromUTF8();
for( token = NextTok(); token != T_RIGHT; token = NextTok() ) for( token = NextTok(); token != T_RIGHT; token = NextTok() )
{ {
if( token != T_LEFT ) if( token != T_LEFT )
@ -2660,8 +2646,6 @@ SCH_SYMBOL* SCH_SEXPR_PARSER::parseSchematicSymbol()
SYMBOL_INSTANCE_REFERENCE instance; SYMBOL_INSTANCE_REFERENCE instance;
instance.m_ProjectName = projectName;
NeedSYMBOL(); NeedSYMBOL();
instance.m_Path = KIID_PATH( FromUTF8() ); instance.m_Path = KIID_PATH( FromUTF8() );
@ -2704,7 +2688,6 @@ SCH_SYMBOL* SCH_SEXPR_PARSER::parseSchematicSymbol()
symbol->AddHierarchicalReference( instance ); symbol->AddHierarchicalReference( instance );
} }
} }
}
break; break;
} }

40
eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp
View File

@ -811,40 +811,18 @@ void SCH_SEXPR_PLUGIN::saveSymbol( SCH_SYMBOL* aSymbol, SCH_SHEET_PATH* aSheetPa
m_out->Print( aNestLevel + 1, "(instances\n" ); m_out->Print( aNestLevel + 1, "(instances\n" );
// Sort symbol instance data to minimize file churn. for( const SYMBOL_INSTANCE_REFERENCE& instance : aSymbol->GetInstanceReferences() )
std::vector< SYMBOL_INSTANCE_REFERENCE > sortedInstances( aSymbol->GetInstanceReferences() );
std::sort( sortedInstances.begin(), sortedInstances.end(), SortSymbolInstancesByProjectUuid );
KIID lastProjectUuid;
for( size_t i = 0; i < sortedInstances.size(); i++ )
{ {
if( lastProjectUuid != sortedInstances[i].m_Path[0] ) wxString path = instance.m_Path.AsString();
{
wxString projectName;
if( sortedInstances[i].m_Path[0] == m_schematic->RootScreen()->GetUuid() ) m_out->Print( aNestLevel + 2, "(path %s\n",
projectName = m_schematic->Prj().GetProjectName();
else
projectName = sortedInstances[i].m_ProjectName;
lastProjectUuid = sortedInstances[i].m_Path[0];
m_out->Print( aNestLevel + 2, "(project %s\n", m_out->Quotew( projectName ).c_str() );
}
wxString path = sortedInstances[i].m_Path.AsString();
m_out->Print( aNestLevel + 3, "(path %s\n",
m_out->Quotew( path ).c_str() ); m_out->Quotew( path ).c_str() );
m_out->Print( aNestLevel + 4, "(reference %s) (unit %d) (value %s) (footprint %s)\n", m_out->Print( aNestLevel + 3, "(reference %s) (unit %d) (value %s) (footprint %s)\n",
m_out->Quotew( sortedInstances[i].m_Reference ).c_str(), m_out->Quotew( instance.m_Reference ).c_str(),
sortedInstances[i].m_Unit, instance.m_Unit,
m_out->Quotew( sortedInstances[i].m_Value ).c_str(), m_out->Quotew( instance.m_Value ).c_str(),
m_out->Quotew( sortedInstances[i].m_Footprint ).c_str() ); m_out->Quotew( instance.m_Footprint ).c_str() );
m_out->Print( aNestLevel + 3, ")\n" ); m_out->Print( aNestLevel + 2, ")\n" );
if( i + 1 == sortedInstances.size() || lastProjectUuid != sortedInstances[i+1].m_Path[0] )
m_out->Print( aNestLevel + 2, ")\n" ); // Closes `project`.
} }
m_out->Print( aNestLevel + 1, ")\n" ); // Closes `instances`. m_out->Print( aNestLevel + 1, ")\n" ); // Closes `instances`.

2
eeschema/sch_plugins/kicad/sch_sexpr_plugin.h
View File

@ -5,7 +5,7 @@
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2020 CERN * Copyright (C) 2020 CERN
* Copyright (C) 2021-2022 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 2021 KiCad Developers, see AUTHORS.txt for contributors.
* *
* @author Wayne Stambaugh <stambaughw@gmail.com> * @author Wayne Stambaugh <stambaughw@gmail.com>
* *

9
eeschema/sch_sheet_path.cpp
View File

@ -91,15 +91,6 @@ public:
}; };
bool SortSymbolInstancesByProjectUuid( const SYMBOL_INSTANCE_REFERENCE& aLhs,
const SYMBOL_INSTANCE_REFERENCE& aRhs )
{
wxCHECK2( !aLhs.m_Path.empty() && !aRhs.m_Path.empty(), false );
return aLhs.m_Path[0] < aRhs.m_Path[0];
}
namespace std namespace std
{ {
size_t hash<SCH_SHEET_PATH>::operator()( const SCH_SHEET_PATH& path ) const size_t hash<SCH_SHEET_PATH>::operator()( const SCH_SHEET_PATH& path ) const

7
eeschema/sch_sheet_path.h
View File

@ -51,16 +51,9 @@ struct SYMBOL_INSTANCE_REFERENCE
// Things that can be back-annotated: // Things that can be back-annotated:
wxString m_Value; wxString m_Value;
wxString m_Footprint; wxString m_Footprint;
// The project name associated with this instance.
wxString m_ProjectName;
}; };
extern bool SortSymbolInstancesByProjectUuid( const SYMBOL_INSTANCE_REFERENCE& aLhs,
const SYMBOL_INSTANCE_REFERENCE& aRhs );
/** /**
* A simple container for sheet instance information. * A simple container for sheet instance information.
*/ */

1
eeschema/schematic.keywords
View File

@ -103,7 +103,6 @@ power
power_in power_in
power_out power_out
private private
project
property property
property_del property_del
pts pts

5
eeschema/sheet.cpp
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2015 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2015 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 2004-2022 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 2004-2021 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -238,7 +238,8 @@ bool SCH_EDIT_FRAME::LoadSheetFromFile( SCH_SHEET* aSheet, SCH_SHEET_PATH* aHier
"lastest file version will resolve this issue.\n\n" "lastest file version will resolve this issue.\n\n"
"Do you wish to continue?" ); "Do you wish to continue?" );
wxMessageDialog msgDlg7( this, msg, _( "Continue Load Schematic" ), wxMessageDialog msgDlg7( this, msg, _( "Continue Load Schematic" ),
wxOK | wxCANCEL | wxCANCEL_DEFAULT | wxCENTER | wxICON_QUESTION ); wxOK | wxCANCEL | wxCANCEL_DEFAULT |
wxCENTER | wxICON_QUESTION );
msgDlg7.SetOKCancelLabels( okButtonLabel, cancelButtonLabel ); msgDlg7.SetOKCancelLabels( okButtonLabel, cancelButtonLabel );
if( msgDlg7.ShowModal() == wxID_CANCEL ) if( msgDlg7.ShowModal() == wxID_CANCEL )