pcbnew: Partial board stats cleanup
Fixes ordering issue and int/double conversion in board area Moves via casting to internal dyn_cast
This commit is contained in:
parent
a0fec9db57
commit
7c37641d83
|
@ -213,15 +213,9 @@ void DIALOG_BOARD_STATISTICS::getDataFromPCB()
|
|||
}
|
||||
|
||||
// Get vias count
|
||||
VIA* via;
|
||||
for( auto& track : board->Tracks() )
|
||||
{
|
||||
if( track->Type() == PCB_VIA_T )
|
||||
{
|
||||
via = dynamic_cast<VIA*>( track );
|
||||
|
||||
// We have to check if cast was successful
|
||||
if( via )
|
||||
if( auto via = dyn_cast<VIA*>( track ) )
|
||||
{
|
||||
for( auto& type : m_viasTypes )
|
||||
{
|
||||
|
@ -233,7 +227,6 @@ void DIALOG_BOARD_STATISTICS::getDataFromPCB()
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
bool boundingBoxCreated = false; //flag if bounding box initialized
|
||||
BOX2I bbox;
|
||||
|
@ -257,12 +250,12 @@ void DIALOG_BOARD_STATISTICS::getDataFromPCB()
|
|||
|
||||
if( m_hasOutline )
|
||||
{
|
||||
m_boardArea = 0;
|
||||
int outlinesCount = polySet.OutlineCount();
|
||||
for( int i = 0; i < outlinesCount; i++ )
|
||||
m_boardArea = 0.0;
|
||||
|
||||
for( int i = 0; i < polySet.OutlineCount(); i++ )
|
||||
{
|
||||
SHAPE_LINE_CHAIN& outline = polySet.Outline( i );
|
||||
m_boardArea += abs( outline.Area() );
|
||||
m_boardArea += std::fabs( outline.Area() );
|
||||
|
||||
// If checkbox "subtract holes" is checked
|
||||
if( m_checkBoxSubtractHoles->GetValue() )
|
||||
|
@ -271,11 +264,6 @@ void DIALOG_BOARD_STATISTICS::getDataFromPCB()
|
|||
m_boardArea -= std::fabs( polySet.Hole( i, j ).Area() );
|
||||
}
|
||||
|
||||
if( GetUserUnits() == INCHES )
|
||||
m_boardArea /= ( IU_PER_MILS * IU_PER_MILS * 1000000 );
|
||||
else
|
||||
m_boardArea /= ( IU_PER_MM * IU_PER_MM );
|
||||
|
||||
if( boundingBoxCreated )
|
||||
{
|
||||
bbox.Merge( outline.BBox() );
|
||||
|
@ -287,6 +275,11 @@ void DIALOG_BOARD_STATISTICS::getDataFromPCB()
|
|||
}
|
||||
}
|
||||
|
||||
if( GetUserUnits() == INCHES )
|
||||
m_boardArea /= ( IU_PER_MILS * IU_PER_MILS * 1000000 );
|
||||
else
|
||||
m_boardArea /= ( IU_PER_MM * IU_PER_MM );
|
||||
|
||||
m_boardWidth = bbox.GetWidth();
|
||||
m_boardHeight = bbox.GetHeight();
|
||||
}
|
||||
|
@ -453,7 +446,7 @@ void DIALOG_BOARD_STATISTICS::saveReportClicked( wxCommandEvent& event )
|
|||
|
||||
// We will save data about components in the table.
|
||||
// We have to calculate column widths
|
||||
size_t colsWidth[4];
|
||||
int colsWidth[4];
|
||||
wxString columns[4] = { "", _( "Front Side" ), _( "Back Side" ), _( "Total" ) };
|
||||
wxString tmp;
|
||||
|
||||
|
@ -466,18 +459,18 @@ void DIALOG_BOARD_STATISTICS::saveReportClicked( wxCommandEvent& event )
|
|||
for( auto& type : m_componentsTypes )
|
||||
{
|
||||
// Get maximum width for left label column
|
||||
colsWidth[0] = std::max( type.title.size(), colsWidth[0] );
|
||||
colsWidth[0] = std::max<int>( type.title.size(), colsWidth[0] );
|
||||
frontTotal += type.frontSideQty;
|
||||
backTotal += type.backSideQty;
|
||||
}
|
||||
|
||||
// Get maximum width for other columns
|
||||
tmp.Printf( "%d", frontTotal );
|
||||
colsWidth[1] = std::max( tmp.size(), colsWidth[1] );
|
||||
colsWidth[1] = std::max<int>( tmp.size(), colsWidth[1] );
|
||||
tmp.Printf( "%d", backTotal );
|
||||
colsWidth[2] = std::max( tmp.size(), colsWidth[2] );
|
||||
colsWidth[2] = std::max<int>( tmp.size(), colsWidth[2] );
|
||||
tmp.Printf( "%d", frontTotal + backTotal );
|
||||
colsWidth[3] = std::max( tmp.size(), colsWidth[3] );
|
||||
colsWidth[3] = std::max<int>( tmp.size(), colsWidth[3] );
|
||||
|
||||
//Write components amount to file
|
||||
msg << "\n";
|
||||
|
|
Loading…
Reference in New Issue