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

Save instance info on clipboard and reapply it when keeping annotations. 

Fixes https://gitlab.com/kicad/code/kicad/issues/5522
This commit is contained in:
Jeff Young 2020-09-06 11:31:53 +01:00
parent 133fb5cded
commit d5fd09249b
3 changed files with 104 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
eeschema/sch_reference_list.h
View File

@ -215,7 +215,7 @@ public:
class SCH_REFERENCE_LIST
{
private:
std::vector <SCH_REFERENCE> flatList;
std::vector<SCH_REFERENCE> flatList;
public:
/** Constructor
@ -229,6 +229,11 @@ public:
return flatList[ aIndex ];
}
void Clear()
{
flatList.clear();
}
/**
* Function GetCount
* @return the number of items in the list

115
eeschema/tools/sch_editor_control.cpp
View File

@ -1219,6 +1219,7 @@ bool SCH_EDITOR_CONTROL::doCopy()
{
EE_SELECTION_TOOL* selTool = m_toolMgr->GetTool<EE_SELECTION_TOOL>();
EE_SELECTION& selection = selTool->RequestSelection();
SCHEMATIC& schematic = m_frame->Schematic();
if( !selection.GetSize() )
return false;
@ -1235,6 +1236,10 @@ bool SCH_EDITOR_CONTROL::doCopy()
}
}
m_supplementaryClipboardInstances.Clear();
schematic.GetSheets().GetComponents( m_supplementaryClipboardInstances, true, true );
m_supplementaryClipboardPath = m_frame->GetCurrentSheet().Path();
STRING_FORMATTER formatter;
SCH_SEXPR_PLUGIN plugin;
@ -1290,6 +1295,60 @@ int SCH_EDITOR_CONTROL::Copy( const TOOL_EVENT& aEvent )
}
void SCH_EDITOR_CONTROL::updatePastedInstances( const SCH_SHEET_PATH& aPastePath,
const KIID_PATH& aClipPath, SCH_SHEET* aSheet,
bool aForceKeepAnnotations )
{
for( SCH_ITEM* item : aSheet->GetScreen()->Items() )
{
if( item->Type() == SCH_COMPONENT_T )
{
SCH_COMPONENT* comp = static_cast<SCH_COMPONENT*>( item );
if( aForceKeepAnnotations )
{
KIID_PATH clipItemPath = aClipPath;
clipItemPath.push_back( comp->m_Uuid );
// SCH_REFERENCE_LIST doesn't include the root sheet in the path
clipItemPath.erase( clipItemPath.begin() );
int ii = m_supplementaryClipboardInstances.FindRefByPath( clipItemPath.AsString() );
if( ii >= 0 )
{
SCH_REFERENCE instance = m_supplementaryClipboardInstances[ ii ];
comp->SetUnit( instance.GetUnit() );
comp->SetRef( &aPastePath, instance.GetRef() );
comp->SetValue( &aPastePath, instance.GetValue() );
comp->SetFootprint( &aPastePath, instance.GetFootprint() );
}
else
{
comp->ClearAnnotation( &aPastePath );
}
}
else
{
comp->ClearAnnotation( &aPastePath );
}
}
else if( item->Type() == SCH_SHEET_T )
{
SCH_SHEET* sheet = static_cast<SCH_SHEET*>( item );
SCH_SHEET_PATH pastePath = aPastePath;
pastePath.push_back( sheet );
KIID_PATH clipPath = aClipPath;
clipPath.push_back( sheet->m_Uuid );
updatePastedInstances( pastePath, clipPath, sheet, aForceKeepAnnotations );
}
}
}
int SCH_EDITOR_CONTROL::Paste( const TOOL_EVENT& aEvent )
{
wxTextEntry* textEntry = dynamic_cast<wxTextEntry*>( wxWindow::FindFocus() );
@ -1341,8 +1400,8 @@ int SCH_EDITOR_CONTROL::Paste( const TOOL_EVENT& aEvent )
EDA_ITEMS loadedItems;
bool sheetsPasted = false;
SCH_SHEET_LIST hierarchy = m_frame->Schematic().GetSheets();
SCH_SHEET_PATH& currentSheet = m_frame->GetCurrentSheet();
wxFileName destFn = currentSheet.Last()->GetFileName();
SCH_SHEET_PATH& pasteRoot = m_frame->GetCurrentSheet();
wxFileName destFn = pasteRoot.Last()->GetFileName();
if( destFn.IsRelative() )
destFn.MakeAbsolute( m_frame->Prj().GetProjectPath() );
@ -1379,6 +1438,7 @@ int SCH_EDITOR_CONTROL::Paste( const TOOL_EVENT& aEvent )
for( unsigned i = 0; i < loadedItems.size(); ++i )
{
EDA_ITEM* item = loadedItems[i];
KIID_PATH clipPath = m_supplementaryClipboardPath;
if( item->Type() == SCH_COMPONENT_T )
{
@ -1399,19 +1459,12 @@ int SCH_EDITOR_CONTROL::Paste( const TOOL_EVENT& aEvent )
if( !forceKeepAnnotations )
{
const_cast<KIID&>( component->m_Uuid ) = KIID();
// clear the annotation, but preserve the selected unit
int unit = component->GetUnit();
component->ClearAnnotation( nullptr );
component->SetUnit( unit );
}
}
else
{
// Everything else gets a new UUID
const_cast<KIID&>( item->m_Uuid ) = KIID();
}
if( item->Type() == SCH_SHEET_T )
{
@ -1419,7 +1472,6 @@ int SCH_EDITOR_CONTROL::Paste( const TOOL_EVENT& aEvent )
SCH_FIELD& nameField = sheet->GetFields()[SHEETNAME];
wxFileName fn = sheet->GetFileName();
SCH_SCREEN* existingScreen = nullptr;
bool dropSheetAnnotations = false;
wxString baseName = nameField.GetText();
wxString candidateName = baseName;
int uniquifier = 1;
@ -1429,43 +1481,48 @@ int SCH_EDITOR_CONTROL::Paste( const TOOL_EVENT& aEvent )
nameField.SetText( candidateName );
sheet->SetParent( currentSheet.Last() );
sheet->SetParent( pasteRoot.Last() );
sheet->SetScreen( nullptr );
sheetsPasted = true;
if( !fn.IsAbsolute() )
{
wxFileName currentSheetFileName = currentSheet.LastScreen()->GetFileName();
wxFileName currentSheetFileName = pasteRoot.LastScreen()->GetFileName();
fn.Normalize( wxPATH_NORM_ALL, currentSheetFileName.GetPath() );
}
if( m_frame->Schematic().Root().SearchHierarchy(
fn.GetFullPath( wxPATH_UNIX ), &existingScreen ) )
dropSheetAnnotations = !forceKeepAnnotations;
else
if( !m_frame->Schematic().Root().SearchHierarchy( fn.GetFullPath( wxPATH_UNIX ),
&existingScreen ) )
{
searchSupplementaryClipboard( sheet->GetFileName(), &existingScreen );
}
if( existingScreen )
{
sheet->SetScreen( existingScreen );
SCH_SHEET_PATH sheetpath = currentSheet;
sheetpath.push_back( sheet );
// Clear annotation and create the AR for this path, if not exists,
// when the screen is shared by sheet paths.
// Otherwise ClearAnnotation do nothing, because the F1 field is used as
// reference default value and takes the latest displayed value
existingScreen->EnsureAlternateReferencesExist();
if( dropSheetAnnotations )
existingScreen->ClearAnnotation( &sheetpath );
}
else
{
if( !m_frame->LoadSheetFromFile( sheet, &currentSheet, fn.GetFullPath() ) )
if( !m_frame->LoadSheetFromFile( sheet, &pasteRoot, fn.GetFullPath() ) )
m_frame->InitSheet( sheet, sheet->GetFileName() );
}
// Push it to the clipboard path while it still has its old KIID
clipPath.push_back( sheet->m_Uuid );
}
// Everything gets a new KIID
const_cast<KIID&>( item->m_Uuid ) = KIID();
// Once we have our new KIID we can update all pasted instances. This will either
// reset the annotations or copy "kept" annotations from the supplementary clipboard.
if( item->Type() == SCH_SHEET_T )
{
SCH_SHEET* sheet = (SCH_SHEET*) item;
SCH_SHEET_PATH pastePath = pasteRoot;
pastePath.push_back( sheet );
updatePastedInstances( pastePath, clipPath, sheet, forceKeepAnnotations );
}
item->SetFlags( IS_NEW | IS_PASTED | IS_MOVED );

13
eeschema/tools/sch_editor_control.h
View File

@ -163,13 +163,8 @@ private:
void doCrossProbeSchToPcb( const TOOL_EVENT& aEvent, bool aForce );
/**
* Loads a .cmp file from CvPcb and update the footprint field of components.
*
* Prepares parameters and calls ProcessCmpToFootprintLinkFileto actually read the file and
* update the footprint fields
*/
bool loadCmpToFootprintLinkFile();
void updatePastedInstances( const SCH_SHEET_PATH& aPastePath, const KIID_PATH& aClipPath,
SCH_SHEET* aSheet, bool aForceKeepAnnotations );
/**
* Read the footprint info from each line in the stuff file by reference designator.
@ -211,9 +206,11 @@ private:
bool m_probingPcbToSch; // Recursion guard when cross-probing to PCBNew
EDA_ITEM* m_pickerItem; // Current item for picker highlighting.
// A map of sheet paths --> screens for the clipboard contents. We use these to hook up
// A map of sheet filename --> screens for the clipboard contents. We use these to hook up
// cut/paste operations for unsaved sheet content.
std::map<wxString, SCH_SCREEN*> m_supplementaryClipboard;
SCH_REFERENCE_LIST m_supplementaryClipboardInstances;
KIID_PATH m_supplementaryClipboardPath;
};