2019-07-16 19:34:07 +00:00
|
|
|
/*
|
|
|
|
* This program source code file is part of KiCad, a free EDA CAD application.
|
|
|
|
*
|
|
|
|
* Copyright (C) 2019 Alexander Shuklin, jasuramme@gmail.com
|
|
|
|
* Copyright (C) 2019 KiCad Developers, see AUTHORS.txt for contributors.
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version 2
|
|
|
|
* of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, you may find one here:
|
|
|
|
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
|
|
|
|
* or you may search the http://www.gnu.org website for the version 2 license,
|
|
|
|
* or you may write to the Free Software Foundation, Inc.,
|
|
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
#include "dialog_board_statistics.h"
|
2019-08-02 09:17:29 +00:00
|
|
|
#include <wildcards_and_files_ext.h>
|
2019-07-16 19:34:07 +00:00
|
|
|
|
2019-07-22 19:04:09 +00:00
|
|
|
#define COL_LABEL 0
|
|
|
|
#define COL_AMOUNT 1
|
2019-07-16 19:34:07 +00:00
|
|
|
|
2019-07-22 19:04:09 +00:00
|
|
|
// Defines for components view
|
|
|
|
#define ROW_LABEL 0
|
2019-07-21 14:45:37 +00:00
|
|
|
#define COL_FRONT_SIDE 1
|
|
|
|
#define COL_BOTTOM_SIDE 2
|
|
|
|
#define COL_TOTAL 3
|
|
|
|
|
2019-07-22 19:04:09 +00:00
|
|
|
// Defines for board view
|
|
|
|
#define ROW_BOARD_WIDTH 0
|
|
|
|
#define ROW_BOARD_HEIGHT 1
|
|
|
|
#define ROW_BOARD_AREA 2
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Struct containing the dialog last saved state
|
|
|
|
*/
|
|
|
|
struct DIALOG_BOARD_STATISTICS_SAVED_STATE
|
|
|
|
{
|
2019-08-20 15:08:31 +00:00
|
|
|
DIALOG_BOARD_STATISTICS_SAVED_STATE() :
|
|
|
|
excludeNoPins( false ),
|
2019-07-22 19:04:09 +00:00
|
|
|
subtractHoles( false ),
|
|
|
|
saveReportInitialized(false)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
// Flags to remember last checkboxes state
|
|
|
|
bool excludeNoPins;
|
|
|
|
bool subtractHoles;
|
|
|
|
|
|
|
|
// Variables to save last report file name and folder
|
2019-08-02 09:17:29 +00:00
|
|
|
bool saveReportInitialized; // true after the 3 next string are initialized
|
|
|
|
wxString saveReportFolder; // last report folder
|
|
|
|
wxString saveReportName; // last report filename
|
|
|
|
wxString m_project; // name of the project used to create the last report
|
|
|
|
// used to reinit last state after a project change
|
2019-07-22 19:04:09 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static DIALOG_BOARD_STATISTICS_SAVED_STATE s_savedDialogState;
|
|
|
|
|
2019-08-20 15:08:31 +00:00
|
|
|
DIALOG_BOARD_STATISTICS::DIALOG_BOARD_STATISTICS( PCB_EDIT_FRAME* aParentFrame ) :
|
2019-08-24 15:10:19 +00:00
|
|
|
DIALOG_BOARD_STATISTICS_BASE( aParentFrame ),
|
|
|
|
m_boardWidth( 0 ),
|
|
|
|
m_boardHeight( 0 ),
|
|
|
|
m_boardArea( 0.0 ),
|
|
|
|
m_hasOutline( false )
|
2019-07-16 19:34:07 +00:00
|
|
|
{
|
|
|
|
m_parentFrame = aParentFrame;
|
|
|
|
|
2019-11-10 20:30:58 +00:00
|
|
|
m_gridDrills->UseNativeColHeader();
|
2019-11-11 10:48:03 +00:00
|
|
|
m_gridDrills->Connect( wxEVT_GRID_COL_SORT, wxGridEventHandler( DIALOG_BOARD_STATISTICS::drillGridSort ), NULL, this );
|
2019-11-10 20:30:58 +00:00
|
|
|
|
2019-07-22 19:04:09 +00:00
|
|
|
m_checkBoxExcludeComponentsNoPins->SetValue( s_savedDialogState.excludeNoPins );
|
|
|
|
m_checkBoxSubtractHoles->SetValue( s_savedDialogState.subtractHoles );
|
2019-07-16 19:34:07 +00:00
|
|
|
|
|
|
|
// Make labels for grids
|
2019-07-20 20:38:28 +00:00
|
|
|
wxFont headingFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT );
|
|
|
|
headingFont.SetSymbolicSize( wxFONTSIZE_SMALL );
|
2019-07-22 19:04:09 +00:00
|
|
|
m_gridComponents->SetCellValue( ROW_LABEL, COL_FRONT_SIDE, _( "Front Side" ) );
|
|
|
|
m_gridComponents->SetCellFont( ROW_LABEL, COL_FRONT_SIDE, headingFont );
|
2019-08-02 09:17:29 +00:00
|
|
|
m_gridComponents->SetCellValue( ROW_LABEL, COL_BOTTOM_SIDE, _( "Back Side" ) );
|
2019-07-22 19:04:09 +00:00
|
|
|
m_gridComponents->SetCellFont( ROW_LABEL, COL_BOTTOM_SIDE, headingFont );
|
|
|
|
m_gridComponents->SetCellValue( ROW_LABEL, COL_TOTAL, _( "Total" ) );
|
|
|
|
m_gridComponents->SetCellFont( ROW_LABEL, COL_TOTAL, headingFont );
|
2019-07-20 20:38:28 +00:00
|
|
|
|
|
|
|
m_gridBoard->SetCellValue( 0, 0, _( "Width:" ) );
|
2019-07-21 10:01:36 +00:00
|
|
|
m_gridBoard->SetCellAlignment( 0, 0, wxALIGN_LEFT, wxALIGN_CENTRE );
|
2019-07-20 20:38:28 +00:00
|
|
|
m_gridBoard->SetCellValue( 1, 0, _( "Height:" ) );
|
2019-07-21 10:01:36 +00:00
|
|
|
m_gridBoard->SetCellAlignment( 1, 0, wxALIGN_LEFT, wxALIGN_CENTRE );
|
2019-07-20 20:38:28 +00:00
|
|
|
m_gridBoard->SetCellValue( 2, 0, _( "Area:" ) );
|
2019-07-21 10:01:36 +00:00
|
|
|
m_gridBoard->SetCellAlignment( 2, 0, wxALIGN_LEFT, wxALIGN_CENTRE );
|
2019-07-22 19:04:09 +00:00
|
|
|
|
|
|
|
wxGrid* grids[] = { m_gridComponents, m_gridPads, m_gridVias, m_gridBoard };
|
|
|
|
for( auto& grid : grids )
|
|
|
|
{
|
|
|
|
// Remove wxgrid's selection boxes
|
|
|
|
grid->SetCellHighlightPenWidth( 0 );
|
|
|
|
grid->SetColMinimalAcceptableWidth( 80 );
|
|
|
|
for( int i = 0; i < grid->GetNumberRows(); i++ )
|
|
|
|
grid->SetCellAlignment( i, COL_LABEL, wxALIGN_LEFT, wxALIGN_CENTRE );
|
|
|
|
}
|
|
|
|
|
|
|
|
wxFileName fn = m_parentFrame->GetBoard()->GetFileName();
|
2019-08-02 09:17:29 +00:00
|
|
|
|
2019-08-20 15:08:31 +00:00
|
|
|
if( !s_savedDialogState.saveReportInitialized
|
|
|
|
|| s_savedDialogState.m_project != Prj().GetProjectFullName() )
|
2019-07-22 19:04:09 +00:00
|
|
|
{
|
|
|
|
fn.SetName( fn.GetName() + "_report" );
|
|
|
|
fn.SetExt( "txt" );
|
|
|
|
s_savedDialogState.saveReportName = fn.GetFullName();
|
|
|
|
s_savedDialogState.saveReportFolder = wxPathOnly( Prj().GetProjectFullName() );
|
2019-08-02 09:17:29 +00:00
|
|
|
s_savedDialogState.m_project = Prj().GetProjectFullName();
|
2019-07-22 19:04:09 +00:00
|
|
|
s_savedDialogState.saveReportInitialized = true;
|
|
|
|
}
|
2019-08-02 09:17:29 +00:00
|
|
|
|
|
|
|
// The wxStdDialogButtonSizer wxID_CANCLE button is in fact a close button
|
|
|
|
// Nothing to cancel:
|
|
|
|
m_sdbControlSizerCancel->SetLabel( _( "Close" ) );
|
2019-07-16 19:34:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void DIALOG_BOARD_STATISTICS::refreshItemsTypes()
|
|
|
|
{
|
|
|
|
m_componentsTypes.clear();
|
|
|
|
|
|
|
|
// If you need some more types to be shown, simply add them to the
|
|
|
|
// corresponding list
|
2020-08-26 21:43:38 +00:00
|
|
|
m_componentsTypes.push_back( componentsType_t( MOD_THROUGH_HOLE, _( "THT:" ) ) );
|
|
|
|
m_componentsTypes.push_back( componentsType_t( MOD_SMD, _( "SMD:" ) ) );
|
2019-07-16 19:34:07 +00:00
|
|
|
|
|
|
|
m_padsTypes.clear();
|
2020-09-30 15:38:35 +00:00
|
|
|
m_padsTypes.push_back( padsType_t( PAD_ATTRIB_PTH, _( "Through hole:" ) ) );
|
2019-07-20 20:38:28 +00:00
|
|
|
m_padsTypes.push_back( padsType_t( PAD_ATTRIB_SMD, _( "SMD:" ) ) );
|
|
|
|
m_padsTypes.push_back( padsType_t( PAD_ATTRIB_CONN, _( "Connector:" ) ) );
|
2020-09-30 15:38:35 +00:00
|
|
|
m_padsTypes.push_back( padsType_t( PAD_ATTRIB_NPTH, _( "NPTH:" ) ) );
|
2019-07-16 19:34:07 +00:00
|
|
|
|
2019-07-22 19:04:09 +00:00
|
|
|
m_viasTypes.clear();
|
2019-12-28 00:55:11 +00:00
|
|
|
m_viasTypes.push_back( viasType_t( VIATYPE::THROUGH, _( "Through vias:" ) ) );
|
|
|
|
m_viasTypes.push_back( viasType_t( VIATYPE::BLIND_BURIED, _( "Blind/buried:" ) ) );
|
|
|
|
m_viasTypes.push_back( viasType_t( VIATYPE::MICROVIA, _( "Micro vias:" ) ) );
|
2019-07-22 19:04:09 +00:00
|
|
|
|
2019-07-16 19:34:07 +00:00
|
|
|
// If there not enough rows in grids, append some
|
2019-07-22 19:04:09 +00:00
|
|
|
int appendRows = m_componentsTypes.size() + 2 - m_gridComponents->GetNumberRows();
|
2019-07-21 14:45:37 +00:00
|
|
|
|
2019-07-16 19:34:07 +00:00
|
|
|
if( appendRows > 0 )
|
|
|
|
m_gridComponents->AppendRows( appendRows );
|
|
|
|
|
|
|
|
appendRows = m_padsTypes.size() + 1 - m_gridPads->GetNumberRows();
|
2019-07-21 14:45:37 +00:00
|
|
|
|
2019-07-16 19:34:07 +00:00
|
|
|
if( appendRows > 0 )
|
|
|
|
m_gridPads->AppendRows( appendRows );
|
2019-07-22 19:04:09 +00:00
|
|
|
|
|
|
|
appendRows = m_viasTypes.size() + 1 - m_gridVias->GetNumberRows();
|
2019-08-20 15:08:31 +00:00
|
|
|
|
2019-07-22 19:04:09 +00:00
|
|
|
if( appendRows )
|
|
|
|
m_gridVias->AppendRows( appendRows );
|
2019-07-16 19:34:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
bool DIALOG_BOARD_STATISTICS::TransferDataToWindow()
|
|
|
|
{
|
|
|
|
refreshItemsTypes();
|
|
|
|
getDataFromPCB();
|
|
|
|
updateWidets();
|
|
|
|
Layout();
|
2019-11-10 20:30:58 +00:00
|
|
|
drillsPanel->Layout();
|
2019-07-16 19:34:07 +00:00
|
|
|
FinishDialogSettings();
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void DIALOG_BOARD_STATISTICS::getDataFromPCB()
|
|
|
|
{
|
2020-08-26 21:43:38 +00:00
|
|
|
BOARD* board = m_parentFrame->GetBoard();
|
2019-07-16 19:34:07 +00:00
|
|
|
|
2019-07-22 19:04:09 +00:00
|
|
|
// Get modules and pads count
|
2019-07-16 19:34:07 +00:00
|
|
|
for( MODULE* module : board->Modules() )
|
|
|
|
{
|
|
|
|
// Do not proceed modules with no pads if checkbox checked
|
2020-08-26 21:43:38 +00:00
|
|
|
if( m_checkBoxExcludeComponentsNoPins->GetValue() && ! module->Pads().size() )
|
2019-07-16 19:34:07 +00:00
|
|
|
continue;
|
|
|
|
|
|
|
|
// Go through components types list
|
|
|
|
for( auto& type : m_componentsTypes )
|
|
|
|
{
|
2020-08-26 21:43:38 +00:00
|
|
|
if( ( module->GetAttributes() & type.attribute ) > 0 )
|
2019-07-16 19:34:07 +00:00
|
|
|
{
|
|
|
|
if( module->IsFlipped() )
|
|
|
|
type.backSideQty++;
|
2019-07-21 14:45:37 +00:00
|
|
|
else
|
|
|
|
type.frontSideQty++;
|
2019-07-16 19:34:07 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-08-26 21:43:38 +00:00
|
|
|
for( D_PAD* pad : module->Pads() )
|
2019-07-16 19:34:07 +00:00
|
|
|
{
|
|
|
|
// Go through pads types list
|
|
|
|
for( auto& type : m_padsTypes )
|
|
|
|
{
|
|
|
|
if( pad->GetAttribute() == type.attribute )
|
|
|
|
{
|
|
|
|
type.qty++;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2019-11-10 20:30:58 +00:00
|
|
|
|
|
|
|
if( pad->GetDrillSize().x > 0 && pad->GetDrillSize().y > 0 )
|
|
|
|
{
|
|
|
|
PCB_LAYER_ID top, bottom;
|
|
|
|
|
|
|
|
if( pad->GetLayerSet().CuStack().empty() )
|
|
|
|
{
|
|
|
|
// The pad is not on any copper layer
|
|
|
|
top = UNDEFINED_LAYER;
|
|
|
|
bottom = UNDEFINED_LAYER;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
top = pad->GetLayerSet().CuStack().front();
|
|
|
|
bottom = pad->GetLayerSet().CuStack().back();
|
|
|
|
}
|
|
|
|
|
|
|
|
drillType_t drill( pad->GetDrillSize().x, pad->GetDrillSize().y,
|
2020-09-30 15:38:35 +00:00
|
|
|
pad->GetDrillShape(), pad->GetAttribute() != PAD_ATTRIB_NPTH,
|
2019-11-10 20:30:58 +00:00
|
|
|
true, top, bottom );
|
|
|
|
|
|
|
|
auto it = m_drillTypes.begin();
|
|
|
|
for( ; it != m_drillTypes.end(); it++ )
|
|
|
|
{
|
|
|
|
if( *it == drill )
|
|
|
|
{
|
|
|
|
it->qty++;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if( it == m_drillTypes.end() )
|
|
|
|
{
|
|
|
|
drill.qty = 1;
|
|
|
|
m_drillTypes.push_back( drill );
|
|
|
|
m_gridDrills->InsertRows();
|
|
|
|
}
|
|
|
|
}
|
2019-07-16 19:34:07 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-11-10 20:30:58 +00:00
|
|
|
// Get via counts
|
2020-08-26 21:43:38 +00:00
|
|
|
for( TRACK* track : board->Tracks() )
|
2019-07-22 19:04:09 +00:00
|
|
|
{
|
2020-08-26 21:43:38 +00:00
|
|
|
if( VIA* via = dyn_cast<VIA*>( track ) )
|
2019-07-22 19:04:09 +00:00
|
|
|
{
|
2019-08-25 15:46:53 +00:00
|
|
|
for( auto& type : m_viasTypes )
|
2019-07-22 19:04:09 +00:00
|
|
|
{
|
2019-08-25 15:46:53 +00:00
|
|
|
if( via->GetViaType() == type.attribute )
|
2019-07-22 19:04:09 +00:00
|
|
|
{
|
2019-08-25 15:46:53 +00:00
|
|
|
type.qty++;
|
|
|
|
break;
|
2019-07-22 19:04:09 +00:00
|
|
|
}
|
|
|
|
}
|
2019-11-10 20:30:58 +00:00
|
|
|
|
|
|
|
drillType_t drill( via->GetDrillValue(), via->GetDrillValue(), PAD_DRILL_SHAPE_CIRCLE,
|
|
|
|
true, false, via->TopLayer(), via->BottomLayer() );
|
|
|
|
|
|
|
|
auto it = m_drillTypes.begin();
|
|
|
|
for( ; it != m_drillTypes.end(); it++ )
|
|
|
|
{
|
|
|
|
if( *it == drill )
|
|
|
|
{
|
|
|
|
it->qty++;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if( it == m_drillTypes.end() )
|
|
|
|
{
|
|
|
|
drill.qty = 1;
|
|
|
|
m_drillTypes.push_back( drill );
|
|
|
|
m_gridDrills->InsertRows();
|
|
|
|
}
|
2019-07-22 19:04:09 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-11-10 20:30:58 +00:00
|
|
|
sort( m_drillTypes.begin(), m_drillTypes.end(),
|
|
|
|
drillType_t::COMPARE( drillType_t::COL_COUNT, false ) );
|
|
|
|
|
2019-07-16 19:34:07 +00:00
|
|
|
bool boundingBoxCreated = false; //flag if bounding box initialized
|
|
|
|
BOX2I bbox;
|
|
|
|
SHAPE_POLY_SET polySet;
|
|
|
|
m_hasOutline = board->GetBoardPolygonOutlines( polySet );
|
|
|
|
|
|
|
|
// If board has no Edge Cuts lines, board->GetBoardPolygonOutlines will
|
|
|
|
// return small rectangle, so we double check that
|
|
|
|
bool edgeCutsExists = false;
|
2020-08-26 21:43:38 +00:00
|
|
|
|
|
|
|
for( BOARD_ITEM* drawing : board->Drawings() )
|
2019-07-16 19:34:07 +00:00
|
|
|
{
|
|
|
|
if( drawing->GetLayer() == Edge_Cuts )
|
|
|
|
{
|
|
|
|
edgeCutsExists = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if( !edgeCutsExists )
|
|
|
|
m_hasOutline = false;
|
|
|
|
|
|
|
|
if( m_hasOutline )
|
|
|
|
{
|
2019-08-25 15:46:53 +00:00
|
|
|
m_boardArea = 0.0;
|
|
|
|
|
|
|
|
for( int i = 0; i < polySet.OutlineCount(); i++ )
|
2019-07-16 19:34:07 +00:00
|
|
|
{
|
2019-08-20 15:08:31 +00:00
|
|
|
SHAPE_LINE_CHAIN& outline = polySet.Outline( i );
|
2019-08-25 15:46:53 +00:00
|
|
|
m_boardArea += std::fabs( outline.Area() );
|
2019-07-16 19:34:07 +00:00
|
|
|
|
|
|
|
// If checkbox "subtract holes" is checked
|
|
|
|
if( m_checkBoxSubtractHoles->GetValue() )
|
|
|
|
{
|
2019-08-24 15:10:19 +00:00
|
|
|
for( int j = 0; j < polySet.HoleCount( i ); j++ )
|
|
|
|
m_boardArea -= std::fabs( polySet.Hole( i, j ).Area() );
|
2019-07-16 19:34:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if( boundingBoxCreated )
|
|
|
|
{
|
|
|
|
bbox.Merge( outline.BBox() );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
bbox = outline.BBox();
|
|
|
|
boundingBoxCreated = true;
|
|
|
|
}
|
|
|
|
}
|
2019-08-24 15:10:19 +00:00
|
|
|
|
2019-12-20 14:11:39 +00:00
|
|
|
if( GetUserUnits() == EDA_UNITS::INCHES )
|
2019-08-25 15:46:53 +00:00
|
|
|
m_boardArea /= ( IU_PER_MILS * IU_PER_MILS * 1000000 );
|
|
|
|
else
|
|
|
|
m_boardArea /= ( IU_PER_MM * IU_PER_MM );
|
|
|
|
|
2019-07-16 19:34:07 +00:00
|
|
|
m_boardWidth = bbox.GetWidth();
|
|
|
|
m_boardHeight = bbox.GetHeight();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void DIALOG_BOARD_STATISTICS::updateWidets()
|
|
|
|
{
|
|
|
|
int totalPads = 0;
|
|
|
|
int currentRow = 0;
|
2019-08-20 15:08:31 +00:00
|
|
|
|
2019-07-16 19:34:07 +00:00
|
|
|
for( auto& type : m_padsTypes )
|
|
|
|
{
|
2019-07-22 19:04:09 +00:00
|
|
|
m_gridPads->SetCellValue( currentRow, COL_LABEL, type.title );
|
|
|
|
m_gridPads->SetCellValue(
|
|
|
|
currentRow, COL_AMOUNT, wxString::Format( wxT( "%i " ), type.qty ) );
|
2019-07-16 19:34:07 +00:00
|
|
|
totalPads += type.qty;
|
|
|
|
currentRow++;
|
|
|
|
}
|
2019-08-20 15:08:31 +00:00
|
|
|
|
2019-07-22 19:04:09 +00:00
|
|
|
m_gridPads->SetCellValue( currentRow, COL_LABEL, _( "Total:" ) );
|
2019-08-02 09:17:29 +00:00
|
|
|
m_gridPads->SetCellValue( currentRow, COL_AMOUNT, wxString::Format( "%i ", totalPads ) );
|
2019-07-22 19:04:09 +00:00
|
|
|
|
|
|
|
int totalVias = 0;
|
|
|
|
currentRow = 0;
|
2019-08-20 15:08:31 +00:00
|
|
|
|
2019-07-22 19:04:09 +00:00
|
|
|
for( auto& type : m_viasTypes )
|
|
|
|
{
|
|
|
|
m_gridVias->SetCellValue( currentRow, COL_LABEL, type.title );
|
|
|
|
m_gridVias->SetCellValue(
|
2019-08-02 09:17:29 +00:00
|
|
|
currentRow, COL_AMOUNT, wxString::Format( "%i ", type.qty ) );
|
2019-07-22 19:04:09 +00:00
|
|
|
totalVias += type.qty;
|
|
|
|
currentRow++;
|
|
|
|
}
|
2019-08-20 15:08:31 +00:00
|
|
|
|
2019-07-22 19:04:09 +00:00
|
|
|
m_gridVias->SetCellValue( currentRow, COL_LABEL, _( "Total:" ) );
|
2019-08-02 09:17:29 +00:00
|
|
|
m_gridVias->SetCellValue( currentRow, COL_AMOUNT, wxString::Format( "%i ", totalVias ) );
|
2019-07-22 19:04:09 +00:00
|
|
|
|
2019-07-16 19:34:07 +00:00
|
|
|
|
|
|
|
int totalFront = 0;
|
|
|
|
int totalBack = 0;
|
|
|
|
|
|
|
|
// We don't use row 0, as there labels are
|
|
|
|
currentRow = 1;
|
2019-08-20 15:08:31 +00:00
|
|
|
|
2019-07-16 19:34:07 +00:00
|
|
|
for( auto& type : m_componentsTypes )
|
|
|
|
{
|
2019-07-22 19:04:09 +00:00
|
|
|
m_gridComponents->SetCellValue( currentRow, COL_LABEL, type.title );
|
2019-07-16 19:34:07 +00:00
|
|
|
m_gridComponents->SetCellValue(
|
2019-08-02 09:17:29 +00:00
|
|
|
currentRow, COL_FRONT_SIDE, wxString::Format( "%i ", type.frontSideQty ) );
|
2019-07-16 19:34:07 +00:00
|
|
|
m_gridComponents->SetCellValue(
|
2019-08-02 09:17:29 +00:00
|
|
|
currentRow, COL_BOTTOM_SIDE, wxString::Format( "%i ", type.backSideQty ) );
|
2019-07-16 19:34:07 +00:00
|
|
|
m_gridComponents->SetCellValue( currentRow, 3,
|
|
|
|
wxString::Format( wxT( "%i " ), type.frontSideQty + type.backSideQty ) );
|
|
|
|
totalFront += type.frontSideQty;
|
|
|
|
totalBack += type.backSideQty;
|
|
|
|
currentRow++;
|
|
|
|
}
|
2019-11-10 20:30:58 +00:00
|
|
|
|
2019-07-22 19:04:09 +00:00
|
|
|
m_gridComponents->SetCellValue( currentRow, COL_LABEL, _( "Total:" ) );
|
2019-07-21 14:45:37 +00:00
|
|
|
m_gridComponents->SetCellValue( currentRow, COL_FRONT_SIDE,
|
2019-08-02 09:17:29 +00:00
|
|
|
wxString::Format( "%i ", totalFront ) );
|
|
|
|
m_gridComponents->SetCellValue( currentRow, COL_BOTTOM_SIDE,
|
|
|
|
wxString::Format( "%i ", totalBack ) );
|
2019-08-20 15:08:31 +00:00
|
|
|
m_gridComponents->SetCellValue( currentRow, COL_TOTAL,
|
|
|
|
wxString::Format( "%i ", totalFront + totalBack ) );
|
2019-07-16 19:34:07 +00:00
|
|
|
|
|
|
|
if( m_hasOutline )
|
|
|
|
{
|
2019-07-22 19:04:09 +00:00
|
|
|
m_gridBoard->SetCellValue( ROW_BOARD_WIDTH, COL_AMOUNT,
|
2019-08-20 15:08:31 +00:00
|
|
|
MessageTextFromValue( GetUserUnits(), m_boardWidth ) + " " );
|
2019-07-22 19:04:09 +00:00
|
|
|
m_gridBoard->SetCellValue( ROW_BOARD_HEIGHT, COL_AMOUNT,
|
2019-08-20 15:08:31 +00:00
|
|
|
MessageTextFromValue( GetUserUnits(), m_boardHeight ) + " " );
|
2019-07-22 19:04:09 +00:00
|
|
|
m_gridBoard->SetCellValue( ROW_BOARD_AREA, COL_AMOUNT,
|
2019-08-20 15:08:31 +00:00
|
|
|
wxString::Format( wxT( "%.3f %s²" ),
|
|
|
|
m_boardArea,
|
|
|
|
GetAbbreviatedUnitsLabel( GetUserUnits() ) ) );
|
2019-07-16 19:34:07 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2019-07-22 19:04:09 +00:00
|
|
|
m_gridBoard->SetCellValue( ROW_BOARD_WIDTH, COL_AMOUNT, _( "unknown" ) );
|
|
|
|
m_gridBoard->SetCellValue( ROW_BOARD_HEIGHT, COL_AMOUNT, _( "unknown" ) );
|
|
|
|
m_gridBoard->SetCellValue( ROW_BOARD_AREA, COL_AMOUNT, _( "unknown" ) );
|
2019-07-16 19:34:07 +00:00
|
|
|
}
|
|
|
|
|
2019-11-10 20:30:58 +00:00
|
|
|
updateDrillGrid();
|
|
|
|
|
2019-07-16 19:34:07 +00:00
|
|
|
m_gridComponents->AutoSize();
|
|
|
|
m_gridPads->AutoSize();
|
|
|
|
m_gridBoard->AutoSize();
|
2019-07-22 19:04:09 +00:00
|
|
|
m_gridVias->AutoSize();
|
2019-11-10 20:30:58 +00:00
|
|
|
m_gridDrills->AutoSize();
|
|
|
|
|
|
|
|
adjustDrillGridColumns();
|
|
|
|
}
|
|
|
|
|
|
|
|
void DIALOG_BOARD_STATISTICS::updateDrillGrid()
|
|
|
|
{
|
|
|
|
BOARD* board = m_parentFrame->GetBoard();
|
|
|
|
int currentRow = 0;
|
|
|
|
|
|
|
|
for( auto& type : m_drillTypes )
|
|
|
|
{
|
|
|
|
wxString shapeStr;
|
|
|
|
wxString startLayerStr;
|
|
|
|
wxString stopLayerStr;
|
|
|
|
|
|
|
|
switch( type.shape )
|
|
|
|
{
|
|
|
|
case PAD_DRILL_SHAPE_CIRCLE:
|
|
|
|
shapeStr = _( "Round" );
|
|
|
|
break;
|
|
|
|
case PAD_DRILL_SHAPE_OBLONG:
|
|
|
|
shapeStr = _( "Slot" );
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
shapeStr = _( "???" );
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if( type.startLayer == UNDEFINED_LAYER )
|
|
|
|
startLayerStr = _( "N/A" );
|
|
|
|
else
|
|
|
|
startLayerStr = board->GetLayerName( type.startLayer );
|
|
|
|
|
|
|
|
if( type.stopLayer == UNDEFINED_LAYER )
|
|
|
|
stopLayerStr = _( "N/A" );
|
|
|
|
else
|
|
|
|
stopLayerStr = board->GetLayerName( type.stopLayer );
|
|
|
|
|
|
|
|
m_gridDrills->SetCellValue(
|
|
|
|
currentRow, drillType_t::COL_COUNT, wxString::Format( "%i", type.qty ) );
|
|
|
|
m_gridDrills->SetCellValue( currentRow, drillType_t::COL_SHAPE, shapeStr );
|
|
|
|
m_gridDrills->SetCellValue( currentRow, drillType_t::COL_X_SIZE,
|
|
|
|
MessageTextFromValue( GetUserUnits(), type.xSize ) );
|
|
|
|
m_gridDrills->SetCellValue( currentRow, drillType_t::COL_Y_SIZE,
|
|
|
|
MessageTextFromValue( GetUserUnits(), type.ySize ) );
|
|
|
|
m_gridDrills->SetCellValue(
|
|
|
|
currentRow, drillType_t::COL_PLATED, type.isPlated ? _( "PTH" ) : _( "NPTH" ) );
|
|
|
|
m_gridDrills->SetCellValue(
|
|
|
|
currentRow, drillType_t::COL_VIA_PAD, type.isPad ? _( "Pad" ) : _( "Via" ) );
|
|
|
|
m_gridDrills->SetCellValue( currentRow, drillType_t::COL_START_LAYER, startLayerStr );
|
|
|
|
m_gridDrills->SetCellValue( currentRow, drillType_t::COL_STOP_LAYER, stopLayerStr );
|
|
|
|
|
|
|
|
currentRow++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void DIALOG_BOARD_STATISTICS::printGridToStringAsTable( wxGrid* aGrid, wxString& aStr,
|
|
|
|
bool aUseRowLabels, bool aUseColLabels, bool aUseFirstColAsLabel )
|
|
|
|
{
|
|
|
|
std::vector<int> widths( aGrid->GetNumberCols(), 0 );
|
|
|
|
int rowLabelsWidth = 0;
|
|
|
|
|
|
|
|
// Determine column widths.
|
|
|
|
|
|
|
|
if( aUseColLabels )
|
|
|
|
{
|
|
|
|
for( int col = 0; col < aGrid->GetNumberCols(); col++ )
|
|
|
|
widths[col] = aGrid->GetColLabelValue( col ).length();
|
|
|
|
}
|
|
|
|
|
|
|
|
for( int row = 0; row < aGrid->GetNumberRows(); row++ )
|
|
|
|
{
|
|
|
|
rowLabelsWidth = std::max<int>( rowLabelsWidth, aGrid->GetRowLabelValue( row ).length() );
|
|
|
|
|
|
|
|
for( int col = 0; col < aGrid->GetNumberCols(); col++ )
|
|
|
|
widths[col] = std::max<int>( widths[col], aGrid->GetCellValue( row, col ).length() );
|
|
|
|
}
|
|
|
|
|
|
|
|
// Print the cells.
|
|
|
|
|
|
|
|
wxString tmp;
|
|
|
|
|
|
|
|
// Print column labels.
|
|
|
|
|
|
|
|
aStr << "|";
|
|
|
|
|
|
|
|
if( aUseRowLabels )
|
|
|
|
{
|
|
|
|
aStr.Append( ' ', rowLabelsWidth );
|
|
|
|
aStr << " |";
|
|
|
|
}
|
|
|
|
|
|
|
|
for( int col = 0; col < aGrid->GetNumberCols(); col++ )
|
|
|
|
{
|
|
|
|
if( aUseColLabels )
|
|
|
|
tmp.Printf( " %*s |", widths[col], aGrid->GetColLabelValue( col ) );
|
|
|
|
else
|
|
|
|
tmp.Printf( " %*s |", widths[col], aGrid->GetCellValue( 0, col ) );
|
|
|
|
aStr << tmp;
|
|
|
|
}
|
|
|
|
|
|
|
|
aStr << "\n";
|
|
|
|
|
|
|
|
// Print column label horizontal separators.
|
|
|
|
|
|
|
|
aStr << "|";
|
|
|
|
|
|
|
|
if( aUseRowLabels )
|
|
|
|
{
|
|
|
|
aStr.Append( '-', rowLabelsWidth );
|
|
|
|
aStr << "-|";
|
|
|
|
}
|
|
|
|
|
|
|
|
for( int col = 0; col < aGrid->GetNumberCols(); col++ )
|
|
|
|
{
|
|
|
|
aStr << "-";
|
|
|
|
aStr.Append( '-', widths[col] );
|
|
|
|
aStr << "-|";
|
|
|
|
}
|
|
|
|
|
|
|
|
aStr << "\n";
|
|
|
|
|
|
|
|
// Print regular cells.
|
|
|
|
|
|
|
|
int firstRow = 0, firstCol = 0;
|
|
|
|
|
|
|
|
if( !aUseColLabels )
|
|
|
|
firstRow = 1;
|
|
|
|
|
|
|
|
if( !aUseRowLabels && aUseFirstColAsLabel )
|
|
|
|
firstCol = 1;
|
|
|
|
|
|
|
|
for( int row = firstRow; row < aGrid->GetNumberRows(); row++ )
|
|
|
|
{
|
|
|
|
if( aUseRowLabels )
|
|
|
|
tmp.Printf( "|%-*s |", rowLabelsWidth, aGrid->GetRowLabelValue( row ) );
|
|
|
|
else if( aUseFirstColAsLabel )
|
|
|
|
tmp.Printf( "|%-*s |", widths[0], aGrid->GetCellValue( row, 0 ) );
|
|
|
|
else
|
|
|
|
tmp.Printf( "|" );
|
|
|
|
aStr << tmp;
|
|
|
|
|
|
|
|
for( int col = firstCol; col < aGrid->GetNumberCols(); col++ )
|
|
|
|
{
|
|
|
|
tmp.Printf( " %*s |", widths[col], aGrid->GetCellValue( row, col ) );
|
|
|
|
aStr << tmp;
|
|
|
|
}
|
|
|
|
aStr << "\n";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void DIALOG_BOARD_STATISTICS::adjustDrillGridColumns()
|
|
|
|
{
|
|
|
|
int newTotalWidth = m_gridDrills->GetClientSize().GetWidth();
|
|
|
|
int curTotalWidth = 0;
|
|
|
|
|
|
|
|
// Find the total current width
|
|
|
|
for( int i = 0; i < m_gridDrills->GetNumberCols(); i++ )
|
|
|
|
{
|
|
|
|
if( i != drillType_t::COL_START_LAYER && i != drillType_t::COL_STOP_LAYER )
|
|
|
|
curTotalWidth += m_gridDrills->GetColSize( i );
|
|
|
|
}
|
|
|
|
|
|
|
|
// Resize the last two columns to fill all available space
|
|
|
|
|
|
|
|
int remainingWidth = newTotalWidth - curTotalWidth;
|
|
|
|
|
|
|
|
m_gridDrills->SetColSize( drillType_t::COL_START_LAYER, remainingWidth / 2 );
|
|
|
|
m_gridDrills->SetColSize( drillType_t::COL_STOP_LAYER, remainingWidth - remainingWidth / 2 );
|
|
|
|
|
|
|
|
m_gridDrills->Refresh();
|
2019-07-16 19:34:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// If any checkbox clicked, we have to refresh dialog data
|
2019-11-10 20:30:58 +00:00
|
|
|
void DIALOG_BOARD_STATISTICS::checkboxClicked( wxCommandEvent& aEvent )
|
2019-07-16 19:34:07 +00:00
|
|
|
{
|
2019-07-22 19:04:09 +00:00
|
|
|
s_savedDialogState.excludeNoPins = m_checkBoxExcludeComponentsNoPins->GetValue();
|
|
|
|
s_savedDialogState.subtractHoles = m_checkBoxSubtractHoles->GetValue();
|
|
|
|
refreshItemsTypes();
|
|
|
|
getDataFromPCB();
|
|
|
|
updateWidets();
|
|
|
|
Layout();
|
2019-11-10 20:30:58 +00:00
|
|
|
drillsPanel->Layout();
|
2019-07-22 19:04:09 +00:00
|
|
|
}
|
|
|
|
|
2019-11-10 20:30:58 +00:00
|
|
|
void DIALOG_BOARD_STATISTICS::saveReportClicked( wxCommandEvent& aEvent )
|
2019-07-22 19:04:09 +00:00
|
|
|
{
|
|
|
|
FILE* outFile;
|
|
|
|
wxString msg;
|
|
|
|
wxString boardName;
|
|
|
|
|
|
|
|
wxFileName fn = m_parentFrame->GetBoard()->GetFileName();
|
|
|
|
boardName = fn.GetName();
|
2019-08-20 15:08:31 +00:00
|
|
|
wxFileDialog saveFileDialog( this, _( "Save Report File" ),
|
|
|
|
s_savedDialogState.saveReportFolder,
|
|
|
|
s_savedDialogState.saveReportName,
|
|
|
|
TextFileWildcard(),
|
|
|
|
wxFD_SAVE | wxFD_OVERWRITE_PROMPT );
|
2019-07-22 19:04:09 +00:00
|
|
|
|
|
|
|
if( saveFileDialog.ShowModal() == wxID_CANCEL )
|
|
|
|
return;
|
|
|
|
|
|
|
|
s_savedDialogState.saveReportFolder = wxPathOnly( saveFileDialog.GetPath() );
|
|
|
|
s_savedDialogState.saveReportName = saveFileDialog.GetFilename();
|
|
|
|
|
2019-08-02 09:17:29 +00:00
|
|
|
outFile = wxFopen( saveFileDialog.GetPath(), "wt" );
|
2019-07-22 19:04:09 +00:00
|
|
|
|
|
|
|
if( outFile == NULL )
|
|
|
|
{
|
2019-08-02 09:17:29 +00:00
|
|
|
msg.Printf( _( "Unable to create file \"%s\"" ), saveFileDialog.GetPath() );
|
2019-07-22 19:04:09 +00:00
|
|
|
DisplayErrorMessage( this, msg );
|
|
|
|
return;
|
|
|
|
}
|
2019-08-20 15:08:31 +00:00
|
|
|
|
2019-11-12 12:47:35 +00:00
|
|
|
msg << _( "PCB statistics report\n=====================" ) << "\n";
|
2019-11-10 20:30:58 +00:00
|
|
|
msg << _( "- Date: " ) << wxDateTime::Now().Format() << "\n";
|
|
|
|
msg << _( "- Project: " ) << Prj().GetProjectName() << "\n";
|
|
|
|
msg << _( "- Board name: " ) << boardName << "\n";
|
2019-07-22 19:04:09 +00:00
|
|
|
|
|
|
|
msg << "\n";
|
2019-11-12 12:47:35 +00:00
|
|
|
msg << _( "Board\n-----" ) << "\n";
|
2019-07-22 19:04:09 +00:00
|
|
|
|
|
|
|
if( m_hasOutline )
|
|
|
|
{
|
2019-11-10 20:30:58 +00:00
|
|
|
msg << _( "- Width: " ) << MessageTextFromValue( GetUserUnits(), m_boardWidth ) << "\n";
|
|
|
|
msg << _( "- Height: " ) << MessageTextFromValue( GetUserUnits(), m_boardHeight ) << "\n";
|
|
|
|
msg << _( "- Area: " )
|
|
|
|
<< wxString::Format(
|
2019-11-12 12:47:35 +00:00
|
|
|
wxT( "%.3f %s^2" ), m_boardArea, GetAbbreviatedUnitsLabel( GetUserUnits() ) )
|
2019-11-10 20:30:58 +00:00
|
|
|
<< "\n";
|
2019-07-22 19:04:09 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2019-11-10 20:30:58 +00:00
|
|
|
msg << _( "- Width: " ) << _( "unknown" ) << "\n";
|
|
|
|
msg << _( "- Height: " ) << _( "unknown" ) << "\n";
|
|
|
|
msg << _( "- Area: " ) << _( "unknown" ) << "\n";
|
2019-07-22 19:04:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
msg << "\n";
|
2019-11-12 12:47:35 +00:00
|
|
|
msg << _( "Pads\n----" ) << "\n";
|
2019-08-20 15:08:31 +00:00
|
|
|
|
2019-07-22 19:04:09 +00:00
|
|
|
for( auto& type : m_padsTypes )
|
2019-11-10 20:30:58 +00:00
|
|
|
msg << "- " << type.title << " " << type.qty << "\n";
|
2019-07-22 19:04:09 +00:00
|
|
|
|
|
|
|
msg << "\n";
|
2019-11-12 12:47:35 +00:00
|
|
|
msg << _( "Vias\n----" ) << "\n";
|
2019-08-20 15:08:31 +00:00
|
|
|
|
2019-07-22 19:04:09 +00:00
|
|
|
for( auto& type : m_viasTypes )
|
2019-11-10 20:30:58 +00:00
|
|
|
msg << "- " << type.title << " " << type.qty << "\n";
|
2019-07-22 19:04:09 +00:00
|
|
|
|
|
|
|
// We will save data about components in the table.
|
|
|
|
// We have to calculate column widths
|
2019-11-10 20:30:58 +00:00
|
|
|
std::vector<int> widths;
|
2019-11-12 12:47:35 +00:00
|
|
|
std::vector<wxString> labels{ "", _( "Front Side" ), _( "Back Side" ), _( "Total" ) };
|
2019-07-22 19:04:09 +00:00
|
|
|
wxString tmp;
|
2019-08-20 15:08:31 +00:00
|
|
|
|
2019-12-05 15:20:59 +00:00
|
|
|
widths.reserve( labels.size() );
|
|
|
|
for( const auto& label : labels )
|
2019-11-10 20:30:58 +00:00
|
|
|
widths.push_back( label.size() );
|
2019-08-20 15:08:31 +00:00
|
|
|
|
2019-07-22 19:04:09 +00:00
|
|
|
int frontTotal = 0;
|
|
|
|
int backTotal = 0;
|
2019-08-20 15:08:31 +00:00
|
|
|
|
2019-12-05 15:20:59 +00:00
|
|
|
for( const auto& type : m_componentsTypes )
|
2019-07-22 19:04:09 +00:00
|
|
|
{
|
|
|
|
// Get maximum width for left label column
|
2019-11-10 20:30:58 +00:00
|
|
|
widths[0] = std::max<int>( type.title.size(), widths[0] );
|
2019-07-22 19:04:09 +00:00
|
|
|
frontTotal += type.frontSideQty;
|
|
|
|
backTotal += type.backSideQty;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Get maximum width for other columns
|
2019-11-10 20:30:58 +00:00
|
|
|
tmp.Printf( "%i", frontTotal );
|
|
|
|
widths[1] = std::max<int>( tmp.size(), widths[1] );
|
|
|
|
tmp.Printf( "%i", backTotal );
|
|
|
|
widths[2] = std::max<int>( tmp.size(), widths[2] );
|
|
|
|
tmp.Printf( "%i", frontTotal + backTotal );
|
|
|
|
widths[3] = std::max<int>( tmp.size(), widths[3] );
|
2019-07-22 19:04:09 +00:00
|
|
|
|
|
|
|
//Write components amount to file
|
|
|
|
msg << "\n";
|
2019-11-12 13:10:39 +00:00
|
|
|
msg << _( "Components\n----------" ) << "\n";
|
2019-11-10 20:30:58 +00:00
|
|
|
msg << "\n";
|
2019-08-20 15:08:31 +00:00
|
|
|
|
2019-11-10 20:30:58 +00:00
|
|
|
printGridToStringAsTable( m_gridComponents, msg, false, false, true );
|
2019-08-20 15:08:31 +00:00
|
|
|
|
2019-11-10 20:30:58 +00:00
|
|
|
msg << "\n";
|
2019-11-12 13:10:39 +00:00
|
|
|
msg << _( "Drill holes\n-----------" ) << "\n";
|
2019-11-10 20:30:58 +00:00
|
|
|
msg << "\n";
|
|
|
|
|
|
|
|
printGridToStringAsTable( m_gridDrills, msg, false, true, false );
|
2019-07-22 19:04:09 +00:00
|
|
|
|
2019-08-20 15:08:31 +00:00
|
|
|
if( fprintf( outFile, "%s", TO_UTF8( msg ) ) < 0 )
|
2019-07-22 19:04:09 +00:00
|
|
|
{
|
2019-08-02 09:17:29 +00:00
|
|
|
msg.Printf( _( "Error writing to file \"%s\"" ), saveFileDialog.GetPath() );
|
2019-07-22 19:04:09 +00:00
|
|
|
DisplayErrorMessage( this, msg );
|
|
|
|
}
|
2019-08-20 15:08:31 +00:00
|
|
|
|
2019-07-22 19:04:09 +00:00
|
|
|
fclose( outFile );
|
2019-07-16 19:34:07 +00:00
|
|
|
}
|
|
|
|
|
2019-11-10 20:30:58 +00:00
|
|
|
void DIALOG_BOARD_STATISTICS::drillGridSize( wxSizeEvent& aEvent )
|
|
|
|
{
|
|
|
|
aEvent.Skip();
|
|
|
|
adjustDrillGridColumns();
|
|
|
|
}
|
|
|
|
|
|
|
|
void DIALOG_BOARD_STATISTICS::drillGridSort( wxGridEvent& aEvent )
|
|
|
|
{
|
|
|
|
drillType_t::COL_ID colId = static_cast<drillType_t::COL_ID>( aEvent.GetCol() );
|
2019-11-12 12:47:35 +00:00
|
|
|
bool ascending =
|
2019-11-10 20:30:58 +00:00
|
|
|
!( m_gridDrills->IsSortingBy( colId ) && m_gridDrills->IsSortOrderAscending() );
|
|
|
|
|
|
|
|
sort( m_drillTypes.begin(), m_drillTypes.end(), drillType_t::COMPARE( colId, ascending ) );
|
|
|
|
|
|
|
|
updateDrillGrid();
|
|
|
|
}
|
|
|
|
|
2019-07-16 19:34:07 +00:00
|
|
|
DIALOG_BOARD_STATISTICS::~DIALOG_BOARD_STATISTICS()
|
|
|
|
{
|
|
|
|
}
|