haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
kicad/pcbnew/tools/drawing_stackup_table_tool.cpp

850 lines
27 KiB
C++
Raw Normal View History

Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2014-2017 CERN
* Copyright (C) 2018-2021 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 "drawing_tool.h"
#include "pcb_actions.h"
#include <pcb_edit_frame.h>
#include <view/view.h>
#include <tool/tool_manager.h>
#include <tools/pcb_actions.h>
#include <tools/tool_event_utils.h>
#include <tools/drawing_tool.h>
#include <board_commit.h>
#include <scoped_set_reset.h>
#include <bitmaps.h>
#include <painter.h>
#include <board.h>
Clean up including of board_design_settings.h
2021-06-06 19:03:10 +00:00
#include <board_design_settings.h>
Cleanup includes in board.h and footprint.h
2021-06-03 18:05:43 +00:00
#include <footprint.h>
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
#include <fp_shape.h>
Remove pcb_group include from board header
2021-06-03 17:03:25 +00:00
#include <pcb_group.h>
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
#include <pcb_text.h>
Fix kicad_string.h / string.cpp mismatch. They don't define a KiCad string class, so the header file name was somewhat misleading. But the fact that they didn't match definitely made coding more difficult.
2021-07-29 09:56:22 +00:00
#include <string_utils.h>
Refinements (add icons to menuitems and better help strings)
2021-03-14 17:44:31 +00:00
#include <wx/utils.h>
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
using SCOPED_DRAW_MODE = SCOPED_SET_RESET<DRAWING_TOOL::MODE>;
More NULL expunging.
2021-07-19 23:56:05 +00:00
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
static std::vector<BOARD_ITEM*> initTextTable( std::vector<std::vector<PCB_TEXT*>> aContent,
More NULL expunging.
2021-07-19 23:56:05 +00:00
wxPoint origin, PCB_LAYER_ID aLayer,
wxPoint* aTableSize,
bool aDrawFrame = true )
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
{
int i;
int j;
int nbCols = aContent.size();
int nbRows = 0;
for( auto col : aContent )
nbRows = std::max( nbRows, static_cast<int>( col.size() ) );
// Limit the number of cells
nbCols = std::min( nbCols, 99 );
nbRows = std::min( nbRows, 99 );
int rowHeight[99];
int colWidth[99];
std::vector<BOARD_ITEM*> table;
Fix source comment / documentation typos
2021-06-09 19:32:58 +00:00
// xmargin and ymargin are margins between the text and the table lines.
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
//
// +--------------------------------+
// | ^ |
// | | ymargin |
// | v |
// |<------->TEXT_TEXT_TEXT<------->|
// | xmargin ^ xmargin |
// | | ymargin |
// | v |
// +--------------------------------+
//
int xmargin = Millimeter2iu( 0.75 );
int ymargin = Millimeter2iu( 0.75 );
// Init table
for( i = 0; i < nbRows; i++ )
rowHeight[i] = 0;
for( i = 0; i < nbCols; i++ )
colWidth[i] = 0;
// First, we determine what the height/Width should be for every cell
i = 0;
Formatting.
2021-09-13 16:18:58 +00:00
for( const std::vector<PCB_TEXT*>& col : aContent )
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
{
j = 0;
if( i >= nbCols )
break;
Formatting.
2021-09-13 16:18:58 +00:00
for( const PCB_TEXT* cell : col )
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
{
if( j >= nbRows )
break;
int height = cell->GetBoundingBox().GetHeight() + 2 * ymargin;
int width = cell->GetBoundingBox().GetWidth() + 2 * xmargin;
rowHeight[j] = rowHeight[j] > height ? rowHeight[j] : height;
colWidth[i] = colWidth[i] > width ? colWidth[i] : width;
j++;
}
i++;
}
// get table size
int height = std::accumulate( rowHeight, rowHeight + nbRows, 0 );
int width = std::accumulate( colWidth, colWidth + nbCols, 0 );
aTableSize->x = width;
aTableSize->y = height;
// Draw the frame
if( aDrawFrame )
{
int y = origin.y;
PCB_SHAPE* line;
for( i = 0; i < nbRows; i++ )
{
line = new PCB_SHAPE;
line->SetLayer( aLayer );
line->SetStartX( origin.x );
line->SetStartY( y );
line->SetEndX( origin.x + width );
line->SetEndY( y );
y += rowHeight[i];
table.push_back( line );
}
line = new PCB_SHAPE;
line->SetLayer( aLayer );
line->SetStartX( origin.x );
line->SetStartY( y );
line->SetEndX( origin.x + width );
line->SetEndY( y );
table.push_back( line );
int x = origin.x;
for( i = 0; i < nbCols; i++ )
{
line = new PCB_SHAPE;
line->SetLayer( aLayer );
line->SetStartX( x );
line->SetStartY( origin.y );
line->SetEndX( x );
line->SetEndY( origin.y + height );
x += colWidth[i];
table.push_back( line );
}
line = new PCB_SHAPE;
line->SetLayer( aLayer );
line->SetStartX( x );
line->SetStartY( origin.y );
line->SetEndX( x );
line->SetEndY( origin.y + height );
table.push_back( line );
}
More NULL expunging.
2021-07-19 23:56:05 +00:00
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
//Now add the text
i = 0;
wxPoint pos = wxPoint( origin.x + xmargin, origin.y + ymargin );
Formatting.
2021-09-13 16:18:58 +00:00
for( std::vector<PCB_TEXT*>& col : aContent )
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
{
j = 0;
if( i >= nbCols )
break;
pos.y = origin.y + ymargin;
Formatting.
2021-09-13 16:18:58 +00:00
for( PCB_TEXT* cell : col )
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
{
if( j >= nbRows )
break;
cell->SetTextPos( pos );
cell->SetLayer( aLayer );
pos.y = pos.y + rowHeight[j];
table.push_back( cell );
j++;
}
pos.x = pos.x + colWidth[i];
i++;
}
return table;
}
Formatting.
2021-09-13 16:18:58 +00:00
std::vector<BOARD_ITEM*> DRAWING_TOOL::DrawSpecificationStackup( const wxPoint& aOrigin,
PCB_LAYER_ID aLayer,
bool aDrawNow,
wxPoint* tableSize )
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
{
Formatting.
2021-09-13 16:18:58 +00:00
BOARD_COMMIT commit( m_frame );
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
std::vector<std::vector<PCB_TEXT*>> texts;
// Style : Header
Fix some leaking objects identified by PVS Studio V773 (cherry picked from commit a7ebfc31f98e912f1e4f2acbcfacf1490731e6ea)
2022-02-05 16:15:10 +00:00
std::unique_ptr<PCB_TEXT> headStyle =
std::make_unique<PCB_TEXT>( static_cast<FOOTPRINT*>( m_frame->GetModel() ) );
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
headStyle->SetLayer( Eco1_User );
headStyle->SetTextSize( wxSize( Millimeter2iu( 1.5 ), Millimeter2iu( 1.5 ) ) );
headStyle->SetTextThickness( Millimeter2iu( 0.3 ) );
headStyle->SetItalic( false );
headStyle->SetTextPos( wxPoint( 0, 0 ) );
More wide-string declarations.
2022-02-05 13:25:43 +00:00
headStyle->SetText( _( "Layer" ) );
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
headStyle->SetHorizJustify( GR_TEXT_HJUSTIFY_LEFT );
headStyle->SetVertJustify( GR_TEXT_VJUSTIFY_TOP );
// Style : data
Fix some leaking objects identified by PVS Studio V773 (cherry picked from commit a7ebfc31f98e912f1e4f2acbcfacf1490731e6ea)
2022-02-05 16:15:10 +00:00
std::unique_ptr<PCB_TEXT> dataStyle =
std::make_unique<PCB_TEXT>( static_cast<FOOTPRINT*>( m_frame->GetModel() ) );
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
dataStyle->SetLayer( Eco1_User );
dataStyle->SetTextSize( wxSize( Millimeter2iu( 1.5 ), Millimeter2iu( 1.5 ) ) );
dataStyle->SetTextThickness( Millimeter2iu( 0.1 ) );
dataStyle->SetItalic( false );
dataStyle->SetTextPos( wxPoint( 0, 0 ) );
More wide-string declarations.
2022-02-05 13:25:43 +00:00
dataStyle->SetText( _( "Layer" ) );
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
dataStyle->SetHorizJustify( GR_TEXT_HJUSTIFY_LEFT );
dataStyle->SetVertJustify( GR_TEXT_VJUSTIFY_TOP );
//Get Layer names
Formatting.
2021-09-13 16:18:58 +00:00
BOARD_DESIGN_SETTINGS& dsnSettings = m_frame->GetDesignSettings();
BOARD_STACKUP& stackup = dsnSettings.GetStackupDescriptor();
pcbnew: fix missing layer names and missing layers in stackup table
2021-06-24 08:52:51 +00:00
stackup.SynchronizeWithBoard( &dsnSettings );
Formatting.
2021-09-13 16:18:58 +00:00
std::vector<BOARD_STACKUP_ITEM*> layers = stackup.GetList();
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
std::vector<PCB_TEXT*> colLayer;
std::vector<PCB_TEXT*> colType;
std::vector<PCB_TEXT*> colMaterial;
std::vector<PCB_TEXT*> colThickness;
std::vector<PCB_TEXT*> colColor;
std::vector<PCB_TEXT*> colEpsilon;
std::vector<PCB_TEXT*> colTanD;
PCB_TEXT* t;
t = static_cast<PCB_TEXT*>( headStyle->Duplicate() );
t->SetText( _( "Layer Name" ) );
colLayer.push_back( t );
t = static_cast<PCB_TEXT*>( headStyle->Duplicate() );
t->SetText( _( "Type" ) );
colType.push_back( t );
t = static_cast<PCB_TEXT*>( headStyle->Duplicate() );
t->SetText( _( "Material" ) );
colMaterial.push_back( t );
t = static_cast<PCB_TEXT*>( headStyle->Duplicate() );
Cleanup unit handling in the stackup drawing tool
2021-10-08 20:37:39 +00:00
switch( m_frame->GetUserUnits() )
{
case EDA_UNITS::MILLIMETRES: t->SetText( _( "Thickness (mm)" ) ); break;
case EDA_UNITS::INCHES: t->SetText( _( "Thickness (inches)" ) ); break;
case EDA_UNITS::MILS: t->SetText( _( "Thickness (mils)" ) ); break;
More wide-string declarations.
2022-02-05 13:25:43 +00:00
default: wxFAIL_MSG( wxT( "Unhandled unit type" ) );
Cleanup unit handling in the stackup drawing tool
2021-10-08 20:37:39 +00:00
}
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
colThickness.push_back( t );
t = static_cast<PCB_TEXT*>( headStyle->Duplicate() );
t->SetText( _( "Color" ) );
colColor.push_back( t );
t = static_cast<PCB_TEXT*>( headStyle->Duplicate() );
t->SetText( _( "Epsilon R" ) );
colEpsilon.push_back( t );
t = static_cast<PCB_TEXT*>( headStyle->Duplicate() );
t->SetText( _( "Loss Tangent" ) );
colTanD.push_back( t );
Drawing stackup table: fix a few issues and missing items. Fixes #9243 https://gitlab.com/kicad/code/kicad/issues/9243 Fixes #9244 https://gitlab.com/kicad/code/kicad/issues/9244
2021-09-26 08:01:59 +00:00
for( int i = 0; i < stackup.GetCount(); i++ )
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
{
Drawing stackup table: fix a few issues and missing items. Fixes #9243 https://gitlab.com/kicad/code/kicad/issues/9243 Fixes #9244 https://gitlab.com/kicad/code/kicad/issues/9244
2021-09-26 08:01:59 +00:00
BOARD_STACKUP_ITEM* stackup_item = layers.at( i );
Avoid assertion on 2-layer board New boards may have INVALID_LAYER inbetween F_Cu and B_Cu in the stackup. Skip these and any layer values beyond what we store currently
2021-09-22 19:37:17 +00:00
Drawing stackup table: fix a few issues and missing items. Fixes #9243 https://gitlab.com/kicad/code/kicad/issues/9243 Fixes #9244 https://gitlab.com/kicad/code/kicad/issues/9244
2021-09-26 08:01:59 +00:00
for( int j = 0; j < stackup_item->GetSublayersCount(); j++ )
pcbnew: fix missing layer names and missing layers in stackup table
2021-06-24 08:52:51 +00:00
{
Drawing stackup table: fix a few issues and missing items. Fixes #9243 https://gitlab.com/kicad/code/kicad/issues/9243 Fixes #9244 https://gitlab.com/kicad/code/kicad/issues/9244
2021-09-26 08:01:59 +00:00
t = static_cast<PCB_TEXT*>( dataStyle->Duplicate() );
Fix source comment/doc typos (follow-up) Found via `codespell -q 3 -S *.po,./thirdparty -L aactual,acount,aline,alocation,alog,anormal,anumber,aother,apoints,aparent,aray,dout,einstance,modul,ot,overide,serie,te,,tesselate,tesselator,tht`
2021-07-03 22:37:31 +00:00
// Layer names are empty until we close at least once the board setup dialog.
pcbnew: fix missing layer names and missing layers in stackup table
2021-06-24 08:52:51 +00:00
// If the user did not open the dialog, then get the names from the board.
// But dielectric layer names will be missing.
Drawing stackup table: fix a few issues and missing items. Fixes #9243 https://gitlab.com/kicad/code/kicad/issues/9243 Fixes #9244 https://gitlab.com/kicad/code/kicad/issues/9244
2021-09-26 08:01:59 +00:00
// In this case, for dielectric, a dummy name will be used
if( stackup_item->GetLayerName().IsEmpty() )
{
Avoid assertion in some cases.
2021-09-26 08:54:50 +00:00
wxString ly_name;
if( IsValidLayer( stackup_item->GetBrdLayerId() ) )
ly_name = m_frame->GetBoard()->GetLayerName( stackup_item->GetBrdLayerId() );
Drawing stackup table: fix a few issues and missing items. Fixes #9243 https://gitlab.com/kicad/code/kicad/issues/9243 Fixes #9244 https://gitlab.com/kicad/code/kicad/issues/9244
2021-09-26 08:01:59 +00:00
if( ly_name.IsEmpty() && stackup_item->GetType() == BS_ITEM_TYPE_DIELECTRIC )
ly_name = _( "Dielectric" );
Pass wxPoint objects by reference instead of on the stack.
2021-07-26 19:35:12 +00:00
Drawing stackup table: fix a few issues and missing items. Fixes #9243 https://gitlab.com/kicad/code/kicad/issues/9243 Fixes #9244 https://gitlab.com/kicad/code/kicad/issues/9244
2021-09-26 08:01:59 +00:00
t->SetText( ly_name );
}
pcbnew: fix missing layer names and missing layers in stackup table
2021-06-24 08:52:51 +00:00
else
Drawing stackup table: fix a few issues and missing items. Fixes #9243 https://gitlab.com/kicad/code/kicad/issues/9243 Fixes #9244 https://gitlab.com/kicad/code/kicad/issues/9244
2021-09-26 08:01:59 +00:00
t->SetText( stackup_item->GetLayerName() );
Pass wxPoint objects by reference instead of on the stack.
2021-07-26 19:35:12 +00:00
pcbnew: fix missing layer names and missing layers in stackup table
2021-06-24 08:52:51 +00:00
colLayer.push_back( t );
t = static_cast<PCB_TEXT*>( dataStyle->Duplicate() );
Drawing stackup table: fix a few issues and missing items. Fixes #9243 https://gitlab.com/kicad/code/kicad/issues/9243 Fixes #9244 https://gitlab.com/kicad/code/kicad/issues/9244
2021-09-26 08:01:59 +00:00
t->SetText( stackup_item->GetTypeName() );
pcbnew: fix missing layer names and missing layers in stackup table
2021-06-24 08:52:51 +00:00
colType.push_back( t );
t = static_cast<PCB_TEXT*>( dataStyle->Duplicate() );
Drawing stackup table: fix a few issues and missing items. Fixes #9243 https://gitlab.com/kicad/code/kicad/issues/9243 Fixes #9244 https://gitlab.com/kicad/code/kicad/issues/9244
2021-09-26 08:01:59 +00:00
t->SetText( stackup_item->GetMaterial( j ) );
pcbnew: fix missing layer names and missing layers in stackup table
2021-06-24 08:52:51 +00:00
colMaterial.push_back( t );
t = static_cast<PCB_TEXT*>( dataStyle->Duplicate() );
Drawing stackup table: fix a few issues and missing items. Fixes #9243 https://gitlab.com/kicad/code/kicad/issues/9243 Fixes #9244 https://gitlab.com/kicad/code/kicad/issues/9244
2021-09-26 08:01:59 +00:00
t->SetText( StringFromValue( m_frame->GetUserUnits(), stackup_item->GetThickness( j ),
pcbnew: fix missing layer names and missing layers in stackup table
2021-06-24 08:52:51 +00:00
true ) );
colThickness.push_back( t );
t = static_cast<PCB_TEXT*>( dataStyle->Duplicate() );
Drawing stackup table: fix a few issues and missing items. Fixes #9243 https://gitlab.com/kicad/code/kicad/issues/9243 Fixes #9244 https://gitlab.com/kicad/code/kicad/issues/9244
2021-09-26 08:01:59 +00:00
t->SetText( stackup_item->GetColor() );
pcbnew: fix missing layer names and missing layers in stackup table
2021-06-24 08:52:51 +00:00
colColor.push_back( t );
t = static_cast<PCB_TEXT*>( dataStyle->Duplicate() );
Drawing stackup table: fix a few issues and missing items. Fixes #9243 https://gitlab.com/kicad/code/kicad/issues/9243 Fixes #9244 https://gitlab.com/kicad/code/kicad/issues/9244
2021-09-26 08:01:59 +00:00
t->SetText( StringFromValue( EDA_UNITS::UNSCALED, stackup_item->GetEpsilonR( j ),
pcbnew: fix missing layer names and missing layers in stackup table
2021-06-24 08:52:51 +00:00
false ) );
colEpsilon.push_back( t );
t = static_cast<PCB_TEXT*>( dataStyle->Duplicate() );
Drawing stackup table: fix a few issues and missing items. Fixes #9243 https://gitlab.com/kicad/code/kicad/issues/9243 Fixes #9244 https://gitlab.com/kicad/code/kicad/issues/9244
2021-09-26 08:01:59 +00:00
t->SetText( StringFromValue( EDA_UNITS::UNSCALED, stackup_item->GetLossTangent( j ),
pcbnew: fix missing layer names and missing layers in stackup table
2021-06-24 08:52:51 +00:00
false ) );
colTanD.push_back( t );
}
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
}
texts.push_back( colLayer );
texts.push_back( colType );
texts.push_back( colMaterial );
texts.push_back( colThickness );
texts.push_back( colColor );
texts.push_back( colEpsilon );
texts.push_back( colTanD );
Pass wxPoint objects by reference instead of on the stack.
2021-07-26 19:35:12 +00:00
std::vector<BOARD_ITEM*> table = initTextTable( texts, aOrigin, aLayer, tableSize, true );
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
if( aDrawNow )
{
Formatting.
2021-09-13 16:18:58 +00:00
for( BOARD_ITEM* item : table )
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
commit.Add( item );
commit.Push( _( "Insert board stackup table" ) );
}
return table;
}
More NULL expunging.
2021-07-19 23:56:05 +00:00
Formatting.
2021-09-13 16:18:58 +00:00
std::vector<BOARD_ITEM*> DRAWING_TOOL::DrawBoardCharacteristics( const wxPoint& aOrigin,
PCB_LAYER_ID aLayer,
bool aDrawNow,
wxPoint* tableSize )
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
{
Formatting.
2021-09-13 16:18:58 +00:00
BOARD_COMMIT commit( m_frame );
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
std::vector<BOARD_ITEM*> objects;
BOARD_DESIGN_SETTINGS& settings = m_frame->GetBoard()->GetDesignSettings();
BOARD_STACKUP& stackup = settings.GetStackupDescriptor();
wxPoint cursorPos = aOrigin;
// Style : Section header
Fix some leaking objects identified by PVS Studio V773 (cherry picked from commit a7ebfc31f98e912f1e4f2acbcfacf1490731e6ea)
2022-02-05 16:15:10 +00:00
std::unique_ptr<PCB_TEXT> headStyle =
std::make_unique<PCB_TEXT>( static_cast<FOOTPRINT*>( m_frame->GetModel() ) );
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
headStyle->SetLayer( Eco1_User );
headStyle->SetTextSize( wxSize( Millimeter2iu( 2.0 ), Millimeter2iu( 2.0 ) ) );
headStyle->SetTextThickness( Millimeter2iu( 0.4 ) );
headStyle->SetItalic( false );
headStyle->SetTextPos( wxPoint( 0, 0 ) );
headStyle->SetHorizJustify( GR_TEXT_HJUSTIFY_LEFT );
headStyle->SetVertJustify( GR_TEXT_VJUSTIFY_TOP );
// Style : Data
Fix some leaking objects identified by PVS Studio V773 (cherry picked from commit a7ebfc31f98e912f1e4f2acbcfacf1490731e6ea)
2022-02-05 16:15:10 +00:00
std::unique_ptr<PCB_TEXT> dataStyle =
std::make_unique<PCB_TEXT>( static_cast<FOOTPRINT*>( m_frame->GetModel() ) );
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
dataStyle->SetLayer( Eco1_User );
dataStyle->SetTextSize( wxSize( Millimeter2iu( 1.5 ), Millimeter2iu( 1.5 ) ) );
dataStyle->SetTextThickness( Millimeter2iu( 0.2 ) );
dataStyle->SetItalic( false );
dataStyle->SetTextPos( wxPoint( 0, 0 ) );
dataStyle->SetHorizJustify( GR_TEXT_HJUSTIFY_LEFT );
dataStyle->SetVertJustify( GR_TEXT_VJUSTIFY_TOP );
PCB_TEXT* t;
t = static_cast<PCB_TEXT*>( headStyle->Duplicate() );
t->SetText( _( "BOARD CHARACTERISTICS" ) );
t->SetPosition( cursorPos );
objects.push_back( t );
cursorPos.y = cursorPos.y + t->GetBoundingBox().GetHeight()
+ From_User_Unit( EDA_UNITS::MILLIMETRES, 1.0 );
std::vector<std::vector<PCB_TEXT*>> texts;
std::vector<PCB_TEXT*> colLabel1;
std::vector<PCB_TEXT*> colData1;
std::vector<PCB_TEXT*> colbreak;
std::vector<PCB_TEXT*> colLabel2;
std::vector<PCB_TEXT*> colData2;
More wide-string declarations.
2022-02-05 13:25:43 +00:00
wxString text;
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
t = static_cast<PCB_TEXT*>( dataStyle->Duplicate() );
t->SetText( _( "Copper Layer Count: " ) );
colLabel1.push_back( t );
t = static_cast<PCB_TEXT*>( dataStyle->Duplicate() );
t->SetText( StringFromValue( EDA_UNITS::UNSCALED, settings.GetCopperLayerCount(), false ) );
colData1.push_back( t );
Use board polygon instead of bbox for size Board BBox uses the visible size of the board, which includes edge cut thickness. This is not appropriate for the Board characteristics. Using the outline polygon gives accurate results and falls back to a bounding box in the case where the outline is invalid Fixes https://gitlab.com/kicad/code/kicad/issues/10972
2022-02-25 19:11:36 +00:00
SHAPE_POLY_SET outline;
m_frame->GetBoard()->GetBoardPolygonOutlines( outline );
BOX2I size = outline.BBox();
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
t = static_cast<PCB_TEXT*>( dataStyle->Duplicate() );
t->SetText( _( "Board overall dimensions: " ) );
colLabel1.push_back( t );
t = static_cast<PCB_TEXT*>( dataStyle->Duplicate() );
More wide-string declarations.
2022-02-05 13:25:43 +00:00
t->SetText( wxString::Format( wxT( "%s x %s" ),
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
MessageTextFromValue( m_frame->GetUserUnits(), size.GetWidth(), true ),
MessageTextFromValue( m_frame->GetUserUnits(), size.GetHeight(), true ) ) );
colData1.push_back( t );
t = static_cast<PCB_TEXT*>( dataStyle->Duplicate() );
t->SetText( _( "Min track/spacing: " ) );
colLabel1.push_back( t );
t = static_cast<PCB_TEXT*>( dataStyle->Duplicate() );
More wide-string declarations.
2022-02-05 13:25:43 +00:00
t->SetText( wxString::Format( wxT( "%s / %s" ),
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
MessageTextFromValue( m_frame->GetUserUnits(), settings.m_TrackMinWidth, true ),
MessageTextFromValue( m_frame->GetUserUnits(), settings.m_MinClearance, true ) ) );
colData1.push_back( t );
t = static_cast<PCB_TEXT*>( dataStyle->Duplicate() );
t->SetText( _( "Copper Finish: " ) );
colLabel1.push_back( t );
t = static_cast<PCB_TEXT*>( dataStyle->Duplicate() );
t->SetText( stackup.m_FinishType );
colData1.push_back( t );
t = static_cast<PCB_TEXT*>( dataStyle->Duplicate() );
t->SetText( _( "Castellated pads: " ) );
colLabel1.push_back( t );
t = static_cast<PCB_TEXT*>( dataStyle->Duplicate() );
t->SetText( stackup.m_CastellatedPads ? _( "Yes" ) : _( "No" ) );
colData1.push_back( t );
t = static_cast<PCB_TEXT*>( dataStyle->Duplicate() );
t->SetText( _( "Board Thickness: " ) );
colLabel2.push_back( t );
t = static_cast<PCB_TEXT*>( dataStyle->Duplicate() );
text = MessageTextFromValue( m_frame->GetUserUnits(), settings.GetBoardThickness(), true );
t->SetText( text );
colData2.push_back( t );
// some empty cells
t = static_cast<PCB_TEXT*>( dataStyle->Duplicate() );
colLabel2.push_back( t );
t = static_cast<PCB_TEXT*>( dataStyle->Duplicate() );
colData2.push_back( t );
t = static_cast<PCB_TEXT*>( dataStyle->Duplicate() );
t->SetText( _( "Min hole diameter: " ) );
colLabel2.push_back( t );
t = static_cast<PCB_TEXT*>( dataStyle->Duplicate() );
double holeSize = std::min( settings.m_MinThroughDrill, settings.m_ViasMinSize );
text = MessageTextFromValue( m_frame->GetUserUnits(), holeSize, true );
t->SetText( text );
colData2.push_back( t );
t = static_cast<PCB_TEXT*>( dataStyle->Duplicate() );
t->SetText( _( "Impedance Control: " ) );
colLabel2.push_back( t );
t = static_cast<PCB_TEXT*>( dataStyle->Duplicate() );
Drawing stackup table: fix a few issues and missing items. Fixes #9243 https://gitlab.com/kicad/code/kicad/issues/9243 Fixes #9244 https://gitlab.com/kicad/code/kicad/issues/9244
2021-09-26 08:01:59 +00:00
t->SetText( stackup.m_HasDielectricConstrains ? _( "Yes" ) : _( "No" ) );
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
colData2.push_back( t );
t = static_cast<PCB_TEXT*>( dataStyle->Duplicate() );
t->SetText( _( "Plated Board Edge: " ) );
colLabel2.push_back( t );
Drawing stackup table: fix a few issues and missing items. Fixes #9243 https://gitlab.com/kicad/code/kicad/issues/9243 Fixes #9244 https://gitlab.com/kicad/code/kicad/issues/9244
2021-09-26 08:01:59 +00:00
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
t = static_cast<PCB_TEXT*>( dataStyle->Duplicate() );
Drawing stackup table: fix a few issues and missing items. Fixes #9243 https://gitlab.com/kicad/code/kicad/issues/9243 Fixes #9244 https://gitlab.com/kicad/code/kicad/issues/9244
2021-09-26 08:01:59 +00:00
t->SetText( stackup.m_EdgePlating ? _( "Yes" ) : _( "No" ) );
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
colData2.push_back( t );
Drawing stackup table: fix a few issues and missing items. Fixes #9243 https://gitlab.com/kicad/code/kicad/issues/9243 Fixes #9244 https://gitlab.com/kicad/code/kicad/issues/9244
2021-09-26 08:01:59 +00:00
t = static_cast<PCB_TEXT*>( dataStyle->Duplicate() );
t->SetText( _( "Edge card connectors: " ) );
colLabel1.push_back( t );
t = static_cast<PCB_TEXT*>( dataStyle->Duplicate() );
switch( stackup.m_EdgeConnectorConstraints )
{
case BS_EDGE_CONNECTOR_NONE: t->SetText( _( "No" ) ); break;
case BS_EDGE_CONNECTOR_IN_USE: t->SetText( _( "Yes" ) ); break;
case BS_EDGE_CONNECTOR_BEVELLED: t->SetText( _( "Yes, Bevelled" ) ); break;
}
colData1.push_back( t );
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
texts.push_back( colLabel1 );
texts.push_back( colData1 );
texts.push_back( colbreak );
texts.push_back( colLabel2 );
texts.push_back( colData2 );
wxPoint tableSize2 = wxPoint();
std::vector<BOARD_ITEM*> table = initTextTable( texts, cursorPos, Eco1_User, &tableSize2,
false );
Formatting.
2021-09-13 16:18:58 +00:00
for( BOARD_ITEM* item : table )
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
objects.push_back( item );
if( aDrawNow )
{
for( auto item : objects )
commit.Add( item );
More wide-string declarations.
2022-02-05 13:25:43 +00:00
commit.Push( wxT( "Board Characteristics" ) );
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
}
tableSize->x = tableSize2.x;
tableSize->y = cursorPos.y + tableSize2.y + From_User_Unit( EDA_UNITS::MILLIMETRES, 2.0 );
return objects;
}
Fix some issues in drawing_stackup_table_tool.cpp
2021-03-14 16:44:01 +00:00
Pcbnew: Fix memory leaks and fix inefficient code.
2021-03-14 19:12:25 +00:00
int DRAWING_TOOL::InteractivePlaceWithPreview( const TOOL_EVENT& aEvent,
std::vector<BOARD_ITEM*>& aItems,
std::vector<BOARD_ITEM*>& aPreview,
LSET* aLayers )
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
{
if( m_isFootprintEditor && !m_frame->GetModel() )
return -1;
bool cancelled = false;
BOARD_COMMIT commit( m_frame );
m_toolMgr->RunAction( PCB_ACTIONS::selectionClear, true );
More NULL expunging.
2021-07-19 23:56:05 +00:00
// do not capture or auto-pan until we start placing the table
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
SCOPED_DRAW_MODE scopedDrawMode( m_mode, MODE::TEXT );
std::string tool = aEvent.GetCommandStr().get();
m_frame->PushTool( tool );
Don't push view control settings to the previous active tool. See further comments in bug report. Fixes https://gitlab.com/kicad/code/kicad/issues/9147
2021-09-13 12:23:10 +00:00
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
Activate();
Don't push view control settings to the previous active tool. See further comments in bug report. Fixes https://gitlab.com/kicad/code/kicad/issues/9147
2021-09-13 12:23:10 +00:00
// Must be done after Activate() so that it gets set into the correct context
m_controls->ShowCursor( true );
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
// Prime the pump
if( aEvent.HasPosition() )
m_toolMgr->RunAction( ACTIONS::cursorClick );
// Main loop: keep receiving events
wxPoint wxCursorPosition = wxPoint();
wxPoint wxPreviousCursorPosition = wxPoint( 0, 0 );
view()->ClearPreview();
view()->InitPreview();
Formatting.
2021-09-13 16:18:58 +00:00
for( BOARD_ITEM* item : aPreview )
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
{
item->Move( wxCursorPosition - wxPreviousCursorPosition );
view()->AddToPreview( item );
}
while( TOOL_EVENT* evt = Wait() )
{
m_frame->GetCanvas()->SetCurrentCursor( KICURSOR::PENCIL );
VECTOR2D pos = m_controls->GetCursorPosition();
wxCursorPosition.x = pos.x;
wxCursorPosition.y = pos.y;
if( evt->IsCancelInteractive() )
{
m_frame->PopTool( tool );
cancelled = true;
break;
}
if( evt->IsMotion() )
{
view()->ShowPreview( false );
for( auto item : aPreview )
{
item->Move( wxCursorPosition - wxPreviousCursorPosition );
}
view()->ShowPreview( true );
wxPreviousCursorPosition.x = wxCursorPosition.x;
wxPreviousCursorPosition.y = wxCursorPosition.y;
}
else if( evt->IsActivate() )
{
if( evt->IsMoveTool() )
{
// leave ourselves on the stack so we come back after the move
cancelled = true;
break;
}
else
{
m_frame->PopTool( tool );
cancelled = true;
break;
}
}
else if( evt->IsClick( BUT_RIGHT ) )
{
m_menu.ShowContextMenu( selection() );
}
else if( evt->IsClick( BUT_LEFT ) )
{
More NULL expunging.
2021-07-19 23:56:05 +00:00
if( aLayers != nullptr )
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
{
Formatting.
2021-09-13 16:18:58 +00:00
PCB_LAYER_ID destLayer = frame()->SelectOneLayer( PCB_LAYER_ID::PCB_LAYER_ID_COUNT,
*aLayers, wxGetMousePosition() );
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
view()->ClearPreview();
Formatting.
2021-09-13 16:18:58 +00:00
if( destLayer == PCB_LAYER_ID::UNDEFINED_LAYER )
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
{
Fix some issues in drawing_stackup_table_tool.cpp
2021-03-14 16:44:01 +00:00
// The user did not pick any layer.
m_frame->PopTool( tool );
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
cancelled = true;
Fix some issues in drawing_stackup_table_tool.cpp
2021-03-14 16:44:01 +00:00
break;
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
}
Formatting.
2021-09-13 16:18:58 +00:00
for( BOARD_ITEM* item : aItems )
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
{
if( item->Type() == PCB_GROUP_T )
Formatting.
2021-09-13 16:18:58 +00:00
static_cast<PCB_GROUP*>( item )->SetLayerRecursive( destLayer, 200 );
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
else
Formatting.
2021-09-13 16:18:58 +00:00
item->SetLayer( destLayer );
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
}
}
Formatting.
2021-09-13 16:18:58 +00:00
for( BOARD_ITEM* item : aItems )
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
{
item->Move( wxCursorPosition );
if( item->Type() == PCB_GROUP_T )
static_cast<PCB_GROUP*>( item )->AddChildrenToCommit( commit );
commit.Add( item );
}
More wide-string declarations.
2022-02-05 13:25:43 +00:00
commit.Push( wxT( "Placing items" ) );
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
m_frame->PopTool( tool );
break;
}
else
More NULL expunging.
2021-07-19 23:56:05 +00:00
{
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
evt->SetPassEvent();
More NULL expunging.
2021-07-19 23:56:05 +00:00
}
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
}
view()->ClearPreview();
frame()->SetMsgPanel( board() );
if( cancelled )
return -1;
return 0;
}
Pass wxPoint objects by reference instead of on the stack.
2021-07-26 19:35:12 +00:00
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
int DRAWING_TOOL::PlaceCharacteristics( const TOOL_EVENT& aEvent )
{
wxPoint tableSize = wxPoint();
LSET layerSet = ( layerSet.AllCuMask() | layerSet.AllTechMask() );
layerSet = static_cast<LSET>( layerSet.set( Edge_Cuts ).set( Margin ) );
layerSet = static_cast<LSET>( layerSet.reset( F_Fab ).reset( B_Fab ) );
PCB_LAYER_ID layer = m_frame->GetActiveLayer();
PCB_LAYER_ID savedLayer = layer;
if( ( layerSet & LSET( layer ) ).count() ) // if layer is a forbidden layer
{
m_frame->SetActiveLayer( Cmts_User );
layer = Cmts_User;
}
Formatting.
2021-09-13 16:18:58 +00:00
std::vector<BOARD_ITEM*> table = DrawBoardCharacteristics( wxPoint( 0, 0 ),
m_frame->GetActiveLayer(), false,
&tableSize );
Pcbnew: Fix memory leaks and fix inefficient code.
2021-03-14 19:12:25 +00:00
std::vector<BOARD_ITEM*> preview;
std::vector<BOARD_ITEM*> items;
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
PCB_SHAPE* line1 = new PCB_SHAPE;
PCB_SHAPE* line2 = new PCB_SHAPE;
PCB_SHAPE* line3 = new PCB_SHAPE;
PCB_SHAPE* line4 = new PCB_SHAPE;
line1->SetStartX( 0 );
line1->SetStartY( 0 );
line1->SetEndX( tableSize.x );
line1->SetEndY( 0 );
line2->SetStartX( 0 );
line2->SetStartY( 0 );
line2->SetEndX( 0 );
line2->SetEndY( tableSize.y );
line3->SetStartX( tableSize.x );
line3->SetStartY( 0 );
line3->SetEndX( tableSize.x );
line3->SetEndY( tableSize.y );
line4->SetStartX( 0 );
line4->SetStartY( tableSize.y );
line4->SetEndX( tableSize.x );
line4->SetEndY( tableSize.y );
line1->SetLayer( m_frame->GetActiveLayer() );
line2->SetLayer( m_frame->GetActiveLayer() );
line3->SetLayer( m_frame->GetActiveLayer() );
line4->SetLayer( m_frame->GetActiveLayer() );
Pcbnew: Fix memory leaks and fix inefficient code.
2021-03-14 19:12:25 +00:00
preview.push_back( line1 );
preview.push_back( line2 );
preview.push_back( line3 );
preview.push_back( line4 );
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
PCB_GROUP* group = new PCB_GROUP( m_board );
group->SetName("group-boardCharacteristics");
for( auto item : table )
group->AddItem( static_cast<BOARD_ITEM*>( item ) );
Pcbnew: Fix memory leaks and fix inefficient code.
2021-03-14 19:12:25 +00:00
items.push_back( static_cast<BOARD_ITEM*>( group ) );
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
Pcbnew: Fix memory leaks and fix inefficient code.
2021-03-14 19:12:25 +00:00
if( InteractivePlaceWithPreview( aEvent, items, preview, &layerSet ) == -1 )
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
m_frame->SetActiveLayer( savedLayer );
else
m_frame->SetActiveLayer( table.front()->GetLayer() );
return 0;
}
Pass wxPoint objects by reference instead of on the stack.
2021-07-26 19:35:12 +00:00
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
int DRAWING_TOOL::PlaceStackup( const TOOL_EVENT& aEvent )
{
wxPoint tableSize = wxPoint();
LSET layerSet = ( layerSet.AllCuMask() | layerSet.AllTechMask() );
layerSet = static_cast<LSET>( layerSet.set( Edge_Cuts ).set( Margin ) );
layerSet = static_cast<LSET>( layerSet.reset( F_Fab ).reset( B_Fab ) );
PCB_LAYER_ID layer = m_frame->GetActiveLayer();
PCB_LAYER_ID savedLayer = layer;
if( ( layerSet & LSET( layer ) ).count() ) // if layer is a forbidden layer
{
m_frame->SetActiveLayer( Cmts_User );
layer = Cmts_User;
}
std::vector<BOARD_ITEM*> table = DrawSpecificationStackup(
wxPoint( 0, 0 ), m_frame->GetActiveLayer(), false, &tableSize );
Pcbnew: Fix memory leaks and fix inefficient code.
2021-03-14 19:12:25 +00:00
std::vector<BOARD_ITEM*> preview;
std::vector<BOARD_ITEM*> items;
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
PCB_SHAPE* line1 = new PCB_SHAPE;
PCB_SHAPE* line2 = new PCB_SHAPE;
PCB_SHAPE* line3 = new PCB_SHAPE;
PCB_SHAPE* line4 = new PCB_SHAPE;
line1->SetStartX( 0 );
line1->SetStartY( 0 );
line1->SetEndX( tableSize.x );
line1->SetEndY( 0 );
line2->SetStartX( 0 );
line2->SetStartY( 0 );
line2->SetEndX( 0 );
line2->SetEndY( tableSize.y );
line3->SetStartX( tableSize.x );
line3->SetStartY( 0 );
line3->SetEndX( tableSize.x );
line3->SetEndY( tableSize.y );
line4->SetStartX( 0 );
line4->SetStartY( tableSize.y );
line4->SetEndX( tableSize.x );
line4->SetEndY( tableSize.y );
line1->SetLayer( m_frame->GetActiveLayer() );
line2->SetLayer( m_frame->GetActiveLayer() );
line3->SetLayer( m_frame->GetActiveLayer() );
line4->SetLayer( m_frame->GetActiveLayer() );
Pcbnew: Fix memory leaks and fix inefficient code.
2021-03-14 19:12:25 +00:00
preview.push_back( line1 );
preview.push_back( line2 );
preview.push_back( line3 );
preview.push_back( line4 );
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
PCB_GROUP* group = new PCB_GROUP( m_board );
group->SetName("group-boardStackUp");
Formatting.
2021-09-13 16:18:58 +00:00
for( BOARD_ITEM* item : table )
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
group->AddItem( item );
Pcbnew: Fix memory leaks and fix inefficient code.
2021-03-14 19:12:25 +00:00
items.push_back( static_cast<BOARD_ITEM*>( group ) );
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
Pcbnew: Fix memory leaks and fix inefficient code.
2021-03-14 19:12:25 +00:00
if( InteractivePlaceWithPreview( aEvent, items, preview, &layerSet ) == -1 )
Move board stackup table drawing code from drawing_tool.cpp to drawing_stackup_table_tool.cpp This avoid a too large drawing_tool.cpp file. Remove also values in internal units and convert them to mm.
2021-03-14 15:12:51 +00:00
m_frame->SetActiveLayer( savedLayer );
else
m_frame->SetActiveLayer( table.front()->GetLayer() );
return 0;
}