Commit d4c811fc authored by jean-pierre charras's avatar jean-pierre charras

minor enhancement (mainly for Cvpcb)

parent 0d485b4b
...@@ -791,34 +791,19 @@ bool BOARD::ComputeBoundaryBox() ...@@ -791,34 +791,19 @@ bool BOARD::ComputeBoundaryBox()
} }
} }
/* Analise footprints */ /* Analyze footprints */
for( MODULE* module = m_Modules; module; module = module->Next() ) for( MODULE* module = m_Modules; module; module = module->Next() )
{ {
hasItems = TRUE; hasItems = TRUE;
xmin = MIN( xmin, ( module->m_Pos.x EDA_Rect box = module->GetBoundingBox();
+ module->m_BoundaryBox.GetX() ) ); xmin = MIN( xmin, box.GetX() );
ymin = MIN( ymin, ( module->m_Pos.y ymin = MIN( ymin, box.GetY() );
+ module->m_BoundaryBox.GetY() ) ); xmax = MAX( xmax, box.GetRight() );
xmax = MAX( xmax, module->m_Pos.x ymax = MAX( ymax, box.GetBottom() );
+ module->m_BoundaryBox.GetRight() );
ymax = MAX( ymax,
module->m_Pos.y + module->m_BoundaryBox.GetBottom() );
for( D_PAD* pt_pad = module->m_Pads; pt_pad; pt_pad = pt_pad->Next() )
{
const wxPoint& pos = pt_pad->GetPosition();
d = pt_pad->m_Rayon;
xmin = MIN( xmin, pos.x - d );
ymin = MIN( ymin, pos.y - d );
xmax = MAX( xmax, pos.x + d );
ymax = MAX( ymax, pos.y + d );
}
} }
/* Analise track and zones */ /* Analize track and zones */
for( TRACK* track = m_Track; track; track = track->Next() ) for( TRACK* track = m_Track; track; track = track->Next() )
{ {
d = ( track->m_Width / 2 ) + 1; d = ( track->m_Width / 2 ) + 1;
......
...@@ -623,11 +623,10 @@ int MODULE::ReadDescr( FILE* File, int* LineNum ) ...@@ -623,11 +623,10 @@ int MODULE::ReadDescr( FILE* File, int* LineNum )
/* Update the bounding rectangle of the module /* Update the bounding rectangle of the module
* *
* The rectangle is the rectangle with the contours and * The bounding box includes outlines and pads, but not the fields.
* Pads. * The rectangle is:
* The rectangle is calculated: * for orientation 0
* For East 0 * coordinates relative to the module anchor.
* Coord in on / anchor position
*/ */
void MODULE::Set_Rectangle_Encadrement() void MODULE::Set_Rectangle_Encadrement()
{ {
...@@ -702,10 +701,9 @@ void MODULE::Set_Rectangle_Encadrement() ...@@ -702,10 +701,9 @@ void MODULE::Set_Rectangle_Encadrement()
} }
/* Equivalent to Module:: Set_Rectangle_Encadrement() coord but real: /* Equivalent to Module::Set_Rectangle_Encadrement() but in board coordinates:
* Updating the rectangle real module PCB cad in ord * Updates the module bounding box on the board
* Entree: pointer module * The rectangle is the rectangle with outlines and pads, but not the fields
* The rectangle is the rectangle with the contours and pads.
* Also updates the surface (.M_Surface) module. * Also updates the surface (.M_Surface) module.
*/ */
void MODULE::SetRectangleExinscrit() void MODULE::SetRectangleExinscrit()
...@@ -785,7 +783,7 @@ void MODULE::SetRectangleExinscrit() ...@@ -785,7 +783,7 @@ void MODULE::SetRectangleExinscrit()
/** /**
* Function GetBoundingBox * Function GetBoundingBox
* returns the full bounding box of this Footprint, including texts * returns the full bounding box of this Footprint, including fields
* Mainly used to redraw the screen area occupied by the footprint * Mainly used to redraw the screen area occupied by the footprint
*/ */
EDA_Rect MODULE::GetBoundingBox() EDA_Rect MODULE::GetBoundingBox()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment