From 54be07c17d066ce0889e49fc50ff150d0b52aacf Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Thu, 12 Mar 2020 20:47:21 +0100 Subject: [PATCH] Pcbnew: Set default solder mask min size to 0. When the solder mask min size is > 0, pads are no longer flashed or regions items. Good Gerber files need pads flashed or regions items. Non 0 solder mask min size is reserved to special cases (home made PCBs for instance) From master branch. --- include/board_design_settings.h | 11 +- pcbnew/dialogs/panel_setup_mask_and_paste.cpp | 6 - .../panel_setup_mask_and_paste_base.cpp | 123 ++-- .../panel_setup_mask_and_paste_base.fbp | 612 ++++++------------ .../dialogs/panel_setup_mask_and_paste_base.h | 25 +- 5 files changed, 309 insertions(+), 468 deletions(-) diff --git a/include/board_design_settings.h b/include/board_design_settings.h index 58cc0d0413..a91123e533 100644 --- a/include/board_design_settings.h +++ b/include/board_design_settings.h @@ -49,8 +49,15 @@ #define DEFAULT_PCB_EDGE_THICKNESS 0.15 -#define DEFAULT_SOLDERMASK_CLEARANCE 0.051 // soldermask to pad clearance -#define DEFAULT_SOLDERMASK_MIN_WIDTH 0.25 // soldermask minimum dam size +#define DEFAULT_SOLDERMASK_CLEARANCE 0.05 // soldermask to pad clearance + +// DEFAULT_SOLDERMASK_MIN_WIDTH is only used in Gerber files: soldermask minimum size. +// Set to 0, because using non 0 value creates an annoying issue in Gerber files: +// pads are no longer identified as pads (Flashed items or regions) +// Therefore solder mask min width must be used only in specific cases +// for instance for home made boards +#define DEFAULT_SOLDERMASK_MIN_WIDTH 0.0 + #define DEFAULT_SOLDERPASTE_CLEARANCE 0.0 #define DEFAULT_SOLDERPASTE_RATIO 0.0 diff --git a/pcbnew/dialogs/panel_setup_mask_and_paste.cpp b/pcbnew/dialogs/panel_setup_mask_and_paste.cpp index 8e64a2a129..7399db9678 100644 --- a/pcbnew/dialogs/panel_setup_mask_and_paste.cpp +++ b/pcbnew/dialogs/panel_setup_mask_and_paste.cpp @@ -41,12 +41,6 @@ PANEL_SETUP_MASK_AND_PASTE::PANEL_SETUP_MASK_AND_PASTE( PAGED_DIALOG* aParent, { m_Frame = aFrame; m_BrdSettings = &m_Frame->GetBoard()->GetDesignSettings(); - - wxFont infoFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ); - infoFont.SetSymbolicSize( wxFONTSIZE_SMALL ); - m_staticTextInfoValPos->SetFont( infoFont ); - m_staticTextInfoValNeg->SetFont( infoFont ); - m_staticTextInfoCopper->SetFont( infoFont ); } diff --git a/pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp b/pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp index 1b44727675..5d6d558ead 100644 --- a/pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp +++ b/pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 30 2017) +// C++ code generated with wxFormBuilder (version Jul 10 2019) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -9,115 +9,136 @@ /////////////////////////////////////////////////////////////////////////// -PANEL_SETUP_MASK_AND_PASTE_BASE::PANEL_SETUP_MASK_AND_PASTE_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) +PANEL_SETUP_MASK_AND_PASTE_BASE::PANEL_SETUP_MASK_AND_PASTE_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name ) { wxBoxSizer* bMainSizer; bMainSizer = new wxBoxSizer( wxVERTICAL ); - + wxBoxSizer* bSizer3; bSizer3 = new wxBoxSizer( wxVERTICAL ); - + wxBoxSizer* bMessages; bMessages = new wxBoxSizer( wxVERTICAL ); - + m_staticTextInfoValPos = new wxStaticText( this, wxID_ANY, _("Positive clearance means area bigger than the pad (usual for mask clearance)."), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextInfoValPos->Wrap( 500 ); - m_staticTextInfoValPos->SetFont( wxFont( 11, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - + m_staticTextInfoValPos->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); + bMessages->Add( m_staticTextInfoValPos, 0, wxBOTTOM, 5 ); - + m_staticTextInfoValNeg = new wxStaticText( this, wxID_ANY, _("Negative clearance means area smaller than the pad (usual for paste clearance)."), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextInfoValNeg->Wrap( 500 ); - m_staticTextInfoValNeg->SetFont( wxFont( 11, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - + m_staticTextInfoValNeg->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); + bMessages->Add( m_staticTextInfoValNeg, 0, wxBOTTOM, 12 ); - - + + wxBoxSizer* bSizer4; + bSizer4 = new wxBoxSizer( wxHORIZONTAL ); + + m_bitmapWarning = new wxStaticBitmap( this, wxID_ANY, wxArtProvider::GetBitmap( wxART_WARNING, wxART_OTHER ), wxDefaultPosition, wxDefaultSize, 0 ); + bSizer4->Add( m_bitmapWarning, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + + m_staticTextInfoMaskMinWidth = new wxStaticText( this, wxID_ANY, _("Note: Set Solder mask minimum width to 0,\nunless your board house ask for a specific value"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextInfoMaskMinWidth->Wrap( -1 ); + m_staticTextInfoMaskMinWidth->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); + + bSizer4->Add( m_staticTextInfoMaskMinWidth, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + + + bMessages->Add( bSizer4, 1, wxEXPAND, 5 ); + + bSizer3->Add( bMessages, 0, wxEXPAND|wxALL, 5 ); - + wxFlexGridSizer* fgGridSolderMaskSizer; fgGridSolderMaskSizer = new wxFlexGridSizer( 0, 3, 0, 0 ); fgGridSolderMaskSizer->AddGrowableCol( 1 ); fgGridSolderMaskSizer->SetFlexibleDirection( wxBOTH ); fgGridSolderMaskSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_MaskMarginLabel = new wxStaticText( this, wxID_ANY, _("Solder mask clearance:"), wxDefaultPosition, wxDefaultSize, 0 ); m_MaskMarginLabel->Wrap( -1 ); m_MaskMarginLabel->SetToolTip( _("This is the global clearance between pads and the solder mask\nThis value can be superseded by local values for a footprint or a pad.") ); - + fgGridSolderMaskSizer->Add( m_MaskMarginLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); - + m_MaskMarginCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgGridSolderMaskSizer->Add( m_MaskMarginCtrl, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - + m_MaskMarginUnits = new wxStaticText( this, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_MaskMarginUnits->Wrap( -1 ); fgGridSolderMaskSizer->Add( m_MaskMarginUnits, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - + m_MaskMinWidthLabel = new wxStaticText( this, wxID_ANY, _("Solder mask minimum width:"), wxDefaultPosition, wxDefaultSize, 0 ); m_MaskMinWidthLabel->Wrap( -1 ); - m_MaskMinWidthLabel->SetToolTip( _("Min dist between 2 pad areas.\nTwo pad areas nearer than this value will be merged during plotting.\nThis parameter is used only to plot solder mask layers.") ); - + m_MaskMinWidthLabel->SetToolTip( _("Min dist between 2 pad areas.\nTwo pad areas nearer than this value will be merged during plotting.\nThis parameter is used only to plot solder mask layers.\nLeave it to 0, unless you know what you are doing.") ); + fgGridSolderMaskSizer->Add( m_MaskMinWidthLabel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); - + m_MaskMinWidthCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgGridSolderMaskSizer->Add( m_MaskMinWidthCtrl, 0, wxEXPAND|wxALL, 5 ); - + m_MaskMinWidthUnits = new wxStaticText( this, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_MaskMinWidthUnits->Wrap( -1 ); fgGridSolderMaskSizer->Add( m_MaskMinWidthUnits, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); - - + + fgGridSolderMaskSizer->Add( 0, 0, 1, wxEXPAND|wxTOP|wxBOTTOM, 10 ); - - + + fgGridSolderMaskSizer->Add( 0, 0, 1, wxEXPAND, 5 ); - - + + fgGridSolderMaskSizer->Add( 0, 0, 1, wxEXPAND, 5 ); - - m_PasteMarginLabel = new wxStaticText( this, wxID_ANY, _("Solder paste clearance:"), wxDefaultPosition, wxDefaultSize, 0 ); + + m_PasteMarginLabel = new wxStaticText( this, wxID_ANY, _("Solder paste absolute clearance:"), wxDefaultPosition, wxDefaultSize, 0 ); m_PasteMarginLabel->Wrap( -1 ); m_PasteMarginLabel->SetToolTip( _("This is the global clearance between pads and the solder paste\nThis value can be superseded by local values for a footprint or a pad.\nThe final clearance value is the sum of this value and the clearance value ratio") ); - + fgGridSolderMaskSizer->Add( m_PasteMarginLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); - + m_PasteMarginCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgGridSolderMaskSizer->Add( m_PasteMarginCtrl, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - + m_PasteMarginUnits = new wxStaticText( this, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_PasteMarginUnits->Wrap( -1 ); fgGridSolderMaskSizer->Add( m_PasteMarginUnits, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - - m_staticTextRatio = new wxStaticText( this, wxID_ANY, _("Solder paste ratio clearance:"), wxDefaultPosition, wxDefaultSize, 0 ); + + m_staticTextRatio = new wxStaticText( this, wxID_ANY, _("Solder paste relative clearance:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextRatio->Wrap( -1 ); - m_staticTextRatio->SetToolTip( _("This is the global clearance ratio in percent between pads and the solder paste\nA value of 10 means the clearance value is 10 percent of the pad size\nThis value can be superseded by local values for a footprint or a pad.\nThe final clearance value is the sum of this value and the clearance value") ); - + m_staticTextRatio->SetToolTip( _("This is the global clearance ratio in per cent between pads and the solder paste\nA value of 10 means the clearance value is 10 per cent of the pad size\nThis value can be superseded by local values for a footprint or a pad.\nThe final clearance value is the sum of this value and the clearance value") ); + fgGridSolderMaskSizer->Add( m_staticTextRatio, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); - + m_SolderPasteMarginRatioCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgGridSolderMaskSizer->Add( m_SolderPasteMarginRatioCtrl, 0, wxEXPAND|wxALL, 5 ); - + m_SolderPasteRatioMarginUnits = new wxStaticText( this, wxID_ANY, _("%"), wxDefaultPosition, wxDefaultSize, 0 ); m_SolderPasteRatioMarginUnits->Wrap( -1 ); fgGridSolderMaskSizer->Add( m_SolderPasteRatioMarginUnits, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); - - + + bSizer3->Add( fgGridSolderMaskSizer, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 5 ); - - + + bSizer3->Add( 0, 0, 0, wxEXPAND|wxTOP|wxBOTTOM, 10 ); - + m_staticTextInfoCopper = new wxStaticText( this, wxID_ANY, _("Note: solder mask and paste values are used only for pads on copper layers."), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextInfoCopper->Wrap( -1 ); - m_staticTextInfoCopper->SetFont( wxFont( 12, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - - bSizer3->Add( m_staticTextInfoCopper, 0, wxALL, 5 ); - - + m_staticTextInfoCopper->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); + + bSizer3->Add( m_staticTextInfoCopper, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + + m_staticTextInfoPaste = new wxStaticText( this, wxID_ANY, _("Note: solder paste clearances (absolute and relative) are added to determine the final clearance."), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextInfoPaste->Wrap( -1 ); + m_staticTextInfoPaste->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); + + bSizer3->Add( m_staticTextInfoPaste, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + bMainSizer->Add( bSizer3, 1, wxRIGHT|wxLEFT, 5 ); - - + + this->SetSizer( bMainSizer ); this->Layout(); bMainSizer->Fit( this ); diff --git a/pcbnew/dialogs/panel_setup_mask_and_paste_base.fbp b/pcbnew/dialogs/panel_setup_mask_and_paste_base.fbp index b0d362c423..ee10a68bc2 100644 --- a/pcbnew/dialogs/panel_setup_mask_and_paste_base.fbp +++ b/pcbnew/dialogs/panel_setup_mask_and_paste_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,6 +14,8 @@ panel_setup_mask_and_paste_base 1000 none + + 1 panel_setup_mask_and_paste_base @@ -24,6 +26,7 @@ 1 1 UI + 0 1 0 @@ -48,36 +51,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bMainSizer @@ -129,11 +102,12 @@ 1 1 - ,93,90,11,70,0 + ,93,90,-1,70,0 0 0 wxID_ANY Positive clearance means area bigger than the pad (usual for mask clearance). + 0 0 @@ -159,29 +133,6 @@ 500 - - - - - - - - - - - - - - - - - - - - - - - @@ -212,11 +163,12 @@ 1 1 - ,93,90,11,70,0 + ,93,90,-1,70,0 0 0 wxID_ANY Negative clearance means area smaller than the pad (usual for paste clearance). + 0 0 @@ -242,29 +194,136 @@ 500 - - - - - - - - - - - - - - - - - - - - - - - + + + + 5 + wxEXPAND + 1 + + + bSizer4 + wxHORIZONTAL + none + + 5 + wxALL|wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + + + + + + + Load From Art Provider; wxART_WARNING; wxART_OTHER + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_bitmapWarning + 1 + + + protected + 1 + + Resizable + 1 + + ; ; forward_declare + 0 + + + + + + + + 5 + wxALL|wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + ,93,90,-1,70,0 + 0 + 0 + wxID_ANY + Note: Set Solder mask minimum width to 0, unless your board house ask for a specific value + 0 + + 0 + + + 0 + + 1 + m_staticTextInfoMaskMinWidth + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + @@ -318,6 +377,7 @@ 0 wxID_ANY Solder mask clearance: + 0 0 @@ -343,29 +403,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -430,33 +467,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -492,6 +502,7 @@ 0 wxID_ANY mm + 0 0 @@ -517,29 +528,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -575,6 +563,7 @@ 0 wxID_ANY Solder mask minimum width: + 0 0 @@ -595,34 +584,11 @@ 0 - Min dist between 2 pad areas. Two pad areas nearer than this value will be merged during plotting. This parameter is used only to plot solder mask layers. + Min dist between 2 pad areas. Two pad areas nearer than this value will be merged during plotting. This parameter is used only to plot solder mask layers. Leave it to 0, unless you know what you are doing. -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -687,33 +653,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -749,6 +688,7 @@ 0 wxID_ANY mm + 0 0 @@ -774,29 +714,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -861,7 +778,8 @@ 0 0 wxID_ANY - Solder paste clearance: + Solder paste absolute clearance: + 0 0 @@ -887,29 +805,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -974,33 +869,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1036,6 +904,7 @@ 0 wxID_ANY mm + 0 0 @@ -1061,29 +930,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -1118,7 +964,8 @@ 0 0 wxID_ANY - Solder paste ratio clearance: + Solder paste relative clearance: + 0 0 @@ -1144,29 +991,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -1231,33 +1055,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1293,6 +1090,7 @@ 0 wxID_ANY % + 0 0 @@ -1318,29 +1116,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -1357,7 +1132,7 @@ 5 - wxALL + wxTOP|wxRIGHT|wxLEFT 0 1 @@ -1383,11 +1158,12 @@ 1 1 - ,90,90,12,70,0 + ,90,90,-1,70,0 0 0 wxID_ANY Note: solder mask and paste values are used only for pads on copper layers. + 0 0 @@ -1413,29 +1189,67 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + ,90,90,-1,70,0 + 0 + 0 + wxID_ANY + Note: solder paste clearances (absolute and relative) are added to determine the final clearance. + 0 + + 0 + + + 0 + + 1 + m_staticTextInfoPaste + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 diff --git a/pcbnew/dialogs/panel_setup_mask_and_paste_base.h b/pcbnew/dialogs/panel_setup_mask_and_paste_base.h index 7f21fcf9a7..00978b3369 100644 --- a/pcbnew/dialogs/panel_setup_mask_and_paste_base.h +++ b/pcbnew/dialogs/panel_setup_mask_and_paste_base.h @@ -1,12 +1,11 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 30 2017) +// C++ code generated with wxFormBuilder (version Jul 10 2019) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __PANEL_SETUP_MASK_AND_PASTE_BASE_H__ -#define __PANEL_SETUP_MASK_AND_PASTE_BASE_H__ +#pragma once #include #include @@ -17,6 +16,10 @@ #include #include #include +#include +#include +#include +#include #include #include #include @@ -26,13 +29,15 @@ /////////////////////////////////////////////////////////////////////////////// /// Class PANEL_SETUP_MASK_AND_PASTE_BASE /////////////////////////////////////////////////////////////////////////////// -class PANEL_SETUP_MASK_AND_PASTE_BASE : public wxPanel +class PANEL_SETUP_MASK_AND_PASTE_BASE : public wxPanel { private: - + protected: wxStaticText* m_staticTextInfoValPos; wxStaticText* m_staticTextInfoValNeg; + wxStaticBitmap* m_bitmapWarning; + wxStaticText* m_staticTextInfoMaskMinWidth; wxStaticText* m_MaskMarginLabel; wxTextCtrl* m_MaskMarginCtrl; wxStaticText* m_MaskMarginUnits; @@ -46,12 +51,12 @@ class PANEL_SETUP_MASK_AND_PASTE_BASE : public wxPanel wxTextCtrl* m_SolderPasteMarginRatioCtrl; wxStaticText* m_SolderPasteRatioMarginUnits; wxStaticText* m_staticTextInfoCopper; - + wxStaticText* m_staticTextInfoPaste; + public: - - PANEL_SETUP_MASK_AND_PASTE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL ); + + PANEL_SETUP_MASK_AND_PASTE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); ~PANEL_SETUP_MASK_AND_PASTE_BASE(); - + }; -#endif //__PANEL_SETUP_MASK_AND_PASTE_BASE_H__