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

Eeschema: fix sheet bug in schematic editor drawing tool. 

SCH_SHEET objects can only have another SCH_SHEET object as a parent
or nullptr for the root sheet so overload EDA_ITEM::SetParent() to
prevent the parent from being set to another type of object and add
some checks to the root sheet code just in case someone gets clever
and attempts to bypass the overloaded SetParent() call.
This commit is contained in:
Wayne Stambaugh 2020-04-26 14:27:51 -04:00
parent 349ec2031b
commit fa57c8a570
5 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eeschema/sch_eagle_plugin.cpp
View File

@ -596,7 +596,7 @@ void SCH_EAGLE_PLUGIN::loadSchematic( wxXmlNode* aSchematicNode )
std::unique_ptr<SCH_SHEET> sheet( new SCH_SHEET( pos ) ); std::unique_ptr<SCH_SHEET> sheet( new SCH_SHEET( pos ) );
SCH_SCREEN* screen = new SCH_SCREEN( m_kiway ); SCH_SCREEN* screen = new SCH_SCREEN( m_kiway );
sheet->SetParent( m_rootSheet->GetScreen() ); sheet->SetParent( m_rootSheet );
sheet->SetScreen( screen ); sheet->SetScreen( screen );
sheet->GetScreen()->SetFileName( sheet->GetFileName() ); sheet->GetScreen()->SetFileName( sheet->GetFileName() );

22
eeschema/sch_sheet.cpp
View File

@ -146,6 +146,19 @@ EDA_ITEM* SCH_SHEET::Clone() const
} }
void SCH_SHEET::SetParent( EDA_ITEM* aSheet )
{
m_Parent = nullptr;
if( aSheet )
{
// Parent must be another SCH_SHEET object or nullptr
wxCHECK( aSheet->Type() == SCH_SHEET_T, /* void */ );
m_Parent = aSheet;
}
}
void SCH_SHEET::SetScreen( SCH_SCREEN* aScreen ) void SCH_SHEET::SetScreen( SCH_SCREEN* aScreen )
{ {
if( aScreen == m_screen ) if( aScreen == m_screen )
@ -180,11 +193,16 @@ int SCH_SHEET::GetScreenCount() const
SCH_SHEET* SCH_SHEET::GetRootSheet() SCH_SHEET* SCH_SHEET::GetRootSheet()
{ {
SCH_SHEET* sheet = dynamic_cast< SCH_SHEET* >( GetParent() ); EDA_ITEM* item = GetParent();
if( sheet == NULL ) if( item == nullptr )
return this; return this;
SCH_SHEET* sheet = dynamic_cast< SCH_SHEET* >( item );
// The parent must be a SCH_SHEET object.
wxCHECK( sheet, nullptr );
// Recurse until a sheet is found with no parent which is the root sheet. // Recurse until a sheet is found with no parent which is the root sheet.
return sheet->GetRootSheet(); return sheet->GetRootSheet();
} }

2
eeschema/sch_sheet.h
View File

@ -254,6 +254,8 @@ public:
return wxT( "SCH_SHEET" ); return wxT( "SCH_SHEET" );
} }
virtual void SetParent( EDA_ITEM* aSheet ) override;
/** /**
* Return true for items which are moved with the anchor point at mouse cursor * Return true for items which are moved with the anchor point at mouse cursor
* and false for items moved with no reference to anchor. * and false for items moved with no reference to anchor.

2
eeschema/tools/sch_drawing_tools.cpp
View File

@ -843,7 +843,7 @@ int SCH_DRAWING_TOOLS::DrawSheet( const TOOL_EVENT& aEvent )
sheet = new SCH_SHEET( (wxPoint) cursorPos ); sheet = new SCH_SHEET( (wxPoint) cursorPos );
sheet->SetFlags( IS_NEW | IS_RESIZED ); sheet->SetFlags( IS_NEW | IS_RESIZED );
sheet->SetParent( m_frame->GetScreen() ); sheet->SetParent( m_frame->GetCurrentSheet().Last() );
sheet->SetScreen( NULL ); sheet->SetScreen( NULL );
sheet->SetBorderWidth( m_frame->GetDefaultLineWidth() ); sheet->SetBorderWidth( m_frame->GetDefaultLineWidth() );
sheet->SetBorderColor( cfg->m_Drawing.default_sheet_border_color ); sheet->SetBorderColor( cfg->m_Drawing.default_sheet_border_color );

4
include/base_struct.h
View File

@ -4,7 +4,7 @@
* Copyright (C) 2013-2015 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2013-2015 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 2008-2015 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com> * Copyright (C) 2008-2015 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
* Copyright (C) 2008 Wayne Stambaugh <stambaughw@gmail.com> * Copyright (C) 2008 Wayne Stambaugh <stambaughw@gmail.com>
* Copyright (C) 2004-2019 KiCad Developers, see change_log.txt for contributors. * Copyright (C) 2004-2020 KiCad Developers, see change_log.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
@ -197,7 +197,7 @@ public:
inline KICAD_T Type() const { return m_StructType; } inline KICAD_T Type() const { return m_StructType; }
EDA_ITEM* GetParent() const { return m_Parent; } EDA_ITEM* GetParent() const { return m_Parent; }
void SetParent( EDA_ITEM* aParent ) { m_Parent = aParent; } virtual void SetParent( EDA_ITEM* aParent ) { m_Parent = aParent; }
inline bool IsNew() const { return m_Flags & IS_NEW; } inline bool IsNew() const { return m_Flags & IS_NEW; }
inline bool IsModified() const { return m_Flags & IS_CHANGED; } inline bool IsModified() const { return m_Flags & IS_CHANGED; }