Attached a patch (against the current master version) with these changes:
Fixes in Pad settings dialog.
And mainly for pads not on copper layers, all margins/clearances are ignored,
even margins defined
in the Pad settings dialog (it was not the case in the previous patch).
This new behavior has my preference, because it is more intuitive.
--
Jean-Pierre CHARRAS
From 604a793221226a95b94efbe62498dbb853ab67df Mon Sep 17 00:00:00 2001
From: jean-pierre charras <jp.char...@wanadoo.fr>
Date: Wed, 2 May 2018 10:31:10 +0200
Subject: [PATCH] mask clearance parameters: use clearances only for pads on
copper layers, and never for pads on technical layers only.
---
pcbnew/class_pad.cpp | 24 ++++-
pcbnew/class_pad.h | 26 +++--
.../dialog_edit_footprint_for_BoardEditor_base.cpp | 10 +-
.../dialog_edit_footprint_for_BoardEditor_base.fbp | 84 ++++++++++++++-
.../dialog_edit_footprint_for_BoardEditor_base.h | 6 +-
.../dialog_edit_footprint_for_fp_editor_base.cpp | 10 +-
.../dialog_edit_footprint_for_fp_editor_base.fbp | 84 ++++++++++++++-
.../dialog_edit_footprint_for_fp_editor_base.h | 6 +-
pcbnew/dialogs/dialog_mask_clearance_base.cpp | 15 ++-
pcbnew/dialogs/dialog_mask_clearance_base.fbp | 89 ++++++++++++++-
pcbnew/dialogs/dialog_mask_clearance_base.h | 9 +-
pcbnew/dialogs/dialog_pad_properties.h | 5 +
pcbnew/dialogs/dialog_pad_properties_base.cpp | 38 ++++---
pcbnew/dialogs/dialog_pad_properties_base.fbp | 120 +++++++++++++++++----
pcbnew/dialogs/dialog_pad_properties_base.h | 9 +-
15 files changed, 467 insertions(+), 68 deletions(-)
diff --git a/pcbnew/class_pad.cpp b/pcbnew/class_pad.cpp
index 75540aa..c4a48c8 100644
--- a/pcbnew/class_pad.cpp
+++ b/pcbnew/class_pad.cpp
@@ -1,9 +1,9 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
- * Copyright (C) 2016 Jean-Pierre Charras, jp.charras at wanadoo.fr
+ * Copyright (C) 2018 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck <d...@softplc.com>
- * Copyright (C) 1992-2016 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -576,7 +576,17 @@ int D_PAD::GetClearance( BOARD_CONNECTED_ITEM* aItem )
const
int D_PAD::GetSolderMaskMargin() const
{
+ // The pad inherits the margin only to calculate a default shape,
+ // therefore only if it is also a copper layer
+ // Pads defined only on mask layers (and perhaps on other tech layers) use
the shape
+ // defined by the pad settings only
+ bool isOnCopperLayer = ( m_layerMask & LSET::AllCuMask() ).any();
+
+ if( !isOnCopperLayer )
+ return 0;
+
int margin = m_LocalSolderMaskMargin;
+
MODULE* module = GetParent();
if( module )
@@ -609,8 +619,18 @@ int D_PAD::GetSolderMaskMargin() const
wxSize D_PAD::GetSolderPasteMargin() const
{
+ // The pad inherits the margin only to calculate a default shape,
+ // therefore only if it is also a copper layer.
+ // Pads defined only on mask layers (and perhaps on other tech layers) use
the shape
+ // defined by the pad settings only
+ bool isOnCopperLayer = ( m_layerMask & LSET::AllCuMask() ).any();
+
+ if( !isOnCopperLayer )
+ return wxSize( 0, 0 );
+
int margin = m_LocalSolderPasteMargin;
double mratio = m_LocalSolderPasteMarginRatio;
+
MODULE* module = GetParent();
if( module )
diff --git a/pcbnew/class_pad.h b/pcbnew/class_pad.h
index 7eeb289..e251304 100644
--- a/pcbnew/class_pad.h
+++ b/pcbnew/class_pad.h
@@ -1,8 +1,8 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
- * Copyright (C) 2017 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 1992-2017 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2018 Jean-Pierre Charras, jp.charras at wanadoo.fr
+ * Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -454,23 +454,29 @@ public:
* Function GetSolderMaskMargin
* @return the margin for the solder mask layer
* usually > 0 (mask shape bigger than pad
- * value is
+ * For pads also on copper layers, the value (used to build a default
shape) is
* 1 - the local value
- * 2 - if null, the parent footprint value
- * 1 - if null, the global value
+ * 2 - if 0, the parent footprint value
+ * 3 - if 0, the global value
+ * For pads NOT on copper layers, the value is the local value because
there is
+ * not default shape to build
*/
int GetSolderMaskMargin() const;
/**
* Function GetSolderPasteMargin
* @return the margin for the solder mask layer
- * usually < 0 (mask shape smaller than pad
+ * usually < 0 (mask shape smaller than pad)
* because the margin can be dependent on the pad size, the margin has a x
and a y value
- * value is
+ *
+ * For pads also on copper layers, the value (used to build a default
shape) is
* 1 - the local value
- * 2 - if null, the parent footprint value
- * 1 - if null, the global value
- */
+ * 2 - if 0, the parent footprint value
+ * 3 - if 0, the global value
+ *
+ * For pads NOT on copper layers, the value is the local value because
there is
+ * not default shape to build
+ */
wxSize GetSolderPasteMargin() const;
void SetZoneConnection( ZoneConnection aType ) { m_ZoneConnection = aType;
}
diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp
b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp
index c46ae36..5c3a5fb 100644
--- a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp
+++ b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp
@@ -1,8 +1,8 @@
///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Apr 19 2018)
+// C++ code generated with wxFormBuilder (version Aug 4 2017)
// http://www.wxformbuilder.org/
//
-// PLEASE DO *NOT* EDIT THIS FILE!
+// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#include "widgets/text_ctrl_eval.h"
@@ -230,6 +230,12 @@
DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow
bSizer11->Add( m_staticTextInfoValNeg, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+ m_staticTextInfo2 = new wxStaticText(
sbSizerLocalProperties->GetStaticBox(), wxID_ANY, _("These values are used only
to build the mask shape\nof pads on copper layers"), wxDefaultPosition,
wxDefaultSize, 0 );
+ m_staticTextInfo2->Wrap( -1 );
+ m_staticTextInfo2->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(),
wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false,
wxEmptyString ) );
+
+ bSizer11->Add( m_staticTextInfo2, 0, wxALL, 5 );
+
sbSizerLocalProperties->Add( bSizer11, 0, wxEXPAND, 5 );
diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp
b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp
index 0adb42e..55d26de 100644
--- a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp
+++ b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp
@@ -14,7 +14,6 @@
<property
name="file">dialog_edit_footprint_for_BoardEditor_base</property>
<property name="first_id">1000</property>
<property name="help_provider">none</property>
- <property name="indent_with_spaces"></property>
<property name="internationalize">1</property>
<property
name="name">dialog_edit_footprint_for_BoardEditor_base</property>
<property name="namespace"></property>
@@ -3306,6 +3305,89 @@
<event
name="OnUpdateUI"></event>
</object>
</object>
+ <object
class="sizeritem" expanded="1">
+ <property
name="border">5</property>
+ <property
name="flag">wxALL</property>
+ <property
name="proportion">0</property>
+ <object
class="wxStaticText" expanded="1">
+ <property
name="BottomDockable">1</property>
+ <property
name="LeftDockable">1</property>
+ <property
name="RightDockable">1</property>
+ <property
name="TopDockable">1</property>
+ <property
name="aui_layer"></property>
+ <property
name="aui_name"></property>
+ <property
name="aui_position"></property>
+ <property
name="aui_row"></property>
+ <property
name="best_size"></property>
+ <property
name="bg"></property>
+ <property
name="caption"></property>
+ <property
name="caption_visible">1</property>
+ <property
name="center_pane">0</property>
+ <property
name="close_button">1</property>
+ <property
name="context_help"></property>
+ <property
name="context_menu">1</property>
+ <property
name="default_pane">0</property>
+ <property
name="dock">Dock</property>
+ <property
name="dock_fixed">0</property>
+ <property
name="docking">Left</property>
+ <property
name="enabled">1</property>
+ <property
name="fg"></property>
+ <property
name="floatable">1</property>
+ <property
name="font">,90,92,-1,70,0</property>
+ <property
name="gripper">0</property>
+ <property
name="hidden">0</property>
+ <property
name="id">wxID_ANY</property>
+ <property
name="label">These values are used only to build the mask shape
of pads on
copper layers</property>
+ <property
name="max_size"></property>
+ <property
name="maximize_button">0</property>
+ <property
name="maximum_size"></property>
+ <property
name="min_size"></property>
+ <property
name="minimize_button">0</property>
+ <property
name="minimum_size"></property>
+ <property
name="moveable">1</property>
+ <property
name="name">m_staticTextInfo2</property>
+ <property
name="pane_border">1</property>
+ <property
name="pane_position"></property>
+ <property
name="pane_size"></property>
+ <property
name="permission">protected</property>
+ <property
name="pin_button">1</property>
+ <property
name="pos"></property>
+ <property
name="resize">Resizable</property>
+ <property
name="show">1</property>
+ <property
name="size"></property>
+ <property
name="style"></property>
+ <property
name="subclass"></property>
+ <property
name="toolbar_pane">0</property>
+ <property
name="tooltip"></property>
+ <property
name="window_extra_style"></property>
+ <property
name="window_name"></property>
+ <property
name="window_style"></property>
+ <property
name="wrap">-1</property>
+ <event
name="OnChar"></event>
+ <event
name="OnEnterWindow"></event>
+ <event
name="OnEraseBackground"></event>
+ <event
name="OnKeyDown"></event>
+ <event
name="OnKeyUp"></event>
+ <event
name="OnKillFocus"></event>
+ <event
name="OnLeaveWindow"></event>
+ <event
name="OnLeftDClick"></event>
+ <event
name="OnLeftDown"></event>
+ <event
name="OnLeftUp"></event>
+ <event
name="OnMiddleDClick"></event>
+ <event
name="OnMiddleDown"></event>
+ <event
name="OnMiddleUp"></event>
+ <event
name="OnMotion"></event>
+ <event
name="OnMouseEvents"></event>
+ <event
name="OnMouseWheel"></event>
+ <event
name="OnPaint"></event>
+ <event
name="OnRightDClick"></event>
+ <event
name="OnRightDown"></event>
+ <event
name="OnRightUp"></event>
+ <event
name="OnSetFocus"></event>
+ <event
name="OnSize"></event>
+ <event
name="OnUpdateUI"></event>
+ </object>
+ </object>
</object>
</object>
<object class="sizeritem"
expanded="1">
diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.h
b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.h
index 2b97e6d..b97e533 100644
--- a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.h
+++ b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.h
@@ -1,8 +1,8 @@
///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Apr 19 2018)
+// C++ code generated with wxFormBuilder (version Aug 4 2017)
// http://www.wxformbuilder.org/
//
-// PLEASE DO *NOT* EDIT THIS FILE!
+// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#ifndef __DIALOG_EDIT_FOOTPRINT_FOR_BOARDEDITOR_BASE_H__
@@ -11,6 +11,7 @@
#include <wx/artprov.h>
#include <wx/xrc/xmlres.h>
#include <wx/intl.h>
+class DIALOG_SHIM;
class TEXT_CTRL_EVAL;
#include "dialog_shim.h"
@@ -91,6 +92,7 @@ class DIALOG_FOOTPRINT_BOARD_EDITOR_BASE : public DIALOG_SHIM
wxStaticText* m_staticTextInfo;
wxStaticText* m_staticTextInfoValPos;
wxStaticText* m_staticTextInfoValNeg;
+ wxStaticText* m_staticTextInfo2;
wxStaticText* m_staticTextNetClearance;
TEXT_CTRL_EVAL* m_NetClearanceValueCtrl;
wxStaticText* m_NetClearanceUnits;
diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp
b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp
index 7b5f74b..de7070d 100644
--- a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp
+++ b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp
@@ -1,8 +1,8 @@
///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Apr 19 2018)
+// C++ code generated with wxFormBuilder (version Aug 4 2017)
// http://www.wxformbuilder.org/
//
-// PLEASE DO *NOT* EDIT THIS FILE!
+// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#include "widgets/text_ctrl_eval.h"
@@ -167,6 +167,12 @@
DIALOG_FOOTPRINT_FP_EDITOR_BASE::DIALOG_FOOTPRINT_FP_EDITOR_BASE( wxWindow* pare
sbSizer8->Add( m_staticTextInfoValNeg, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+ m_staticTextInfo2 = new wxStaticText( sbSizer8->GetStaticBox(),
wxID_ANY, _("These values are used only to build the mask shape\nof pads on
copper layers"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticTextInfo2->Wrap( -1 );
+ m_staticTextInfo2->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(),
wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false,
wxEmptyString ) );
+
+ sbSizer8->Add( m_staticTextInfo2, 0, wxALL, 5 );
+
wxFlexGridSizer* fgSizer1;
fgSizer1 = new wxFlexGridSizer( 5, 3, 0, 0 );
fgSizer1->AddGrowableCol( 1 );
diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.fbp
b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.fbp
index 8099393..9277ae5 100644
--- a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.fbp
+++ b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.fbp
@@ -14,7 +14,6 @@
<property
name="file">dialog_edit_footprint_for_fp_editor_base</property>
<property name="first_id">1000</property>
<property name="help_provider">none</property>
- <property name="indent_with_spaces"></property>
<property name="internationalize">1</property>
<property
name="name">dialog_edit_footprint_for_fp_editor_base</property>
<property name="namespace"></property>
@@ -2417,6 +2416,89 @@
<event
name="OnUpdateUI"></event>
</object>
</object>
+ <object class="sizeritem"
expanded="1">
+ <property
name="border">5</property>
+ <property
name="flag">wxALL</property>
+ <property
name="proportion">0</property>
+ <object
class="wxStaticText" expanded="1">
+ <property
name="BottomDockable">1</property>
+ <property
name="LeftDockable">1</property>
+ <property
name="RightDockable">1</property>
+ <property
name="TopDockable">1</property>
+ <property
name="aui_layer"></property>
+ <property
name="aui_name"></property>
+ <property
name="aui_position"></property>
+ <property
name="aui_row"></property>
+ <property
name="best_size"></property>
+ <property
name="bg"></property>
+ <property
name="caption"></property>
+ <property
name="caption_visible">1</property>
+ <property
name="center_pane">0</property>
+ <property
name="close_button">1</property>
+ <property
name="context_help"></property>
+ <property
name="context_menu">1</property>
+ <property
name="default_pane">0</property>
+ <property
name="dock">Dock</property>
+ <property
name="dock_fixed">0</property>
+ <property
name="docking">Left</property>
+ <property
name="enabled">1</property>
+ <property
name="fg"></property>
+ <property
name="floatable">1</property>
+ <property
name="font">,90,92,-1,70,0</property>
+ <property
name="gripper">0</property>
+ <property
name="hidden">0</property>
+ <property
name="id">wxID_ANY</property>
+ <property
name="label">These values are used only to build the mask shape
of pads on
copper layers</property>
+ <property
name="max_size"></property>
+ <property
name="maximize_button">0</property>
+ <property
name="maximum_size"></property>
+ <property
name="min_size"></property>
+ <property
name="minimize_button">0</property>
+ <property
name="minimum_size"></property>
+ <property
name="moveable">1</property>
+ <property
name="name">m_staticTextInfo2</property>
+ <property
name="pane_border">1</property>
+ <property
name="pane_position"></property>
+ <property
name="pane_size"></property>
+ <property
name="permission">protected</property>
+ <property
name="pin_button">1</property>
+ <property
name="pos"></property>
+ <property
name="resize">Resizable</property>
+ <property
name="show">1</property>
+ <property
name="size"></property>
+ <property
name="style"></property>
+ <property
name="subclass"></property>
+ <property
name="toolbar_pane">0</property>
+ <property
name="tooltip"></property>
+ <property
name="window_extra_style"></property>
+ <property
name="window_name"></property>
+ <property
name="window_style"></property>
+ <property
name="wrap">-1</property>
+ <event
name="OnChar"></event>
+ <event
name="OnEnterWindow"></event>
+ <event
name="OnEraseBackground"></event>
+ <event
name="OnKeyDown"></event>
+ <event
name="OnKeyUp"></event>
+ <event
name="OnKillFocus"></event>
+ <event
name="OnLeaveWindow"></event>
+ <event
name="OnLeftDClick"></event>
+ <event
name="OnLeftDown"></event>
+ <event
name="OnLeftUp"></event>
+ <event
name="OnMiddleDClick"></event>
+ <event
name="OnMiddleDown"></event>
+ <event
name="OnMiddleUp"></event>
+ <event
name="OnMotion"></event>
+ <event
name="OnMouseEvents"></event>
+ <event
name="OnMouseWheel"></event>
+ <event
name="OnPaint"></event>
+ <event
name="OnRightDClick"></event>
+ <event
name="OnRightDown"></event>
+ <event
name="OnRightUp"></event>
+ <event
name="OnSetFocus"></event>
+ <event
name="OnSize"></event>
+ <event
name="OnUpdateUI"></event>
+ </object>
+ </object>
<object class="sizeritem"
expanded="0">
<property
name="border">5</property>
<property
name="flag">wxEXPAND</property>
diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.h
b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.h
index d0263b7..764baad 100644
--- a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.h
+++ b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.h
@@ -1,8 +1,8 @@
///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Apr 19 2018)
+// C++ code generated with wxFormBuilder (version Aug 4 2017)
// http://www.wxformbuilder.org/
//
-// PLEASE DO *NOT* EDIT THIS FILE!
+// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#ifndef __DIALOG_EDIT_FOOTPRINT_FOR_FP_EDITOR_BASE_H__
@@ -11,6 +11,7 @@
#include <wx/artprov.h>
#include <wx/xrc/xmlres.h>
#include <wx/intl.h>
+class DIALOG_SHIM;
class TEXT_CTRL_EVAL;
#include "dialog_shim.h"
@@ -76,6 +77,7 @@ class DIALOG_FOOTPRINT_FP_EDITOR_BASE : public DIALOG_SHIM
wxStaticText* m_staticTextInfo;
wxStaticText* m_staticTextInfoValPos;
wxStaticText* m_staticTextInfoValNeg;
+ wxStaticText* m_staticTextInfo2;
wxStaticText* m_staticTextNetClearance;
TEXT_CTRL_EVAL* m_NetClearanceValueCtrl;
wxStaticText* m_NetClearanceUnits;
diff --git a/pcbnew/dialogs/dialog_mask_clearance_base.cpp
b/pcbnew/dialogs/dialog_mask_clearance_base.cpp
index ee133a5..b731fde 100644
--- a/pcbnew/dialogs/dialog_mask_clearance_base.cpp
+++ b/pcbnew/dialogs/dialog_mask_clearance_base.cpp
@@ -1,8 +1,8 @@
///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Nov 22 2017)
+// C++ code generated with wxFormBuilder (version Aug 4 2017)
// http://www.wxformbuilder.org/
//
-// PLEASE DO *NOT* EDIT THIS FILE!
+// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#include "dialog_mask_clearance_base.h"
@@ -24,9 +24,15 @@
DIALOG_PADS_MASK_CLEARANCE_BASE::DIALOG_PADS_MASK_CLEARANCE_BASE( wxWindow* pare
wxBoxSizer* bMainUpperSizer;
bMainUpperSizer = new wxBoxSizer( wxVERTICAL );
- m_staticTextInfo = new wxStaticText( this, wxID_ANY, _("Note: for
clearance values:\n- a positive value means a mask bigger than a pad\n- a
negative value means a mask smaller than a pad\n"), wxDefaultPosition,
wxDefaultSize, 0 );
+ m_staticTextInfo = new wxStaticText( this, wxID_ANY, _("Note: for
clearance values:\n- a positive value means a mask bigger than a pad\n- a
negative value means a mask smaller than a pad"), wxDefaultPosition,
wxDefaultSize, 0 );
m_staticTextInfo->Wrap( -1 );
- bMainUpperSizer->Add( m_staticTextInfo, 0,
wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT, 5 );
+ bMainUpperSizer->Add( m_staticTextInfo, 0,
wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+
+ m_staticTextInfo2 = new wxStaticText( this, wxID_ANY, _("These global
values are used only to build the mask shape\nof pads on copper layers"),
wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticTextInfo2->Wrap( -1 );
+ m_staticTextInfo2->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(),
wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false,
wxEmptyString ) );
+
+ bMainUpperSizer->Add( m_staticTextInfo2, 0,
wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition,
wxDefaultSize, wxLI_HORIZONTAL );
bMainUpperSizer->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 );
@@ -119,7 +125,6 @@
DIALOG_PADS_MASK_CLEARANCE_BASE::DIALOG_PADS_MASK_CLEARANCE_BASE( wxWindow* pare
this->SetSizer( bMainSizer );
this->Layout();
- bMainSizer->Fit( this );
}
DIALOG_PADS_MASK_CLEARANCE_BASE::~DIALOG_PADS_MASK_CLEARANCE_BASE()
diff --git a/pcbnew/dialogs/dialog_mask_clearance_base.fbp
b/pcbnew/dialogs/dialog_mask_clearance_base.fbp
index 13ef67e..053fa67 100644
--- a/pcbnew/dialogs/dialog_mask_clearance_base.fbp
+++ b/pcbnew/dialogs/dialog_mask_clearance_base.fbp
@@ -44,7 +44,7 @@
<property name="minimum_size"></property>
<property name="name">DIALOG_PADS_MASK_CLEARANCE_BASE</property>
<property name="pos"></property>
- <property name="size">-1,-1</property>
+ <property name="size">393,332</property>
<property
name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
<property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
<property name="title">Pads Mask Clearance</property>
@@ -104,7 +104,7 @@
<property name="permission">none</property>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
- <property
name="flag">wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT</property>
+ <property
name="flag">wxALIGN_CENTER_HORIZONTAL|wxALL</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="1">
<property name="BottomDockable">1</property>
@@ -134,7 +134,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
- <property name="label">Note: for clearance
values:
- a positive value means a mask bigger than a pad
- a
negative value means a mask smaller than a pad
</property>
+ <property name="label">Note: for clearance
values:
- a positive value means a mask bigger than a pad
- a
negative value means a mask smaller than a pad</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
@@ -187,6 +187,89 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
+ <property
name="flag">wxALL|wxALIGN_CENTER_HORIZONTAL</property>
+ <property name="proportion">0</property>
+ <object class="wxStaticText" expanded="1">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+ <property name="TopDockable">1</property>
+ <property name="aui_layer"></property>
+ <property name="aui_name"></property>
+ <property name="aui_position"></property>
+ <property name="aui_row"></property>
+ <property name="best_size"></property>
+ <property name="bg"></property>
+ <property name="caption"></property>
+ <property name="caption_visible">1</property>
+ <property name="center_pane">0</property>
+ <property name="close_button">1</property>
+ <property name="context_help"></property>
+ <property name="context_menu">1</property>
+ <property name="default_pane">0</property>
+ <property name="dock">Dock</property>
+ <property name="dock_fixed">0</property>
+ <property name="docking">Left</property>
+ <property name="enabled">1</property>
+ <property name="fg"></property>
+ <property name="floatable">1</property>
+ <property name="font">,90,92,-1,70,0</property>
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="id">wxID_ANY</property>
+ <property name="label">These global values are
used only to build the mask shape
of pads on copper layers</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size"></property>
+ <property name="min_size"></property>
+ <property name="minimize_button">0</property>
+ <property name="minimum_size"></property>
+ <property name="moveable">1</property>
+ <property
name="name">m_staticTextInfo2</property>
+ <property name="pane_border">1</property>
+ <property name="pane_position"></property>
+ <property name="pane_size"></property>
+ <property
name="permission">protected</property>
+ <property name="pin_button">1</property>
+ <property name="pos"></property>
+ <property name="resize">Resizable</property>
+ <property name="show">1</property>
+ <property name="size"></property>
+ <property name="style"></property>
+ <property name="subclass"></property>
+ <property name="toolbar_pane">0</property>
+ <property name="tooltip"></property>
+ <property name="window_extra_style"></property>
+ <property name="window_name"></property>
+ <property name="window_style"></property>
+ <property name="wrap">-1</property>
+ <event name="OnChar"></event>
+ <event name="OnEnterWindow"></event>
+ <event name="OnEraseBackground"></event>
+ <event name="OnKeyDown"></event>
+ <event name="OnKeyUp"></event>
+ <event name="OnKillFocus"></event>
+ <event name="OnLeaveWindow"></event>
+ <event name="OnLeftDClick"></event>
+ <event name="OnLeftDown"></event>
+ <event name="OnLeftUp"></event>
+ <event name="OnMiddleDClick"></event>
+ <event name="OnMiddleDown"></event>
+ <event name="OnMiddleUp"></event>
+ <event name="OnMotion"></event>
+ <event name="OnMouseEvents"></event>
+ <event name="OnMouseWheel"></event>
+ <event name="OnPaint"></event>
+ <event name="OnRightDClick"></event>
+ <event name="OnRightDown"></event>
+ <event name="OnRightUp"></event>
+ <event name="OnSetFocus"></event>
+ <event name="OnSize"></event>
+ <event name="OnUpdateUI"></event>
+ </object>
+ </object>
+ <object class="sizeritem" expanded="1">
+ <property name="border">5</property>
<property name="flag">wxEXPAND | wxALL</property>
<property name="proportion">0</property>
<object class="wxStaticLine" expanded="1">
diff --git a/pcbnew/dialogs/dialog_mask_clearance_base.h
b/pcbnew/dialogs/dialog_mask_clearance_base.h
index cbbfa50..70448bb 100644
--- a/pcbnew/dialogs/dialog_mask_clearance_base.h
+++ b/pcbnew/dialogs/dialog_mask_clearance_base.h
@@ -1,8 +1,8 @@
///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Nov 22 2017)
+// C++ code generated with wxFormBuilder (version Aug 4 2017)
// http://www.wxformbuilder.org/
//
-// PLEASE DO *NOT* EDIT THIS FILE!
+// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#ifndef __DIALOG_MASK_CLEARANCE_BASE_H__
@@ -11,6 +11,8 @@
#include <wx/artprov.h>
#include <wx/xrc/xmlres.h>
#include <wx/intl.h>
+class DIALOG_SHIM;
+
#include "dialog_shim.h"
#include <wx/string.h>
#include <wx/stattext.h>
@@ -41,6 +43,7 @@ class DIALOG_PADS_MASK_CLEARANCE_BASE : public DIALOG_SHIM
protected:
wxStaticText* m_staticTextInfo;
+ wxStaticText* m_staticTextInfo2;
wxStaticLine* m_staticline1;
wxStaticText* m_MaskClearanceTitle;
wxTextCtrl* m_SolderMaskMarginCtrl;
@@ -69,7 +72,7 @@ class DIALOG_PADS_MASK_CLEARANCE_BASE : public DIALOG_SHIM
public:
- DIALOG_PADS_MASK_CLEARANCE_BASE( wxWindow* parent, wxWindowID
id = wxID_ANY, const wxString& title = _("Pads Mask Clearance"), const wxPoint&
pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style =
wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+ DIALOG_PADS_MASK_CLEARANCE_BASE( wxWindow* parent, wxWindowID
id = wxID_ANY, const wxString& title = _("Pads Mask Clearance"), const wxPoint&
pos = wxDefaultPosition, const wxSize& size = wxSize( 393,332 ), long style =
wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~DIALOG_PADS_MASK_CLEARANCE_BASE();
};
diff --git a/pcbnew/dialogs/dialog_pad_properties.h
b/pcbnew/dialogs/dialog_pad_properties.h
index 6bc9b61..4987287 100644
--- a/pcbnew/dialogs/dialog_pad_properties.h
+++ b/pcbnew/dialogs/dialog_pad_properties.h
@@ -119,6 +119,11 @@ private:
void OnResize( wxSizeEvent& event );
void OnCancel( wxCommandEvent& event ) override;
+ void updateUITextWarning( wxUpdateUIEvent& event ) override
+ {
+ event.Enable( ( m_dummyPad->GetLayerSet() & LSET::AllCuMask() ).any()
);
+ }
+
void OnPadShapeSelection( wxCommandEvent& event ) override;
void OnDrillShapeSelected( wxCommandEvent& event ) override;
void onChangePadMode( wxCommandEvent& event ) override;
diff --git a/pcbnew/dialogs/dialog_pad_properties_base.cpp
b/pcbnew/dialogs/dialog_pad_properties_base.cpp
index fd1eb59..6dfb10a 100644
--- a/pcbnew/dialogs/dialog_pad_properties_base.cpp
+++ b/pcbnew/dialogs/dialog_pad_properties_base.cpp
@@ -1,8 +1,8 @@
///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Apr 19 2018)
+// C++ code generated with wxFormBuilder (version Jul 2 2017)
// http://www.wxformbuilder.org/
//
-// PLEASE DO *NOT* EDIT THIS FILE!
+// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#include "widgets/text_ctrl_eval.h"
@@ -406,11 +406,17 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE(
wxWindow* parent, wxWind
bSizerClearance->Add( m_staticTextWarning, 0, wxALL, 5 );
+ m_staticTextInfo = new wxStaticText( m_localSettingsPanel, wxID_ANY,
_("These parameters are used only by pads on copper layers\nPads only on
technical layers do not use these parameters"), wxDefaultPosition,
wxDefaultSize, 0 );
+ m_staticTextInfo->Wrap( -1 );
+ m_staticTextInfo->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(),
wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false,
wxEmptyString ) );
+
+ bSizerClearance->Add( m_staticTextInfo, 0, wxALL, 5 );
+
m_staticTextInfoPosValue = new wxStaticText( m_localSettingsPanel,
wxID_ANY, _("Positive clearance means area bigger than the pad (usual for mask
clearance)."), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextInfoPosValue->Wrap( -1 );
m_staticTextInfoPosValue->SetFont( wxFont(
wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_ITALIC,
wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
- bSizerClearance->Add( m_staticTextInfoPosValue, 0, wxALL, 5 );
+ bSizerClearance->Add( m_staticTextInfoPosValue, 0,
wxTOP|wxRIGHT|wxLEFT, 5 );
m_staticTextInfoNegVal = new wxStaticText( m_localSettingsPanel,
wxID_ANY, _("Negative clearance means area smaller than the pad (usual for
paste clearance)."), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextInfoNegVal->Wrap( -1 );
@@ -652,36 +658,36 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE(
wxWindow* parent, wxWind
m_staticModuleSideValue->Wrap( -1 );
sbSizeModuleInfo->Add( m_staticModuleSideValue, 0,
wxALL|wxBOTTOM|wxTOP, 5 );
- wxBoxSizer* bSizer23;
- bSizer23 = new wxBoxSizer( wxHORIZONTAL );
+ wxBoxSizer* bSizerParentInfo;
+ bSizerParentInfo = new wxBoxSizer( wxHORIZONTAL );
m_staticTitleModuleRot = new wxStaticText(
sbSizeModuleInfo->GetStaticBox(), wxID_ANY, _("Rotation:"), wxDefaultPosition,
wxDefaultSize, 0 );
m_staticTitleModuleRot->Wrap( -1 );
- bSizer23->Add( m_staticTitleModuleRot, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 );
+ bSizerParentInfo->Add( m_staticTitleModuleRot, 0,
wxBOTTOM|wxLEFT|wxRIGHT, 5 );
- bSizer23->Add( 0, 0, 1, wxEXPAND, 5 );
+ bSizerParentInfo->Add( 0, 0, 1, wxEXPAND, 5 );
m_staticModuleRotValue = new wxStaticText(
sbSizeModuleInfo->GetStaticBox(), wxID_ANY, _("180.0"), wxDefaultPosition,
wxDefaultSize, 0 );
m_staticModuleRotValue->Wrap( -1 );
- bSizer23->Add( m_staticModuleRotValue, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 );
+ bSizerParentInfo->Add( m_staticModuleRotValue, 0,
wxBOTTOM|wxRIGHT|wxLEFT, 5 );
- sbSizeModuleInfo->Add( bSizer23, 1, wxEXPAND, 5 );
+ sbSizeModuleInfo->Add( bSizerParentInfo, 1, wxEXPAND, 5 );
- sbSizeModuleInfo->Add( 0, 0, 1, wxEXPAND, 5 );
+ bSizerDisplayPad->Add( sbSizeModuleInfo, 0,
wxBOTTOM|wxEXPAND|wxRIGHT|wxTOP, 8 );
- bSizerDisplayPad->Add( sbSizeModuleInfo, 0,
wxBOTTOM|wxEXPAND|wxRIGHT|wxTOP, 8 );
+ bSizerDisplayPad->Add( 0, 0, 1, wxEXPAND, 5 );
m_panelShowPad = new wxPanel( this, wxID_ANY, wxDefaultPosition,
wxSize( 220,-1 ), wxFULL_REPAINT_ON_RESIZE|wxSIMPLE_BORDER );
m_panelShowPad->SetBackgroundColour( wxColour( 0, 0, 0 ) );
- bSizerDisplayPad->Add( m_panelShowPad, 12, wxRIGHT|wxTOP|wxEXPAND, 10 );
+ bSizerDisplayPad->Add( m_panelShowPad, 12,
wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 10 );
m_panelShowPadGal = new PCB_DRAW_PANEL_GAL( this, -1, wxPoint( 0, 0 ),
wxDefaultSize, m_galOptions, EDA_DRAW_PANEL_GAL::GAL_TYPE_CAIRO);
- bSizerDisplayPad->Add( m_panelShowPadGal, 12, wxEXPAND|wxRIGHT|wxTOP,
10 );
+ bSizerDisplayPad->Add( m_panelShowPadGal, 12,
wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 10 );
m_cbShowPadOutline = new wxCheckBox( this, wxID_ANY, _("Show pad in
outline mode"), wxDefaultPosition, wxDefaultSize, 0 );
bSizerDisplayPad->Add( m_cbShowPadOutline, 0, wxBOTTOM|wxRIGHT|wxTOP, 5
);
@@ -693,7 +699,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE(
wxWindow* parent, wxWind
bSizerDisplayPad->Add( m_staticline13, 0, wxALL|wxEXPAND, 4 );
- bSizerUpper->Add( bSizerDisplayPad, 1, wxBOTTOM|wxEXPAND|wxRIGHT|wxTOP,
10 );
+ bSizerUpper->Add( bSizerDisplayPad, 1, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT,
10 );
m_MainSizer->Add( bSizerUpper, 1, wxEXPAND, 5 );
@@ -744,6 +750,8 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE(
wxWindow* parent, wxWind
m_PadLayerDraft->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED,
wxCommandEventHandler( DIALOG_PAD_PROPERTIES_BASE::OnSetLayers ), NULL, this );
m_PadLayerECO1->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED,
wxCommandEventHandler( DIALOG_PAD_PROPERTIES_BASE::OnSetLayers ), NULL, this );
m_PadLayerECO2->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED,
wxCommandEventHandler( DIALOG_PAD_PROPERTIES_BASE::OnSetLayers ), NULL, this );
+ m_staticTextWarning->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler(
DIALOG_PAD_PROPERTIES_BASE::updateUITextWarning ), NULL, this );
+ m_staticTextInfo->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler(
DIALOG_PAD_PROPERTIES_BASE::updateUiTextInfo ), NULL, this );
m_NetClearanceValueCtrl->Connect( wxEVT_COMMAND_TEXT_UPDATED,
wxCommandEventHandler( DIALOG_PAD_PROPERTIES_BASE::OnValuesChanged ), NULL,
this );
m_listCtrlPrimitives->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler(
DIALOG_PAD_PROPERTIES_BASE::onPrimitiveDClick ), NULL, this );
m_listCtrlPrimitives->Connect( wxEVT_COMMAND_LIST_ITEM_DESELECTED,
wxListEventHandler( DIALOG_PAD_PROPERTIES_BASE::OnPrimitiveSelection ), NULL,
this );
@@ -791,6 +799,8 @@ DIALOG_PAD_PROPERTIES_BASE::~DIALOG_PAD_PROPERTIES_BASE()
m_PadLayerDraft->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED,
wxCommandEventHandler( DIALOG_PAD_PROPERTIES_BASE::OnSetLayers ), NULL, this );
m_PadLayerECO1->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED,
wxCommandEventHandler( DIALOG_PAD_PROPERTIES_BASE::OnSetLayers ), NULL, this );
m_PadLayerECO2->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED,
wxCommandEventHandler( DIALOG_PAD_PROPERTIES_BASE::OnSetLayers ), NULL, this );
+ m_staticTextWarning->Disconnect( wxEVT_UPDATE_UI,
wxUpdateUIEventHandler( DIALOG_PAD_PROPERTIES_BASE::updateUITextWarning ),
NULL, this );
+ m_staticTextInfo->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler(
DIALOG_PAD_PROPERTIES_BASE::updateUiTextInfo ), NULL, this );
m_NetClearanceValueCtrl->Disconnect( wxEVT_COMMAND_TEXT_UPDATED,
wxCommandEventHandler( DIALOG_PAD_PROPERTIES_BASE::OnValuesChanged ), NULL,
this );
m_listCtrlPrimitives->Disconnect( wxEVT_LEFT_DCLICK,
wxMouseEventHandler( DIALOG_PAD_PROPERTIES_BASE::onPrimitiveDClick ), NULL,
this );
m_listCtrlPrimitives->Disconnect( wxEVT_COMMAND_LIST_ITEM_DESELECTED,
wxListEventHandler( DIALOG_PAD_PROPERTIES_BASE::OnPrimitiveSelection ), NULL,
this );
diff --git a/pcbnew/dialogs/dialog_pad_properties_base.fbp
b/pcbnew/dialogs/dialog_pad_properties_base.fbp
index 5c38d6b..ba5ca19 100644
--- a/pcbnew/dialogs/dialog_pad_properties_base.fbp
+++ b/pcbnew/dialogs/dialog_pad_properties_base.fbp
@@ -14,7 +14,6 @@
<property name="file">dialog_pad_properties_base</property>
<property name="first_id">1000</property>
<property name="help_provider">none</property>
- <property name="indent_with_spaces"></property>
<property name="internationalize">1</property>
<property name="name">dialog_pad_properties_base</property>
<property name="namespace"></property>
@@ -7089,7 +7088,7 @@
<event
name="OnRightUp"></event>
<event
name="OnSetFocus"></event>
<event
name="OnSize"></event>
- <event
name="OnUpdateUI"></event>
+ <event
name="OnUpdateUI">updateUITextWarning</event>
</object>
</object>
<object class="sizeritem"
expanded="1">
@@ -7120,6 +7119,89 @@
<property
name="enabled">1</property>
<property
name="fg"></property>
<property
name="floatable">1</property>
+ <property
name="font">,90,92,-1,70,0</property>
+ <property
name="gripper">0</property>
+ <property
name="hidden">0</property>
+ <property
name="id">wxID_ANY</property>
+ <property
name="label">These parameters are used only by pads on copper layers
Pads
only on technical layers do not use these parameters</property>
+ <property
name="max_size"></property>
+ <property
name="maximize_button">0</property>
+ <property
name="maximum_size"></property>
+ <property
name="min_size"></property>
+ <property
name="minimize_button">0</property>
+ <property
name="minimum_size"></property>
+ <property
name="moveable">1</property>
+ <property
name="name">m_staticTextInfo</property>
+ <property
name="pane_border">1</property>
+ <property
name="pane_position"></property>
+ <property
name="pane_size"></property>
+ <property
name="permission">protected</property>
+ <property
name="pin_button">1</property>
+ <property
name="pos"></property>
+ <property
name="resize">Resizable</property>
+ <property
name="show">1</property>
+ <property
name="size"></property>
+ <property
name="style"></property>
+ <property
name="subclass"></property>
+ <property
name="toolbar_pane">0</property>
+ <property
name="tooltip"></property>
+ <property
name="window_extra_style"></property>
+ <property
name="window_name"></property>
+ <property
name="window_style"></property>
+ <property
name="wrap">-1</property>
+ <event
name="OnChar"></event>
+ <event
name="OnEnterWindow"></event>
+ <event
name="OnEraseBackground"></event>
+ <event
name="OnKeyDown"></event>
+ <event
name="OnKeyUp"></event>
+ <event
name="OnKillFocus"></event>
+ <event
name="OnLeaveWindow"></event>
+ <event
name="OnLeftDClick"></event>
+ <event
name="OnLeftDown"></event>
+ <event
name="OnLeftUp"></event>
+ <event
name="OnMiddleDClick"></event>
+ <event
name="OnMiddleDown"></event>
+ <event
name="OnMiddleUp"></event>
+ <event
name="OnMotion"></event>
+ <event
name="OnMouseEvents"></event>
+ <event
name="OnMouseWheel"></event>
+ <event
name="OnPaint"></event>
+ <event
name="OnRightDClick"></event>
+ <event
name="OnRightDown"></event>
+ <event
name="OnRightUp"></event>
+ <event
name="OnSetFocus"></event>
+ <event
name="OnSize"></event>
+ <event
name="OnUpdateUI">updateUiTextInfo</event>
+ </object>
+ </object>
+ <object class="sizeritem"
expanded="1">
+ <property
name="border">5</property>
+ <property
name="flag">wxTOP|wxRIGHT|wxLEFT</property>
+ <property
name="proportion">0</property>
+ <object
class="wxStaticText" expanded="1">
+ <property
name="BottomDockable">1</property>
+ <property
name="LeftDockable">1</property>
+ <property
name="RightDockable">1</property>
+ <property
name="TopDockable">1</property>
+ <property
name="aui_layer"></property>
+ <property
name="aui_name"></property>
+ <property
name="aui_position"></property>
+ <property
name="aui_row"></property>
+ <property
name="best_size"></property>
+ <property
name="bg"></property>
+ <property
name="caption"></property>
+ <property
name="caption_visible">1</property>
+ <property
name="center_pane">0</property>
+ <property
name="close_button">1</property>
+ <property
name="context_help"></property>
+ <property
name="context_menu">1</property>
+ <property
name="default_pane">0</property>
+ <property
name="dock">Dock</property>
+ <property
name="dock_fixed">0</property>
+ <property
name="docking">Left</property>
+ <property
name="enabled">1</property>
+ <property
name="fg"></property>
+ <property
name="floatable">1</property>
<property
name="font">,93,90,-1,70,0</property>
<property
name="gripper">0</property>
<property
name="hidden">0</property>
@@ -10349,7 +10431,7 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">10</property>
- <property
name="flag">wxBOTTOM|wxEXPAND|wxRIGHT|wxTOP</property>
+ <property
name="flag">wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size">200,-1</property>
@@ -10462,13 +10544,13 @@
<event
name="OnUpdateUI"></event>
</object>
</object>
- <object class="sizeritem" expanded="0">
+ <object class="sizeritem" expanded="1">
<property
name="border">5</property>
<property
name="flag">wxEXPAND</property>
<property
name="proportion">1</property>
- <object class="wxBoxSizer"
expanded="0">
+ <object class="wxBoxSizer"
expanded="1">
<property
name="minimum_size"></property>
- <property
name="name">bSizer23</property>
+ <property
name="name">bSizerParentInfo</property>
<property
name="orient">wxHORIZONTAL</property>
<property
name="permission">none</property>
<object class="sizeritem"
expanded="0">
@@ -10566,7 +10648,7 @@
</object>
<object class="sizeritem"
expanded="0">
<property
name="border">5</property>
- <property
name="flag">wxBOTTOM|wxLEFT|wxRIGHT</property>
+ <property
name="flag">wxBOTTOM|wxRIGHT|wxLEFT</property>
<property
name="proportion">0</property>
<object
class="wxStaticText" expanded="0">
<property
name="BottomDockable">1</property>
@@ -10649,21 +10731,21 @@
</object>
</object>
</object>
- <object class="sizeritem" expanded="1">
- <property
name="border">5</property>
- <property
name="flag">wxEXPAND</property>
- <property
name="proportion">1</property>
- <object class="spacer"
expanded="1">
- <property
name="height">0</property>
- <property
name="permission">protected</property>
- <property
name="width">0</property>
- </object>
- </object>
+ </object>
+ </object>
+ <object class="sizeritem" expanded="1">
+ <property name="border">5</property>
+ <property name="flag">wxEXPAND</property>
+ <property name="proportion">1</property>
+ <object class="spacer" expanded="1">
+ <property name="height">0</property>
+ <property
name="permission">protected</property>
+ <property name="width">0</property>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">10</property>
- <property
name="flag">wxRIGHT|wxTOP|wxEXPAND</property>
+ <property
name="flag">wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT</property>
<property name="proportion">12</property>
<object class="wxPanel" expanded="0">
<property
name="BottomDockable">1</property>
@@ -10743,7 +10825,7 @@
</object>
<object class="sizeritem" expanded="0">
<property name="border">10</property>
- <property
name="flag">wxEXPAND|wxRIGHT|wxTOP</property>
+ <property
name="flag">wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT</property>
<property name="proportion">12</property>
<object class="CustomControl" expanded="0">
<property
name="BottomDockable">1</property>
diff --git a/pcbnew/dialogs/dialog_pad_properties_base.h
b/pcbnew/dialogs/dialog_pad_properties_base.h
index a80bc65..ce604e9 100644
--- a/pcbnew/dialogs/dialog_pad_properties_base.h
+++ b/pcbnew/dialogs/dialog_pad_properties_base.h
@@ -1,8 +1,8 @@
///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Apr 19 2018)
+// C++ code generated with wxFormBuilder (version Jul 2 2017)
// http://www.wxformbuilder.org/
//
-// PLEASE DO *NOT* EDIT THIS FILE!
+// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#ifndef __DIALOG_PAD_PROPERTIES_BASE_H__
@@ -11,7 +11,9 @@
#include <wx/artprov.h>
#include <wx/xrc/xmlres.h>
#include <wx/intl.h>
+class DIALOG_SHIM;
class TEXT_CTRL_EVAL;
+class wxListView;
#include "dialog_shim.h"
#include <wx/string.h>
@@ -137,6 +139,7 @@ class DIALOG_PAD_PROPERTIES_BASE : public DIALOG_SHIM
wxCheckBox* m_PadLayerECO2;
wxPanel* m_localSettingsPanel;
wxStaticText* m_staticTextWarning;
+ wxStaticText* m_staticTextInfo;
wxStaticText* m_staticTextInfoPosValue;
wxStaticText* m_staticTextInfoNegVal;
wxStaticText* m_staticTextNetClearance;
@@ -197,6 +200,8 @@ class DIALOG_PAD_PROPERTIES_BASE : public DIALOG_SHIM
virtual void OnSetLayers( wxCommandEvent& event ) {
event.Skip(); }
virtual void onCornerSizePercentChange( wxCommandEvent& event )
{ event.Skip(); }
virtual void OnDrillShapeSelected( wxCommandEvent& event ) {
event.Skip(); }
+ virtual void updateUITextWarning( wxUpdateUIEvent& event ) {
event.Skip(); }
+ virtual void updateUiTextInfo( wxUpdateUIEvent& event ) {
event.Skip(); }
virtual void onPrimitiveDClick( wxMouseEvent& event ) {
event.Skip(); }
virtual void OnPrimitiveSelection( wxListEvent& event ) {
event.Skip(); }
virtual void onDeletePrimitive( wxCommandEvent& event ) {
event.Skip(); }
--
1.9.5.msysgit.1
_______________________________________________
Mailing list: https://launchpad.net/~kicad-developers
Post to : kicad-developers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~kicad-developers
More help : https://help.launchpad.net/ListHelp
