Skip to content

K
kicad-source-mirror
Commit aa9de21c authored by jean-pierre charras's avatar jean-pierre charras
Browse files
Options

Ref and Value for footprints: use now the layer color, not a specific color:... 

Ref and Value for footprints: use now the layer color, not a specific color: this is needed by the fact these fields can be on an other layer than silk screen, and therefore must have the corresponding color
Also do not allow copper layers, solder paste and solder mask: put Ref or Value on these layers has no sense, and can create serious issues on the board.
parent 260ca0e7
Show whitespace changes
Inline Side-by-side
Showing with 2165 additions and 669 deletions
pcbnew/class_pcb_layer_widget.cpp
View file @ aa9de21c
......@@ -66,8 +66,8 @@ const LAYER_WIDGET::ROW PCB_LAYER_WIDGET::s_render_rows[] = {
RR( _( "Pads Front" ), PAD_FR_VISIBLE, WHITE, _( "Show footprint pads on board's front" ) ),
RR( _( "Pads Back" ), PAD_BK_VISIBLE, WHITE, _( "Show footprint pads on board's back" ) ),
RR( _( "Text Front" ), MOD_TEXT_FR_VISIBLE, WHITE, _( "Show footprint text on board's front" ) ),
RR( _( "Text Back" ), MOD_TEXT_BK_VISIBLE, WHITE, _( "Show footprint text on board's back" ) ),
RR( _( "Text Front" ), MOD_TEXT_FR_VISIBLE, UNSPECIFIED_COLOR, _( "Show footprint text on board's front" ) ),
RR( _( "Text Back" ), MOD_TEXT_BK_VISIBLE, UNSPECIFIED_COLOR, _( "Show footprint text on board's back" ) ),
RR( _( "Hidden Text" ), MOD_TEXT_INVISIBLE, WHITE, _( "Show footprint text marked as invisible" ) ),
RR( _( "Anchors" ), ANCHOR_VISIBLE, WHITE, _( "Show footprint and text origins as a cross" ) ),
......
pcbnew/class_text_mod.cpp
View file @ aa9de21c
......@@ -250,9 +250,8 @@ void TEXTE_MODULE::Draw( EDA_DRAW_PANEL* panel, wxDC* DC, GR_DRAWMODE draw_mode,
BOARD* brd = GetBoard( );
/* Reference and values takes the color from the corresponding Visibles
other texts take the color of the layer they are on */
EDA_COLOR_T color;
EDA_COLOR_T color = brd->GetLayerColor( GetLayer() );
/* For reference and value suppress the element if the layer it is
* on is on a disabled side, user text also has standard layer
......@@ -263,25 +262,13 @@ void TEXTE_MODULE::Draw( EDA_DRAW_PANEL* panel, wxDC* DC, GR_DRAWMODE draw_mode,
(IsBackLayer( text_layer ) && !brd->IsElementVisible( MOD_TEXT_BK_VISIBLE )) )
return;
switch( GetType() )
{
case TEXT_is_REFERENCE:
case TEXT_is_VALUE:
if( IsFrontLayer( text_layer ) )
color = brd->GetVisibleElementColor( MOD_TEXT_FR_VISIBLE );
else
color = brd->GetVisibleElementColor( MOD_TEXT_BK_VISIBLE );
break;
default: // Otherwise the compiler is not sure about initializing color
case TEXT_is_DIVERS:
if( brd->IsLayerVisible( m_Layer ) )
color = brd->GetLayerColor( GetLayer() );
else
// text which are not ref or value are shown only if the layer is visible
// ref or value have a specific display option
if( GetType() == TEXT_is_DIVERS && ! brd->IsLayerVisible( m_Layer ) )
return;
}
// 'Ghost' the element if forced show
// Invisible texts are still drawn (not plotted) in MOD_TEXT_INVISIBLE
// Just because we must have to edit them (at least to make them visible)
if( m_NoShow )
{
if( !brd->IsElementVisible( MOD_TEXT_INVISIBLE ) )
......
pcbnew/dialogs/dialog_edit_module_text.cpp
View file @ aa9de21c
......@@ -113,6 +113,11 @@ void DialogEditModuleText::initDlg( )
m_ModuleInfoText->SetLabel( msg );
// Create a list of not allowed layers.
// could be slightly dependent of the type of footprint text.
LSET forbiddenLayers( LSET::AllCuMask() );
forbiddenLayers.set( Edge_Cuts ).set( Margin ).set( F_Paste ).set( B_Paste ).set( F_Mask ).set( B_Mask );
switch( m_currentText->GetType() )
{
case TEXTE_MODULE::TEXT_is_VALUE:
......@@ -154,11 +159,11 @@ void DialogEditModuleText::initDlg( )
m_Orient->SetSelection( 1 );
if( !m_currentText->IsVisible() )
m_Show->SetSelection( 1 );;
m_Show->SetSelection( 1 );
// Configure the layers list selector
m_LayerSelectionCtrl->SetLayersHotkeys( false );
m_LayerSelectionCtrl->SetLayerSet( LSET::InternalCuMask().set( Edge_Cuts ) );
m_LayerSelectionCtrl->SetLayerSet( forbiddenLayers );
m_LayerSelectionCtrl->SetBoardFrame( m_parent );
m_LayerSelectionCtrl->Resync();
......@@ -238,6 +243,7 @@ void DialogEditModuleText::OnOkClick( wxCommandEvent& event )
LAYER_NUM layer = m_LayerSelectionCtrl->GetLayerSelection();
m_currentText->SetLayer( ToLAYER_ID( layer ) );
m_currentText->SetMirrored( IsBackLayer( m_currentText->GetLayer() ) );
#ifndef USE_WX_OVERLAY
if( m_dc ) // Display new text
......
pcbnew/dialogs/dialog_layers_setup.cpp
View file @ aa9de21c
......@@ -74,6 +74,8 @@ static LSEQ dlg_layers()
// layers that are put out into the dialog UI, coordinate with wxformbuilder and
// getCTLs( LAYER_NUM aLayerNumber )
static const LAYER_ID layers[] = {
F_CrtYd,
F_Fab,
F_Adhes,
F_Paste,
F_SilkS,
......@@ -117,6 +119,8 @@ static LSEQ dlg_layers()
B_SilkS,
B_Paste,
B_Adhes,
B_Fab,
B_CrtYd,
Edge_Cuts,
Margin,
......@@ -257,6 +261,8 @@ CTLs DIALOG_LAYERS_SETUP::getCTLs( LAYER_NUM aLayerNumber )
switch( aLayerNumber )
{
case F_CrtYd: RETAUX( m_CrtYdFront );
case F_Fab: RETAUX( m_FabFront );
case F_Adhes: RETAUX( m_AdhesFront );
case F_Paste: RETAUX( m_SoldPFront );
case F_SilkS: RETAUX( m_SilkSFront );
......@@ -300,6 +306,8 @@ CTLs DIALOG_LAYERS_SETUP::getCTLs( LAYER_NUM aLayerNumber )
case B_SilkS: RETAUX( m_SilkSBack );
case B_Paste: RETAUX( m_SoldPBack );
case B_Adhes: RETAUX( m_AdhesBack );
case B_Fab: RETAUX( m_FabBack );
case B_CrtYd: RETAUX( m_CrtYdBack );
case Edge_Cuts: RETAUX( m_PCBEdges );
case Margin: RETAUX( m_Margin );
......
pcbnew/dialogs/dialog_layers_setup_base.cpp
View file @ aa9de21c
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Jun 6 2014)
// C++ code generated with wxFormBuilder (version Nov 6 2013)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
......@@ -45,7 +45,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID
wxString m_CopperLayersChoiceChoices[] = { _("2"), _("4"), _("6"), _("8"), _("10"), _("12"), _("14"), _("16"), _("18"), _("20"), _("22"), _("24"), _("26"), _("28"), _("30"), _("32") };
int m_CopperLayersChoiceNChoices = sizeof( m_CopperLayersChoiceChoices ) / sizeof( wxString );
m_CopperLayersChoice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_CopperLayersChoiceNChoices, m_CopperLayersChoiceChoices, 0 );
m_CopperLayersChoice->SetSelection( 3 );
m_CopperLayersChoice->SetSelection( 2 );
bCopperLayersSizer->Add( m_CopperLayersChoice, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
......@@ -81,9 +81,59 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID
m_LayerListFlexGridSizer->SetFlexibleDirection( wxHORIZONTAL );
m_LayerListFlexGridSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
m_CrtYdFrontName = new wxStaticText( m_LayersListPanel, ID_CRTYDFRONTNAME, _("CrtYd_Front_later"), wxDefaultPosition, wxDefaultSize, 0 );
m_CrtYdFrontName->Wrap( -1 );
m_LayerListFlexGridSizer->Add( m_CrtYdFrontName, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_CrtYdFrontPanel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
m_CrtYdFrontPanel->SetBackgroundColour( wxColour( 255, 233, 236 ) );
wxBoxSizer* bSizer611;
bSizer611 = new wxBoxSizer( wxVERTICAL );
m_CrtYdFrontCheckBox = new wxCheckBox( m_CrtYdFrontPanel, ID_CRTYDFRONTCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_CrtYdFrontCheckBox->SetToolTip( _("If you want a courtyard layer for the front side of the board") );
bSizer611->Add( m_CrtYdFrontCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
m_CrtYdFrontPanel->SetSizer( bSizer611 );
m_CrtYdFrontPanel->Layout();
bSizer611->Fit( m_CrtYdFrontPanel );
m_LayerListFlexGridSizer->Add( m_CrtYdFrontPanel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
m_CrtYdFrontStaticText = new wxStaticText( m_LayersListPanel, ID_CRTYDFRONTCHOICE, _("Off-board, testing"), wxDefaultPosition, wxDefaultSize, 0 );
m_CrtYdFrontStaticText->Wrap( -1 );
m_LayerListFlexGridSizer->Add( m_CrtYdFrontStaticText, 0, wxALL, 5 );
m_FabFrontName = new wxStaticText( m_LayersListPanel, ID_FABFRONTNAME, _("Fab_Front_later"), wxDefaultPosition, wxDefaultSize, 0 );
m_FabFrontName->Wrap( -1 );
m_LayerListFlexGridSizer->Add( m_FabFrontName, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
m_FabFrontPanel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
m_FabFrontPanel->SetBackgroundColour( wxColour( 236, 233, 236 ) );
wxBoxSizer* bSizer61;
bSizer61 = new wxBoxSizer( wxVERTICAL );
m_FabFrontCheckBox = new wxCheckBox( m_FabFrontPanel, ID_FABFRONTCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_FabFrontCheckBox->SetToolTip( _("If you want a fabrication layer for the front side of the board") );
bSizer61->Add( m_FabFrontCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
m_FabFrontPanel->SetSizer( bSizer61 );
m_FabFrontPanel->Layout();
bSizer61->Fit( m_FabFrontPanel );
m_LayerListFlexGridSizer->Add( m_FabFrontPanel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
m_FabFrontStaticText = new wxStaticText( m_LayersListPanel, ID_FABFRONTCHOICE, _("Off-board, manufacturing"), wxDefaultPosition, wxDefaultSize, 0 );
m_FabFrontStaticText->Wrap( -1 );
m_LayerListFlexGridSizer->Add( m_FabFrontStaticText, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
m_AdhesFrontName = new wxStaticText( m_LayersListPanel, ID_ADHESFRONTNAME, _("Adhes_Front_later"), wxDefaultPosition, wxDefaultSize, 0 );
m_AdhesFrontName->Wrap( -1 );
m_LayerListFlexGridSizer->Add( m_AdhesFrontName, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 );
m_LayerListFlexGridSizer->Add( m_AdhesFrontName, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_AdhesFrontPanel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
m_AdhesFrontPanel->SetBackgroundColour( wxColour( 236, 233, 236 ) );
......@@ -100,18 +150,18 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID
m_AdhesFrontPanel->SetSizer( bSizer6 );
m_AdhesFrontPanel->Layout();
bSizer6->Fit( m_AdhesFrontPanel );
m_LayerListFlexGridSizer->Add( m_AdhesFrontPanel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
m_LayerListFlexGridSizer->Add( m_AdhesFrontPanel, 1, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
m_AdhesFrontStaticText = new wxStaticText( m_LayersListPanel, ID_ADHESFRONTCHOICE, _("Off-board, manufacturing"), wxDefaultPosition, wxDefaultSize, 0 );
m_AdhesFrontStaticText->Wrap( -1 );
m_LayerListFlexGridSizer->Add( m_AdhesFrontStaticText, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 );
m_LayerListFlexGridSizer->Add( m_AdhesFrontStaticText, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_SoldPFrontName = new wxStaticText( m_LayersListPanel, ID_SOLDPFRONTNAME, _("SoldP_Front_later"), wxDefaultPosition, wxDefaultSize, 0 );
m_SoldPFrontName->Wrap( -1 );
m_LayerListFlexGridSizer->Add( m_SoldPFrontName, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 );
m_SoldPFrontPanel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
m_SoldPFrontPanel->SetBackgroundColour( wxColour( 236, 233, 236 ) );
m_SoldPFrontPanel->SetBackgroundColour( wxColour( 255, 253, 235 ) );
wxBoxSizer* bSizer7;
bSizer7 = new wxBoxSizer( wxVERTICAL );
......@@ -127,7 +177,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID
bSizer7->Fit( m_SoldPFrontPanel );
m_LayerListFlexGridSizer->Add( m_SoldPFrontPanel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
m_SoldPFrontStaticText = new wxStaticText( m_LayersListPanel, ID_SOLDPFRONTCHOICE, _("Off-board, manufacturing"), wxDefaultPosition, wxDefaultSize, 0 );
m_SoldPFrontStaticText = new wxStaticText( m_LayersListPanel, ID_SOLDPFRONTCHOICE, _("On-board, non-copper"), wxDefaultPosition, wxDefaultSize, 0 );
m_SoldPFrontStaticText->Wrap( -1 );
m_LayerListFlexGridSizer->Add( m_SoldPFrontStaticText, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 );
......@@ -1108,7 +1158,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID
m_LayerListFlexGridSizer->Add( m_SoldPBackName, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 );
m_SoldPBackPanel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
m_SoldPBackPanel->SetBackgroundColour( wxColour( 236, 233, 236 ) );
m_SoldPBackPanel->SetBackgroundColour( wxColour( 255, 253, 235 ) );
wxBoxSizer* bSizer26;
bSizer26 = new wxBoxSizer( wxVERTICAL );
......@@ -1124,7 +1174,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID
bSizer26->Fit( m_SoldPBackPanel );
m_LayerListFlexGridSizer->Add( m_SoldPBackPanel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
m_SoldPBackStaticText = new wxStaticText( m_LayersListPanel, ID_SOLDPBACKCHOICE, _("Off-board, manufacturing"), wxDefaultPosition, wxDefaultSize, 0 );
m_SoldPBackStaticText = new wxStaticText( m_LayersListPanel, ID_SOLDPBACKCHOICE, _("On-board, non-copper"), wxDefaultPosition, wxDefaultSize, 0 );
m_SoldPBackStaticText->Wrap( -1 );
m_LayerListFlexGridSizer->Add( m_SoldPBackStaticText, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 );
......@@ -1153,6 +1203,56 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID
m_AdhesBackStaticText->Wrap( -1 );
m_LayerListFlexGridSizer->Add( m_AdhesBackStaticText, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 );
m_FabBackName = new wxStaticText( m_LayersListPanel, ID_FABBACKNAME, _("Fab_Back_later"), wxDefaultPosition, wxDefaultSize, 0 );
m_FabBackName->Wrap( -1 );
m_LayerListFlexGridSizer->Add( m_FabBackName, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
m_FabBackPanel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
m_FabBackPanel->SetBackgroundColour( wxColour( 236, 233, 236 ) );
wxBoxSizer* bSizer281;
bSizer281 = new wxBoxSizer( wxVERTICAL );
m_FabBackCheckBox = new wxCheckBox( m_FabBackPanel, ID_FABBACKCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_FabBackCheckBox->SetToolTip( _("If you want a fabrication layer for the back side of the board") );
bSizer281->Add( m_FabBackCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
m_FabBackPanel->SetSizer( bSizer281 );
m_FabBackPanel->Layout();
bSizer281->Fit( m_FabBackPanel );
m_LayerListFlexGridSizer->Add( m_FabBackPanel, 1, wxEXPAND, 5 );
m_FabBackStaticText = new wxStaticText( m_LayersListPanel, ID_FABBACKCHOICE, _("Off-board, manufacturing"), wxDefaultPosition, wxDefaultSize, 0 );
m_FabBackStaticText->Wrap( -1 );
m_LayerListFlexGridSizer->Add( m_FabBackStaticText, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
m_CrtYdBackName = new wxStaticText( m_LayersListPanel, ID_CRTYDBACKNAME, _("CrtYd_Back_later"), wxDefaultPosition, wxDefaultSize, 0 );
m_CrtYdBackName->Wrap( -1 );
m_LayerListFlexGridSizer->Add( m_CrtYdBackName, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
m_CrtYdBackPanel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
m_CrtYdBackPanel->SetBackgroundColour( wxColour( 255, 233, 236 ) );
wxBoxSizer* bSizer6111;
bSizer6111 = new wxBoxSizer( wxVERTICAL );
m_CrtYdBackCheckBox = new wxCheckBox( m_CrtYdBackPanel, ID_CRTYDBACKCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_CrtYdBackCheckBox->SetToolTip( _("If you want a courtyard layer for the front side of the board") );
bSizer6111->Add( m_CrtYdBackCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
m_CrtYdBackPanel->SetSizer( bSizer6111 );
m_CrtYdBackPanel->Layout();
bSizer6111->Fit( m_CrtYdBackPanel );
m_LayerListFlexGridSizer->Add( m_CrtYdBackPanel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
m_CrtYdBackStaticText = new wxStaticText( m_LayersListPanel, ID_CRTYDBACKCHOICE, _("Off-board, testing"), wxDefaultPosition, wxDefaultSize, 0 );
m_CrtYdBackStaticText->Wrap( -1 );
m_LayerListFlexGridSizer->Add( m_CrtYdBackStaticText, 0, wxALL, 5 );
m_PCBEdgesName = new wxStaticText( m_LayersListPanel, ID_PCBEDGESNAME, _("PCB_Edges_later"), wxDefaultPosition, wxDefaultSize, 0 );
m_PCBEdgesName->Wrap( -1 );
m_LayerListFlexGridSizer->Add( m_PCBEdgesName, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 );
......@@ -1301,7 +1401,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID
m_LayersListPanel->SetSizer( m_LayerListFlexGridSizer );
m_LayersListPanel->Layout();
m_LayerListFlexGridSizer->Fit( m_LayersListPanel );
b_layersListSizer->Add( m_LayersListPanel, 1, wxALL|wxEXPAND, 5 );
b_layersListSizer->Add( m_LayersListPanel, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
bMainSizer->Add( b_layersListSizer, 1, wxEXPAND, 5 );
......@@ -1318,11 +1418,12 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID
this->SetSizer( bMainSizer );
this->Layout();
bMainSizer->Fit( this );
// Connect Events
m_PresetsChoice->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnPresetsChoice ), NULL, this );
m_CopperLayersChoice->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCopperLayersChoice ), NULL, this );
m_CrtYdFrontCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
m_FabFrontCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
m_AdhesFrontCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
m_SoldPFrontCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
m_SilkSFrontCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
......@@ -1363,6 +1464,8 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID
m_SilkSBackCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
m_SoldPBackCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
m_AdhesBackCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
m_FabBackCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
m_CrtYdBackCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
m_PCBEdgesCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
m_MarginCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
m_Eco1CheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
......@@ -1378,6 +1481,8 @@ DIALOG_LAYERS_SETUP_BASE::~DIALOG_LAYERS_SETUP_BASE()
// Disconnect Events
m_PresetsChoice->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnPresetsChoice ), NULL, this );
m_CopperLayersChoice->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCopperLayersChoice ), NULL, this );
m_CrtYdFrontCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
m_FabFrontCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
m_AdhesFrontCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
m_SoldPFrontCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
m_SilkSFrontCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
......@@ -1418,6 +1523,8 @@ DIALOG_LAYERS_SETUP_BASE::~DIALOG_LAYERS_SETUP_BASE()
m_SilkSBackCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
m_SoldPBackCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
m_AdhesBackCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
m_FabBackCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
m_CrtYdBackCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
m_PCBEdgesCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
m_MarginCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
m_Eco1CheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
......
pcbnew/dialogs/dialog_layers_setup_base.fbp
View file @ aa9de21c
This source diff could not be displayed because it is too large. You can view the blob instead.
pcbnew/dialogs/dialog_layers_setup_base.h
View file @ aa9de21c
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Jun 6 2014)
// C++ code generated with wxFormBuilder (version Nov 6 2013)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
......@@ -31,142 +31,154 @@ class DIALOG_SHIM;
///////////////////////////////////////////////////////////////////////////
#define ID_ADHESFRONTNAME 1000
#define ID_ADHESFRONTCHECKBOX 1001
#define ID_ADHESFRONTCHOICE 1002
#define ID_SOLDPFRONTNAME 1003
#define ID_SOLDPFRONTCHECKBOX 1004
#define ID_SOLDPFRONTCHOICE 1005
#define ID_SILKSFRONTNAME 1006
#define ID_SILKSFRONTCHECKBOX 1007
#define ID_SILKSFRONTCHOICE 1008
#define ID_MASKFRONTNAME 1009
#define ID_MASKFRONTCHECKBOX 1010
#define ID_MASKFRONTCHOICE 1011
#define ID_FRONTNAME 1012
#define ID_FRONTCHECKBOX 1013
#define ID_FRONTCHOICE 1014
#define ID_IN1NAME 1015
#define ID_IN1CHECKBOX 1016
#define ID_IN1CHOICE 1017
#define ID_IN2NAME 1018
#define ID_IN2CHECKBOX 1019
#define ID_IN2CHOICE 1020
#define ID_IN3NAME 1021
#define ID_IN3CHECKBOX 1022
#define ID_IN3CHOICE 1023
#define ID_IN4NAME 1024
#define ID_IN4CHECKBOX 1025
#define ID_IN4CHOICE 1026
#define ID_IN5NAME 1027
#define ID_IN5CHECKBOX 1028
#define ID_IN5CHOICE 1029
#define ID_IN6NAME 1030
#define ID_IN6CHECKBOX 1031
#define ID_IN6CHOICE 1032
#define ID_IN7NAME 1033
#define ID_IN7CHECKBOX 1034
#define ID_IN7CHOICE 1035
#define ID_IN8NAME 1036
#define ID_IN8CHECKBOX 1037
#define ID_IN8CHOICE 1038
#define ID_IN9NAME 1039
#define ID_IN9CHECKBOX 1040
#define ID_IN9CHOICE 1041
#define ID_IN10NAME 1042
#define ID_IN10CHECKBOX 1043
#define ID_IN10CHOICE 1044
#define ID_IN11NAME 1045
#define ID_IN11CHECKBOX 1046
#define ID_IN11CHOICE 1047
#define ID_IN12NAME 1048
#define ID_IN12CHECKBOX 1049
#define ID_IN12CHOICE 1050
#define ID_IN13NAME 1051
#define ID_IN13CHECKBOX 1052
#define ID_IN13CHOICE 1053
#define ID_IN14NAME 1054
#define ID_IN14CHECKBOX 1055
#define ID_IN14CHOICE 1056
#define ID_IN15NAME 1057
#define ID_IN15CHECKBOX 1058
#define ID_IN15CHOICE 1059
#define ID_IN16NAME 1060
#define ID_IN16CHECKBOX 1061
#define ID_IN16CHOICE 1062
#define ID_IN17NAME 1063
#define ID_IN17CHECKBOX 1064
#define ID_IN17CHOICE 1065
#define ID_IN18NAME 1066
#define ID_IN18CHECKBOX 1067
#define ID_IN18CHOICE 1068
#define ID_IN19NAME 1069
#define ID_IN19CHECKBOX 1070
#define ID_IN19CHOICE 1071
#define ID_IN20NAME 1072
#define ID_IN20CHECKBOX 1073
#define ID_IN20CHOICE 1074
#define ID_IN21NAME 1075
#define ID_IN21CHECKBOX 1076
#define ID_IN21CHOICE 1077
#define ID_IN22NAME 1078
#define ID_IN22CHECKBOX 1079
#define ID_IN22CHOICE 1080
#define ID_IN23NAME 1081
#define ID_IN23CHECKBOX 1082
#define ID_IN24NAME 1083
#define ID_IN24CHECKBOX 1084
#define ID_IN24CHOICE 1085
#define ID_IN25NAME 1086
#define ID_IN25CHECKBOX 1087
#define ID_IN25CHOICE 1088
#define ID_IN26NAME 1089
#define ID_IN26CHECKBOX 1090
#define ID_IN26CHOICE 1091
#define ID_IN27NAME 1092
#define ID_IN27CHECKBOX 1093
#define ID_IN27CHOICE 1094
#define ID_IN28NAME 1095
#define ID_IN28CHECKBOX 1096
#define ID_IN28CHOICE 1097
#define ID_IN29NAME 1098
#define ID_IN29CHECKBOX 1099
#define ID_IN29CHOICE 1100
#define ID_IN30NAME 1101
#define ID_IN30CHECKBOX 1102
#define ID_IN30CHOICE 1103
#define ID_BACKNAME 1104
#define ID_BACKCHECKBOX 1105
#define ID_BACKCHOICE 1106
#define ID_MASKBACKNAME 1107
#define ID_MASKBACKCHECKBOX 1108
#define ID_MASKBACKCHOICE 1109
#define ID_SILKSBACKNAME 1110
#define ID_SILKSBACKCHECKBOX 1111
#define ID_SILKSBACKCHOICE 1112
#define ID_SOLDPBACKNAME 1113
#define ID_SOLDPBACKCHECKBOX 1114
#define ID_SOLDPBACKCHOICE 1115
#define ID_ADHESBACKNAME 1116
#define ID_ADHESBACKCHECKBOX 1117
#define ID_ADHESBACKCHOICE 1118
#define ID_PCBEDGESNAME 1119
#define ID_PCBEDGESCHECKBOX 1120
#define ID_PCBEDGESCHOICE 1121
#define ID_MARGINNAME 1122
#define ID_MARGINCHECKBOX 1123
#define ID_ECO2CHOICE 1124
#define ID_ECO2NAME 1125
#define ID_ECO2CHECKBOX 1126
#define ID_ECO1NAME 1127
#define ID_ECO1CHECKBOX 1128
#define ID_ECO1CHOICE 1129
#define ID_COMMENTSNAME 1130
#define ID_COMMENTSCHECKBOX 1131
#define ID_COMMENTSCHOICE 1132
#define ID_DRAWINGSNAME 1133
#define ID_DRAWINGSCHECKBOX 1134
#define ID_DRAWINGSCHOICE 1135
#define ID_CRTYDFRONTNAME 1000
#define ID_CRTYDFRONTCHECKBOX 1001
#define ID_CRTYDFRONTCHOICE 1002
#define ID_FABFRONTNAME 1003
#define ID_FABFRONTCHECKBOX 1004
#define ID_FABFRONTCHOICE 1005
#define ID_ADHESFRONTNAME 1006
#define ID_ADHESFRONTCHECKBOX 1007
#define ID_ADHESFRONTCHOICE 1008
#define ID_SOLDPFRONTNAME 1009
#define ID_SOLDPFRONTCHECKBOX 1010
#define ID_SOLDPFRONTCHOICE 1011
#define ID_SILKSFRONTNAME 1012
#define ID_SILKSFRONTCHECKBOX 1013
#define ID_SILKSFRONTCHOICE 1014
#define ID_MASKFRONTNAME 1015
#define ID_MASKFRONTCHECKBOX 1016
#define ID_MASKFRONTCHOICE 1017
#define ID_FRONTNAME 1018
#define ID_FRONTCHECKBOX 1019
#define ID_FRONTCHOICE 1020
#define ID_IN1NAME 1021
#define ID_IN1CHECKBOX 1022
#define ID_IN1CHOICE 1023
#define ID_IN2NAME 1024
#define ID_IN2CHECKBOX 1025
#define ID_IN2CHOICE 1026
#define ID_IN3NAME 1027
#define ID_IN3CHECKBOX 1028
#define ID_IN3CHOICE 1029
#define ID_IN4NAME 1030
#define ID_IN4CHECKBOX 1031
#define ID_IN4CHOICE 1032
#define ID_IN5NAME 1033
#define ID_IN5CHECKBOX 1034
#define ID_IN5CHOICE 1035
#define ID_IN6NAME 1036
#define ID_IN6CHECKBOX 1037
#define ID_IN6CHOICE 1038
#define ID_IN7NAME 1039
#define ID_IN7CHECKBOX 1040
#define ID_IN7CHOICE 1041
#define ID_IN8NAME 1042
#define ID_IN8CHECKBOX 1043
#define ID_IN8CHOICE 1044
#define ID_IN9NAME 1045
#define ID_IN9CHECKBOX 1046
#define ID_IN9CHOICE 1047
#define ID_IN10NAME 1048
#define ID_IN10CHECKBOX 1049
#define ID_IN10CHOICE 1050
#define ID_IN11NAME 1051
#define ID_IN11CHECKBOX 1052
#define ID_IN11CHOICE 1053
#define ID_IN12NAME 1054
#define ID_IN12CHECKBOX 1055
#define ID_IN12CHOICE 1056
#define ID_IN13NAME 1057
#define ID_IN13CHECKBOX 1058
#define ID_IN13CHOICE 1059
#define ID_IN14NAME 1060
#define ID_IN14CHECKBOX 1061
#define ID_IN14CHOICE 1062
#define ID_IN15NAME 1063
#define ID_IN15CHECKBOX 1064
#define ID_IN15CHOICE 1065
#define ID_IN16NAME 1066
#define ID_IN16CHECKBOX 1067
#define ID_IN16CHOICE 1068
#define ID_IN17NAME 1069
#define ID_IN17CHECKBOX 1070
#define ID_IN17CHOICE 1071
#define ID_IN18NAME 1072
#define ID_IN18CHECKBOX 1073
#define ID_IN18CHOICE 1074
#define ID_IN19NAME 1075
#define ID_IN19CHECKBOX 1076
#define ID_IN19CHOICE 1077
#define ID_IN20NAME 1078
#define ID_IN20CHECKBOX 1079
#define ID_IN20CHOICE 1080
#define ID_IN21NAME 1081
#define ID_IN21CHECKBOX 1082
#define ID_IN21CHOICE 1083
#define ID_IN22NAME 1084
#define ID_IN22CHECKBOX 1085
#define ID_IN22CHOICE 1086
#define ID_IN23NAME 1087
#define ID_IN23CHECKBOX 1088
#define ID_IN24NAME 1089
#define ID_IN24CHECKBOX 1090
#define ID_IN24CHOICE 1091
#define ID_IN25NAME 1092
#define ID_IN25CHECKBOX 1093
#define ID_IN25CHOICE 1094
#define ID_IN26NAME 1095
#define ID_IN26CHECKBOX 1096
#define ID_IN26CHOICE 1097
#define ID_IN27NAME 1098
#define ID_IN27CHECKBOX 1099
#define ID_IN27CHOICE 1100
#define ID_IN28NAME 1101
#define ID_IN28CHECKBOX 1102
#define ID_IN28CHOICE 1103
#define ID_IN29NAME 1104
#define ID_IN29CHECKBOX 1105
#define ID_IN29CHOICE 1106
#define ID_IN30NAME 1107
#define ID_IN30CHECKBOX 1108
#define ID_IN30CHOICE 1109
#define ID_BACKNAME 1110
#define ID_BACKCHECKBOX 1111
#define ID_BACKCHOICE 1112
#define ID_MASKBACKNAME 1113
#define ID_MASKBACKCHECKBOX 1114
#define ID_MASKBACKCHOICE 1115
#define ID_SILKSBACKNAME 1116
#define ID_SILKSBACKCHECKBOX 1117
#define ID_SILKSBACKCHOICE 1118
#define ID_SOLDPBACKNAME 1119
#define ID_SOLDPBACKCHECKBOX 1120
#define ID_SOLDPBACKCHOICE 1121
#define ID_ADHESBACKNAME 1122
#define ID_ADHESBACKCHECKBOX 1123
#define ID_ADHESBACKCHOICE 1124
#define ID_FABBACKNAME 1125
#define ID_FABBACKCHECKBOX 1126
#define ID_FABBACKCHOICE 1127
#define ID_CRTYDBACKNAME 1128
#define ID_CRTYDBACKCHECKBOX 1129
#define ID_CRTYDBACKCHOICE 1130
#define ID_PCBEDGESNAME 1131
#define ID_PCBEDGESCHECKBOX 1132
#define ID_PCBEDGESCHOICE 1133
#define ID_MARGINNAME 1134
#define ID_MARGINCHECKBOX 1135
#define ID_ECO2CHOICE 1136
#define ID_ECO2NAME 1137
#define ID_ECO2CHECKBOX 1138
#define ID_ECO1NAME 1139
#define ID_ECO1CHECKBOX 1140
#define ID_ECO1CHOICE 1141
#define ID_COMMENTSNAME 1142
#define ID_COMMENTSCHECKBOX 1143
#define ID_COMMENTSCHOICE 1144
#define ID_DRAWINGSNAME 1145
#define ID_DRAWINGSCHECKBOX 1146
#define ID_DRAWINGSCHOICE 1147
///////////////////////////////////////////////////////////////////////////////
/// Class DIALOG_LAYERS_SETUP_BASE
......@@ -184,6 +196,14 @@ class DIALOG_LAYERS_SETUP_BASE : public DIALOG_SHIM
wxPanel* m_TitlePanel;
wxScrolledWindow* m_LayersListPanel;
wxFlexGridSizer* m_LayerListFlexGridSizer;
wxStaticText* m_CrtYdFrontName;
wxPanel* m_CrtYdFrontPanel;
wxCheckBox* m_CrtYdFrontCheckBox;
wxStaticText* m_CrtYdFrontStaticText;
wxStaticText* m_FabFrontName;
wxPanel* m_FabFrontPanel;
wxCheckBox* m_FabFrontCheckBox;
wxStaticText* m_FabFrontStaticText;
wxStaticText* m_AdhesFrontName;
wxPanel* m_AdhesFrontPanel;
wxCheckBox* m_AdhesFrontCheckBox;
......@@ -344,6 +364,14 @@ class DIALOG_LAYERS_SETUP_BASE : public DIALOG_SHIM
wxPanel* m_AdhesBackPanel;
wxCheckBox* m_AdhesBackCheckBox;
wxStaticText* m_AdhesBackStaticText;
wxStaticText* m_FabBackName;
wxPanel* m_FabBackPanel;
wxCheckBox* m_FabBackCheckBox;
wxStaticText* m_FabBackStaticText;
wxStaticText* m_CrtYdBackName;
wxPanel* m_CrtYdBackPanel;
wxCheckBox* m_CrtYdBackCheckBox;
wxStaticText* m_CrtYdBackStaticText;
wxStaticText* m_PCBEdgesName;
wxPanel* m_PCBEdgesPanel;
wxCheckBox* m_PCBEdgesCheckBox;
......@@ -383,7 +411,7 @@ class DIALOG_LAYERS_SETUP_BASE : public DIALOG_SHIM
public:
DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Layer Setup"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Layer Setup"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 550,1580 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~DIALOG_LAYERS_SETUP_BASE();
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment