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

Eeschema: yet another attempt to fix network share editing performance. 

Root out a few other areas where the hierarchy integrity test was being
performed while editing where it wasn't required.
This commit is contained in:
Wayne Stambaugh 2021-10-07 07:22:50 -04:00
parent 765816ccb1
commit 9b6798c479
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eeschema/block.cpp
View File

@ -470,7 +470,7 @@ void SCH_EDIT_FRAME::PasteListOfItems( wxDC* DC )
bool hasSheetPasted = false; bool hasSheetPasted = false;
// Keep trace of existing sheet paths. Paste block can modify this list // Keep trace of existing sheet paths. Paste block can modify this list
SCH_SHEET_LIST initial_sheetpathList( g_RootSheet ); SCH_SHEET_LIST initial_sheetpathList( g_RootSheet, false );
for( i = 0; i < m_blockItems.GetCount(); i++ ) for( i = 0; i < m_blockItems.GetCount(); i++ )
{ {

14
eeschema/sch_edit_frame.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) 2017 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2017 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-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
@ -507,7 +507,7 @@ void SCH_EDIT_FRAME::SetSheetNumberAndCount()
int sheet_count = g_RootSheet->CountSheets(); int sheet_count = g_RootSheet->CountSheets();
int SheetNumber = 1; int SheetNumber = 1;
wxString current_sheetpath = m_CurrentSheet->Path(); wxString current_sheetpath = m_CurrentSheet->Path();
SCH_SHEET_LIST sheetList( g_RootSheet ); SCH_SHEET_LIST sheetList( g_RootSheet, false );
// Examine all sheets path to find the current sheets path, // Examine all sheets path to find the current sheets path,
// and count them from root to the current sheet path: // and count them from root to the current sheet path:
@ -642,7 +642,8 @@ void SCH_EDIT_FRAME::OnCloseWindow( wxCloseEvent& aEvent )
{ {
if( Kiface().IsSingle() ) if( Kiface().IsSingle() )
{ {
LIB_EDIT_FRAME* libeditFrame = (LIB_EDIT_FRAME*) Kiway().Player( FRAME_SCH_LIB_EDITOR, false ); LIB_EDIT_FRAME* libeditFrame = (LIB_EDIT_FRAME*) Kiway().Player( FRAME_SCH_LIB_EDITOR,
false );
if( libeditFrame && !libeditFrame->Close() ) // Can close component editor? if( libeditFrame && !libeditFrame->Close() ) // Can close component editor?
return; return;
@ -661,7 +662,7 @@ void SCH_EDIT_FRAME::OnCloseWindow( wxCloseEvent& aEvent )
if( simFrame && !simFrame->Close() ) // Can close the simulator? if( simFrame && !simFrame->Close() ) // Can close the simulator?
return; return;
SCH_SHEET_LIST sheetList( g_RootSheet ); SCH_SHEET_LIST sheetList( g_RootSheet, false );
if( sheetList.IsModified() ) if( sheetList.IsModified() )
{ {
@ -1377,7 +1378,6 @@ void SCH_EDIT_FRAME::addCurrentItemToScreen()
undoItem = parentSheet; undoItem = parentSheet;
} }
else if( item->Type() == SCH_FIELD_T ) else if( item->Type() == SCH_FIELD_T )
{ {
parentComponent = (SCH_COMPONENT*) item->GetParent(); parentComponent = (SCH_COMPONENT*) item->GetParent();
@ -1394,7 +1394,7 @@ void SCH_EDIT_FRAME::addCurrentItemToScreen()
// for all new sheet paths added by the new sheet (if this sheet is loaded from // for all new sheet paths added by the new sheet (if this sheet is loaded from
// and existing sheet or a existing file, it can also contain subsheets) // and existing sheet or a existing file, it can also contain subsheets)
bool doClearAnnotation = false; bool doClearAnnotation = false;
SCH_SHEET_LIST initial_sheetpathList( g_RootSheet ); SCH_SHEET_LIST initial_sheetpathList( g_RootSheet, false );
if( item->Type() == SCH_SHEET_T ) if( item->Type() == SCH_SHEET_T )
{ {
@ -1506,7 +1506,9 @@ void SCH_EDIT_FRAME::UpdateTitle()
title += _( " [Read Only]" ); title += _( " [Read Only]" );
} }
else else
{
title += _( " [no file]" ); title += _( " [no file]" );
}
} }
SetTitle( title ); SetTitle( title );