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

Clearer naming.

This commit is contained in:
Jeff Young 2021-11-28 15:07:38 +00:00
parent 3886e681ae
commit f23cd9c9e5
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
eeschema/tools/sch_editor_control.cpp
View File

@ -1611,39 +1611,39 @@ int SCH_EDITOR_CONTROL::Paste( const TOOL_EVENT& aEvent )
} }
EE_SELECTION_TOOL* selTool = m_toolMgr->GetTool<EE_SELECTION_TOOL>(); EE_SELECTION_TOOL* selTool = m_toolMgr->GetTool<EE_SELECTION_TOOL>();
std::string text; std::string content;
if( aEvent.IsAction( &ACTIONS::duplicate ) ) if( aEvent.IsAction( &ACTIONS::duplicate ) )
text = m_localClipboard; content = m_localClipboard;
else else
text = m_toolMgr->GetClipboardUTF8(); content = m_toolMgr->GetClipboardUTF8();
if( text.empty() ) if( content.empty() )
return 0; return 0;
STRING_LINE_READER reader( text, "Clipboard" ); STRING_LINE_READER reader( content, "Clipboard" );
SCH_SEXPR_PLUGIN plugin; SCH_SEXPR_PLUGIN plugin;
SCH_SHEET paste_sheet; SCH_SHEET tempSheet;
SCH_SCREEN* paste_screen = new SCH_SCREEN( &m_frame->Schematic() ); SCH_SCREEN* tempScreen = new SCH_SCREEN( &m_frame->Schematic() );
// Screen object on heap is owned by the sheet. // Screen object on heap is owned by the sheet.
paste_sheet.SetScreen( paste_screen ); tempSheet.SetScreen( tempScreen );
try try
{ {
plugin.LoadContent( reader, &paste_sheet ); plugin.LoadContent( reader, &tempSheet );
} }
catch( IO_ERROR& ) catch( IO_ERROR& )
{ {
// If it wasn't content, then paste as text // If it wasn't content, then paste as content
SCH_TEXT* text_item = new SCH_TEXT( wxPoint( 0, 0 ), text ); SCH_TEXT* text_item = new SCH_TEXT( wxPoint( 0, 0 ), content );
text_item->SetLabelSpinStyle( LABEL_SPIN_STYLE::RIGHT ); // Left alignment text_item->SetLabelSpinStyle( LABEL_SPIN_STYLE::RIGHT ); // Left alignment
paste_screen->Append( text_item ); tempScreen->Append( text_item );
} }
// Save loaded screen instances to m_clipboardSheetInstances // Save loaded screen instances to m_clipboardSheetInstances
setClipboardInstances( paste_screen ); setClipboardInstances( tempScreen );
PASTE_MODE pasteMode = PASTE_MODE::REMOVE_ANNOTATIONS; PASTE_MODE pasteMode = PASTE_MODE::REMOVE_ANNOTATIONS;
@ -1693,7 +1693,7 @@ int SCH_EDITOR_CONTROL::Paste( const TOOL_EVENT& aEvent )
std::map<SCH_SHEET_PATH, SCH_REFERENCE_LIST> pastedSymbols; std::map<SCH_SHEET_PATH, SCH_REFERENCE_LIST> pastedSymbols;
std::map<SCH_SHEET_PATH, SCH_SHEET_LIST> pastedSheets; std::map<SCH_SHEET_PATH, SCH_SHEET_LIST> pastedSheets;
for( SCH_ITEM* item : paste_screen->Items() ) for( SCH_ITEM* item : tempScreen->Items() )
{ {
loadedItems.push_back( item ); loadedItems.push_back( item );
@ -1721,7 +1721,7 @@ int SCH_EDITOR_CONTROL::Paste( const TOOL_EVENT& aEvent )
} }
// Remove the references from our temporary screen to prevent freeing on the DTOR // Remove the references from our temporary screen to prevent freeing on the DTOR
paste_screen->Clear( false ); tempScreen->Clear( false );
for( unsigned i = 0; i < loadedItems.size(); ++i ) for( unsigned i = 0; i < loadedItems.size(); ++i )
{ {
@ -1746,8 +1746,8 @@ int SCH_EDITOR_CONTROL::Paste( const TOOL_EVENT& aEvent )
if( it == end ) if( it == end )
{ {
// If can't find library definition in the design, use the pasted library // If can't find library definition in the design, use the pasted library
it = paste_screen->GetLibSymbols().find( symbol->GetSchSymbolLibraryName() ); it = tempScreen->GetLibSymbols().find( symbol->GetSchSymbolLibraryName() );
end = paste_screen->GetLibSymbols().end(); end = tempScreen->GetLibSymbols().end();
} }
LIB_SYMBOL* libSymbol = nullptr; LIB_SYMBOL* libSymbol = nullptr;
@ -1759,10 +1759,7 @@ int SCH_EDITOR_CONTROL::Paste( const TOOL_EVENT& aEvent )
} }
for( SCH_SHEET_PATH& instance : pasteInstances ) for( SCH_SHEET_PATH& instance : pasteInstances )
{ updatePastedSymbol( symbol, tempScreen, instance, clipPath, forceKeepAnnotations );
updatePastedSymbol( symbol, paste_screen, instance, clipPath,
forceKeepAnnotations );
}
// Assign a new KIID // Assign a new KIID
const_cast<KIID&>( item->m_Uuid ) = KIID(); const_cast<KIID&>( item->m_Uuid ) = KIID();