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

Eagle SCH import: moved sheet bbox calculation to a function

This commit is contained in:
Maciej Suminski 2018-04-06 13:23:24 +02:00
parent 9ee698bbcd
commit 78c9b34b5d
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
eeschema/sch_eagle_plugin.cpp
View File

@ -88,6 +88,25 @@ static int countChildren( wxXmlNode* aCurrentNode, const wxString& aName )
} }
///> Computes a bounding box for all items in a schematic sheet
static EDA_RECT getSheetBbox( SCH_SHEET* aSheet )
{
EDA_RECT bbox;
SCH_ITEM* item = aSheet->GetScreen()->GetDrawItems();
bbox = item->GetBoundingBox();
item = item->Next();
while( item )
{
bbox.Merge( item->GetBoundingBox() );
item = item->Next();
}
return bbox;
}
wxString SCH_EAGLE_PLUGIN::getLibName() wxString SCH_EAGLE_PLUGIN::getLibName()
{ {
if( m_libName.IsEmpty() ) if( m_libName.IsEmpty() )
@ -682,21 +701,8 @@ void SCH_EAGLE_PLUGIN::loadSheet( wxXmlNode* aSheetNode, int aSheetIndex )
plainNode = plainNode->GetNext(); plainNode = plainNode->GetNext();
} }
// Find the bounding box of the imported items.
EDA_RECT sheetBoundingBox;
SCH_ITEM* item = m_currentSheet->GetScreen()->GetDrawItems();
sheetBoundingBox = item->GetBoundingBox();
item = item->Next();
while( item )
{
sheetBoundingBox.Merge( item->GetBoundingBox() );
item = item->Next();
}
// Calculate the new sheet size. // Calculate the new sheet size.
EDA_RECT sheetBoundingBox = getSheetBbox( m_currentSheet );
wxSize targetSheetSize = sheetBoundingBox.GetSize(); wxSize targetSheetSize = sheetBoundingBox.GetSize();
targetSheetSize.IncBy( 1500, 1500 ); targetSheetSize.IncBy( 1500, 1500 );
@ -724,13 +730,10 @@ void SCH_EAGLE_PLUGIN::loadSheet( wxXmlNode* aSheetNode, int aSheetIndex )
translation.y = translation.y - translation.y % 100; translation.y = translation.y - translation.y % 100;
// Translate the items. // Translate the items.
item = m_currentSheet->GetScreen()->GetDrawItems(); for( SCH_ITEM* item = m_currentSheet->GetScreen()->GetDrawItems(); item; item = item->Next() )
while( item )
{ {
item->SetPosition( item->GetPosition() + translation ); item->SetPosition( item->GetPosition() + translation );
item->ClearFlags(); item->ClearFlags();
item = item->Next();
} }
} }