AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-04 22:55:30 +00:00
Files Issues Releases Activity

Cleanup.

Browse Source
This commit is contained in:
Jeff Young 2021-07-22 00:14:56 +01:00
parent 92e589b398
commit e26341d424
66 changed files with 472 additions and 583 deletions

2
common/dialogs/panel_color_settings.cpp
View File

@ -318,7 +318,7 @@ void PANEL_COLOR_SETTINGS::OnColorChanged( wxCommandEvent& aEvent )
{
COLOR_SWATCH* swatch = static_cast<COLOR_SWATCH*>( aEvent.GetEventObject() );
COLOR4D newColor = swatch->GetSwatchColor();
LAYER_NUM layer = static_cast<SCH_LAYER_ID>( swatch->GetId() - FIRST_BUTTON_ID );
int layer = static_cast<SCH_LAYER_ID>( swatch->GetId() - FIRST_BUTTON_ID );
updateColor( layer, newColor );
}

4
common/lset.cpp
View File

@ -761,10 +761,8 @@ LSET LSET::AllCuMask( int aCuLayerCount )
clear_count = Clamp( 0, clear_count, MAX_CU_LAYERS - 2 );
for( LAYER_NUM elem=In30_Cu; clear_count; --elem, --clear_count )
{
for( int elem = In30_Cu; clear_count; --elem, --clear_count )
ret.set( elem, false );
}
return ret;
}

64
common/plugins/eagle/eagle_parser.h
View File

@ -490,28 +490,26 @@ struct EROT
/// Eagle wire
struct EWIRE
{
ECOORD x1;
ECOORD y1;
ECOORD x2;
ECOORD y2;
ECOORD width;
LAYER_NUM layer;
ECOORD x1;
ECOORD y1;
ECOORD x2;
ECOORD y2;
ECOORD width;
int layer;
// for style: (continuous | longdash | shortdash | dashdot)
enum {
CONTINUOUS,
LONGDASH,
SHORTDASH,
DASHDOT,
};
enum { CONTINUOUS,
LONGDASH,
SHORTDASH,
DASHDOT };
opt_int style;
opt_double curve; ///< range is -359.9..359.9
// for cap: (flat | round)
enum {
FLAT,
ROUND,
};
enum { FLAT,
ROUND };
opt_int cap;
EWIRE( wxXmlNode* aWire );
@ -531,13 +529,13 @@ struct EJUNCTION
/// Eagle label
struct ELABEL
{
ECOORD x;
ECOORD y;
ECOORD size;
LAYER_NUM layer;
opt_erot rot;
ECOORD x;
ECOORD y;
ECOORD size;
int layer;
opt_erot rot;
opt_wxString xref;
wxString netname;
wxString netname;
ELABEL( wxXmlNode* aLabel, const wxString& aNetName );
};
@ -546,12 +544,12 @@ struct ELABEL
/// Eagle via
struct EVIA
{
ECOORD x;
ECOORD y;
int layer_front_most; /// < extent
int layer_back_most; /// < inclusive
ECOORD drill;
opt_ecoord diam;
ECOORD x;
ECOORD y;
int layer_front_most; /// < extent
int layer_back_most; /// < inclusive
ECOORD drill;
opt_ecoord diam;
opt_wxString shape;
EVIA( wxXmlNode* aVia );
@ -561,11 +559,11 @@ struct EVIA
/// Eagle circle
struct ECIRCLE
{
ECOORD x;
ECOORD y;
ECOORD radius;
ECOORD width;
LAYER_NUM layer;
ECOORD x;
ECOORD y;
ECOORD radius;
ECOORD width;
int layer;
ECIRCLE( wxXmlNode* aCircle );
};

41
common/widgets/layer_box_selector.cpp
View File

@ -22,13 +22,12 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <layer_ids.h>
#include <bitmaps.h>
#include <wx/dcmemory.h>
#include <wx/odcombo.h>
#include <wx/menuitem.h>
#include <layer_ids.h>
#include <widgets/layer_box_selector.h>
@ -73,11 +72,10 @@ void LAYER_SELECTOR::DrawColorSwatch( wxBitmap& aLayerbmp, const COLOR4D& aBackg
}
LAYER_BOX_SELECTOR::LAYER_BOX_SELECTOR( wxWindow* parent, wxWindowID id,
const wxPoint& pos, const wxSize& size,
int n, const wxString choices[] ) :
wxBitmapComboBox( parent, id, wxEmptyString, pos, size, n, choices, wxCB_READONLY ),
LAYER_SELECTOR()
LAYER_BOX_SELECTOR::LAYER_BOX_SELECTOR( wxWindow* parent, wxWindowID id, const wxPoint& pos,
const wxSize& size, int n, const wxString choices[] ) :
wxBitmapComboBox( parent, id, wxEmptyString, pos, size, n, choices, wxCB_READONLY ),
LAYER_SELECTOR()
{
if( choices != nullptr )
ResyncBitmapOnly();
@ -87,9 +85,8 @@ LAYER_BOX_SELECTOR::LAYER_BOX_SELECTOR( wxWindow* parent, wxWindowID id,
}
LAYER_BOX_SELECTOR::LAYER_BOX_SELECTOR( wxWindow* parent, wxWindowID id,
const wxPoint& pos, const wxSize& size,
const wxArrayString& choices ) :
LAYER_BOX_SELECTOR::LAYER_BOX_SELECTOR( wxWindow* parent, wxWindowID id, const wxPoint& pos,
const wxSize& size, const wxArrayString& choices ) :
wxBitmapComboBox( parent, id, wxEmptyString, pos, size, choices, wxCB_READONLY ),
LAYER_SELECTOR()
{
@ -108,26 +105,18 @@ LAYER_BOX_SELECTOR::~LAYER_BOX_SELECTOR()
}
int LAYER_BOX_SELECTOR::GetChoice()
{
return GetSelection();
}
LAYER_NUM LAYER_BOX_SELECTOR::GetLayerSelection() const
int LAYER_BOX_SELECTOR::GetLayerSelection() const
{
if( GetSelection() < 0 )
return UNDEFINED_LAYER;
return (LAYER_NUM)(intptr_t) GetClientData( GetSelection() );
return (int)(intptr_t) GetClientData( GetSelection() );
}
int LAYER_BOX_SELECTOR::SetLayerSelection( LAYER_NUM layer )
int LAYER_BOX_SELECTOR::SetLayerSelection( int layer )
{
int elements = GetCount();
for( int i = 0; i < elements; i++ )
for( int i = 0; i < (int) GetCount(); i++ )
{
if( GetClientData( (unsigned) i ) == (void*)(intptr_t) layer )
{
@ -137,7 +126,9 @@ int LAYER_BOX_SELECTOR::SetLayerSelection( LAYER_NUM layer )
return i;
}
else
return i; //If element already selected; do nothing
{
return i; // If element already selected; do nothing
}
}
}
@ -149,9 +140,7 @@ int LAYER_BOX_SELECTOR::SetLayerSelection( LAYER_NUM layer )
void LAYER_BOX_SELECTOR::ResyncBitmapOnly()
{
int elements = GetCount();
for( LAYER_NUM i = 0; i < elements; ++i )
for( int i = 0; i < (int) GetCount(); ++i )
{
wxBitmap layerbmp( 14, 14 );
DrawColorSwatch( layerbmp, getLayerColor( LAYER_PCB_BACKGROUND ), getLayerColor( i ) );

31
common/widgets/lib_tree.cpp
View File

@ -25,13 +25,11 @@
#include <widgets/lib_tree.h>
#include <macros.h>
#include <wxdataviewctrl_helpers.h>
#include <wx/artprov.h>
#include <wx/sizer.h>
#include <tool/tool_interactive.h>
#include <tool/tool_manager.h>
#include <wx/srchctrl.h>
#include <wx/settings.h>
#include <wx/statbmp.h>
#include <wx/timer.h>
@ -50,8 +48,7 @@ LIB_TREE::LIB_TREE( wxWindow* aParent, LIB_TABLE* aLibTable,
{
wxBoxSizer* search_sizer = new wxBoxSizer( wxHORIZONTAL );
m_query_ctrl = new wxSearchCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition,
wxDefaultSize );
m_query_ctrl = new wxSearchCtrl( this, wxID_ANY );
m_query_ctrl->ShowCancelButton( true );
@ -79,7 +76,6 @@ LIB_TREE::LIB_TREE( wxWindow* aParent, LIB_TABLE* aLibTable,
m_query_ctrl->Bind( wxEVT_CHAR_HOOK, &LIB_TREE::onQueryCharHook, this );
m_query_ctrl->Bind( wxEVT_MOTION, &LIB_TREE::onQueryMouseMoved, this );
Bind( wxEVT_TIMER, &LIB_TREE::onDebounceTimer, this, m_debounceTimer->GetId() );
}
@ -204,6 +200,7 @@ void LIB_TREE::Unselect()
m_tree_ctrl->UnselectAll();
}
void LIB_TREE::ExpandLibId( const LIB_ID& aLibId )
{
expandIfValid( m_adapter->FindItem( aLibId ) );
@ -394,8 +391,8 @@ void LIB_TREE::onDebounceTimer( wxTimerEvent& aEvent )
void LIB_TREE::onQueryCharHook( wxKeyEvent& aKeyStroke )
{
auto const sel = m_tree_ctrl->GetSelection();
auto type = sel.IsOk() ? m_adapter->GetTypeFor( sel ) : LIB_TREE_NODE::INVALID;
const wxDataViewItem sel = m_tree_ctrl->GetSelection();
LIB_TREE_NODE::TYPE type = sel.IsOk() ? m_adapter->GetTypeFor( sel ) : LIB_TREE_NODE::INVALID;
switch( aKeyStroke.GetKeyCode() )
{
@ -421,15 +418,14 @@ void LIB_TREE::onQueryCharHook( wxKeyEvent& aKeyStroke )
case WXK_RETURN:
if( type == LIB_TREE_NODE::LIB )
{
toggleExpand( sel );
break;
}
// Intentionally fall through, so the selected symbol will be treated as the selected one
KI_FALLTHROUGH;
else
aKeyStroke.Skip(); // pass on to search box to select node
break;
default:
aKeyStroke.Skip(); // Any other key: pass on to search box directly.
aKeyStroke.Skip(); // Any other key: pass on to search box directly.
break;
}
}
@ -460,14 +456,9 @@ void LIB_TREE::onTreeSelect( wxDataViewEvent& aEvent )
void LIB_TREE::onTreeActivate( wxDataViewEvent& aEvent )
{
if( !GetSelectedLibId().IsValid() )
{
// Expand library/part units subtree
toggleExpand( m_tree_ctrl->GetSelection() );
}
toggleExpand( m_tree_ctrl->GetSelection() ); // Expand library/part units subtree
else
{
postSelectEvent();
}
postSelectEvent(); // Open symbol/footprint
}

7
common/widgets/msgpanel.cpp
View File

@ -38,9 +38,8 @@ BEGIN_EVENT_TABLE( EDA_MSG_PANEL, wxPanel )
END_EVENT_TABLE()
EDA_MSG_PANEL::EDA_MSG_PANEL( wxWindow* aParent, int aId,
const wxPoint& aPosition, const wxSize& aSize,
long style, const wxString &name ) :
EDA_MSG_PANEL::EDA_MSG_PANEL( wxWindow* aParent, int aId, const wxPoint& aPosition,
const wxSize& aSize, long style, const wxString &name ) :
wxPanel( aParent, aId, aPosition, aSize, style, name )
{
SetFont( KIUI::GetStatusFont( this ) );
@ -150,7 +149,7 @@ void EDA_MSG_PANEL::SetMessage( int aXPosition, const wxString& aUpperText,
// update the vector, which is sorted by m_X
int limit = m_Items.size();
for( ndx=0; ndx<limit; ++ndx )
for( ndx = 0; ndx < limit; ++ndx )
{
// replace any item with same X
if( m_Items[ndx].m_X == item.m_X )

4
eeschema/sch_draw_panel.cpp
View File

@ -125,9 +125,9 @@ void SCH_DRAW_PANEL::DisplaySheet( SCH_SCREEN *aScreen )
void SCH_DRAW_PANEL::setDefaultLayerOrder()
{
for( LAYER_NUM i = 0; (unsigned) i < sizeof( SCH_LAYER_ORDER ) / sizeof( LAYER_NUM ); ++i )
for( int i = 0; (unsigned) i < sizeof( SCH_LAYER_ORDER ) / sizeof( int ); ++i )
{
LAYER_NUM layer = SCH_LAYER_ORDER[i];
int layer = SCH_LAYER_ORDER[i];
wxASSERT( layer < KIGFX::VIEW::VIEW_MAX_LAYERS );
m_view->SetLayerOrder( layer, i );

4
eeschema/sch_preview_panel.cpp
View File

@ -99,9 +99,9 @@ void SCH_PREVIEW_PANEL::OnShow()
void SCH_PREVIEW_PANEL::setDefaultLayerOrder()
{
for( LAYER_NUM i = 0; (unsigned) i < sizeof( SCH_LAYER_ORDER ) / sizeof( LAYER_NUM ); ++i )
for( int i = 0; (unsigned) i < sizeof( SCH_LAYER_ORDER ) / sizeof( int ); ++i )
{
LAYER_NUM layer = SCH_LAYER_ORDER[i];
int layer = SCH_LAYER_ORDER[i];
wxASSERT( layer < KIGFX::VIEW::VIEW_MAX_LAYERS );
m_view->SetLayerOrder( layer, i );

2
eeschema/sch_view.h
View File

@ -42,7 +42,7 @@ class DS_PROXY_VIEW_ITEM;
// Eeschema 100nm as the internal units
constexpr double SCH_WORLD_UNIT ( 1e-7 / 0.0254 );
static const LAYER_NUM SCH_LAYER_ORDER[] =
static const int SCH_LAYER_ORDER[] =
{
LAYER_GP_OVERLAY, LAYER_SELECT_OVERLAY,
LAYER_ERC_ERR, LAYER_ERC_WARN, LAYER_DANGLING,

26
gerbview/dialogs/dialog_layers_select_to_pcb.cpp
View File

@ -39,9 +39,9 @@
#include <dialogs/dialog_layers_select_to_pcb.h>
#include <wx/msgdlg.h>
#include <gestfich.h>
extern const wxString GetPCBDefaultLayerName( LAYER_NUM aLayerNumber );
extern const wxString GetPCBDefaultLayerName( int aLayerNumber );
enum swap_layer_id {
@ -188,7 +188,7 @@ void LAYERS_MAP_DIALOG::initDialog()
{
goodSize = text->GetSize();
for( LAYER_NUM jj = 0; jj < GERBER_DRAWLAYERS_COUNT; ++jj )
for( int jj = 0; jj < GERBER_DRAWLAYERS_COUNT; ++jj )
{
text->SetLabel( GetPCBDefaultLayerName( jj ) );
@ -274,11 +274,7 @@ void LAYERS_MAP_DIALOG::OnBrdLayersCountSelection( wxCommandEvent& event )
void LAYERS_MAP_DIALOG::OnResetClick( wxCommandEvent& event )
{
wxString msg;
int ii;
LAYER_NUM layer;
for( ii = 0, layer = 0; ii < m_gerberActiveLayersCount; ii++, ++layer )
for( int ii = 0; ii < m_gerberActiveLayersCount; ++ii )
{
m_layersLookUpTable[ii] = UNSELECTED_LAYER;
m_layersList[ii]->SetLabel( _( "Do not export" ) );
@ -290,15 +286,13 @@ void LAYERS_MAP_DIALOG::OnResetClick( wxCommandEvent& event )
void LAYERS_MAP_DIALOG::OnStoreSetup( wxCommandEvent& event )
{
auto config = static_cast<GERBVIEW_SETTINGS*>( Kiface().KifaceSettings() );
GERBVIEW_SETTINGS* config = static_cast<GERBVIEW_SETTINGS*>( Kiface().KifaceSettings() );
config->m_BoardLayersCount = m_exportBoardCopperLayersCount;
config->m_GerberToPcbLayerMapping.clear();
for( int ii = 0; ii < GERBER_DRAWLAYERS_COUNT; ++ii )
{
config->m_GerberToPcbLayerMapping.push_back( m_layersLookUpTable[ii] );
}
// Enable the "Get Stored Choice" button in case it was disabled in "initDialog()"
// due to no previously stored choices.
@ -327,7 +321,7 @@ void LAYERS_MAP_DIALOG::OnGetSetup( wxCommandEvent& event )
for( int ii = 0; ii < m_gerberActiveLayersCount; ii++ )
{
LAYER_NUM layer = m_layersLookUpTable[ii];
int layer = m_layersLookUpTable[ii];
if( layer == UNSELECTED_LAYER )
{
@ -350,17 +344,15 @@ void LAYERS_MAP_DIALOG::OnGetSetup( wxCommandEvent& event )
void LAYERS_MAP_DIALOG::OnSelectLayer( wxCommandEvent& event )
{
int ii;
int ii = event.GetId() - ID_BUTTON_0;
ii = event.GetId() - ID_BUTTON_0;
if( (ii < 0) || (ii >= GERBER_DRAWLAYERS_COUNT) )
if( ii < 0 || ii >= GERBER_DRAWLAYERS_COUNT )
{
wxFAIL_MSG( wxT( "Bad layer id" ) );
return;
}
LAYER_NUM jj = m_layersLookUpTable[m_buttonTable[ii]];
int jj = m_layersLookUpTable[ m_buttonTable[ii] ];
if( jj != UNSELECTED_LAYER && jj != UNDEFINED_LAYER && !IsValidLayer( jj ) )
jj = B_Cu; // (Defaults to "Copper" layer.)

14
gerbview/dialogs/dialog_layers_select_to_pcb.h
View File

@ -41,7 +41,7 @@ class LAYERS_MAP_DIALOG : public LAYERS_MAP_DIALOG_BASE
public: LAYERS_MAP_DIALOG( GERBVIEW_FRAME* parent );
~LAYERS_MAP_DIALOG() {};
LAYER_NUM * GetLayersLookUpTable() { return m_layersLookUpTable; }
int* GetLayersLookUpTable() { return m_layersLookUpTable; }
static int GetCopperLayersCount() { return m_exportBoardCopperLayersCount; }
protected:
@ -121,14 +121,14 @@ private:
private:
GERBVIEW_FRAME* m_Parent;
int m_gerberActiveLayersCount; // Number of initialized Gerber layers
static int m_exportBoardCopperLayersCount;
int m_gerberActiveLayersCount; // Number of initialized Gerber layers
static int m_exportBoardCopperLayersCount;
// Indexes Gerber layers to PCB file layers the last value in table is the number of
// Indexes Gerber layers to PCB file layers; the last value in table is the number of
// copper layers.
LAYER_NUM m_layersLookUpTable[GERBER_DRAWLAYERS_COUNT];
int m_buttonTable[int(GERBER_DRAWLAYERS_COUNT)+1]; // Indexes buttons to Gerber layers
wxStaticText* m_layersList[int(GERBER_DRAWLAYERS_COUNT)+1]; // Indexes text strings to buttons
int m_layersLookUpTable[ GERBER_DRAWLAYERS_COUNT ];
int m_buttonTable[ int(GERBER_DRAWLAYERS_COUNT) + 1 ];
wxStaticText* m_layersList[ int(GERBER_DRAWLAYERS_COUNT) + 1 ];
};
#endif // DIALOG_LAYERS_SELECT_TO_PCB_H_

37
gerbview/export_to_pcbnew.cpp
View File

@ -39,7 +39,7 @@
#include "excellon_image.h"
// Imported function
extern const wxString GetPCBDefaultLayerName( LAYER_NUM aLayerNumber );
extern const wxString GetPCBDefaultLayerName( int aLayerNumber );
GBR_TO_PCB_EXPORTER::GBR_TO_PCB_EXPORTER( GERBVIEW_FRAME* aFrame, const wxString& aFileName )
@ -56,7 +56,7 @@ GBR_TO_PCB_EXPORTER::~GBR_TO_PCB_EXPORTER()
}
bool GBR_TO_PCB_EXPORTER::ExportPcb( const LAYER_NUM* aLayerLookUpTable, int aCopperLayers )
bool GBR_TO_PCB_EXPORTER::ExportPcb( const int* aLayerLookUpTable, int aCopperLayers )
{
LOCALE_IO toggle; // toggles on, then off, the C locale.
@ -98,7 +98,7 @@ bool GBR_TO_PCB_EXPORTER::ExportPcb( const LAYER_NUM* aLayerLookUpTable, int aCo
if( gerber == nullptr ) // Graphic layer not yet used
continue;
LAYER_NUM pcb_layer_number = aLayerLookUpTable[layer];
int pcb_layer_number = aLayerLookUpTable[layer];
if( !IsPcbLayer( pcb_layer_number ) )
continue;
@ -106,7 +106,7 @@ bool GBR_TO_PCB_EXPORTER::ExportPcb( const LAYER_NUM* aLayerLookUpTable, int aCo
if( pcb_layer_number <= pcbCopperLayerMax ) // copper layer
continue;
for( GERBER_DRAW_ITEM* gerb_item : gerber->GetItems() )
for( GERBER_DRAW_ITEM* gerb_item : gerber->GetItems() )
export_non_copper_item( gerb_item, pcb_layer_number );
}
@ -118,7 +118,7 @@ bool GBR_TO_PCB_EXPORTER::ExportPcb( const LAYER_NUM* aLayerLookUpTable, int aCo
if( gerber == nullptr ) // Graphic layer not yet used
continue;
LAYER_NUM pcb_layer_number = aLayerLookUpTable[layer];
int pcb_layer_number = aLayerLookUpTable[layer];
if( pcb_layer_number < 0 || pcb_layer_number > pcbCopperLayerMax )
continue;
@ -139,8 +139,7 @@ bool GBR_TO_PCB_EXPORTER::ExportPcb( const LAYER_NUM* aLayerLookUpTable, int aCo
}
void GBR_TO_PCB_EXPORTER::export_non_copper_item( const GERBER_DRAW_ITEM* aGbrItem,
LAYER_NUM aLayer )
void GBR_TO_PCB_EXPORTER::export_non_copper_item( const GERBER_DRAW_ITEM* aGbrItem, int aLayer )
{
// used when a D_CODE is not found. default D_CODE to draw a flashed item
static D_CODE dummyD_CODE( 0 );
@ -277,7 +276,7 @@ void GBR_TO_PCB_EXPORTER::export_via( const EXPORT_VIA& aVia )
}
void GBR_TO_PCB_EXPORTER::export_copper_item( const GERBER_DRAW_ITEM* aGbrItem, LAYER_NUM aLayer )
void GBR_TO_PCB_EXPORTER::export_copper_item( const GERBER_DRAW_ITEM* aGbrItem, int aLayer )
{
switch( aGbrItem->m_Shape )
{
@ -311,8 +310,7 @@ void GBR_TO_PCB_EXPORTER::export_copper_item( const GERBER_DRAW_ITEM* aGbrItem,
}
void GBR_TO_PCB_EXPORTER::export_segline_copper_item( const GERBER_DRAW_ITEM* aGbrItem,
LAYER_NUM aLayer )
void GBR_TO_PCB_EXPORTER::export_segline_copper_item( const GERBER_DRAW_ITEM* aGbrItem, int aLayer )
{
wxPoint seg_start, seg_end;
@ -327,9 +325,8 @@ void GBR_TO_PCB_EXPORTER::export_segline_copper_item( const GERBER_DRAW_ITEM* aG
}
void GBR_TO_PCB_EXPORTER::writeCopperLineItem( const wxPoint& aStart,
const wxPoint& aEnd,
int aWidth, LAYER_NUM aLayer )
void GBR_TO_PCB_EXPORTER::writeCopperLineItem( const wxPoint& aStart, const wxPoint& aEnd,
int aWidth, int aLayer )
{
fprintf( m_fp, "(segment (start %s %s) (end %s %s) (width %s) (layer %s) (net 0))\n",
Double2Str( MapToPcbUnits(aStart.x) ).c_str(),
@ -341,8 +338,7 @@ void GBR_TO_PCB_EXPORTER::writeCopperLineItem( const wxPoint& aStart,
}
void GBR_TO_PCB_EXPORTER::export_segarc_copper_item( const GERBER_DRAW_ITEM* aGbrItem,
LAYER_NUM aLayer )
void GBR_TO_PCB_EXPORTER::export_segarc_copper_item( const GERBER_DRAW_ITEM* aGbrItem, int aLayer )
{
double a = atan2( (double) ( aGbrItem->m_Start.y - aGbrItem->m_ArcCentre.y ),
(double) ( aGbrItem->m_Start.x - aGbrItem->m_ArcCentre.x ) );
@ -397,8 +393,7 @@ void GBR_TO_PCB_EXPORTER::export_segarc_copper_item( const GERBER_DRAW_ITEM* aGb
}
void GBR_TO_PCB_EXPORTER::export_flashed_copper_item( const GERBER_DRAW_ITEM* aGbrItem,
LAYER_NUM aLayer )
void GBR_TO_PCB_EXPORTER::export_flashed_copper_item( const GERBER_DRAW_ITEM* aGbrItem, int aLayer )
{
static D_CODE flashed_item_D_CODE( 0 );
@ -437,7 +432,7 @@ void GBR_TO_PCB_EXPORTER::export_flashed_copper_item( const GERBER_DRAW_ITEM* aG
void GBR_TO_PCB_EXPORTER::writePcbFilledCircle( const VECTOR2I& aCenterPosition, int aRadius,
LAYER_NUM aLayer )
int aLayer )
{
fprintf( m_fp, "(gr_circle (center %s %s) (end %s %s)",
@ -452,7 +447,7 @@ void GBR_TO_PCB_EXPORTER::writePcbFilledCircle( const VECTOR2I& aCenterPosition,
}
void GBR_TO_PCB_EXPORTER::writePcbHeader( const LAYER_NUM* aLayerLookUpTable )
void GBR_TO_PCB_EXPORTER::writePcbHeader( const int* aLayerLookUpTable )
{
fprintf( m_fp, "(kicad_pcb (version 4) (generator gerbview)\n\n" );
@ -481,7 +476,7 @@ void GBR_TO_PCB_EXPORTER::writePcbHeader( const LAYER_NUM* aLayerLookUpTable )
}
void GBR_TO_PCB_EXPORTER::writePcbPolygon( const SHAPE_POLY_SET& aPolys, LAYER_NUM aLayer,
void GBR_TO_PCB_EXPORTER::writePcbPolygon( const SHAPE_POLY_SET& aPolys, int aLayer,
const wxPoint& aOffset )
{
SHAPE_POLY_SET polys = aPolys;
@ -529,7 +524,7 @@ void GBR_TO_PCB_EXPORTER::writePcbPolygon( const SHAPE_POLY_SET& aPolys, LAYER_N
}
void GBR_TO_PCB_EXPORTER::writePcbZoneItem( const GERBER_DRAW_ITEM* aGbrItem, LAYER_NUM aLayer )
void GBR_TO_PCB_EXPORTER::writePcbZoneItem( const GERBER_DRAW_ITEM* aGbrItem, int aLayer )
{
SHAPE_POLY_SET polys = aGbrItem->m_Polygon;
polys.Simplify( SHAPE_POLY_SET::PM_STRICTLY_SIMPLE );

30
gerbview/export_to_pcbnew.h
View File

@ -57,7 +57,7 @@ public:
/**
* Save a board from a set of Gerber images.
*/
bool ExportPcb( const LAYER_NUM* aLayerLookUpTable, int aCopperLayers );
bool ExportPcb( const int* aLayerLookUpTable, int aCopperLayers );
private:
/**
@ -70,7 +70,7 @@ private:
* than the hole. We'll leave it this way if the pad gets drawn as a copper polygon, or
* increase it to the proper size if it has a circular, concentric copper flashing.
*/
void collect_hole( const GERBER_DRAW_ITEM* aGbrItem );
void collect_hole( const GERBER_DRAW_ITEM* aGbrItem );
/**
* Write a via to the board file.
@ -79,7 +79,7 @@ private:
* holes in pads. (We can't generate actual pads because the Gerbers don't contain
* info on how to group them into footprints.)
*/
void export_via( const EXPORT_VIA& aVia );
void export_via( const EXPORT_VIA& aVia );
/**
* Write a non copper line or arc to the board file.
@ -87,15 +87,15 @@ private:
* @param aGbrItem is the Gerber item (line, arc) to export.
* @param aLayer is the technical layer to use.
*/
void export_non_copper_item( const GERBER_DRAW_ITEM* aGbrItem, LAYER_NUM aLayer );
void export_non_copper_item( const GERBER_DRAW_ITEM* aGbrItem, int aLayer );
/**
* Write a non-copper polygon to the board file.
*
* @param aLayer is the technical layer to use.
*/
void writePcbPolygon( const SHAPE_POLY_SET& aPolys, LAYER_NUM aLayer,
const wxPoint& aOffset = { 0, 0 } );
void writePcbPolygon( const SHAPE_POLY_SET& aPolys, int aLayer,
const wxPoint& aOffset = { 0, 0 } );
/**
* Write a filled circle to the board file (with line thickness = 0).
@ -105,8 +105,7 @@ private:
* @param aRadius is the circle radius.
* @param aLayer is the layer to use.
*/
void writePcbFilledCircle( const VECTOR2I& aCenterPosition, int aRadius,
LAYER_NUM aLayer );
void writePcbFilledCircle( const VECTOR2I& aCenterPosition, int aRadius, int aLayer );
/**
* Write a zone item to the board file.
@ -116,7 +115,7 @@ private:
* @param aGbrItem is the Gerber item (line, arc) to export.
* @param aLayer is the technical layer to use.
*/
void writePcbZoneItem( const GERBER_DRAW_ITEM* aGbrItem, LAYER_NUM aLayer );
void writePcbZoneItem( const GERBER_DRAW_ITEM* aGbrItem, int aLayer );
/**
* Write a track (or via) to the board file.
@ -124,7 +123,7 @@ private:
* @param aGbrItem is the Gerber item (line, arc, flashed) to export.
* @param aLayer is the copper layer to use.
*/
void export_copper_item( const GERBER_DRAW_ITEM* aGbrItem, LAYER_NUM aLayer );
void export_copper_item( const GERBER_DRAW_ITEM* aGbrItem, int aLayer );
/**
* Write a synthetic pad to the board file.
@ -135,7 +134,7 @@ private:
*
* @param aGbrItem is the flashed Gerber item to export.
*/
void export_flashed_copper_item( const GERBER_DRAW_ITEM* aGbrItem, LAYER_NUM aLayer );
void export_flashed_copper_item( const GERBER_DRAW_ITEM* aGbrItem, int aLayer );
/**
* Write a track (not via) to the board file.
@ -143,7 +142,7 @@ private:
* @param aGbrItem is the Gerber item (line only) to export.
* @param aLayer is the copper layer to use.
*/
void export_segline_copper_item( const GERBER_DRAW_ITEM* aGbrItem, LAYER_NUM aLayer );
void export_segline_copper_item( const GERBER_DRAW_ITEM* aGbrItem, int aLayer );
/**
* Write a set of tracks (arcs are approximated by track segments) to the board file.
@ -151,18 +150,17 @@ private:
* @param aGbrItem is the Gerber item (arc only) to export.
* @param aLayer is the copper layer to use
*/
void export_segarc_copper_item( const GERBER_DRAW_ITEM* aGbrItem, LAYER_NUM aLayer );
void export_segarc_copper_item( const GERBER_DRAW_ITEM* aGbrItem, int aLayer );
/**
* Basic write function to write a a #PCB_TRACK to the board file from a non flashed item.
*/
void writeCopperLineItem( const wxPoint& aStart, const wxPoint& aEnd,
int aWidth, LAYER_NUM aLayer );
void writeCopperLineItem( const wxPoint& aStart, const wxPoint& aEnd, int aWidth, int aLayer );
/**
* Write a very basic header to the board file.
*/
void writePcbHeader( const LAYER_NUM* aLayerLookUpTable );
void writePcbHeader( const int* aLayerLookUpTable );
/**
* Map GerbView internal units to millimeters for Pcbnew board files.

68
gerbview/toolbars_gerber.cpp
View File

@ -85,8 +85,10 @@ void GERBVIEW_FRAME::ReCreateHToolbar()
m_mainToolBar->AddControl( m_SelLayerBox );
if( !m_TextInfo )
m_TextInfo = new wxTextCtrl( m_mainToolBar, ID_TOOLBARH_GERBER_DATA_TEXT_BOX, wxEmptyString, wxDefaultPosition,
wxDefaultSize, wxTE_READONLY );
{
m_TextInfo = new wxTextCtrl( m_mainToolBar, ID_TOOLBARH_GERBER_DATA_TEXT_BOX, wxEmptyString,
wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
}
m_mainToolBar->AddControl( m_TextInfo );
@ -108,8 +110,8 @@ void GERBVIEW_FRAME::ReCreateAuxiliaryToolbar()
}
else
{
m_auxiliaryToolBar = new ACTION_TOOLBAR( this, ID_AUX_TOOLBAR,
wxDefaultPosition, wxDefaultSize,
m_auxiliaryToolBar = new ACTION_TOOLBAR( this, ID_AUX_TOOLBAR, wxDefaultPosition,
wxDefaultSize,
KICAD_AUI_TB_STYLE | wxAUI_TB_HORZ_LAYOUT );
m_auxiliaryToolBar->SetAuiManager( &m_auimgr );
}
@ -118,8 +120,7 @@ void GERBVIEW_FRAME::ReCreateAuxiliaryToolbar()
// (note, when the m_auxiliaryToolBar is recreated, tools are deleted, but controls
// are not deleted: they are just no longer managed by the toolbar
if( !m_SelComponentBox )
m_SelComponentBox = new wxChoice( m_auxiliaryToolBar,
ID_GBR_AUX_TOOLBAR_PCB_CMP_CHOICE );
m_SelComponentBox = new wxChoice( m_auxiliaryToolBar, ID_GBR_AUX_TOOLBAR_PCB_CMP_CHOICE );
if( !m_cmpText )
m_cmpText = new wxStaticText( m_auxiliaryToolBar, wxID_ANY, _( "Cmp:" ) + wxS( " " ) );
@ -132,8 +133,7 @@ void GERBVIEW_FRAME::ReCreateAuxiliaryToolbar()
// Creates choice box to display net names and highlight selected:
if( !m_SelNetnameBox )
m_SelNetnameBox = new wxChoice( m_auxiliaryToolBar,
ID_GBR_AUX_TOOLBAR_PCB_NET_CHOICE );
m_SelNetnameBox = new wxChoice( m_auxiliaryToolBar, ID_GBR_AUX_TOOLBAR_PCB_NET_CHOICE );
if( !m_netText )
m_netText = new wxStaticText( m_auxiliaryToolBar, wxID_ANY, _( "Net:" ) );
@ -146,8 +146,10 @@ void GERBVIEW_FRAME::ReCreateAuxiliaryToolbar()
// Creates choice box to display aperture attributes and highlight selected:
if( !m_SelAperAttributesBox )
{
m_SelAperAttributesBox = new wxChoice( m_auxiliaryToolBar,
ID_GBR_AUX_TOOLBAR_PCB_APERATTRIBUTES_CHOICE );
}
if( !m_apertText )
m_apertText = new wxStaticText( m_auxiliaryToolBar, wxID_ANY, _( "Attr:" ) );
@ -159,9 +161,11 @@ void GERBVIEW_FRAME::ReCreateAuxiliaryToolbar()
m_auxiliaryToolBar->AddSpacer( 5 );
if( !m_DCodeSelector )
{
m_DCodeSelector = new DCODE_SELECTION_BOX( m_auxiliaryToolBar,
ID_TOOLBARH_GERBER_SELECT_ACTIVE_DCODE,
wxDefaultPosition, wxSize( 150, -1 ) );
}
if( !m_dcodeText )
m_dcodeText = new wxStaticText( m_auxiliaryToolBar, wxID_ANY, _( "DCode:" ) );
@ -172,8 +176,8 @@ void GERBVIEW_FRAME::ReCreateAuxiliaryToolbar()
if( !m_gridSelectBox )
{
m_gridSelectBox = new wxChoice( m_auxiliaryToolBar, ID_ON_GRID_SELECT,
wxDefaultPosition, wxDefaultSize, 0, nullptr );
m_gridSelectBox = new wxChoice( m_auxiliaryToolBar, ID_ON_GRID_SELECT, wxDefaultPosition,
wxDefaultSize, 0, nullptr );
}
m_auxiliaryToolBar->AddScaledSeparator( this );
@ -181,8 +185,8 @@ void GERBVIEW_FRAME::ReCreateAuxiliaryToolbar()
if( !m_zoomSelectBox )
{
m_zoomSelectBox = new wxChoice( m_auxiliaryToolBar, ID_ON_ZOOM_SELECT,
wxDefaultPosition, wxDefaultSize, 0, nullptr );
m_zoomSelectBox = new wxChoice( m_auxiliaryToolBar, ID_ON_ZOOM_SELECT, wxDefaultPosition,
wxDefaultSize, 0, nullptr );
}
m_auxiliaryToolBar->AddScaledSeparator( this );
@ -343,8 +347,8 @@ void GERBVIEW_FRAME::updateDCodeSelectBox()
dcode->m_Num_Dcode,
dcode->m_Size.x / scale, dcode->m_Size.y / scale,
units,
D_CODE::ShowApertureType( dcode->m_Shape )
);
D_CODE::ShowApertureType( dcode->m_Shape ) );
if( !dcode->m_AperFunction.IsEmpty() )
msg << ", " << dcode->m_AperFunction;
@ -384,8 +388,8 @@ void GERBVIEW_FRAME::updateComponentListSelectBox()
m_SelComponentBox->Append( NO_SELECTION_STRING );
// Now copy the list to the choice box
for( auto& ii : full_list )
m_SelComponentBox->Append( ii.first );
for( const std::pair<const wxString, int>& entry : full_list )
m_SelComponentBox->Append( entry.first );
m_SelComponentBox->SetSelection( 0 );
}
@ -412,8 +416,8 @@ void GERBVIEW_FRAME::updateNetnameListSelectBox()
m_SelNetnameBox->Append( NO_SELECTION_STRING );
// Now copy the list to the choice box
for( auto& ii : full_list )
m_SelNetnameBox->Append( UnescapeString( ii.first ) );
for( const std::pair<const wxString, int>& entry : full_list )
m_SelNetnameBox->Append( UnescapeString( entry.first ) );
m_SelNetnameBox->SetSelection( 0 );
}
@ -455,10 +459,8 @@ void GERBVIEW_FRAME::updateAperAttributesSelectBox()
m_SelAperAttributesBox->Append( NO_SELECTION_STRING );
// Now copy the list to the choice box
for( auto ii = full_list.begin(); ii != full_list.end(); ++ii )
{
m_SelAperAttributesBox->Append( ii->first );
}
for( const std::pair<const wxString, int>& entry : full_list )
m_SelAperAttributesBox->Append( entry.first );
m_SelAperAttributesBox->SetSelection( 0 );
}
@ -468,20 +470,10 @@ void GERBVIEW_FRAME::OnUpdateDrawMode( wxUpdateUIEvent& aEvent )
{
switch( aEvent.GetId() )
{
case ID_TB_OPTIONS_SHOW_GBR_MODE_0:
aEvent.Check( GetDisplayMode() == 0 );
break;
case ID_TB_OPTIONS_SHOW_GBR_MODE_1:
aEvent.Check( GetDisplayMode() == 1 );
break;
case ID_TB_OPTIONS_SHOW_GBR_MODE_2:
aEvent.Check( GetDisplayMode() == 2 );
break;
default:
break;
case ID_TB_OPTIONS_SHOW_GBR_MODE_0: aEvent.Check( GetDisplayMode() == 0 ); break;
case ID_TB_OPTIONS_SHOW_GBR_MODE_1: aEvent.Check( GetDisplayMode() == 1 ); break;
case ID_TB_OPTIONS_SHOW_GBR_MODE_2: aEvent.Check( GetDisplayMode() == 2 ); break;
default: break;
}
}
@ -491,9 +483,9 @@ void GERBVIEW_FRAME::OnUpdateSelectDCode( wxUpdateUIEvent& aEvent )
if( !m_DCodeSelector )
return;
int layer = GetActiveLayer();
int layer = GetActiveLayer();
GERBER_FILE_IMAGE* gerber = GetGbrImage( layer );
int selected = ( gerber ) ? gerber->m_Selected_Tool : 0;
int selected = gerber ? gerber->m_Selected_Tool : 0;
aEvent.Enable( gerber != nullptr );

2
gerbview/tools/gerbview_control.cpp
View File

@ -101,7 +101,7 @@ int GERBVIEW_CONTROL::ExportToPcbnew( const TOOL_EVENT& aEvent )
GERBER_FILE_IMAGE_LIST* images = m_frame->GetGerberLayout()->GetImagesList();
// Count the Gerber layers which are actually currently used
for( LAYER_NUM ii = 0; ii < (LAYER_NUM)images->ImagesMaxCount(); ++ii )
for( int ii = 0; ii < (int) images->ImagesMaxCount(); ++ii )
{
if( images->GetGbrImage( ii ) )
layercount++;

43
gerbview/widgets/layer_widget.cpp
View File

@ -66,7 +66,7 @@ int LAYER_WIDGET::encodeId( int aColumn, int aId )
}
LAYER_NUM LAYER_WIDGET::getDecodedId( int aControlId )
int LAYER_WIDGET::getDecodedId( int aControlId )
{
int id = aControlId / LYR_COLUMN_COUNT; // rounding is OK.
return id;
@ -76,7 +76,7 @@ LAYER_NUM LAYER_WIDGET::getDecodedId( int aControlId )
void LAYER_WIDGET::OnLeftDownLayers( wxMouseEvent& event )
{
int row;
LAYER_NUM layer;
int layer;
wxWindow* eventSource = (wxWindow*) event.GetEventObject();
@ -154,7 +154,7 @@ void LAYER_WIDGET::OnLayerSwatchChanged( wxCommandEvent& aEvent )
{
COLOR_SWATCH* eventSource = static_cast<COLOR_SWATCH*>( aEvent.GetEventObject() );
COLOR4D newColor = eventSource->GetSwatchColor();
LAYER_NUM layer = getDecodedId( eventSource->GetId() );
int layer = getDecodedId( eventSource->GetId() );
// tell the client code.
OnLayerColorChange( layer, newColor );
@ -170,7 +170,8 @@ void LAYER_WIDGET::OnLayerSwatchChanged( wxCommandEvent& aEvent )
void LAYER_WIDGET::OnLayerCheckBox( wxCommandEvent& event )
{
wxCheckBox* eventSource = (wxCheckBox*) event.GetEventObject();
LAYER_NUM layer = getDecodedId( eventSource->GetId() );
int layer = getDecodedId( eventSource->GetId() );
OnLayerVisible( layer, eventSource->IsChecked() );
passOnFocus();
}
@ -201,20 +202,16 @@ void LAYER_WIDGET::OnRightDownRender( wxMouseEvent& aEvent, COLOR_SWATCH* aColor
void LAYER_WIDGET::OnRenderSwatchChanged( wxCommandEvent& aEvent )
{
auto eventSource = static_cast<COLOR_SWATCH*>( aEvent.GetEventObject() );
COLOR4D newColor = eventSource->GetSwatchColor();
LAYER_NUM id = getDecodedId( eventSource->GetId() );
COLOR_SWATCH* eventSource = static_cast<COLOR_SWATCH*>( aEvent.GetEventObject() );
COLOR4D newColor = eventSource->GetSwatchColor();
int id = getDecodedId( eventSource->GetId() );
if( id == LAYER_PCB_BACKGROUND )
{
// Update all swatch backgrounds
int count = GetLayerRowCount();
int row;
int col = 1; // bitmap button is column 1 in layers tab
for( row = 0; row < count; ++row )
for( int row = 0; row < GetLayerRowCount(); ++row )
{
COLOR_SWATCH* swatch = dynamic_cast<COLOR_SWATCH*>( getLayerComp( row, col ) );
@ -222,10 +219,9 @@ void LAYER_WIDGET::OnRenderSwatchChanged( wxCommandEvent& aEvent )
swatch->SetSwatchBackground( newColor );
}
count = GetRenderRowCount();
col = 0; // bitmap button is column 0 in render tab
for( row = 0; row < count; ++row )
for( int row = 0; row < GetRenderRowCount(); ++row )
{
COLOR_SWATCH* swatch = dynamic_cast<COLOR_SWATCH*>( getRenderComp( row, col ) );
@ -244,7 +240,8 @@ void LAYER_WIDGET::OnRenderSwatchChanged( wxCommandEvent& aEvent )
void LAYER_WIDGET::OnRenderCheckBox( wxCommandEvent& event )
{
wxCheckBox* eventSource = (wxCheckBox*) event.GetEventObject();
LAYER_NUM id = getDecodedId( eventSource->GetId() );
int id = getDecodedId( eventSource->GetId() );
OnRenderEnable( id, eventSource->IsChecked() );
passOnFocus();
}
@ -271,7 +268,7 @@ wxWindow* LAYER_WIDGET::getLayerComp( int aRow, int aColumn ) const
}
int LAYER_WIDGET::findLayerRow( LAYER_NUM aLayer ) const
int LAYER_WIDGET::findLayerRow( int aLayer ) const
{
int count = GetLayerRowCount();
@ -710,14 +707,14 @@ void LAYER_WIDGET::SelectLayerRow( int aRow )
}
void LAYER_WIDGET::SelectLayer( LAYER_NUM aLayer )
void LAYER_WIDGET::SelectLayer( int aLayer )
{
int row = findLayerRow( aLayer );
SelectLayerRow( row );
}
LAYER_NUM LAYER_WIDGET::GetSelectedLayer()
int LAYER_WIDGET::GetSelectedLayer()
{
wxWindow* w = getLayerComp( m_CurrentRow, 0 );
@ -728,14 +725,14 @@ LAYER_NUM LAYER_WIDGET::GetSelectedLayer()
}
void LAYER_WIDGET::SetLayerVisible( LAYER_NUM aLayer, bool isVisible )
void LAYER_WIDGET::SetLayerVisible( int aLayer, bool isVisible )
{
setLayerCheckbox( aLayer, isVisible );
OnLayerVisible( aLayer, isVisible );
}
void LAYER_WIDGET::setLayerCheckbox( LAYER_NUM aLayer, bool isVisible )
void LAYER_WIDGET::setLayerCheckbox( int aLayer, bool isVisible )
{
int row = findLayerRow( aLayer );
@ -748,7 +745,7 @@ void LAYER_WIDGET::setLayerCheckbox( LAYER_NUM aLayer, bool isVisible )
}
bool LAYER_WIDGET::IsLayerVisible( LAYER_NUM aLayer )
bool LAYER_WIDGET::IsLayerVisible( int aLayer )
{
int row = findLayerRow( aLayer );
@ -763,7 +760,7 @@ bool LAYER_WIDGET::IsLayerVisible( LAYER_NUM aLayer )
}
void LAYER_WIDGET::SetLayerColor( LAYER_NUM aLayer, const COLOR4D& aColor )
void LAYER_WIDGET::SetLayerColor( int aLayer, const COLOR4D& aColor )
{
int row = findLayerRow( aLayer );
@ -778,7 +775,7 @@ void LAYER_WIDGET::SetLayerColor( LAYER_NUM aLayer, const COLOR4D& aColor )
}
COLOR4D LAYER_WIDGET::GetLayerColor( LAYER_NUM aLayer ) const
COLOR4D LAYER_WIDGET::GetLayerColor( int aLayer ) const
{
int row = findLayerRow( aLayer );

22
gerbview/widgets/layer_widget.h
View File

@ -218,32 +218,32 @@ public:
/**
* Change the row selection in the layer list to \a aLayer provided.
*/
void SelectLayer( LAYER_NUM aLayer );
void SelectLayer( int aLayer );
/**
* Return the selected layer or -1 if none.
*/
LAYER_NUM GetSelectedLayer();
int GetSelectedLayer();
/**
* Set \a aLayer visible or not. This does not invoke OnLayerVisible().
*/
void SetLayerVisible( LAYER_NUM aLayer, bool isVisible );
void SetLayerVisible( int aLayer, bool isVisible );
/**
* Return the visible state of the layer ROW associated with \a aLayer id.
*/
bool IsLayerVisible( LAYER_NUM aLayer );
bool IsLayerVisible( int aLayer );
/**
* Change the color of \a aLayer
*/
void SetLayerColor( LAYER_NUM aLayer, const COLOR4D& aColor );
void SetLayerColor( int aLayer, const COLOR4D& aColor );
/**
* Return the color of the layer ROW associated with \a aLayer id.
*/
COLOR4D GetLayerColor( LAYER_NUM aLayer ) const;
COLOR4D GetLayerColor( int aLayer ) const;
/**
* Set the state of the checkbox associated with \a aId within the Render tab group of the
@ -319,7 +319,7 @@ public:
* be used to decide when to update the screen only one time instead of
* several times in the midst of a multiple layer change.
*/
virtual void OnLayerVisible( LAYER_NUM aLayer, bool isVisible, bool isFinal = true ) = 0;
virtual void OnLayerVisible( int aLayer, bool isVisible, bool isFinal = true ) = 0;
/**
* Notify client code about a layer being right-clicked.
@ -376,10 +376,10 @@ protected:
/**
* Decode \a aControlId to original un-encoded value.
*
* This holds if encodedId was called with a LAYER_NUM (this box is used for other things
* This holds if encodedId was called with a layer (this box is used for other things
* than layers, too).
*/
static LAYER_NUM getDecodedId( int aControlId );
static int getDecodedId( int aControlId );
void OnLeftDownLayers( wxMouseEvent& event );
@ -430,7 +430,7 @@ protected:
/**
* Return the row index that \a aLayer resides in, or -1 if not found.
*/
int findLayerRow( LAYER_NUM aLayer ) const;
int findLayerRow( int aLayer ) const;
int findRenderRow( int aId ) const;
/**
@ -440,7 +440,7 @@ protected:
void insertRenderRow( int aRow, const ROW& aSpec );
void setLayerCheckbox( LAYER_NUM aLayer, bool isVisible );
void setLayerCheckbox( int aLayer, bool isVisible );
void updateLayerRow( int aRow, const wxString& aName );

74
include/layer_ids.h
View File

@ -33,13 +33,6 @@
#include <wx/string.h>
/**
* This can be replaced with int and removed. Until then, it is something you can increment,
* and its meaning is only advisory but can extend beyond PCB layers into view layers
* and gerber layers.
*/
typedef int LAYER_NUM;
/**
* A quick note on layer IDs:
*
@ -773,7 +766,7 @@ private:
* @param aLayerId = Layer index to test. It can be an int, so its useful during I/O
* @return true if aLayerIndex is a valid layer index
*/
inline bool IsValidLayer( LAYER_NUM aLayerId )
inline bool IsValidLayer( int aLayerId )
{
return unsigned( aLayerId ) < PCB_LAYER_ID_COUNT;
}
@ -784,7 +777,7 @@ inline bool IsValidLayer( LAYER_NUM aLayerId )
* @param aLayer = Layer to test
* @return true if aLayer is a layer valid in Pcbnew
*/
inline bool IsPcbLayer( LAYER_NUM aLayer )
inline bool IsPcbLayer( int aLayer )
{
return aLayer >= F_Cu && aLayer < PCB_LAYER_ID_COUNT;
}
@ -795,7 +788,7 @@ inline bool IsPcbLayer( LAYER_NUM aLayer )
* @param aLayerId = Layer to test
* @return true if aLayer is a valid copper layer
*/
inline bool IsCopperLayer( LAYER_NUM aLayerId )
inline bool IsCopperLayer( int aLayerId )
{
return aLayerId >= F_Cu && aLayerId <= B_Cu;
}
@ -806,7 +799,7 @@ inline bool IsCopperLayer( LAYER_NUM aLayerId )
* @param aLayerId = Layer to test
* @return true if aLayer is a non copper layer
*/
inline bool IsNonCopperLayer( LAYER_NUM aLayerId )
inline bool IsNonCopperLayer( int aLayerId )
{
return aLayerId > B_Cu && aLayerId <= PCB_LAYER_ID_COUNT;
}
@ -819,7 +812,7 @@ inline bool IsNonCopperLayer( LAYER_NUM aLayerId )
* @param aIncludeSyntheticCopperLayers
* @return
*/
inline bool IsCopperLayer( LAYER_NUM aLayerId, bool aIncludeSyntheticCopperLayers )
inline bool IsCopperLayer( int aLayerId, bool aIncludeSyntheticCopperLayers )
{
if( aIncludeSyntheticCopperLayers )
return !IsNonCopperLayer( aLayerId );
@ -827,14 +820,14 @@ inline bool IsCopperLayer( LAYER_NUM aLayerId, bool aIncludeSyntheticCopperLayer
return IsCopperLayer( aLayerId );
}
inline bool IsViaPadLayer( LAYER_NUM aLayer )
inline bool IsViaPadLayer( int aLayer )
{
return aLayer == LAYER_VIA_THROUGH
|| aLayer == LAYER_VIA_MICROVIA
|| aLayer == LAYER_VIA_BBLIND;
}
inline bool IsHoleLayer( LAYER_NUM aLayer )
inline bool IsHoleLayer( int aLayer )
{
return aLayer == LAYER_VIA_HOLES
|| aLayer == LAYER_VIA_HOLEWALLS
@ -854,19 +847,17 @@ inline bool IsUserLayer( PCB_LAYER_ID aLayerId )
return aLayerId >= Dwgs_User && aLayerId <= Eco2_User;
}
/*
@todo Where does this comment actually belong?
IMPORTANT: If a layer is not a front layer not necessarily is true
the converse. The same hold for a back layer.
So a layer can be:
- Front
- Back
- Neither (internal or auxiliary)
The check most frequent is for back layers, since it involves flips
*/
* IMPORTANT: If a layer is not a front layer that doesn't necessarily mean it's a back layer.
*
* So a layer can be:
* - Front
* - Back
* - Neither (internal or auxiliary)
*
* The check most frequent is for back layers, since it involves flips.
*/
/**
* Layer classification: check if it's a front layer
@ -963,14 +954,13 @@ inline int GetNetnameLayer( int aLayer )
* @param aLayer = Layer to test
* @return true if aLayer is a valid netname layer
*/
inline bool IsNetnameLayer( LAYER_NUM aLayer )
inline bool IsNetnameLayer( int aLayer )
{
return aLayer >= NETNAMES_LAYER_INDEX( F_Cu ) &&
aLayer < NETNAMES_LAYER_ID_END;
return aLayer >= NETNAMES_LAYER_INDEX( F_Cu ) && aLayer < NETNAMES_LAYER_ID_END;
}
inline bool IsZoneLayer( LAYER_NUM aLayer )
inline bool IsZoneLayer( int aLayer )
{
return aLayer >= LAYER_ZONE_START && aLayer <= LAYER_ZONE_END;
}
@ -978,8 +968,8 @@ inline bool IsZoneLayer( LAYER_NUM aLayer )
inline bool IsDCodeLayer( int aLayer )
{
return aLayer >= (GERBVIEW_LAYER_ID_START + GERBER_DRAWLAYERS_COUNT) &&
aLayer < (GERBVIEW_LAYER_ID_START + (2 * GERBER_DRAWLAYERS_COUNT));
return aLayer >= ( GERBVIEW_LAYER_ID_START + GERBER_DRAWLAYERS_COUNT )
&& aLayer < ( GERBVIEW_LAYER_ID_START + ( 2 * GERBER_DRAWLAYERS_COUNT ) );
}
@ -989,18 +979,18 @@ inline bool IsDCodeLayer( int aLayer )
* @param aLayer is the layer to test
* @return true if the layer is one that participates in net coloring
*/
inline bool IsNetCopperLayer( LAYER_NUM aLayer )
inline bool IsNetCopperLayer( int aLayer )
{
static std::set<LAYER_NUM> netCopperLayers =
static std::set<int> netCopperLayers =
{
LAYER_PAD_FR,
LAYER_PAD_BK,
LAYER_PADS_TH,
LAYER_PAD_HOLEWALLS,
LAYER_VIA_THROUGH,
LAYER_VIA_BBLIND,
LAYER_VIA_MICROVIA,
LAYER_VIA_HOLEWALLS
LAYER_PAD_FR,
LAYER_PAD_BK,
LAYER_PADS_TH,
LAYER_PAD_HOLEWALLS,
LAYER_VIA_THROUGH,
LAYER_VIA_BBLIND,
LAYER_VIA_MICROVIA,
LAYER_VIA_HOLEWALLS
};
return IsCopperLayer( aLayer ) || netCopperLayers.count( aLayer );

25
include/widgets/layer_box_selector.h
View File

@ -51,13 +51,13 @@ public:
protected:
// Return a color index from the layer id
virtual COLOR4D getLayerColor( LAYER_NUM aLayer ) const = 0;
virtual COLOR4D getLayerColor( int aLayer ) const = 0;
// Return the name of the layer id
virtual wxString getLayerName( LAYER_NUM aLayer ) const = 0;
virtual wxString getLayerName( int aLayer ) const = 0;
// Return true if the layer id is enabled (i.e. is it should be displayed)
virtual bool isLayerEnabled( LAYER_NUM aLayer ) const = 0;
virtual bool isLayerEnabled( int aLayer ) const = 0;
bool m_layerhotkeys;
};
@ -69,25 +69,18 @@ protected:
class LAYER_BOX_SELECTOR : public wxBitmapComboBox, public LAYER_SELECTOR
{
public:
LAYER_BOX_SELECTOR( wxWindow* parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = nullptr );
LAYER_BOX_SELECTOR( wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, int n = 0,
const wxString choices[] = nullptr );
LAYER_BOX_SELECTOR( wxWindow* parent, wxWindowID id,
const wxPoint& pos, const wxSize& size,
LAYER_BOX_SELECTOR( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
const wxArrayString& choices );
~LAYER_BOX_SELECTOR() override;
// Get Current Item #
int GetChoice();
int GetLayerSelection() const;
// Get Current Layer
LAYER_NUM GetLayerSelection() const;
// Set Layer #
int SetLayerSelection( LAYER_NUM layer );
int SetLayerSelection( int layer );
// Reload the Layers
// Virtual pure function because GerbView uses its own functions in a derived class

14
pcbnew/autorouter/ar_matrix.cpp
View File

@ -282,8 +282,8 @@ void AR_MATRIX::SetDist( int aRow, int aCol, int aSide, DIST_CELL x )
* half-width = lg, org = ux0,uy0 end = ux1,uy1
* coordinates are in PCB units
*/
void AR_MATRIX::drawSegmentQcq( int ux0, int uy0, int ux1, int uy1, int lg, LAYER_NUM layer,
int color, AR_MATRIX::CELL_OP op_logic )
void AR_MATRIX::drawSegmentQcq( int ux0, int uy0, int ux1, int uy1, int lg, int layer, int color,
AR_MATRIX::CELL_OP op_logic )
{
int64_t row, col;
int64_t inc;
@ -408,8 +408,8 @@ void AR_MATRIX::drawSegmentQcq( int ux0, int uy0, int ux1, int uy1, int lg, LAYE
* half-width = lg, center = ux0, uy0, ux1,uy1 is a point on the circle.
* coord are in PCB units.
*/
void AR_MATRIX::traceCircle( int ux0, int uy0, int ux1, int uy1, int lg, LAYER_NUM layer, int color,
AR_MATRIX::CELL_OP op_logic )
void AR_MATRIX::traceCircle( int ux0, int uy0, int ux1, int uy1, int lg, int layer, int color,
AR_MATRIX::CELL_OP op_logic )
{
int radius, nb_segm;
int x0, y0, // Starting point of the current segment trace.
@ -568,8 +568,8 @@ void AR_MATRIX::traceFilledCircle(
* center = ux0,uy0, starting at ux1, uy1. Coordinates are in
* PCB units.
*/
void AR_MATRIX::traceArc( int ux0, int uy0, int ux1, int uy1, double ArcAngle, int lg,
LAYER_NUM layer, int color, AR_MATRIX::CELL_OP op_logic )
void AR_MATRIX::traceArc( int ux0, int uy0, int ux1, int uy1, double ArcAngle, int lg, int layer,
int color, AR_MATRIX::CELL_OP op_logic )
{
int radius, nb_segm;
int x0, y0, // Starting point of the current segment trace
@ -768,7 +768,7 @@ void AR_MATRIX::TraceSegmentPcb( PCB_SHAPE* aShape, int aColor, int aMargin,
int half_width = ( aShape->GetWidth() / 2 ) + aMargin;
// Calculate the bounding rectangle of the segment (if H, V or Via)
LAYER_NUM layer = UNDEFINED_LAYER; // Draw on all layers
int layer = UNDEFINED_LAYER; // Draw on all layers
if( aShape->GetShape() == SHAPE_T::CIRCLE || aShape->GetShape() == SHAPE_T::SEGMENT )
{

8
pcbnew/autorouter/ar_matrix.h
View File

@ -122,16 +122,16 @@ public:
AR_MATRIX::CELL_OP op_logic );
private:
void drawSegmentQcq( int ux0, int uy0, int ux1, int uy1, int lg, LAYER_NUM layer, int color,
CELL_OP op_logic );
void drawSegmentQcq( int ux0, int uy0, int ux1, int uy1, int lg, int layer, int color,
CELL_OP op_logic );
void traceCircle( int ux0, int uy0, int ux1, int uy1, int lg, LAYER_NUM layer, int color,
void traceCircle( int ux0, int uy0, int ux1, int uy1, int lg, int layer, int color,
AR_MATRIX::CELL_OP op_logic );
void traceFilledCircle( int cx, int cy, int radius, LSET aLayerMask, int color,
AR_MATRIX::CELL_OP op_logic );
void traceArc( int ux0, int uy0, int ux1, int uy1, double ArcAngle, int lg, LAYER_NUM layer,
void traceArc( int ux0, int uy0, int ux1, int uy1, double ArcAngle, int lg, int layer,
int color, AR_MATRIX::CELL_OP op_logic );
public:

26
pcbnew/board.cpp
View File

@ -75,7 +75,7 @@ BOARD::BOARD() :
// we have not loaded a board yet, assume latest until then.
m_fileFormatVersionAtLoad = LEGACY_BOARD_FILE_VERSION;
for( LAYER_NUM layer = 0; layer < PCB_LAYER_ID_COUNT; ++layer )
for( int layer = 0; layer < PCB_LAYER_ID_COUNT; ++layer )
{
m_layers[layer].m_name = GetStandardLayerName( ToLAYER_ID( layer ) );
@ -340,17 +340,15 @@ bool BOARD::SetLayerDescr( PCB_LAYER_ID aIndex, const LAYER& aLayer )
const PCB_LAYER_ID BOARD::GetLayerID( const wxString& aLayerName ) const
{
// Check the BOARD physical layer names.
for( LAYER_NUM layer = 0; layer < PCB_LAYER_ID_COUNT; ++layer )
for( int layer = 0; layer < PCB_LAYER_ID_COUNT; ++layer )
{
if ( ( m_layers[ layer ].m_name == aLayerName )
|| ( m_layers[ layer ].m_userName == aLayerName ) )
if ( m_layers[ layer ].m_name == aLayerName || m_layers[ layer ].m_userName == aLayerName )
return ToLAYER_ID( layer );
}
// Otherwise fall back to the system standard layer names for virtual layers.
for( LAYER_NUM layer = 0; layer < PCB_LAYER_ID_COUNT; ++layer )
for( int layer = 0; layer < PCB_LAYER_ID_COUNT; ++layer )
{
if( GetStandardLayerName( ToLAYER_ID( layer ) ) == aLayerName )
return ToLAYER_ID( layer );
@ -399,8 +397,6 @@ LAYER_T BOARD::GetLayerType( PCB_LAYER_ID aLayer ) const
if( !IsCopperLayer( aLayer ) )
return LT_SIGNAL;
//@@IMB: The original test was broken due to the discontinuity
// in the layer sequence.
if( IsLayerEnabled( aLayer ) )
return m_layers[aLayer].m_type;
@ -413,8 +409,6 @@ bool BOARD::SetLayerType( PCB_LAYER_ID aLayer, LAYER_T aLayerType )
if( !IsCopperLayer( aLayer ) )
return false;
//@@IMB: The original test was broken due to the discontinuity
// in the layer sequence.
if( IsLayerEnabled( aLayer ) )
{
m_layers[aLayer].m_type = aLayerType;
@ -574,15 +568,9 @@ bool BOARD::IsFootprintLayerVisible( PCB_LAYER_ID aLayer ) const
{
switch( aLayer )
{
case F_Cu:
return IsElementVisible( LAYER_MOD_FR );
case B_Cu:
return IsElementVisible( LAYER_MOD_BK );
default:
wxFAIL_MSG( wxT( "BOARD::IsModuleLayerVisible() param error: bad layer" ) );
return true;
case F_Cu: return IsElementVisible( LAYER_MOD_FR );
case B_Cu: return IsElementVisible( LAYER_MOD_BK );
default: wxFAIL_MSG( wxT( "BOARD::IsModuleLayerVisible(): bad layer" ) ); return true;
}
}

6
pcbnew/dialogs/dialog_global_deletion.cpp
View File

@ -70,7 +70,7 @@ int GLOBAL_EDIT_TOOL::GlobalDeletions( const TOOL_EVENT& aEvent )
}
void DIALOG_GLOBAL_DELETION::SetCurrentLayer( LAYER_NUM aLayer )
void DIALOG_GLOBAL_DELETION::SetCurrentLayer( int aLayer )
{
m_currentLayer = aLayer;
m_textCtrlCurrLayer->SetValue( m_Parent->GetBoard()->GetLayerName( ToLAYER_ID( aLayer ) ) );
@ -177,8 +177,8 @@ void DIALOG_GLOBAL_DELETION::DoGlobalDeletions()
for( BOARD_ITEM* item : board->Drawings() )
{
KICAD_T type = item->Type();
LAYER_NUM layer = item->GetLayer();
KICAD_T type = item->Type();
int layer = item->GetLayer();
if( !delete_all )
{

4
pcbnew/dialogs/dialog_global_deletion.h
View File

@ -30,7 +30,7 @@ class DIALOG_GLOBAL_DELETION: public DIALOG_GLOBAL_DELETION_BASE
{
public:
DIALOG_GLOBAL_DELETION( PCB_EDIT_FRAME* parent );
void SetCurrentLayer( LAYER_NUM aLayer );
void SetCurrentLayer( int aLayer );
///< @todo Move this back into the tool rather than having the dialog do the deleting.
void DoGlobalDeletions();
@ -42,7 +42,7 @@ private:
void onCheckDeleteBoardOutlines( wxCommandEvent& event ) override;
PCB_EDIT_FRAME* m_Parent;
LAYER_NUM m_currentLayer;
int m_currentLayer;
};
#endif // _DIALOG_GLOBAL_DELETION_H_

2
pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp
View File

@ -71,7 +71,7 @@ static bool g_modifyFootprintGraphics;
static bool g_modifyBoardText;
static bool g_modifyBoardGraphics;
static bool g_filterByLayer;
static LAYER_NUM g_layerFilter;
static int g_layerFilter;
static bool g_filterByReference;
static wxString g_referenceFilter;
static bool g_filterByFootprint;

Some files were not shown because too many files have changed in this diff Show More