diff --git a/pcbnew/dialogs/panel_setup_layers.cpp b/pcbnew/dialogs/panel_setup_layers.cpp index 8e0e61d248..28f440efda 100644 --- a/pcbnew/dialogs/panel_setup_layers.cpp +++ b/pcbnew/dialogs/panel_setup_layers.cpp @@ -133,12 +133,13 @@ PANEL_SETUP_LAYERS::PANEL_SETUP_LAYERS( PAGED_DIALOG* aParent, PCB_EDIT_FRAME* a PANEL_SETUP_LAYERS_CTLs PANEL_SETUP_LAYERS::getCTLs( LAYER_NUM aLayerNumber ) { -#define RETURN_COPPER( x ) return PANEL_SETUP_LAYERS_CTLs( x##Name, x##CheckBox, x##Choice ) -#define RETURN_AUX( x ) return PANEL_SETUP_LAYERS_CTLs( x##Name, x##CheckBox, x##StaticText ) +#define RETURN_COPPER( x ) return PANEL_SETUP_LAYERS_CTLs( x##Name, x##CheckBox, x##Choice ) +#define RETURN_AUX( x ) return PANEL_SETUP_LAYERS_CTLs( x##Name, x##CheckBox, x##StaticText ) +#define RETURN_MANDATORY( x ) return PANEL_SETUP_LAYERS_CTLs( x##Name, nullptr, x##StaticText ) switch( aLayerNumber ) { - case F_CrtYd: RETURN_AUX( m_CrtYdFront ); + case F_CrtYd: RETURN_MANDATORY( m_CrtYdFront ); case F_Fab: RETURN_AUX( m_FabFront ); case F_Adhes: RETURN_AUX( m_AdhesFront ); case F_Paste: RETURN_AUX( m_SoldPFront ); @@ -184,10 +185,10 @@ PANEL_SETUP_LAYERS_CTLs PANEL_SETUP_LAYERS::getCTLs( LAYER_NUM aLayerNumber ) case B_Paste: RETURN_AUX( m_SoldPBack ); case B_Adhes: RETURN_AUX( m_AdhesBack ); case B_Fab: RETURN_AUX( m_FabBack ); - case B_CrtYd: RETURN_AUX( m_CrtYdBack ); + case B_CrtYd: RETURN_MANDATORY( m_CrtYdBack ); - case Edge_Cuts: RETURN_AUX( m_PCBEdges ); - case Margin: RETURN_AUX( m_Margin ); + case Edge_Cuts: RETURN_MANDATORY( m_PCBEdges ); + case Margin: RETURN_MANDATORY( m_Margin ); case Eco2_User: RETURN_AUX( m_Eco2 ); case Eco1_User: RETURN_AUX( m_Eco1 ); case Cmts_User: RETURN_AUX( m_Comments ); @@ -272,6 +273,9 @@ void PANEL_SETUP_LAYERS::setUserDefinedLayerCheckBoxes() // This code hides inactive copper layers, or redisplays hidden layers which are now needed. PANEL_SETUP_LAYERS_CTLs ctl = getCTLs( layer ); + // All user-defined layers should have a checkbox + wxASSERT( ctl.checkbox ); + ctl.name->Show( state ); ctl.checkbox->Show( state ); ctl.choice->Show( state ); @@ -344,7 +348,7 @@ LSET PANEL_SETUP_LAYERS::GetUILayerMask() PCB_LAYER_ID layer = *seq; wxCheckBox* ctl = getCheckBox( layer ); - if( ctl->GetValue() ) + if( !ctl || ctl->GetValue() ) layerMaskResult.set( layer ); } @@ -356,6 +360,9 @@ void PANEL_SETUP_LAYERS::setLayerCheckBox( LAYER_NUM aLayer, bool isChecked ) { PANEL_SETUP_LAYERS_CTLs ctl = getCTLs( aLayer ); + if( !ctl.checkbox ) + return; + ctl.checkbox->SetValue( isChecked ); } @@ -383,6 +390,9 @@ void PANEL_SETUP_LAYERS::setCopperLayerCheckBoxes( int copperCount ) // This code hides inactive copper layers, or redisplays hidden layers which are now needed. PANEL_SETUP_LAYERS_CTLs ctl = getCTLs( layer ); + // Inner layers should have a checkbox + wxASSERT( ctl.checkbox ); + ctl.name->Show( state ); ctl.checkbox->Show( state ); ctl.choice->Show( state ); @@ -424,19 +434,6 @@ void PANEL_SETUP_LAYERS::DenyChangeCheckBox( wxCommandEvent& event ) return; } } - - for( int layer : { F_CrtYd, B_CrtYd, Edge_Cuts, Margin } ) - { - wxCheckBox* mandatory = getCheckBox( layer ); - - if( source == mandatory ) - { - msg.Printf( _( "The %s layer is mandatory." ), GetLayerName( layer ) ); - DisplayError( this, msg ); - mandatory->SetValue( true ); - return; - } - } } @@ -840,6 +837,9 @@ void PANEL_SETUP_LAYERS::addUserDefinedLayer( wxCommandEvent& aEvent ) PANEL_SETUP_LAYERS_CTLs ctl = getCTLs( *seq ); + // All user-defined layers should have a checkbox + wxASSERT( ctl.checkbox ); + wxTextCtrl* textCtrl = dynamic_cast( ctl.name ); wxCHECK( textCtrl, /* void */ ); diff --git a/pcbnew/dialogs/panel_setup_layers_base.cpp b/pcbnew/dialogs/panel_setup_layers_base.cpp index 856a7b8362..cecc930308 100644 --- a/pcbnew/dialogs/panel_setup_layers_base.cpp +++ b/pcbnew/dialogs/panel_setup_layers_base.cpp @@ -40,10 +40,8 @@ PANEL_SETUP_LAYERS_BASE::PANEL_SETUP_LAYERS_BASE( wxWindow* parent, wxWindowID i m_LayerListFlexGridSizer->SetFlexibleDirection( wxHORIZONTAL ); m_LayerListFlexGridSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_CrtYdFrontCheckBox = new wxCheckBox( m_LayersListPanel, ID_CRTYDFRONTCHECKBOX, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), 0 ); - m_CrtYdFrontCheckBox->SetToolTip( _("If you want a courtyard layer for the front side of the board") ); - m_LayerListFlexGridSizer->Add( m_CrtYdFrontCheckBox, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxLEFT, 5 ); + m_LayerListFlexGridSizer->Add( 0, 0, 1, wxEXPAND, 5 ); m_CrtYdFrontName = new wxTextCtrl( m_LayersListPanel, wxID_ANY, _("CrtYd_Front"), wxDefaultPosition, wxDefaultSize, 0 ); m_CrtYdFrontName->SetMinSize( wxSize( 160,-1 ) ); @@ -632,10 +630,8 @@ PANEL_SETUP_LAYERS_BASE::PANEL_SETUP_LAYERS_BASE( wxWindow* parent, wxWindowID i m_FabBackStaticText->Wrap( -1 ); m_LayerListFlexGridSizer->Add( m_FabBackStaticText, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - m_CrtYdBackCheckBox = new wxCheckBox( m_LayersListPanel, ID_CRTYDBACKCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_CrtYdBackCheckBox->SetToolTip( _("If you want a courtyard layer for the back side of the board") ); - m_LayerListFlexGridSizer->Add( m_CrtYdBackCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + m_LayerListFlexGridSizer->Add( 0, 0, 1, wxEXPAND, 5 ); m_CrtYdBackName = new wxTextCtrl( m_LayersListPanel, wxID_ANY, _("CrtYd_Back"), wxDefaultPosition, wxDefaultSize, 0 ); m_LayerListFlexGridSizer->Add( m_CrtYdBackName, 0, wxEXPAND|wxRIGHT, 5 ); @@ -644,10 +640,8 @@ PANEL_SETUP_LAYERS_BASE::PANEL_SETUP_LAYERS_BASE( wxWindow* parent, wxWindowID i m_CrtYdBackStaticText->Wrap( -1 ); m_LayerListFlexGridSizer->Add( m_CrtYdBackStaticText, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); - m_PCBEdgesCheckBox = new wxCheckBox( m_LayersListPanel, ID_PCBEDGESCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_PCBEdgesCheckBox->SetToolTip( _("If you want a board perimeter layer") ); - m_LayerListFlexGridSizer->Add( m_PCBEdgesCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + m_LayerListFlexGridSizer->Add( 0, 0, 1, wxEXPAND, 5 ); m_PCBEdgesName = new wxTextCtrl( m_LayersListPanel, wxID_ANY, _("Pcb_Edges"), wxDefaultPosition, wxDefaultSize, 0 ); m_LayerListFlexGridSizer->Add( m_PCBEdgesName, 0, wxEXPAND|wxRIGHT, 5 ); @@ -656,8 +650,8 @@ PANEL_SETUP_LAYERS_BASE::PANEL_SETUP_LAYERS_BASE( wxWindow* parent, wxWindowID i m_PCBEdgesStaticText->Wrap( -1 ); m_LayerListFlexGridSizer->Add( m_PCBEdgesStaticText, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - m_MarginCheckBox = new wxCheckBox( m_LayersListPanel, ID_MARGINCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_LayerListFlexGridSizer->Add( m_MarginCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + + m_LayerListFlexGridSizer->Add( 0, 0, 1, wxEXPAND, 5 ); m_MarginName = new wxTextCtrl( m_LayersListPanel, wxID_ANY, _("Margin"), wxDefaultPosition, wxDefaultSize, 0 ); m_LayerListFlexGridSizer->Add( m_MarginName, 0, wxEXPAND|wxRIGHT, 5 ); @@ -816,7 +810,6 @@ PANEL_SETUP_LAYERS_BASE::PANEL_SETUP_LAYERS_BASE( wxWindow* parent, wxWindowID i // Connect Events m_addUserDefinedLayerButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::addUserDefinedLayer ), NULL, this ); - m_CrtYdFrontCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::DenyChangeCheckBox ), NULL, this ); m_FabFrontCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::OnCheckBox ), NULL, this ); m_AdhesFrontCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::OnCheckBox ), NULL, this ); m_SoldPFrontCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::OnCheckBox ), NULL, this ); @@ -859,9 +852,6 @@ PANEL_SETUP_LAYERS_BASE::PANEL_SETUP_LAYERS_BASE( wxWindow* parent, wxWindowID i m_SoldPBackCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::OnCheckBox ), NULL, this ); m_AdhesBackCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::OnCheckBox ), NULL, this ); m_FabBackCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::OnCheckBox ), NULL, this ); - m_CrtYdBackCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::DenyChangeCheckBox ), NULL, this ); - m_PCBEdgesCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::DenyChangeCheckBox ), NULL, this ); - m_MarginCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::DenyChangeCheckBox ), NULL, this ); m_Eco1CheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::OnCheckBox ), NULL, this ); m_Eco2CheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::OnCheckBox ), NULL, this ); m_CommentsCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::OnCheckBox ), NULL, this ); @@ -881,7 +871,6 @@ PANEL_SETUP_LAYERS_BASE::~PANEL_SETUP_LAYERS_BASE() { // Disconnect Events m_addUserDefinedLayerButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::addUserDefinedLayer ), NULL, this ); - m_CrtYdFrontCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::DenyChangeCheckBox ), NULL, this ); m_FabFrontCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::OnCheckBox ), NULL, this ); m_AdhesFrontCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::OnCheckBox ), NULL, this ); m_SoldPFrontCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::OnCheckBox ), NULL, this ); @@ -924,9 +913,6 @@ PANEL_SETUP_LAYERS_BASE::~PANEL_SETUP_LAYERS_BASE() m_SoldPBackCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::OnCheckBox ), NULL, this ); m_AdhesBackCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::OnCheckBox ), NULL, this ); m_FabBackCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::OnCheckBox ), NULL, this ); - m_CrtYdBackCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::DenyChangeCheckBox ), NULL, this ); - m_PCBEdgesCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::DenyChangeCheckBox ), NULL, this ); - m_MarginCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::DenyChangeCheckBox ), NULL, this ); m_Eco1CheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::OnCheckBox ), NULL, this ); m_Eco2CheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::OnCheckBox ), NULL, this ); m_CommentsCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::OnCheckBox ), NULL, this ); diff --git a/pcbnew/dialogs/panel_setup_layers_base.fbp b/pcbnew/dialogs/panel_setup_layers_base.fbp index 7455dee542..82a6607aa5 100644 --- a/pcbnew/dialogs/panel_setup_layers_base.fbp +++ b/pcbnew/dialogs/panel_setup_layers_base.fbp @@ -284,69 +284,14 @@ protected 0 2 - + 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_CRTYDFRONTCHECKBOX - - - 0 - - - 0 - -1,-1 - 1 - m_CrtYdFrontCheckBox - 1 - - + wxEXPAND + 1 + + 0 protected - 1 - - Resizable - 1 - -1,-1 - - - 0 - If you want a courtyard layer for the front side of the board - - wxFILTER_NONE - wxDefaultValidator - - - - - DenyChangeCheckBox + 0 @@ -8550,69 +8495,14 @@ -1 - + 5 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_CRTYDBACKCHECKBOX - - - 0 - - - 0 - - 1 - m_CrtYdBackCheckBox - 1 - - + wxEXPAND + 1 + + 0 protected - 1 - - Resizable - 1 - - - - 0 - If you want a courtyard layer for the back side of the board - - wxFILTER_NONE - wxDefaultValidator - - - - - DenyChangeCheckBox + 0 @@ -8740,69 +8630,14 @@ -1 - + 5 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_PCBEDGESCHECKBOX - - - 0 - - - 0 - - 1 - m_PCBEdgesCheckBox - 1 - - + wxEXPAND + 1 + + 0 protected - 1 - - Resizable - 1 - - - - 0 - If you want a board perimeter layer - - wxFILTER_NONE - wxDefaultValidator - - - - - DenyChangeCheckBox + 0 @@ -8930,69 +8765,14 @@ -1 - + 5 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_MARGINCHECKBOX - - - 0 - - - 0 - - 1 - m_MarginCheckBox - 1 - - + wxEXPAND + 1 + + 0 protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - DenyChangeCheckBox + 0 diff --git a/pcbnew/dialogs/panel_setup_layers_base.h b/pcbnew/dialogs/panel_setup_layers_base.h index d3690aa7ba..56be8157ec 100644 --- a/pcbnew/dialogs/panel_setup_layers_base.h +++ b/pcbnew/dialogs/panel_setup_layers_base.h @@ -21,145 +21,141 @@ #include #include #include -#include #include #include +#include #include #include #include /////////////////////////////////////////////////////////////////////////// -#define ID_CRTYDFRONTCHECKBOX 1000 -#define ID_CRTYDFRONTCHOICE 1001 -#define ID_FABFRONTCHECKBOX 1002 -#define ID_FABFRONTCHOICE 1003 -#define ID_ADHESFRONTCHECKBOX 1004 -#define ID_ADHESFRONTCHOICE 1005 -#define ID_SOLDPFRONTCHECKBOX 1006 -#define ID_SOLDPFRONTCHOICE 1007 -#define ID_SILKSFRONTCHECKBOX 1008 -#define ID_SILKSFRONTCHOICE 1009 -#define ID_MASKFRONTCHECKBOX 1010 -#define ID_MASKFRONTCHOICE 1011 -#define ID_FRONTCHECKBOX 1012 -#define ID_FRONTNAME 1013 -#define ID_FRONTCHOICE 1014 -#define ID_IN1CHECKBOX 1015 -#define ID_IN1NAME 1016 -#define ID_IN1CHOICE 1017 -#define ID_IN2CHECKBOX 1018 -#define ID_IN2NAME 1019 -#define ID_IN2CHOICE 1020 -#define ID_IN3CHECKBOX 1021 -#define ID_IN3NAME 1022 -#define ID_IN3CHOICE 1023 -#define ID_IN4CHECKBOX 1024 -#define ID_IN4NAME 1025 -#define ID_IN4CHOICE 1026 -#define ID_IN5CHECKBOX 1027 -#define ID_IN5NAME 1028 -#define ID_IN5CHOICE 1029 -#define ID_IN6CHECKBOX 1030 -#define ID_IN6NAME 1031 -#define ID_IN6CHOICE 1032 -#define ID_IN7CHECKBOX 1033 -#define ID_IN7NAME 1034 -#define ID_IN7CHOICE 1035 -#define ID_IN8CHECKBOX 1036 -#define ID_IN8NAME 1037 -#define ID_IN8CHOICE 1038 -#define ID_IN9CHECKBOX 1039 -#define ID_IN9NAME 1040 -#define ID_IN9CHOICE 1041 -#define ID_IN10CHECKBOX 1042 -#define ID_IN10NAME 1043 -#define ID_IN10CHOICE 1044 -#define ID_IN11CHECKBOX 1045 -#define ID_IN11NAME 1046 -#define ID_IN11CHOICE 1047 -#define ID_IN12CHECKBOX 1048 -#define ID_IN12NAME 1049 -#define ID_IN12CHOICE 1050 -#define ID_IN13CHECKBOX 1051 -#define ID_IN13NAME 1052 -#define ID_IN13CHOICE 1053 -#define ID_IN14CHECKBOX 1054 -#define ID_IN14NAME 1055 -#define ID_IN14CHOICE 1056 -#define ID_IN15CHECKBOX 1057 -#define ID_IN15NAME 1058 -#define ID_IN15CHOICE 1059 -#define ID_IN16CHECKBOX 1060 -#define ID_IN16NAME 1061 -#define ID_IN16CHOICE 1062 -#define ID_IN17CHECKBOX 1063 -#define ID_IN17NAME 1064 -#define ID_IN17CHOICE 1065 -#define ID_IN18CHECKBOX 1066 -#define ID_IN18NAME 1067 -#define ID_IN18CHOICE 1068 -#define ID_IN19CHECKBOX 1069 -#define ID_IN19NAME 1070 -#define ID_IN19CHOICE 1071 -#define ID_IN20CHECKBOX 1072 -#define ID_IN20NAME 1073 -#define ID_IN20CHOICE 1074 -#define ID_IN21CHECKBOX 1075 -#define ID_IN21NAME 1076 -#define ID_IN21CHOICE 1077 -#define ID_IN22CHECKBOX 1078 -#define ID_IN22NAME 1079 -#define ID_IN22CHOICE 1080 -#define ID_IN23CHECKBOX 1081 -#define ID_IN23NAME 1082 -#define ID_IN24CHECKBOX 1083 -#define ID_IN24NAME 1084 -#define ID_IN24CHOICE 1085 -#define ID_IN25CHECKBOX 1086 -#define ID_IN25NAME 1087 -#define ID_IN25CHOICE 1088 -#define ID_IN26CHECKBOX 1089 -#define ID_IN26NAME 1090 -#define ID_IN26CHOICE 1091 -#define ID_IN27CHECKBOX 1092 -#define ID_IN27NAME 1093 -#define ID_IN27CHOICE 1094 -#define ID_IN28CHECKBOX 1095 -#define ID_IN28NAME 1096 -#define ID_IN28CHOICE 1097 -#define ID_IN29CHECKBOX 1098 -#define ID_IN29NAME 1099 -#define ID_IN29CHOICE 1100 -#define ID_IN30CHECKBOX 1101 -#define ID_IN30NAME 1102 -#define ID_IN30CHOICE 1103 -#define ID_BACKCHECKBOX 1104 -#define ID_BACKNAME 1105 -#define ID_BACKCHOICE 1106 -#define ID_MASKBACKCHECKBOX 1107 -#define ID_MASKBACKCHOICE 1108 -#define ID_SILKSBACKCHECKBOX 1109 -#define ID_SILKSBACKCHOICE 1110 -#define ID_SOLDPBACKCHECKBOX 1111 -#define ID_SOLDPBACKCHOICE 1112 -#define ID_ADHESBACKCHECKBOX 1113 -#define ID_ADHESBACKCHOICE 1114 -#define ID_FABBACKCHECKBOX 1115 -#define ID_FABBACKCHOICE 1116 -#define ID_CRTYDBACKCHECKBOX 1117 -#define ID_CRTYDBACKCHOICE 1118 -#define ID_PCBEDGESCHECKBOX 1119 -#define ID_PCBEDGESCHOICE 1120 -#define ID_MARGINCHECKBOX 1121 -#define ID_ECO2CHOICE 1122 -#define ID_ECO2CHECKBOX 1123 -#define ID_ECO1CHECKBOX 1124 -#define ID_ECO1CHOICE 1125 -#define ID_COMMENTSCHECKBOX 1126 -#define ID_COMMENTSCHOICE 1127 -#define ID_DRAWINGSCHECKBOX 1128 -#define ID_DRAWINGSCHOICE 1129 +#define ID_CRTYDFRONTCHOICE 1000 +#define ID_FABFRONTCHECKBOX 1001 +#define ID_FABFRONTCHOICE 1002 +#define ID_ADHESFRONTCHECKBOX 1003 +#define ID_ADHESFRONTCHOICE 1004 +#define ID_SOLDPFRONTCHECKBOX 1005 +#define ID_SOLDPFRONTCHOICE 1006 +#define ID_SILKSFRONTCHECKBOX 1007 +#define ID_SILKSFRONTCHOICE 1008 +#define ID_MASKFRONTCHECKBOX 1009 +#define ID_MASKFRONTCHOICE 1010 +#define ID_FRONTCHECKBOX 1011 +#define ID_FRONTNAME 1012 +#define ID_FRONTCHOICE 1013 +#define ID_IN1CHECKBOX 1014 +#define ID_IN1NAME 1015 +#define ID_IN1CHOICE 1016 +#define ID_IN2CHECKBOX 1017 +#define ID_IN2NAME 1018 +#define ID_IN2CHOICE 1019 +#define ID_IN3CHECKBOX 1020 +#define ID_IN3NAME 1021 +#define ID_IN3CHOICE 1022 +#define ID_IN4CHECKBOX 1023 +#define ID_IN4NAME 1024 +#define ID_IN4CHOICE 1025 +#define ID_IN5CHECKBOX 1026 +#define ID_IN5NAME 1027 +#define ID_IN5CHOICE 1028 +#define ID_IN6CHECKBOX 1029 +#define ID_IN6NAME 1030 +#define ID_IN6CHOICE 1031 +#define ID_IN7CHECKBOX 1032 +#define ID_IN7NAME 1033 +#define ID_IN7CHOICE 1034 +#define ID_IN8CHECKBOX 1035 +#define ID_IN8NAME 1036 +#define ID_IN8CHOICE 1037 +#define ID_IN9CHECKBOX 1038 +#define ID_IN9NAME 1039 +#define ID_IN9CHOICE 1040 +#define ID_IN10CHECKBOX 1041 +#define ID_IN10NAME 1042 +#define ID_IN10CHOICE 1043 +#define ID_IN11CHECKBOX 1044 +#define ID_IN11NAME 1045 +#define ID_IN11CHOICE 1046 +#define ID_IN12CHECKBOX 1047 +#define ID_IN12NAME 1048 +#define ID_IN12CHOICE 1049 +#define ID_IN13CHECKBOX 1050 +#define ID_IN13NAME 1051 +#define ID_IN13CHOICE 1052 +#define ID_IN14CHECKBOX 1053 +#define ID_IN14NAME 1054 +#define ID_IN14CHOICE 1055 +#define ID_IN15CHECKBOX 1056 +#define ID_IN15NAME 1057 +#define ID_IN15CHOICE 1058 +#define ID_IN16CHECKBOX 1059 +#define ID_IN16NAME 1060 +#define ID_IN16CHOICE 1061 +#define ID_IN17CHECKBOX 1062 +#define ID_IN17NAME 1063 +#define ID_IN17CHOICE 1064 +#define ID_IN18CHECKBOX 1065 +#define ID_IN18NAME 1066 +#define ID_IN18CHOICE 1067 +#define ID_IN19CHECKBOX 1068 +#define ID_IN19NAME 1069 +#define ID_IN19CHOICE 1070 +#define ID_IN20CHECKBOX 1071 +#define ID_IN20NAME 1072 +#define ID_IN20CHOICE 1073 +#define ID_IN21CHECKBOX 1074 +#define ID_IN21NAME 1075 +#define ID_IN21CHOICE 1076 +#define ID_IN22CHECKBOX 1077 +#define ID_IN22NAME 1078 +#define ID_IN22CHOICE 1079 +#define ID_IN23CHECKBOX 1080 +#define ID_IN23NAME 1081 +#define ID_IN24CHECKBOX 1082 +#define ID_IN24NAME 1083 +#define ID_IN24CHOICE 1084 +#define ID_IN25CHECKBOX 1085 +#define ID_IN25NAME 1086 +#define ID_IN25CHOICE 1087 +#define ID_IN26CHECKBOX 1088 +#define ID_IN26NAME 1089 +#define ID_IN26CHOICE 1090 +#define ID_IN27CHECKBOX 1091 +#define ID_IN27NAME 1092 +#define ID_IN27CHOICE 1093 +#define ID_IN28CHECKBOX 1094 +#define ID_IN28NAME 1095 +#define ID_IN28CHOICE 1096 +#define ID_IN29CHECKBOX 1097 +#define ID_IN29NAME 1098 +#define ID_IN29CHOICE 1099 +#define ID_IN30CHECKBOX 1100 +#define ID_IN30NAME 1101 +#define ID_IN30CHOICE 1102 +#define ID_BACKCHECKBOX 1103 +#define ID_BACKNAME 1104 +#define ID_BACKCHOICE 1105 +#define ID_MASKBACKCHECKBOX 1106 +#define ID_MASKBACKCHOICE 1107 +#define ID_SILKSBACKCHECKBOX 1108 +#define ID_SILKSBACKCHOICE 1109 +#define ID_SOLDPBACKCHECKBOX 1110 +#define ID_SOLDPBACKCHOICE 1111 +#define ID_ADHESBACKCHECKBOX 1112 +#define ID_ADHESBACKCHOICE 1113 +#define ID_FABBACKCHECKBOX 1114 +#define ID_FABBACKCHOICE 1115 +#define ID_CRTYDBACKCHOICE 1116 +#define ID_PCBEDGESCHOICE 1117 +#define ID_ECO2CHOICE 1118 +#define ID_ECO2CHECKBOX 1119 +#define ID_ECO1CHECKBOX 1120 +#define ID_ECO1CHOICE 1121 +#define ID_COMMENTSCHECKBOX 1122 +#define ID_COMMENTSCHOICE 1123 +#define ID_DRAWINGSCHECKBOX 1124 +#define ID_DRAWINGSCHOICE 1125 /////////////////////////////////////////////////////////////////////////////// /// Class PANEL_SETUP_LAYERS_BASE @@ -173,7 +169,6 @@ class PANEL_SETUP_LAYERS_BASE : public wxPanel wxStaticLine* m_staticline2; wxScrolledWindow* m_LayersListPanel; wxFlexGridSizer* m_LayerListFlexGridSizer; - wxCheckBox* m_CrtYdFrontCheckBox; wxTextCtrl* m_CrtYdFrontName; wxStaticText* m_CrtYdFrontStaticText; wxCheckBox* m_FabFrontCheckBox; @@ -302,13 +297,10 @@ class PANEL_SETUP_LAYERS_BASE : public wxPanel wxCheckBox* m_FabBackCheckBox; wxTextCtrl* m_FabBackName; wxStaticText* m_FabBackStaticText; - wxCheckBox* m_CrtYdBackCheckBox; wxTextCtrl* m_CrtYdBackName; wxStaticText* m_CrtYdBackStaticText; - wxCheckBox* m_PCBEdgesCheckBox; wxTextCtrl* m_PCBEdgesName; wxStaticText* m_PCBEdgesStaticText; - wxCheckBox* m_MarginCheckBox; wxTextCtrl* m_MarginName; wxStaticText* m_MarginStaticText; wxCheckBox* m_Eco1CheckBox; @@ -353,8 +345,8 @@ class PANEL_SETUP_LAYERS_BASE : public wxPanel // Virtual event handlers, overide them in your derived class virtual void addUserDefinedLayer( wxCommandEvent& event ) { event.Skip(); } - virtual void DenyChangeCheckBox( wxCommandEvent& event ) { event.Skip(); } virtual void OnCheckBox( wxCommandEvent& event ) { event.Skip(); } + virtual void DenyChangeCheckBox( wxCommandEvent& event ) { event.Skip(); } public: