| Thread Previous • Date Previous • Date Next • Thread Next |
On 2019-05-30 15:00, jp charras wrote:
Le 29/05/2019 à 21:31, Seth Hillbrand a écrit :On 2019-05-29 10:33, jp charras wrote:Attached a patch that modify the way filled areas (solid polygons) arebuilt in copper areas.Currently, solid polygons are slightly smaller than the exact area, andthe polygon outlines have a thickness to fill the exact area. With this patch, polygon outlines have no thickness and the polygons have the exact area. To test it on a given zone, the zone setting must be edited with the "Fill polys without thick outline" checked.Hi JP- Why did you decide to make this a user option? Is there some featurethat it prevents that a user would want for some areas but not for others?I tested it with a large board and it reduces the polygon point count byalmost 50% (!) for complex fills. If I zoom in on an edge, it appears that the approximation count is substantially coarsened by the patch. See attached image. The edge on the right is with the new option enabled. The edge of the left is without the new option.I didn't find any other issues. Large boards were much faster and DRC / plotting appear consistent between options (with the exception noted above)-SethThanks Seth for your test. Currently, having a user option is useful to test and compare the 2 options (the current way, and the new way).
OK. Makes sense. Instead of changing the board file, can we put the option in the advanced config file to enable our testing? It would be nice to avoid changing the file format here.
If it is useful, I am attaching a patch to do this. It also uses the board settings for approximations to avoid the excess coarsening.
Feel free to squash this into your patch to minimize the commit size if you find it useful.
Best- Seth
From 262f71228ad4a4d37db2400d00802ac8d4f26308 Mon Sep 17 00:00:00 2001
From: Seth Hillbrand <hillbrand@xxxxxxxxxxx>
Date: Wed, 29 May 2019 07:45:33 -0700
Subject: [PATCH] Some mods to JP's patch
These move the setting to AdvancedConfig and use configurable settings
for approximation calculations
---
common/advanced_config.cpp | 8 +
common/geometry/shape_poly_set.cpp | 2 +-
common/pcb.keywords | 1 -
include/advanced_config.h | 5 +
include/geometry/shape_poly_set.h | 2 +-
pcbnew/class_zone.cpp | 15 +-
pcbnew/class_zone.h | 4 -
pcbnew/dialogs/dialog_copper_zones.cpp | 5 +-
pcbnew/dialogs/dialog_copper_zones_base.cpp | 291 +-
pcbnew/dialogs/dialog_copper_zones_base.fbp | 4088 ++++++++++++-------
pcbnew/dialogs/dialog_copper_zones_base.h | 43 +-
pcbnew/kicad_plugin.cpp | 4 -
pcbnew/pcb_painter.cpp | 5 +-
pcbnew/pcb_parser.cpp | 14 -
pcbnew/plot_brditems_plotter.cpp | 14 +-
pcbnew/zone_filler.cpp | 33 +-
pcbnew/zone_settings.cpp | 6 +-
pcbnew/zone_settings.h | 1 -
18 files changed, 2811 insertions(+), 1730 deletions(-)
diff --git a/common/advanced_config.cpp b/common/advanced_config.cpp
index 3b72d1731..f1df6a120 100644
--- a/common/advanced_config.cpp
+++ b/common/advanced_config.cpp
@@ -72,6 +72,11 @@ static const wxChar RealtimeConnectivity[] = wxT( "RealtimeConnectivity" );
*/
static const wxChar AllowLegacyCanvasInGtk3[] = wxT( "AllowLegacyCanvasInGtk3" );
+/**
+ * Draw zones in pcbnew with the stroked outline.
+ */
+static const wxChar ThickZones[] = wxT( "ThickZones" );
+
} // namespace KEYS
@@ -152,6 +157,7 @@ ADVANCED_CFG::ADVANCED_CFG()
m_enableSvgImport = false;
m_allowLegacyCanvasInGtk3 = false;
m_realTimeConnectivity = true;
+ m_thickZones = true;
loadFromConfigFile();
}
@@ -194,6 +200,8 @@ void ADVANCED_CFG::loadSettings( wxConfigBase& aCfg )
configParams.push_back(
new PARAM_CFG_BOOL( true, AC_KEYS::RealtimeConnectivity, &m_realTimeConnectivity, false ) );
+ configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::ThickZones, &m_thickZones, true ) );
+
wxConfigLoadSetups( &aCfg, configParams );
dumpCfg( configParams );
diff --git a/common/geometry/shape_poly_set.cpp b/common/geometry/shape_poly_set.cpp
index 63c6f2341..60d1186b6 100644
--- a/common/geometry/shape_poly_set.cpp
+++ b/common/geometry/shape_poly_set.cpp
@@ -1512,7 +1512,7 @@ int SHAPE_POLY_SET::TotalVertices() const
SHAPE_POLY_SET::POLYGON SHAPE_POLY_SET::ChamferPolygon( unsigned int aDistance, int aIndex )
{
- return chamferFilletPolygon( CORNER_MODE::CHAMFERED, aDistance, aIndex );
+ return chamferFilletPolygon( CORNER_MODE::CHAMFERED, aDistance, aIndex, 0 );
}
diff --git a/common/pcb.keywords b/common/pcb.keywords
index 8e816f06a..1e28ba07b 100644
--- a/common/pcb.keywords
+++ b/common/pcb.keywords
@@ -132,7 +132,6 @@ not_allowed
np_thru_hole
offset
options
-outline_thickness
oval
pad
pads
diff --git a/include/advanced_config.h b/include/advanced_config.h
index 86c532a31..882945372 100644
--- a/include/advanced_config.h
+++ b/include/advanced_config.h
@@ -78,6 +78,11 @@ public:
*/
bool m_realTimeConnectivity;
+ /**
+ * Draw zones with outlines -- To be removed after testing
+ */
+ bool m_thickZones;
+
/**
* Helper to determine if legacy canvas is allowed (according to platform
* and config)
diff --git a/include/geometry/shape_poly_set.h b/include/geometry/shape_poly_set.h
index 68b4d52ee..ad06c5198 100644
--- a/include/geometry/shape_poly_set.h
+++ b/include/geometry/shape_poly_set.h
@@ -1187,7 +1187,7 @@ class SHAPE_POLY_SET : public SHAPE
* @return POLYGON - the chamfered/filleted version of the polygon.
*/
POLYGON chamferFilletPolygon( CORNER_MODE aMode, unsigned int aDistance,
- int aIndex, int aErrorMax = -1 );
+ int aIndex, int aErrorMax );
///> Returns true if the polygon set has any holes that touch share a vertex.
bool hasTouchingHoles( const POLYGON& aPoly ) const;
diff --git a/pcbnew/class_zone.cpp b/pcbnew/class_zone.cpp
index a4d58c873..bac58ea3d 100644
--- a/pcbnew/class_zone.cpp
+++ b/pcbnew/class_zone.cpp
@@ -28,6 +28,7 @@
* @brief Implementation of class to handle copper zones.
*/
+#include <advanced_config.h>
#include <bitmaps.h>
#include <class_drawpanel.h>
#include <fctsys.h>
@@ -74,7 +75,6 @@ ZONE_CONTAINER::ZONE_CONTAINER( BOARD* aBoard ) :
m_cornerRadius = 0;
SetLocalFlags( 0 ); // flags tempoarry used in zone calculations
m_Poly = new SHAPE_POLY_SET(); // Outlines
- m_ZoneOutlineThickness = 0;
aBoard->GetZoneSettings().ExportSetting( *this );
m_needRefill = false; // True only after some edition.
@@ -93,7 +93,6 @@ ZONE_CONTAINER::ZONE_CONTAINER( const ZONE_CONTAINER& aZone ) :
m_IsFilled = aZone.m_IsFilled;
m_ZoneClearance = aZone.m_ZoneClearance; // clearance value
m_ZoneMinThickness = aZone.m_ZoneMinThickness;
- m_ZoneOutlineThickness = aZone.m_ZoneOutlineThickness;
m_FillMode = aZone.m_FillMode; // Filling mode (segments/polygons)
m_hv45 = aZone.m_hv45;
m_priority = aZone.m_priority;
@@ -133,7 +132,6 @@ ZONE_CONTAINER& ZONE_CONTAINER::operator=( const ZONE_CONTAINER& aOther )
m_CornerSelection = nullptr; // for corner moving, corner index to (null if no selection)
m_ZoneClearance = aOther.m_ZoneClearance; // clearance value
m_ZoneMinThickness = aOther.m_ZoneMinThickness;
- m_ZoneOutlineThickness = aOther.m_ZoneOutlineThickness;
m_FillMode = aOther.m_FillMode; // filling mode (segments/polygons)
m_PadConnection = aOther.m_PadConnection;
m_ThermalReliefGap = aOther.m_ThermalReliefGap;
@@ -484,9 +482,10 @@ void ZONE_CONTAINER::DrawFilledArea( EDA_DRAW_PANEL* panel,
CornersBuffer.push_back( p0 );
// Draw outlines:
- if( GetZoneOutlineThickness() > 1 || outline_mode )
+ if( ( ADVANCED_CFG::GetCfg().m_thickZones && ( m_ZoneMinThickness > 1 ) ) || outline_mode )
{
int ilim = CornersBuffer.size() - 1;
+ int line_thickness = m_ZoneMinThickness;
for( int is = 0, ie = ilim; is <= ilim; ie = is, is++ )
{
@@ -494,14 +493,14 @@ void ZONE_CONTAINER::DrawFilledArea( EDA_DRAW_PANEL* panel,
if( !displ_opts->m_DisplayPcbTrackFill || GetState( FORCE_SKETCH ) )
{
GRCSegm( panel->GetClipBox(), DC, CornersBuffer[is], CornersBuffer[ie],
- GetZoneOutlineThickness(), color );
- GRLine( panel->GetClipBox(), DC, CornersBuffer[is], CornersBuffer[ie],
- 0, color );
+ line_thickness, color );
+ GRLine( panel->GetClipBox(), DC, CornersBuffer[is], CornersBuffer[ie], 0,
+ color );
}
else
{
GRFilledSegment( panel->GetClipBox(), DC, CornersBuffer[is], CornersBuffer[ie],
- GetZoneOutlineThickness(), color );
+ line_thickness, color );
}
}
}
diff --git a/pcbnew/class_zone.h b/pcbnew/class_zone.h
index 16e4b36d3..7ca3248e1 100644
--- a/pcbnew/class_zone.h
+++ b/pcbnew/class_zone.h
@@ -608,9 +608,6 @@ public:
unsigned int GetCornerRadius() const { return m_cornerRadius; }
- int GetZoneOutlineThickness() const { return m_ZoneOutlineThickness; }
- void SetZoneOutlineThickness( int aWidth ) { m_ZoneOutlineThickness = aWidth; }
-
/**
* add a polygon to the zone outline
@@ -750,7 +747,6 @@ private:
ZoneConnection m_PadConnection;
int m_ZoneClearance; ///< Clearance value in internal units.
int m_ZoneMinThickness; ///< Minimum thickness value in filled areas.
- int m_ZoneOutlineThickness; ///< thickness of outline of filled polygons.
/** True when a zone was filled, false after deleting the filled areas. */
bool m_IsFilled;
diff --git a/pcbnew/dialogs/dialog_copper_zones.cpp b/pcbnew/dialogs/dialog_copper_zones.cpp
index 53bbff00c..dc02e889a 100644
--- a/pcbnew/dialogs/dialog_copper_zones.cpp
+++ b/pcbnew/dialogs/dialog_copper_zones.cpp
@@ -45,7 +45,7 @@ private:
PCB_BASE_FRAME* m_Parent;
wxConfigBase* m_Config; // Current config
- bool m_settingsExported; // settings will be written to all other zones
+ bool m_settingsExported; // settings were written to all other zones
ZONE_SETTINGS m_settings;
ZONE_SETTINGS* m_ptr;
@@ -138,7 +138,6 @@ DIALOG_COPPER_ZONE::DIALOG_COPPER_ZONE( PCB_BASE_FRAME* aParent, ZONE_SETTINGS*
bool DIALOG_COPPER_ZONE::TransferDataToWindow()
{
m_constrainOutline->SetValue( m_settings.m_Zone_45_Only );
- m_cbFilledPolyOutlineOpt->SetValue( m_settings.m_ZoneOutlineThickness == 0 );
m_cornerSmoothingChoice->SetSelection( m_settings.GetCornerSmoothingType() );
m_cornerRadius.SetValue( m_settings.GetCornerRadius() );
m_PriorityLevelCtrl->SetValue( m_settings.m_ZonePriority );
@@ -352,8 +351,6 @@ bool DIALOG_COPPER_ZONE::AcceptOptions( bool aUseExportableSetupOnly )
m_settings.m_ZonePriority = m_PriorityLevelCtrl->GetValue();
m_settings.m_Zone_45_Only = m_constrainOutline->GetValue();
- m_settings.m_ZoneOutlineThickness = m_cbFilledPolyOutlineOpt->GetValue() ? 0
- : m_settings.m_ZoneMinThickness;
m_settings.m_ThermalReliefGap = m_antipadClearance.GetValue();
m_settings.m_ThermalReliefCopperBridge = m_spokeWidth.GetValue();
diff --git a/pcbnew/dialogs/dialog_copper_zones_base.cpp b/pcbnew/dialogs/dialog_copper_zones_base.cpp
index eee9f4754..77cef6d95 100644
--- a/pcbnew/dialogs/dialog_copper_zones_base.cpp
+++ b/pcbnew/dialogs/dialog_copper_zones_base.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Dec 1 2018)
+// C++ code generated with wxFormBuilder (version Dec 30 2017)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
@@ -12,342 +12,333 @@
DIALOG_COPPER_ZONE_BASE::DIALOG_COPPER_ZONE_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style )
{
this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-
+
m_MainBoxSizer = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* m_OptionsBoxSizer;
m_OptionsBoxSizer = new wxBoxSizer( wxHORIZONTAL );
-
+
wxStaticBoxSizer* sbSizer2;
sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Layer") ), wxVERTICAL );
-
+
m_layers = new wxDataViewListCtrl( sbSizer2->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDV_NO_HEADER|wxBORDER_SIMPLE );
m_layers->SetMinSize( wxSize( 120,-1 ) );
-
+
sbSizer2->Add( m_layers, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
-
+
+
m_OptionsBoxSizer->Add( sbSizer2, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
-
+
wxStaticBoxSizer* sbSizer3;
sbSizer3 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Net") ), wxHORIZONTAL );
-
- m_ListNetNameSelection = new wxListBox( sbSizer3->GetStaticBox(), ID_NETNAME_SELECTION, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+
+ m_ListNetNameSelection = new wxListBox( sbSizer3->GetStaticBox(), ID_NETNAME_SELECTION, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
sbSizer3->Add( m_ListNetNameSelection, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
+
wxBoxSizer* bFilteringSizer;
bFilteringSizer = new wxBoxSizer( wxVERTICAL );
-
+
m_staticTextDisplay = new wxStaticText( sbSizer3->GetStaticBox(), wxID_ANY, _("Hide nets matching:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextDisplay->Wrap( -1 );
bFilteringSizer->Add( m_staticTextDisplay, 0, wxRIGHT|wxLEFT, 5 );
-
+
m_DoNotShowNetNameFilter = new wxTextCtrl( sbSizer3->GetStaticBox(), ID_TEXTCTRL_NETNAMES_FILTER, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER );
m_DoNotShowNetNameFilter->SetToolTip( _("Pattern to filter net names in filtered list.\nNet names matching this pattern are not displayed.") );
m_DoNotShowNetNameFilter->SetMinSize( wxSize( 180,-1 ) );
-
+
bFilteringSizer->Add( m_DoNotShowNetNameFilter, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
+
m_staticTextVFilter = new wxStaticText( sbSizer3->GetStaticBox(), wxID_ANY, _("Show nets matching:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextVFilter->Wrap( -1 );
bFilteringSizer->Add( m_staticTextVFilter, 0, wxRIGHT|wxLEFT, 5 );
-
+
m_ShowNetNameFilter = new wxTextCtrl( sbSizer3->GetStaticBox(), ID_TEXTCTRL_NETNAMES_FILTER, _("*"), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER );
m_ShowNetNameFilter->SetToolTip( _("Pattern to filter net names in filtered list.\nOnly net names matching this pattern are displayed.") );
-
+
bFilteringSizer->Add( m_ShowNetNameFilter, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-
+
m_buttonRunFilter = new wxButton( sbSizer3->GetStaticBox(), wxID_APPLY_FILTERS, _("Apply Filters"), wxDefaultPosition, wxDefaultSize, 0 );
bFilteringSizer->Add( m_buttonRunFilter, 0, wxALL|wxEXPAND, 5 );
-
-
+
+
bFilteringSizer->Add( 0, 0, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
-
+
m_showAllNetsOpt = new wxCheckBox( sbSizer3->GetStaticBox(), wxID_ANY, _("Show all nets"), wxDefaultPosition, wxDefaultSize, 0 );
bFilteringSizer->Add( m_showAllNetsOpt, 0, wxALL, 5 );
-
-
+
+
bFilteringSizer->Add( 0, 0, 0, wxEXPAND|wxTOP, 5 );
-
+
m_sortByPadsOpt = new wxCheckBox( sbSizer3->GetStaticBox(), wxID_ANY, _("Sort nets by pad count"), wxDefaultPosition, wxDefaultSize, 0 );
bFilteringSizer->Add( m_sortByPadsOpt, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-
+
m_bNoNetWarning = new wxBoxSizer( wxHORIZONTAL );
-
+
m_bitmapNoNetWarning = new wxStaticBitmap( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
m_bNoNetWarning->Add( m_bitmapNoNetWarning, 0, wxTOP|wxBOTTOM|wxLEFT, 8 );
-
+
m_staticText18 = new wxStaticText( sbSizer3->GetStaticBox(), wxID_ANY, _("No net will result\nin an unconnected \ncopper island."), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText18->Wrap( -1 );
m_bNoNetWarning->Add( m_staticText18, 0, wxALL, 5 );
-
-
+
+
bFilteringSizer->Add( m_bNoNetWarning, 1, wxEXPAND|wxRESERVE_SPACE_EVEN_IF_HIDDEN|wxTOP, 20 );
-
-
+
+
sbSizer3->Add( bFilteringSizer, 0, wxEXPAND, 20 );
-
-
+
+
m_OptionsBoxSizer->Add( sbSizer3, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
-
-
+
+
m_MainBoxSizer->Add( m_OptionsBoxSizer, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-
+
wxBoxSizer* bSizerMiddle;
bSizerMiddle = new wxBoxSizer( wxHORIZONTAL );
-
+
wxStaticBoxSizer* m_ExportableSetupSizer;
m_ExportableSetupSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Settings") ), wxHORIZONTAL );
-
+
wxGridBagSizer* gbSizer1;
gbSizer1 = new wxGridBagSizer( 0, 0 );
gbSizer1->SetFlexibleDirection( wxBOTH );
gbSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-
+
m_constrainOutline = new wxCheckBox( m_ExportableSetupSizer->GetStaticBox(), wxID_ANY, _("Constrain outline to H, V and 45 degrees"), wxDefaultPosition, wxDefaultSize, 0 );
- gbSizer1->Add( m_constrainOutline, wxGBPosition( 0, 0 ), wxGBSpan( 1, 3 ), wxTOP|wxBOTTOM|wxRIGHT, 5 );
-
- m_cbFilledPolyOutlineOpt = new wxCheckBox( m_ExportableSetupSizer->GetStaticBox(), wxID_ANY, _("Fill polys without thick outline"), wxDefaultPosition, wxDefaultSize, 0 );
- m_cbFilledPolyOutlineOpt->SetToolTip( _("Filled polygons with thick outline is the legacy option.\nFilled polygons without thick outline is the recommended option:\n- For large boards, redrawing is faster.\n- Exported filled shapes have the exact size.\n") );
-
- gbSizer1->Add( m_cbFilledPolyOutlineOpt, wxGBPosition( 1, 0 ), wxGBSpan( 1, 3 ), wxTOP|wxBOTTOM|wxRIGHT, 5 );
-
- m_staticTextPriorityLevel = new wxStaticText( m_ExportableSetupSizer->GetStaticBox(), wxID_ANY, _("Zone priority level:"), wxDefaultPosition, wxDefaultSize, 0 );
- m_staticTextPriorityLevel->Wrap( -1 );
- m_staticTextPriorityLevel->SetToolTip( _("Zones are filled by priority level, level 3 has higher priority than level 2.\nWhen a zone is inside another zone:\n* If its priority is higher, its outlines are removed from the other zone.\n* If its priority is equal, a DRC error is set.") );
-
- gbSizer1->Add( m_staticTextPriorityLevel, wxGBPosition( 2, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-
- m_PriorityLevelCtrl = new wxSpinCtrl( m_ExportableSetupSizer->GetStaticBox(), ID_M_PRIORITYLEVELCTRL, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 100, 0 );
- gbSizer1->Add( m_PriorityLevelCtrl, wxGBPosition( 2, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxALL, 5 );
-
- m_staticTextStyle = new wxStaticText( m_ExportableSetupSizer->GetStaticBox(), wxID_ANY, _("Outline display:"), wxDefaultPosition, wxDefaultSize, 0 );
- m_staticTextStyle->Wrap( -1 );
- gbSizer1->Add( m_staticTextStyle, wxGBPosition( 3, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-
- wxString m_OutlineAppearanceCtrlChoices[] = { _("Line"), _("Hatched"), _("Fully hatched") };
- int m_OutlineAppearanceCtrlNChoices = sizeof( m_OutlineAppearanceCtrlChoices ) / sizeof( wxString );
- m_OutlineAppearanceCtrl = new wxChoice( m_ExportableSetupSizer->GetStaticBox(), ID_M_OUTLINEAPPEARANCECTRL, wxDefaultPosition, wxDefaultSize, m_OutlineAppearanceCtrlNChoices, m_OutlineAppearanceCtrlChoices, 0 );
- m_OutlineAppearanceCtrl->SetSelection( 0 );
- gbSizer1->Add( m_OutlineAppearanceCtrl, wxGBPosition( 3, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxALL, 5 );
-
- m_staticline1 = new wxStaticLine( m_ExportableSetupSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
- gbSizer1->Add( m_staticline1, wxGBPosition( 4, 0 ), wxGBSpan( 1, 2 ), wxEXPAND | wxALL, 5 );
-
+ gbSizer1->Add( m_constrainOutline, wxGBPosition( 0, 0 ), wxGBSpan( 1, 3 ), wxBOTTOM|wxRIGHT, 5 );
+
m_staticTextSmoothing = new wxStaticText( m_ExportableSetupSizer->GetStaticBox(), wxID_ANY, _("Corner smoothing:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextSmoothing->Wrap( -1 );
- gbSizer1->Add( m_staticTextSmoothing, wxGBPosition( 5, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-
+ gbSizer1->Add( m_staticTextSmoothing, wxGBPosition( 1, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+
wxString m_cornerSmoothingChoiceChoices[] = { _("None"), _("Chamfer"), _("Fillet") };
int m_cornerSmoothingChoiceNChoices = sizeof( m_cornerSmoothingChoiceChoices ) / sizeof( wxString );
m_cornerSmoothingChoice = new wxChoice( m_ExportableSetupSizer->GetStaticBox(), ID_CORNER_SMOOTHING, wxDefaultPosition, wxDefaultSize, m_cornerSmoothingChoiceNChoices, m_cornerSmoothingChoiceChoices, 0 );
m_cornerSmoothingChoice->SetSelection( 0 );
- gbSizer1->Add( m_cornerSmoothingChoice, wxGBPosition( 5, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxALL, 5 );
-
+ gbSizer1->Add( m_cornerSmoothingChoice, wxGBPosition( 1, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxALL, 5 );
+
m_cornerRadiusLabel = new wxStaticText( m_ExportableSetupSizer->GetStaticBox(), wxID_ANY, _("Chamfer distance:"), wxDefaultPosition, wxDefaultSize, 0 );
m_cornerRadiusLabel->Wrap( -1 );
- gbSizer1->Add( m_cornerRadiusLabel, wxGBPosition( 6, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 );
-
+ gbSizer1->Add( m_cornerRadiusLabel, wxGBPosition( 2, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 );
+
m_cornerRadiusCtrl = new wxTextCtrl( m_ExportableSetupSizer->GetStaticBox(), ID_M_CORNERSMOOTHINGCTRL, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- gbSizer1->Add( m_cornerRadiusCtrl, wxGBPosition( 6, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
+ gbSizer1->Add( m_cornerRadiusCtrl, wxGBPosition( 2, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
m_cornerRadiusUnits = new wxStaticText( m_ExportableSetupSizer->GetStaticBox(), wxID_ANY, _("units"), wxDefaultPosition, wxDefaultSize, 0 );
m_cornerRadiusUnits->Wrap( -1 );
- gbSizer1->Add( m_cornerRadiusUnits, wxGBPosition( 6, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 );
-
-
+ gbSizer1->Add( m_cornerRadiusUnits, wxGBPosition( 2, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 );
+
+ m_staticTextPriorityLevel = new wxStaticText( m_ExportableSetupSizer->GetStaticBox(), wxID_ANY, _("Zone priority level:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticTextPriorityLevel->Wrap( -1 );
+ m_staticTextPriorityLevel->SetToolTip( _("Zones are filled by priority level, level 3 has higher priority than level 2.\nWhen a zone is inside another zone:\n* If its priority is higher, its outlines are removed from the other zone.\n* If its priority is equal, a DRC error is set.") );
+
+ gbSizer1->Add( m_staticTextPriorityLevel, wxGBPosition( 3, 0 ), wxGBSpan( 1, 1 ), wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+
+ m_PriorityLevelCtrl = new wxSpinCtrl( m_ExportableSetupSizer->GetStaticBox(), ID_M_PRIORITYLEVELCTRL, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 100, 0 );
+ gbSizer1->Add( m_PriorityLevelCtrl, wxGBPosition( 3, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+ m_staticTextStyle = new wxStaticText( m_ExportableSetupSizer->GetStaticBox(), wxID_ANY, _("Outline display:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticTextStyle->Wrap( -1 );
+ gbSizer1->Add( m_staticTextStyle, wxGBPosition( 4, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 );
+
+ wxString m_OutlineAppearanceCtrlChoices[] = { _("Line"), _("Hatched"), _("Fully hatched") };
+ int m_OutlineAppearanceCtrlNChoices = sizeof( m_OutlineAppearanceCtrlChoices ) / sizeof( wxString );
+ m_OutlineAppearanceCtrl = new wxChoice( m_ExportableSetupSizer->GetStaticBox(), ID_M_OUTLINEAPPEARANCECTRL, wxDefaultPosition, wxDefaultSize, m_OutlineAppearanceCtrlNChoices, m_OutlineAppearanceCtrlChoices, 0 );
+ m_OutlineAppearanceCtrl->SetSelection( 0 );
+ gbSizer1->Add( m_OutlineAppearanceCtrl, wxGBPosition( 4, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+
gbSizer1->AddGrowableCol( 1 );
-
+
m_ExportableSetupSizer->Add( gbSizer1, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-
+
wxGridBagSizer* gbSizerSettings;
gbSizerSettings = new wxGridBagSizer( 0, 0 );
gbSizerSettings->SetFlexibleDirection( wxBOTH );
gbSizerSettings->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-
+
m_clearanceLabel = new wxStaticText( m_ExportableSetupSizer->GetStaticBox(), wxID_ANY, _("Clearance:"), wxDefaultPosition, wxDefaultSize, 0 );
m_clearanceLabel->Wrap( -1 );
gbSizerSettings->Add( m_clearanceLabel, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 );
-
+
m_clearanceCtrl = new wxTextCtrl( m_ExportableSetupSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
gbSizerSettings->Add( m_clearanceCtrl, wxGBPosition( 0, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
+
m_clearanceUnits = new wxStaticText( m_ExportableSetupSizer->GetStaticBox(), wxID_ANY, _("units"), wxDefaultPosition, wxDefaultSize, 0 );
m_clearanceUnits->Wrap( -1 );
gbSizerSettings->Add( m_clearanceUnits, wxGBPosition( 0, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 );
-
+
m_minWidthLabel = new wxStaticText( m_ExportableSetupSizer->GetStaticBox(), wxID_ANY, _("Minimum width:"), wxDefaultPosition, wxDefaultSize, 0 );
m_minWidthLabel->Wrap( -1 );
m_minWidthLabel->SetToolTip( _("Minimum thickness of filled areas.") );
-
+
gbSizerSettings->Add( m_minWidthLabel, wxGBPosition( 1, 0 ), wxGBSpan( 1, 1 ), wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-
+
m_minWidthCtrl = new wxTextCtrl( m_ExportableSetupSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
gbSizerSettings->Add( m_minWidthCtrl, wxGBPosition( 1, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
+
m_minWidthUnits = new wxStaticText( m_ExportableSetupSizer->GetStaticBox(), wxID_ANY, _("units"), wxDefaultPosition, wxDefaultSize, 0 );
m_minWidthUnits->Wrap( -1 );
gbSizerSettings->Add( m_minWidthUnits, wxGBPosition( 1, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 );
-
+
m_connectionLabel = new wxStaticText( m_ExportableSetupSizer->GetStaticBox(), wxID_ANY, _("Pad connections:"), wxDefaultPosition, wxDefaultSize, 0 );
m_connectionLabel->Wrap( -1 );
m_connectionLabel->SetToolTip( _("Default pad connection type to zone.\nThis setting can be overridden by local pad settings") );
-
- gbSizerSettings->Add( m_connectionLabel, wxGBPosition( 2, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
+
+ gbSizerSettings->Add( m_connectionLabel, wxGBPosition( 2, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
wxString m_PadInZoneOptChoices[] = { _("Solid"), _("Thermal reliefs"), _("Reliefs for PTH"), _("None") };
int m_PadInZoneOptNChoices = sizeof( m_PadInZoneOptChoices ) / sizeof( wxString );
m_PadInZoneOpt = new wxChoice( m_ExportableSetupSizer->GetStaticBox(), ID_M_PADINZONEOPT, wxDefaultPosition, wxDefaultSize, m_PadInZoneOptNChoices, m_PadInZoneOptChoices, 0 );
m_PadInZoneOpt->SetSelection( 0 );
- gbSizerSettings->Add( m_PadInZoneOpt, wxGBPosition( 2, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxALL, 5 );
-
+ gbSizerSettings->Add( m_PadInZoneOpt, wxGBPosition( 2, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
m_antipadLabel = new wxStaticText( m_ExportableSetupSizer->GetStaticBox(), wxID_ANY, _("Thermal clearance:"), wxDefaultPosition, wxDefaultSize, 0 );
m_antipadLabel->Wrap( -1 );
gbSizerSettings->Add( m_antipadLabel, wxGBPosition( 3, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 );
-
+
m_antipadCtrl = new wxTextCtrl( m_ExportableSetupSizer->GetStaticBox(), wxID_ANTIPAD_SIZE, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_antipadCtrl->SetToolTip( _("Clearance between pads in the same net and filled areas.") );
-
+
gbSizerSettings->Add( m_antipadCtrl, wxGBPosition( 3, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
-
+
m_antipadUnits = new wxStaticText( m_ExportableSetupSizer->GetStaticBox(), wxID_ANY, _("units"), wxDefaultPosition, wxDefaultSize, 0 );
m_antipadUnits->Wrap( -1 );
gbSizerSettings->Add( m_antipadUnits, wxGBPosition( 3, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5 );
-
+
m_spokeWidthLabel = new wxStaticText( m_ExportableSetupSizer->GetStaticBox(), wxID_ANY, _("Thermal spoke width:"), wxDefaultPosition, wxDefaultSize, 0 );
m_spokeWidthLabel->Wrap( -1 );
gbSizerSettings->Add( m_spokeWidthLabel, wxGBPosition( 4, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
+
m_spokeWidthCtrl = new wxTextCtrl( m_ExportableSetupSizer->GetStaticBox(), wxID_COPPER_BRIDGE_VALUE, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_spokeWidthCtrl->SetToolTip( _("Width of copper in thermal reliefs.") );
-
+
gbSizerSettings->Add( m_spokeWidthCtrl, wxGBPosition( 4, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxALL, 5 );
-
+
m_spokeWidthUnits = new wxStaticText( m_ExportableSetupSizer->GetStaticBox(), wxID_ANY, _("units"), wxDefaultPosition, wxDefaultSize, 0 );
m_spokeWidthUnits->Wrap( -1 );
gbSizerSettings->Add( m_spokeWidthUnits, wxGBPosition( 4, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-
-
+
+
gbSizerSettings->AddGrowableCol( 1 );
-
+
m_ExportableSetupSizer->Add( gbSizerSettings, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-
-
+
+
bSizerMiddle->Add( m_ExportableSetupSizer, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 );
-
+
wxStaticBoxSizer* sbSizerZoneStyle;
sbSizerZoneStyle = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Style") ), wxVERTICAL );
-
+
wxFlexGridSizer* fgSizerZoneStyle;
fgSizerZoneStyle = new wxFlexGridSizer( 0, 3, 0, 0 );
fgSizerZoneStyle->AddGrowableCol( 1 );
fgSizerZoneStyle->SetFlexibleDirection( wxBOTH );
fgSizerZoneStyle->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-
+
m_staticTextGridFillType = new wxStaticText( sbSizerZoneStyle->GetStaticBox(), wxID_ANY, _("Fill type:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextGridFillType->Wrap( -1 );
fgSizerZoneStyle->Add( m_staticTextGridFillType, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-
+
wxString m_GridStyleCtrlChoices[] = { _("Solid shape"), _("Hatch pattern") };
int m_GridStyleCtrlNChoices = sizeof( m_GridStyleCtrlChoices ) / sizeof( wxString );
m_GridStyleCtrl = new wxChoice( sbSizerZoneStyle->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_GridStyleCtrlNChoices, m_GridStyleCtrlChoices, 0 );
m_GridStyleCtrl->SetSelection( 0 );
fgSizerZoneStyle->Add( m_GridStyleCtrl, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-
-
+
+
fgSizerZoneStyle->Add( 0, 0, 1, wxEXPAND, 5 );
-
+
m_staticTextGrindOrient = new wxStaticText( sbSizerZoneStyle->GetStaticBox(), wxID_ANY, _("Orientation:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextGrindOrient->Wrap( -1 );
fgSizerZoneStyle->Add( m_staticTextGrindOrient, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-
+
m_tcGridStyleOrientation = new wxTextCtrl( sbSizerZoneStyle->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
fgSizerZoneStyle->Add( m_tcGridStyleOrientation, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-
+
m_staticTextRotUnits = new wxStaticText( sbSizerZoneStyle->GetStaticBox(), wxID_ANY, _("degree"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextRotUnits->Wrap( -1 );
fgSizerZoneStyle->Add( m_staticTextRotUnits, 0, wxALL, 5 );
-
+
m_staticTextStyleThickness = new wxStaticText( sbSizerZoneStyle->GetStaticBox(), wxID_ANY, _("Hatch width:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextStyleThickness->Wrap( -1 );
fgSizerZoneStyle->Add( m_staticTextStyleThickness, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-
+
m_tcGridStyleThickness = new wxTextCtrl( sbSizerZoneStyle->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
fgSizerZoneStyle->Add( m_tcGridStyleThickness, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-
+
m_GridStyleThicknessUnits = new wxStaticText( sbSizerZoneStyle->GetStaticBox(), wxID_ANY, _("units"), wxDefaultPosition, wxDefaultSize, 0 );
m_GridStyleThicknessUnits->Wrap( -1 );
fgSizerZoneStyle->Add( m_GridStyleThicknessUnits, 0, wxALL, 5 );
-
+
m_staticTextGridGap = new wxStaticText( sbSizerZoneStyle->GetStaticBox(), wxID_ANY, _("Hatch gap:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextGridGap->Wrap( -1 );
fgSizerZoneStyle->Add( m_staticTextGridGap, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-
+
m_tcGridStyleGap = new wxTextCtrl( sbSizerZoneStyle->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
fgSizerZoneStyle->Add( m_tcGridStyleGap, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-
+
m_GridStyleGapUnits = new wxStaticText( sbSizerZoneStyle->GetStaticBox(), wxID_ANY, _("units"), wxDefaultPosition, wxDefaultSize, 0 );
m_GridStyleGapUnits->Wrap( -1 );
fgSizerZoneStyle->Add( m_GridStyleGapUnits, 0, wxALL, 5 );
-
+
m_staticTextGridSmoothingLevel = new wxStaticText( sbSizerZoneStyle->GetStaticBox(), wxID_ANY, _("Smoothing effort:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextGridSmoothingLevel->Wrap( -1 );
m_staticTextGridSmoothingLevel->SetToolTip( _("Value of smoothing effort\n0 = no smoothing\n1 = chamfer\n2 = round corners\n3 = round corners (finer shape)") );
-
+
fgSizerZoneStyle->Add( m_staticTextGridSmoothingLevel, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-
+
m_spinCtrlSmoothLevel = new wxSpinCtrl( sbSizerZoneStyle->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 3, 0 );
fgSizerZoneStyle->Add( m_spinCtrlSmoothLevel, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-
-
+
+
fgSizerZoneStyle->Add( 0, 0, 1, wxEXPAND, 5 );
-
+
m_staticTextGridSmootingVal = new wxStaticText( sbSizerZoneStyle->GetStaticBox(), wxID_ANY, _("Smooth value (0..1):"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextGridSmootingVal->Wrap( -1 );
m_staticTextGridSmootingVal->SetToolTip( _("Ratio between smoothed corners size and the gap between lines\n0 = no smoothing\n1.0 = max radius/chamfer size (half gap value)") );
-
+
fgSizerZoneStyle->Add( m_staticTextGridSmootingVal, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-
+
m_spinCtrlSmoothValue = new wxSpinCtrlDouble( sbSizerZoneStyle->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 1, 0.100000, 0.1 );
- m_spinCtrlSmoothValue->SetDigits( 0 );
fgSizerZoneStyle->Add( m_spinCtrlSmoothValue, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-
-
+
+
fgSizerZoneStyle->Add( 0, 0, 1, wxEXPAND, 5 );
-
-
+
+
sbSizerZoneStyle->Add( fgSizerZoneStyle, 1, wxEXPAND, 5 );
-
-
+
+
bSizerMiddle->Add( sbSizerZoneStyle, 1, wxEXPAND|wxTOP|wxRIGHT, 10 );
-
-
+
+
m_MainBoxSizer->Add( bSizerMiddle, 0, wxEXPAND, 5 );
-
+
wxBoxSizer* bSizerbottom;
bSizerbottom = new wxBoxSizer( wxHORIZONTAL );
-
+
m_ExportSetupButton = new wxButton( this, wxID_BUTTON_EXPORT, _("Export Settings to Other Zones"), wxDefaultPosition, wxDefaultSize, 0 );
m_ExportSetupButton->SetToolTip( _("Export this zone setup (excluding layer and net selection) to all other copper zones.") );
-
+
bSizerbottom->Add( m_ExportSetupButton, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 10 );
-
+
m_sdbSizer = new wxStdDialogButtonSizer();
m_sdbSizerOK = new wxButton( this, wxID_OK );
m_sdbSizer->AddButton( m_sdbSizerOK );
m_sdbSizerCancel = new wxButton( this, wxID_CANCEL );
m_sdbSizer->AddButton( m_sdbSizerCancel );
m_sdbSizer->Realize();
-
+
bSizerbottom->Add( m_sdbSizer, 1, wxALL|wxEXPAND, 5 );
-
-
+
+
m_MainBoxSizer->Add( bSizerbottom, 0, wxEXPAND|wxLEFT, 5 );
-
-
+
+
this->SetSizer( m_MainBoxSizer );
this->Layout();
-
+
// Connect Events
this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_COPPER_ZONE_BASE::OnClose ) );
this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_COPPER_ZONE_BASE::OnUpdateUI ) );
@@ -376,5 +367,5 @@ DIALOG_COPPER_ZONE_BASE::~DIALOG_COPPER_ZONE_BASE()
m_GridStyleCtrl->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_COPPER_ZONE_BASE::OnStyleSelection ), NULL, this );
m_ExportSetupButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_COPPER_ZONE_BASE::ExportSetupToOtherCopperZones ), NULL, this );
m_sdbSizerCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_COPPER_ZONE_BASE::OnButtonCancelClick ), NULL, this );
-
+
}
diff --git a/pcbnew/dialogs/dialog_copper_zones_base.fbp b/pcbnew/dialogs/dialog_copper_zones_base.fbp
index 7866b9d19..9987fa3f4 100644
--- a/pcbnew/dialogs/dialog_copper_zones_base.fbp
+++ b/pcbnew/dialogs/dialog_copper_zones_base.fbp
@@ -2,7 +2,7 @@
<wxFormBuilder_Project>
<FileVersion major="1" minor="15" />
<object class="Project" expanded="1">
- <property name="class_decoration"></property>
+ <property name="class_decoration" />
<property name="code_generation">C++</property>
<property name="disconnect_events">1</property>
<property name="disconnect_mode">source_name</property>
@@ -14,12 +14,11 @@
<property name="file">dialog_copper_zones_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_copper_zones_base</property>
- <property name="namespace"></property>
+ <property name="namespace" />
<property name="path">.</property>
- <property name="precompiled_header"></property>
+ <property name="precompiled_header" />
<property name="relative_path">1</property>
<property name="skip_lua_events">1</property>
<property name="skip_php_events">1</property>
@@ -30,33 +29,67 @@
<object class="Dialog" expanded="1">
<property name="aui_managed">0</property>
<property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
- <property name="bg"></property>
- <property name="center"></property>
- <property name="context_help"></property>
+ <property name="bg" />
+ <property name="center" />
+ <property name="context_help" />
<property name="context_menu">1</property>
<property name="enabled">1</property>
<property name="event_handler">impl_virtual</property>
- <property name="extra_style"></property>
- <property name="fg"></property>
- <property name="font"></property>
+ <property name="extra_style" />
+ <property name="fg" />
+ <property name="font" />
<property name="hidden">0</property>
<property name="id">ID_DIALOG_COPPER_ZONE_BASE</property>
- <property name="maximum_size"></property>
- <property name="minimum_size"></property>
+ <property name="maximum_size" />
+ <property name="minimum_size" />
<property name="name">DIALOG_COPPER_ZONE_BASE</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="size">825,528</property>
<property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
<property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
<property name="title">Copper Zone Properties</property>
- <property name="tooltip"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
+ <property name="tooltip" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
+ <event name="OnActivate" />
+ <event name="OnActivateApp" />
+ <event name="OnAuiFindManager" />
+ <event name="OnAuiPaneButton" />
+ <event name="OnAuiPaneClose" />
+ <event name="OnAuiPaneMaximize" />
+ <event name="OnAuiPaneRestore" />
+ <event name="OnAuiRender" />
+ <event name="OnChar" />
<event name="OnClose">OnClose</event>
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnHibernate" />
+ <event name="OnIconize" />
+ <event name="OnIdle" />
+ <event name="OnInitDialog" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
<event name="OnUpdateUI">OnUpdateUI</event>
<object class="wxBoxSizer" expanded="1">
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="name">m_MainBoxSizer</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">protected</property>
@@ -65,7 +98,7 @@
<property name="flag">wxEXPAND|wxRIGHT|wxLEFT</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="1">
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="name">m_OptionsBoxSizer</property>
<property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property>
@@ -76,37 +109,78 @@
<object class="wxStaticBoxSizer" expanded="1">
<property name="id">wxID_ANY</property>
<property name="label">Layer</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="name">sbSizer2</property>
<property name="orient">wxVERTICAL</property>
<property name="parent">1</property>
<property name="permission">none</property>
+ <event name="OnUpdateUI" />
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT</property>
<property name="proportion">1</property>
<object class="wxDataViewListCtrl" expanded="1">
- <property name="bg"></property>
- <property name="context_help"></property>
+ <property name="bg" />
+ <property name="context_help" />
<property name="context_menu">1</property>
<property name="enabled">1</property>
- <property name="fg"></property>
- <property name="font"></property>
+ <property name="fg" />
+ <property name="font" />
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
- <property name="maximum_size"></property>
+ <property name="maximum_size" />
<property name="minimum_size">120,-1</property>
<property name="name">m_layers</property>
<property name="permission">protected</property>
- <property name="pos"></property>
- <property name="size"></property>
+ <property name="pos" />
+ <property name="size" />
<property name="style">wxDV_NO_HEADER</property>
<property name="subclass">; forward_declare</property>
- <property name="tooltip"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
+ <property name="tooltip" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
<property name="window_style">wxBORDER_SIMPLE</property>
+ <event name="OnChar" />
+ <event name="OnDataViewListCtrlColumnHeaderClick" />
+ <event name="OnDataViewListCtrlColumnHeaderRightClick" />
+ <event name="OnDataViewListCtrlColumnReordered" />
+ <event name="OnDataViewListCtrlColumnSorted" />
+ <event name="OnDataViewListCtrlItemActivated" />
+ <event name="OnDataViewListCtrlItemBeginDrag" />
+ <event name="OnDataViewListCtrlItemCollapsed" />
+ <event name="OnDataViewListCtrlItemCollapsing" />
+ <event name="OnDataViewListCtrlItemContextMenu" />
+ <event name="OnDataViewListCtrlItemDrop" />
+ <event name="OnDataViewListCtrlItemDropPossible" />
+ <event name="OnDataViewListCtrlItemEditingDone" />
+ <event name="OnDataViewListCtrlItemEditingStarted" />
+ <event name="OnDataViewListCtrlItemExpanded" />
+ <event name="OnDataViewListCtrlItemExpanding" />
+ <event name="OnDataViewListCtrlItemStartEditing" />
<event name="OnDataViewListCtrlItemValueChanged">OnLayerSelection</event>
+ <event name="OnDataViewListCtrlSelectionChanged" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
</object>
@@ -118,11 +192,12 @@
<object class="wxStaticBoxSizer" expanded="1">
<property name="id">wxID_ANY</property>
<property name="label">Net</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="name">sbSizer3</property>
<property name="orient">wxHORIZONTAL</property>
<property name="parent">1</property>
<property name="permission">none</property>
+ <event name="OnUpdateUI" />
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT</property>
@@ -132,58 +207,83 @@
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
- <property name="choices"></property>
+ <property name="choices" />
<property name="close_button">1</property>
- <property name="context_help"></property>
+ <property name="context_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">ID_NETNAME_SELECTION</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_ListNetNameSelection</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
+ <property name="size" />
+ <property name="style" />
<property name="subclass">; forward_declare</property>
<property name="toolbar_pane">0</property>
- <property name="tooltip"></property>
- <property name="validator_data_type"></property>
+ <property name="tooltip" />
+ <property name="validator_data_type" />
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
+ <property name="validator_variable" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnListBox" />
+ <event name="OnListBoxDClick" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="sizeritem" expanded="1">
@@ -191,7 +291,7 @@
<property name="flag">wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxBoxSizer" expanded="1">
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="name">bFilteringSizer</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
@@ -204,56 +304,78 @@
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Hide nets matching:</property>
- <property name="markup">0</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_staticTextDisplay</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
+ <property name="size" />
+ <property name="style" />
+ <property name="subclass" />
<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="tooltip" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
<property name="wrap">-1</property>
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="sizeritem" expanded="0">
@@ -265,60 +387,86 @@
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">ID_TEXTCTRL_NETNAMES_FILTER</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
+ <property name="maximum_size" />
<property name="maxlength">0</property>
- <property name="min_size"></property>
+ <property name="min_size" />
<property name="minimize_button">0</property>
<property name="minimum_size">180,-1</property>
<property name="moveable">1</property>
<property name="name">m_DoNotShowNetNameFilter</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
+ <property name="size" />
<property name="style">wxTE_PROCESS_ENTER</property>
- <property name="subclass"></property>
+ <property name="subclass" />
<property name="toolbar_pane">0</property>
<property name="tooltip">Pattern to filter net names in filtered list.
Net names matching this pattern are not displayed.</property>
- <property name="validator_data_type"></property>
+ <property name="validator_data_type" />
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
- <property name="value"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
+ <property name="validator_variable" />
+ <property name="value" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnText" />
<event name="OnTextEnter">OnRunFiltersButtonClick</event>
+ <event name="OnTextMaxLen" />
+ <event name="OnTextURL" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="sizeritem" expanded="0">
@@ -330,56 +478,78 @@
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Show nets matching:</property>
- <property name="markup">0</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_staticTextVFilter</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
+ <property name="size" />
+ <property name="style" />
+ <property name="subclass" />
<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="tooltip" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
<property name="wrap">-1</property>
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="sizeritem" expanded="0">
@@ -391,60 +561,86 @@
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">ID_TEXTCTRL_NETNAMES_FILTER</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
+ <property name="maximum_size" />
<property name="maxlength">0</property>
- <property name="min_size"></property>
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_ShowNetNameFilter</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
+ <property name="size" />
<property name="style">wxTE_PROCESS_ENTER</property>
- <property name="subclass"></property>
+ <property name="subclass" />
<property name="toolbar_pane">0</property>
<property name="tooltip">Pattern to filter net names in filtered list.
Only net names matching this pattern are displayed.</property>
- <property name="validator_data_type"></property>
+ <property name="validator_data_type" />
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
+ <property name="validator_variable" />
<property name="value">*</property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnText" />
<event name="OnTextEnter">OnRunFiltersButtonClick</event>
+ <event name="OnTextMaxLen" />
+ <event name="OnTextURL" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="sizeritem" expanded="0">
@@ -456,68 +652,83 @@
<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="bitmap"></property>
- <property name="caption"></property>
+ <property name="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<property name="context_menu">1</property>
- <property name="current"></property>
<property name="default">0</property>
<property name="default_pane">0</property>
- <property name="disabled"></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="fg" />
<property name="floatable">1</property>
- <property name="focus"></property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_APPLY_FILTERS</property>
<property name="label">Apply Filters</property>
- <property name="margins"></property>
- <property name="markup">0</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_buttonRunFilter</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
- <property name="position"></property>
- <property name="pressed"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
+ <property name="size" />
+ <property name="style" />
+ <property name="subclass" />
<property name="toolbar_pane">0</property>
- <property name="tooltip"></property>
- <property name="validator_data_type"></property>
+ <property name="tooltip" />
+ <property name="validator_data_type" />
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
+ <property name="validator_variable" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
<event name="OnButtonClick">OnRunFiltersButtonClick</event>
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="sizeritem" expanded="1">
@@ -539,60 +750,83 @@
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="checked">0</property>
<property name="close_button">1</property>
- <property name="context_help"></property>
+ <property name="context_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Show all nets</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_showAllNetsOpt</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
+ <property name="size" />
+ <property name="style" />
<property name="subclass">; forward_declare</property>
<property name="toolbar_pane">0</property>
- <property name="tooltip"></property>
- <property name="validator_data_type"></property>
+ <property name="tooltip" />
+ <property name="validator_data_type" />
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
+ <property name="validator_variable" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
+ <event name="OnChar" />
<event name="OnCheckBox">OnNetSortingOptionSelected</event>
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="sizeritem" expanded="1">
@@ -614,60 +848,83 @@
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="checked">0</property>
<property name="close_button">1</property>
- <property name="context_help"></property>
+ <property name="context_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Sort nets by pad count</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_sortByPadsOpt</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
+ <property name="size" />
+ <property name="style" />
<property name="subclass">; forward_declare</property>
<property name="toolbar_pane">0</property>
- <property name="tooltip"></property>
- <property name="validator_data_type"></property>
+ <property name="tooltip" />
+ <property name="validator_data_type" />
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
+ <property name="validator_variable" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
+ <event name="OnChar" />
<event name="OnCheckBox">OnNetSortingOptionSelected</event>
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="sizeritem" expanded="0">
@@ -675,7 +932,7 @@
<property name="flag">wxEXPAND|wxRESERVE_SPACE_EVEN_IF_HIDDEN|wxTOP</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="0">
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="name">m_bNoNetWarning</property>
<property name="orient">wxHORIZONTAL</property>
<property name="permission">protected</property>
@@ -688,53 +945,76 @@
<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="bitmap"></property>
- <property name="caption"></property>
+ <property name="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="bitmap" />
+ <property name="caption" />
<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_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_bitmapNoNetWarning</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
+ <property name="size" />
<property name="subclass">; forward_declare</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="tooltip" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="sizeritem" expanded="0">
@@ -746,56 +1026,78 @@
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">No net will result
in an unconnected 
copper island.</property>
- <property name="markup">0</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_staticText18</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
+ <property name="size" />
+ <property name="style" />
<property name="subclass">; forward_declare</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="tooltip" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
<property name="wrap">-1</property>
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
</object>
@@ -811,7 +1113,7 @@
<property name="flag">wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxBoxSizer" expanded="1">
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="name">bSizerMiddle</property>
<property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property>
@@ -822,22 +1124,23 @@
<object class="wxStaticBoxSizer" expanded="1">
<property name="id">wxID_ANY</property>
<property name="label">Settings</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="name">m_ExportableSetupSizer</property>
<property name="orient">wxHORIZONTAL</property>
<property name="parent">1</property>
<property name="permission">none</property>
+ <event name="OnUpdateUI" />
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxGridBagSizer" expanded="1">
- <property name="empty_cell_size"></property>
+ <property name="empty_cell_size" />
<property name="flexible_direction">wxBOTH</property>
<property name="growablecols">1</property>
- <property name="growablerows"></property>
+ <property name="growablerows" />
<property name="hgap">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="name">gbSizer1</property>
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
<property name="permission">none</property>
@@ -846,7 +1149,7 @@
<property name="border">5</property>
<property name="colspan">3</property>
<property name="column">0</property>
- <property name="flag">wxTOP|wxBOTTOM|wxRIGHT</property>
+ <property name="flag">wxBOTTOM|wxRIGHT</property>
<property name="row">0</property>
<property name="rowspan">1</property>
<object class="wxCheckBox" expanded="0">
@@ -854,126 +1157,83 @@
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="checked">0</property>
<property name="close_button">1</property>
- <property name="context_help"></property>
+ <property name="context_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Constrain outline to H, V and 45 degrees</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_constrainOutline</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
+ <property name="size" />
+ <property name="style" />
<property name="subclass">; forward_declare</property>
<property name="toolbar_pane">0</property>
- <property name="tooltip"></property>
- <property name="validator_data_type"></property>
+ <property name="tooltip" />
+ <property name="validator_data_type" />
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
- </object>
- </object>
- <object class="gbsizeritem" expanded="1">
- <property name="border">5</property>
- <property name="colspan">3</property>
- <property name="column">0</property>
- <property name="flag">wxTOP|wxBOTTOM|wxRIGHT</property>
- <property name="row">1</property>
- <property name="rowspan">1</property>
- <object class="wxCheckBox" 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="checked">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"></property>
- <property name="gripper">0</property>
- <property name="hidden">0</property>
- <property name="id">wxID_ANY</property>
- <property name="label">Fill polys without thick outline</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_cbFilledPolyOutlineOpt</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">; ; forward_declare</property>
- <property name="toolbar_pane">0</property>
- <property name="tooltip">Filled polygons with thick outline is the legacy option.
Filled polygons without thick outline is the recommended option:
- For large boards, redrawing is faster.
- Exported filled shapes have the exact size.
</property>
- <property name="validator_data_type"></property>
- <property name="validator_style">wxFILTER_NONE</property>
- <property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
+ <property name="validator_variable" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
+ <event name="OnChar" />
+ <event name="OnCheckBox" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="gbsizeritem" expanded="0">
@@ -981,63 +1241,85 @@
<property name="colspan">1</property>
<property name="column">0</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT</property>
- <property name="row">2</property>
+ <property name="row">1</property>
<property name="rowspan">1</property>
<object class="wxStaticText" expanded="0">
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
- <property name="label">Zone priority level:</property>
- <property name="markup">0</property>
- <property name="max_size"></property>
+ <property name="label">Corner smoothing:</property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
- <property name="name">m_staticTextPriorityLevel</property>
+ <property name="name">m_staticTextSmoothing</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
+ <property name="size" />
+ <property name="style" />
+ <property name="subclass" />
<property name="toolbar_pane">0</property>
- <property name="tooltip">Zones are filled by priority level, level 3 has higher priority than level 2.
When a zone is inside another zone:
* If its priority is higher, its outlines are removed from the other zone.
* If its priority is equal, a DRC error is set.</property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
+ <property name="tooltip" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
<property name="wrap">-1</property>
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="gbsizeritem" expanded="0">
@@ -1045,387 +1327,533 @@
<property name="colspan">1</property>
<property name="column">1</property>
<property name="flag">wxEXPAND|wxALL</property>
- <property name="row">2</property>
+ <property name="row">1</property>
<property name="rowspan">1</property>
- <object class="wxSpinCtrl" expanded="0">
+ <object class="wxChoice" expanded="0">
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
+ <property name="choices">"None" "Chamfer" "Fillet"</property>
<property name="close_button">1</property>
- <property name="context_help"></property>
+ <property name="context_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
- <property name="id">ID_M_PRIORITYLEVELCTRL</property>
- <property name="initial">0</property>
- <property name="max">100</property>
- <property name="max_size"></property>
+ <property name="id">ID_CORNER_SMOOTHING</property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min">0</property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
- <property name="name">m_PriorityLevelCtrl</property>
+ <property name="name">m_cornerSmoothingChoice</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
+ <property name="selection">0</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style">wxSP_ARROW_KEYS</property>
- <property name="subclass"></property>
+ <property name="size" />
+ <property name="style" />
+ <property name="subclass" />
<property name="toolbar_pane">0</property>
- <property name="tooltip"></property>
- <property name="value"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
+ <property name="tooltip" />
+ <property name="validator_data_type" />
+ <property name="validator_style">wxFILTER_NONE</property>
+ <property name="validator_type">wxDefaultValidator</property>
+ <property name="validator_variable" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
+ <event name="OnChar" />
+ <event name="OnChoice" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="gbsizeritem" expanded="0">
<property name="border">5</property>
<property name="colspan">1</property>
<property name="column">0</property>
- <property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT</property>
- <property name="row">3</property>
+ <property name="flag">wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT</property>
+ <property name="row">2</property>
<property name="rowspan">1</property>
<object class="wxStaticText" expanded="0">
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
- <property name="label">Outline display:</property>
- <property name="markup">0</property>
- <property name="max_size"></property>
+ <property name="label">Chamfer distance:</property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
- <property name="name">m_staticTextStyle</property>
+ <property name="name">m_cornerRadiusLabel</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
+ <property name="size" />
+ <property name="style" />
+ <property name="subclass" />
<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="tooltip" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
<property name="wrap">-1</property>
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="gbsizeritem" expanded="0">
<property name="border">5</property>
<property name="colspan">1</property>
<property name="column">1</property>
- <property name="flag">wxEXPAND|wxALL</property>
- <property name="row">3</property>
+ <property name="flag">wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT</property>
+ <property name="row">2</property>
<property name="rowspan">1</property>
- <object class="wxChoice" expanded="0">
+ <object class="wxTextCtrl" expanded="0">
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
- <property name="choices">"Line" "Hatched" "Fully hatched"</property>
<property name="close_button">1</property>
- <property name="context_help"></property>
+ <property name="context_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
- <property name="id">ID_M_OUTLINEAPPEARANCECTRL</property>
- <property name="max_size"></property>
+ <property name="id">ID_M_CORNERSMOOTHINGCTRL</property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="maxlength">0</property>
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size">-1,-1</property>
<property name="moveable">1</property>
- <property name="name">m_OutlineAppearanceCtrl</property>
+ <property name="name">m_cornerRadiusCtrl</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
- <property name="selection">0</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
+ <property name="size" />
+ <property name="style" />
+ <property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property>
- <property name="tooltip"></property>
- <property name="validator_data_type"></property>
+ <property name="tooltip" />
+ <property name="validator_data_type" />
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
+ <property name="validator_variable" />
+ <property name="value" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnText" />
+ <event name="OnTextEnter" />
+ <event name="OnTextMaxLen" />
+ <event name="OnTextURL" />
+ <event name="OnUpdateUI" />
</object>
</object>
- <object class="gbsizeritem" expanded="1">
+ <object class="gbsizeritem" expanded="0">
<property name="border">5</property>
- <property name="colspan">2</property>
- <property name="column">0</property>
- <property name="flag">wxEXPAND | wxALL</property>
- <property name="row">4</property>
+ <property name="colspan">1</property>
+ <property name="column">2</property>
+ <property name="flag">wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT</property>
+ <property name="row">2</property>
<property name="rowspan">1</property>
- <object class="wxStaticLine" expanded="1">
+ <object class="wxStaticText" expanded="0">
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
- <property name="max_size"></property>
+ <property name="label">units</property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
- <property name="name">m_staticline1</property>
+ <property name="name">m_cornerRadiusUnits</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style">wxLI_HORIZONTAL</property>
- <property name="subclass">; ; forward_declare</property>
+ <property name="size" />
+ <property name="style" />
+ <property name="subclass">; forward_declare</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="tooltip" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
+ <property name="wrap">-1</property>
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="gbsizeritem" expanded="0">
<property name="border">5</property>
<property name="colspan">1</property>
<property name="column">0</property>
- <property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT</property>
- <property name="row">5</property>
+ <property name="flag">wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL</property>
+ <property name="row">3</property>
<property name="rowspan">1</property>
<object class="wxStaticText" expanded="0">
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
- <property name="label">Corner smoothing:</property>
- <property name="markup">0</property>
- <property name="max_size"></property>
+ <property name="label">Zone priority level:</property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
- <property name="name">m_staticTextSmoothing</property>
+ <property name="name">m_staticTextPriorityLevel</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
+ <property name="size" />
+ <property name="style" />
+ <property name="subclass" />
<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="tooltip">Zones are filled by priority level, level 3 has higher priority than level 2.
When a zone is inside another zone:
* If its priority is higher, its outlines are removed from the other zone.
* If its priority is equal, a DRC error is set.</property>
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
<property name="wrap">-1</property>
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="gbsizeritem" expanded="0">
<property name="border">5</property>
<property name="colspan">1</property>
<property name="column">1</property>
- <property name="flag">wxEXPAND|wxALL</property>
- <property name="row">5</property>
+ <property name="flag">wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT</property>
+ <property name="row">3</property>
<property name="rowspan">1</property>
- <object class="wxChoice" expanded="0">
+ <object class="wxSpinCtrl" expanded="0">
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
- <property name="choices">"None" "Chamfer" "Fillet"</property>
<property name="close_button">1</property>
- <property name="context_help"></property>
+ <property name="context_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
- <property name="id">ID_CORNER_SMOOTHING</property>
- <property name="max_size"></property>
+ <property name="id">ID_M_PRIORITYLEVELCTRL</property>
+ <property name="initial">0</property>
+ <property name="max">100</property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min">0</property>
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
- <property name="name">m_cornerSmoothingChoice</property>
+ <property name="name">m_PriorityLevelCtrl</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
- <property name="selection">0</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
+ <property name="size" />
+ <property name="style">wxSP_ARROW_KEYS</property>
+ <property name="subclass" />
<property name="toolbar_pane">0</property>
- <property name="tooltip"></property>
- <property name="validator_data_type"></property>
- <property name="validator_style">wxFILTER_NONE</property>
- <property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
+ <property name="tooltip" />
+ <property name="value" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnSpinCtrl" />
+ <event name="OnSpinCtrlText" />
+ <event name="OnTextEnter" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="gbsizeritem" expanded="0">
@@ -1433,63 +1861,85 @@
<property name="colspan">1</property>
<property name="column">0</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT</property>
- <property name="row">6</property>
+ <property name="row">4</property>
<property name="rowspan">1</property>
<object class="wxStaticText" expanded="0">
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
- <property name="label">Chamfer distance:</property>
- <property name="markup">0</property>
- <property name="max_size"></property>
+ <property name="label">Outline display:</property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
- <property name="name">m_cornerRadiusLabel</property>
+ <property name="name">m_staticTextStyle</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
+ <property name="size" />
+ <property name="style" />
+ <property name="subclass" />
<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="tooltip" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
<property name="wrap">-1</property>
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="gbsizeritem" expanded="0">
@@ -1497,130 +1947,90 @@
<property name="colspan">1</property>
<property name="column">1</property>
<property name="flag">wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT</property>
- <property name="row">6</property>
+ <property name="row">4</property>
<property name="rowspan">1</property>
- <object class="wxTextCtrl" expanded="0">
+ <object class="wxChoice" expanded="0">
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
+ <property name="choices">"Line" "Hatched" "Fully hatched"</property>
<property name="close_button">1</property>
- <property name="context_help"></property>
+ <property name="context_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
- <property name="id">ID_M_CORNERSMOOTHINGCTRL</property>
- <property name="max_size"></property>
+ <property name="id">ID_M_OUTLINEAPPEARANCECTRL</property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="maxlength">0</property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size">-1,-1</property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
- <property name="name">m_cornerRadiusCtrl</property>
+ <property name="name">m_OutlineAppearanceCtrl</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
+ <property name="selection">0</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass">; ; forward_declare</property>
+ <property name="size" />
+ <property name="style" />
+ <property name="subclass" />
<property name="toolbar_pane">0</property>
- <property name="tooltip"></property>
- <property name="validator_data_type"></property>
+ <property name="tooltip" />
+ <property name="validator_data_type" />
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
- <property name="value"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
- </object>
- </object>
- <object class="gbsizeritem" expanded="0">
- <property name="border">5</property>
- <property name="colspan">1</property>
- <property name="column">2</property>
- <property name="flag">wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT</property>
- <property name="row">6</property>
- <property name="rowspan">1</property>
- <object class="wxStaticText" expanded="0">
- <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"></property>
- <property name="gripper">0</property>
- <property name="hidden">0</property>
- <property name="id">wxID_ANY</property>
- <property name="label">units</property>
- <property name="markup">0</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_cornerRadiusUnits</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">; forward_declare</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>
+ <property name="validator_variable" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
+ <event name="OnChar" />
+ <event name="OnChoice" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
</object>
@@ -1630,12 +2040,12 @@
<property name="flag">wxEXPAND|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxGridBagSizer" expanded="0">
- <property name="empty_cell_size"></property>
+ <property name="empty_cell_size" />
<property name="flexible_direction">wxBOTH</property>
<property name="growablecols">1</property>
- <property name="growablerows"></property>
+ <property name="growablerows" />
<property name="hgap">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="name">gbSizerSettings</property>
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
<property name="permission">none</property>
@@ -1652,56 +2062,78 @@
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Clearance:</property>
- <property name="markup">0</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_clearanceLabel</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
+ <property name="size" />
+ <property name="style" />
+ <property name="subclass" />
<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="tooltip" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
<property name="wrap">-1</property>
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="gbsizeritem" expanded="0">
@@ -1716,59 +2148,86 @@
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
+ <property name="maximum_size" />
<property name="maxlength">0</property>
- <property name="min_size"></property>
+ <property name="min_size" />
<property name="minimize_button">0</property>
<property name="minimum_size">-1,-1</property>
<property name="moveable">1</property>
<property name="name">m_clearanceCtrl</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
+ <property name="size" />
+ <property name="style" />
+ <property name="subclass" />
<property name="toolbar_pane">0</property>
- <property name="tooltip"></property>
- <property name="validator_data_type"></property>
+ <property name="tooltip" />
+ <property name="validator_data_type" />
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
- <property name="value"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
+ <property name="validator_variable" />
+ <property name="value" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnText" />
+ <event name="OnTextEnter" />
+ <event name="OnTextMaxLen" />
+ <event name="OnTextURL" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="gbsizeritem" expanded="0">
@@ -1783,56 +2242,78 @@
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">units</property>
- <property name="markup">0</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_clearanceUnits</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
+ <property name="size" />
+ <property name="style" />
<property name="subclass">; forward_declare</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="tooltip" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
<property name="wrap">-1</property>
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="gbsizeritem" expanded="0">
@@ -1847,56 +2328,78 @@
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Minimum width:</property>
- <property name="markup">0</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_minWidthLabel</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
+ <property name="size" />
+ <property name="style" />
+ <property name="subclass" />
<property name="toolbar_pane">0</property>
<property name="tooltip">Minimum thickness of filled areas.</property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
<property name="wrap">-1</property>
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="gbsizeritem" expanded="0">
@@ -1911,59 +2414,86 @@
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
+ <property name="maximum_size" />
<property name="maxlength">0</property>
- <property name="min_size"></property>
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_minWidthCtrl</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
+ <property name="size" />
+ <property name="style" />
+ <property name="subclass" />
<property name="toolbar_pane">0</property>
- <property name="tooltip"></property>
- <property name="validator_data_type"></property>
+ <property name="tooltip" />
+ <property name="validator_data_type" />
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
- <property name="value"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
+ <property name="validator_variable" />
+ <property name="value" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnText" />
+ <event name="OnTextEnter" />
+ <event name="OnTextMaxLen" />
+ <event name="OnTextURL" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="gbsizeritem" expanded="0">
@@ -1978,63 +2508,85 @@
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">units</property>
- <property name="markup">0</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_minWidthUnits</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
+ <property name="size" />
+ <property name="style" />
<property name="subclass">; forward_declare</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="tooltip" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
<property name="wrap">-1</property>
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="gbsizeritem" expanded="0">
<property name="border">5</property>
<property name="colspan">1</property>
<property name="column">0</property>
- <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+ <property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT</property>
<property name="row">2</property>
<property name="rowspan">1</property>
<object class="wxStaticText" expanded="0">
@@ -2042,63 +2594,85 @@
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Pad connections:</property>
- <property name="markup">0</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_connectionLabel</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
+ <property name="size" />
+ <property name="style" />
+ <property name="subclass" />
<property name="toolbar_pane">0</property>
<property name="tooltip">Default pad connection type to zone.
This setting can be overridden by local pad settings</property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
<property name="wrap">-1</property>
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="gbsizeritem" expanded="0">
<property name="border">5</property>
<property name="colspan">1</property>
<property name="column">1</property>
- <property name="flag">wxEXPAND|wxALL</property>
+ <property name="flag">wxEXPAND|wxRIGHT|wxLEFT</property>
<property name="row">2</property>
<property name="rowspan">1</property>
<object class="wxChoice" expanded="0">
@@ -2106,59 +2680,83 @@
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="choices">"Solid" "Thermal reliefs" "Reliefs for PTH" "None"</property>
<property name="close_button">1</property>
- <property name="context_help"></property>
+ <property name="context_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">ID_M_PADINZONEOPT</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_PadInZoneOpt</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="selection">0</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
+ <property name="size" />
+ <property name="style" />
+ <property name="subclass" />
<property name="toolbar_pane">0</property>
- <property name="tooltip"></property>
- <property name="validator_data_type"></property>
+ <property name="tooltip" />
+ <property name="validator_data_type" />
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
+ <property name="validator_variable" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
+ <event name="OnChar" />
+ <event name="OnChoice" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="gbsizeritem" expanded="0">
@@ -2173,56 +2771,78 @@
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Thermal clearance:</property>
- <property name="markup">0</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_antipadLabel</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
+ <property name="size" />
+ <property name="style" />
+ <property name="subclass" />
<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="tooltip" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
<property name="wrap">-1</property>
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="gbsizeritem" expanded="0">
@@ -2237,59 +2857,86 @@
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANTIPAD_SIZE</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
+ <property name="maximum_size" />
<property name="maxlength">0</property>
- <property name="min_size"></property>
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_antipadCtrl</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
+ <property name="size" />
+ <property name="style" />
+ <property name="subclass" />
<property name="toolbar_pane">0</property>
<property name="tooltip">Clearance between pads in the same net and filled areas.</property>
- <property name="validator_data_type"></property>
+ <property name="validator_data_type" />
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
- <property name="value"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
+ <property name="validator_variable" />
+ <property name="value" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnText" />
+ <event name="OnTextEnter" />
+ <event name="OnTextMaxLen" />
+ <event name="OnTextURL" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="gbsizeritem" expanded="0">
@@ -2304,56 +2951,78 @@
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">units</property>
- <property name="markup">0</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_antipadUnits</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
+ <property name="size" />
+ <property name="style" />
<property name="subclass">; forward_declare</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="tooltip" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
<property name="wrap">-1</property>
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="gbsizeritem" expanded="0">
@@ -2368,56 +3037,78 @@
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Thermal spoke width:</property>
- <property name="markup">0</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_spokeWidthLabel</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
+ <property name="size" />
+ <property name="style" />
+ <property name="subclass" />
<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="tooltip" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
<property name="wrap">-1</property>
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="gbsizeritem" expanded="0">
@@ -2432,59 +3123,86 @@
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_COPPER_BRIDGE_VALUE</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
+ <property name="maximum_size" />
<property name="maxlength">0</property>
- <property name="min_size"></property>
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_spokeWidthCtrl</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
+ <property name="size" />
+ <property name="style" />
+ <property name="subclass" />
<property name="toolbar_pane">0</property>
<property name="tooltip">Width of copper in thermal reliefs.</property>
- <property name="validator_data_type"></property>
+ <property name="validator_data_type" />
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
- <property name="value"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
+ <property name="validator_variable" />
+ <property name="value" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnText" />
+ <event name="OnTextEnter" />
+ <event name="OnTextMaxLen" />
+ <event name="OnTextURL" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="gbsizeritem" expanded="0">
@@ -2499,56 +3217,78 @@
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">units</property>
- <property name="markup">0</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_spokeWidthUnits</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
+ <property name="size" />
+ <property name="style" />
<property name="subclass">; forward_declare</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="tooltip" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
<property name="wrap">-1</property>
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
</object>
@@ -2562,11 +3302,12 @@
<object class="wxStaticBoxSizer" expanded="1">
<property name="id">wxID_ANY</property>
<property name="label">Style</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="name">sbSizerZoneStyle</property>
<property name="orient">wxVERTICAL</property>
<property name="parent">1</property>
<property name="permission">none</property>
+ <event name="OnUpdateUI" />
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
@@ -2575,9 +3316,9 @@
<property name="cols">3</property>
<property name="flexible_direction">wxBOTH</property>
<property name="growablecols">1</property>
- <property name="growablerows"></property>
+ <property name="growablerows" />
<property name="hgap">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="name">fgSizerZoneStyle</property>
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
<property name="permission">none</property>
@@ -2592,56 +3333,78 @@
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Fill type:</property>
- <property name="markup">0</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_staticTextGridFillType</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
+ <property name="size" />
+ <property name="style" />
<property name="subclass">; forward_declare</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="tooltip" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
<property name="wrap">-1</property>
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="sizeritem" expanded="1">
@@ -2653,60 +3416,83 @@
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="choices">"Solid shape" "Hatch pattern"</property>
<property name="close_button">1</property>
- <property name="context_help"></property>
+ <property name="context_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_GridStyleCtrl</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="selection">0</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
+ <property name="size" />
+ <property name="style" />
<property name="subclass">; forward_declare</property>
<property name="toolbar_pane">0</property>
- <property name="tooltip"></property>
- <property name="validator_data_type"></property>
+ <property name="tooltip" />
+ <property name="validator_data_type" />
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
+ <property name="validator_variable" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
+ <event name="OnChar" />
<event name="OnChoice">OnStyleSelection</event>
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="sizeritem" expanded="1">
@@ -2728,56 +3514,78 @@
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Orientation:</property>
- <property name="markup">0</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_staticTextGrindOrient</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
+ <property name="size" />
+ <property name="style" />
<property name="subclass">; forward_declare</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="tooltip" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
<property name="wrap">-1</property>
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="sizeritem" expanded="1">
@@ -2789,59 +3597,86 @@
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="maxlength"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="maxlength" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_tcGridStyleOrientation</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
+ <property name="size" />
+ <property name="style" />
<property name="subclass">; forward_declare</property>
<property name="toolbar_pane">0</property>
- <property name="tooltip"></property>
- <property name="validator_data_type"></property>
+ <property name="tooltip" />
+ <property name="validator_data_type" />
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
- <property name="value"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
+ <property name="validator_variable" />
+ <property name="value" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnText" />
+ <event name="OnTextEnter" />
+ <event name="OnTextMaxLen" />
+ <event name="OnTextURL" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="sizeritem" expanded="1">
@@ -2853,56 +3688,78 @@
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">degree</property>
- <property name="markup">0</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_staticTextRotUnits</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
+ <property name="size" />
+ <property name="style" />
<property name="subclass">; forward_declare</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="tooltip" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
<property name="wrap">-1</property>
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="sizeritem" expanded="1">
@@ -2914,56 +3771,78 @@
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Hatch width:</property>
- <property name="markup">0</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_staticTextStyleThickness</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
+ <property name="size" />
+ <property name="style" />
<property name="subclass">; forward_declare</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="tooltip" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
<property name="wrap">-1</property>
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="sizeritem" expanded="1">
@@ -2975,59 +3854,86 @@
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="maxlength"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="maxlength" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_tcGridStyleThickness</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
+ <property name="size" />
+ <property name="style" />
<property name="subclass">; forward_declare</property>
<property name="toolbar_pane">0</property>
- <property name="tooltip"></property>
- <property name="validator_data_type"></property>
+ <property name="tooltip" />
+ <property name="validator_data_type" />
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
- <property name="value"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
+ <property name="validator_variable" />
+ <property name="value" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnText" />
+ <event name="OnTextEnter" />
+ <event name="OnTextMaxLen" />
+ <event name="OnTextURL" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="sizeritem" expanded="1">
@@ -3039,56 +3945,78 @@
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">units</property>
- <property name="markup">0</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_GridStyleThicknessUnits</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
+ <property name="size" />
+ <property name="style" />
<property name="subclass">; forward_declare</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="tooltip" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
<property name="wrap">-1</property>
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="sizeritem" expanded="1">
@@ -3100,56 +4028,78 @@
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Hatch gap:</property>
- <property name="markup">0</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_staticTextGridGap</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
+ <property name="size" />
+ <property name="style" />
<property name="subclass">; forward_declare</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="tooltip" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
<property name="wrap">-1</property>
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="sizeritem" expanded="1">
@@ -3161,59 +4111,86 @@
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="maxlength"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="maxlength" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_tcGridStyleGap</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
+ <property name="size" />
+ <property name="style" />
<property name="subclass">; forward_declare</property>
<property name="toolbar_pane">0</property>
- <property name="tooltip"></property>
- <property name="validator_data_type"></property>
+ <property name="tooltip" />
+ <property name="validator_data_type" />
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
- <property name="value"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
+ <property name="validator_variable" />
+ <property name="value" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnText" />
+ <event name="OnTextEnter" />
+ <event name="OnTextMaxLen" />
+ <event name="OnTextURL" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="sizeritem" expanded="1">
@@ -3225,56 +4202,78 @@
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">units</property>
- <property name="markup">0</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_GridStyleGapUnits</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
+ <property name="size" />
+ <property name="style" />
<property name="subclass">; forward_declare</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="tooltip" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
<property name="wrap">-1</property>
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="sizeritem" expanded="1">
@@ -3286,56 +4285,78 @@
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Smoothing effort:</property>
- <property name="markup">0</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_staticTextGridSmoothingLevel</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
+ <property name="size" />
+ <property name="style" />
<property name="subclass">; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip">Value of smoothing effort
0 = no smoothing
1 = chamfer
2 = round corners
3 = round corners (finer shape)</property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
<property name="wrap">-1</property>
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="sizeritem" expanded="1">
@@ -3347,57 +4368,83 @@
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="initial">0</property>
<property name="max">3</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
+ <property name="maximum_size" />
<property name="min">0</property>
- <property name="min_size"></property>
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_spinCtrlSmoothLevel</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
+ <property name="size" />
<property name="style">wxSP_ARROW_KEYS</property>
<property name="subclass">; forward_declare</property>
<property name="toolbar_pane">0</property>
- <property name="tooltip"></property>
- <property name="value"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
+ <property name="tooltip" />
+ <property name="value" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnSpinCtrl" />
+ <event name="OnSpinCtrlText" />
+ <event name="OnTextEnter" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="sizeritem" expanded="1">
@@ -3419,56 +4466,78 @@
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Smooth value (0..1):</property>
- <property name="markup">0</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_staticTextGridSmootingVal</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
+ <property name="size" />
+ <property name="style" />
<property name="subclass">; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip">Ratio between smoothed corners size and the gap between lines
0 = no smoothing
1.0 = max radius/chamfer size (half gap value)</property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
<property name="wrap">-1</property>
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="sizeritem" expanded="1">
@@ -3480,59 +4549,82 @@
<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="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<property name="context_menu">1</property>
<property name="default_pane">0</property>
- <property name="digits">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="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="inc">0.1</property>
<property name="initial">0.100000</property>
<property name="max">1</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
+ <property name="maximum_size" />
<property name="min">0</property>
- <property name="min_size"></property>
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_spinCtrlSmoothValue</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
+ <property name="size" />
<property name="style">wxSP_ARROW_KEYS</property>
<property name="subclass">; forward_declare</property>
<property name="toolbar_pane">0</property>
- <property name="tooltip"></property>
- <property name="value"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
+ <property name="tooltip" />
+ <property name="value" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnSpinCtrlDouble" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="sizeritem" expanded="1">
@@ -3556,7 +4648,7 @@
<property name="flag">wxEXPAND|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxBoxSizer" expanded="1">
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="name">bSizerbottom</property>
<property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property>
@@ -3569,68 +4661,83 @@
<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="bitmap"></property>
- <property name="caption"></property>
+ <property name="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<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_help" />
<property name="context_menu">1</property>
- <property name="current"></property>
<property name="default">0</property>
<property name="default_pane">0</property>
- <property name="disabled"></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="fg" />
<property name="floatable">1</property>
- <property name="focus"></property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_BUTTON_EXPORT</property>
<property name="label">Export Settings to Other Zones</property>
- <property name="margins"></property>
- <property name="markup">0</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_ExportSetupButton</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
- <property name="position"></property>
- <property name="pressed"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
+ <property name="size" />
+ <property name="style" />
+ <property name="subclass" />
<property name="toolbar_pane">0</property>
<property name="tooltip">Export this zone setup (excluding layer and net selection) to all other copper zones.</property>
- <property name="validator_data_type"></property>
+ <property name="validator_data_type" />
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
+ <property name="validator_variable" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
<event name="OnButtonClick">ExportSetupToOtherCopperZones</event>
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="sizeritem" expanded="1">
@@ -3646,10 +4753,17 @@
<property name="OK">1</property>
<property name="Save">0</property>
<property name="Yes">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="name">m_sdbSizer</property>
<property name="permission">protected</property>
+ <event name="OnApplyButtonClick" />
<event name="OnCancelButtonClick">OnButtonCancelClick</event>
+ <event name="OnContextHelpButtonClick" />
+ <event name="OnHelpButtonClick" />
+ <event name="OnNoButtonClick" />
+ <event name="OnOKButtonClick" />
+ <event name="OnSaveButtonClick" />
+ <event name="OnYesButtonClick" />
</object>
</object>
</object>
diff --git a/pcbnew/dialogs/dialog_copper_zones_base.h b/pcbnew/dialogs/dialog_copper_zones_base.h
index 0fab5598b..db40f1063 100644
--- a/pcbnew/dialogs/dialog_copper_zones_base.h
+++ b/pcbnew/dialogs/dialog_copper_zones_base.h
@@ -1,11 +1,12 @@
///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Dec 1 2018)
+// C++ code generated with wxFormBuilder (version Dec 30 2017)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
-#pragma once
+#ifndef __DIALOG_COPPER_ZONES_BASE_H__
+#define __DIALOG_COPPER_ZONES_BASE_H__
#include <wx/artprov.h>
#include <wx/xrc/xmlres.h>
@@ -22,15 +23,14 @@
#include <wx/listbox.h>
#include <wx/stattext.h>
#include <wx/textctrl.h>
+#include <wx/button.h>
+#include <wx/checkbox.h>
#include <wx/bitmap.h>
#include <wx/image.h>
#include <wx/icon.h>
-#include <wx/button.h>
-#include <wx/checkbox.h>
#include <wx/statbmp.h>
-#include <wx/spinctrl.h>
#include <wx/choice.h>
-#include <wx/statline.h>
+#include <wx/spinctrl.h>
#include <wx/gbsizer.h>
#include <wx/dialog.h>
@@ -42,7 +42,7 @@
class DIALOG_COPPER_ZONE_BASE : public DIALOG_SHIM
{
private:
-
+
protected:
enum
{
@@ -50,16 +50,16 @@ class DIALOG_COPPER_ZONE_BASE : public DIALOG_SHIM
ID_NETNAME_SELECTION,
ID_TEXTCTRL_NETNAMES_FILTER,
wxID_APPLY_FILTERS,
- ID_M_PRIORITYLEVELCTRL,
- ID_M_OUTLINEAPPEARANCECTRL,
ID_CORNER_SMOOTHING,
ID_M_CORNERSMOOTHINGCTRL,
+ ID_M_PRIORITYLEVELCTRL,
+ ID_M_OUTLINEAPPEARANCECTRL,
ID_M_PADINZONEOPT,
wxID_ANTIPAD_SIZE,
wxID_COPPER_BRIDGE_VALUE,
wxID_BUTTON_EXPORT
};
-
+
wxBoxSizer* m_MainBoxSizer;
wxDataViewListCtrl* m_layers;
wxListBox* m_ListNetNameSelection;
@@ -74,17 +74,15 @@ class DIALOG_COPPER_ZONE_BASE : public DIALOG_SHIM
wxStaticBitmap* m_bitmapNoNetWarning;
wxStaticText* m_staticText18;
wxCheckBox* m_constrainOutline;
- wxCheckBox* m_cbFilledPolyOutlineOpt;
- wxStaticText* m_staticTextPriorityLevel;
- wxSpinCtrl* m_PriorityLevelCtrl;
- wxStaticText* m_staticTextStyle;
- wxChoice* m_OutlineAppearanceCtrl;
- wxStaticLine* m_staticline1;
wxStaticText* m_staticTextSmoothing;
wxChoice* m_cornerSmoothingChoice;
wxStaticText* m_cornerRadiusLabel;
wxTextCtrl* m_cornerRadiusCtrl;
wxStaticText* m_cornerRadiusUnits;
+ wxStaticText* m_staticTextPriorityLevel;
+ wxSpinCtrl* m_PriorityLevelCtrl;
+ wxStaticText* m_staticTextStyle;
+ wxChoice* m_OutlineAppearanceCtrl;
wxStaticText* m_clearanceLabel;
wxTextCtrl* m_clearanceCtrl;
wxStaticText* m_clearanceUnits;
@@ -118,7 +116,7 @@ class DIALOG_COPPER_ZONE_BASE : public DIALOG_SHIM
wxStdDialogButtonSizer* m_sdbSizer;
wxButton* m_sdbSizerOK;
wxButton* m_sdbSizerCancel;
-
+
// Virtual event handlers, overide them in your derived class
virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); }
@@ -128,12 +126,13 @@ class DIALOG_COPPER_ZONE_BASE : public DIALOG_SHIM
virtual void OnStyleSelection( wxCommandEvent& event ) { event.Skip(); }
virtual void ExportSetupToOtherCopperZones( wxCommandEvent& event ) { event.Skip(); }
virtual void OnButtonCancelClick( wxCommandEvent& event ) { event.Skip(); }
-
-
+
+
public:
-
- DIALOG_COPPER_ZONE_BASE( wxWindow* parent, wxWindowID id = ID_DIALOG_COPPER_ZONE_BASE, const wxString& title = _("Copper Zone Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 825,528 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+
+ DIALOG_COPPER_ZONE_BASE( wxWindow* parent, wxWindowID id = ID_DIALOG_COPPER_ZONE_BASE, const wxString& title = _("Copper Zone Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 825,528 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~DIALOG_COPPER_ZONE_BASE();
-
+
};
+#endif //__DIALOG_COPPER_ZONES_BASE_H__
diff --git a/pcbnew/kicad_plugin.cpp b/pcbnew/kicad_plugin.cpp
index ab3cb3bdf..1930c4680 100644
--- a/pcbnew/kicad_plugin.cpp
+++ b/pcbnew/kicad_plugin.cpp
@@ -1710,10 +1710,6 @@ void PCB_IO::format( ZONE_CONTAINER* aZone, int aNestLevel ) const
m_out->Print( aNestLevel+1, "(min_thickness %s)",
FormatInternalUnits( aZone->GetMinThickness() ).c_str() );
- if( aZone->GetMinThickness() != aZone->GetZoneOutlineThickness() )
- m_out->Print( 0, " (outline_thickness %s)",
- FormatInternalUnits( aZone->GetZoneOutlineThickness() ).c_str() );
-
m_out->Print( 0, "\n" );
if( aZone->GetIsKeepout() )
diff --git a/pcbnew/pcb_painter.cpp b/pcbnew/pcb_painter.cpp
index af4c1b531..99af4ce60 100644
--- a/pcbnew/pcb_painter.cpp
+++ b/pcbnew/pcb_painter.cpp
@@ -23,6 +23,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include <advanced_config.h>
#include <class_board.h>
#include <class_track.h>
#include <class_module.h>
@@ -1165,12 +1166,12 @@ void PCB_PAINTER::draw( const ZONE_CONTAINER* aZone, int aLayer )
// Set up drawing options
m_gal->SetStrokeColor( color );
m_gal->SetFillColor( color );
- m_gal->SetLineWidth( aZone->GetZoneOutlineThickness() );
+ m_gal->SetLineWidth( aZone->GetMinThickness() );
if( displayMode == PCB_RENDER_SETTINGS::DZ_SHOW_FILLED )
{
m_gal->SetIsFill( true );
- m_gal->SetIsStroke( aZone->GetZoneOutlineThickness() > 0 );
+ m_gal->SetIsStroke( ADVANCED_CFG::GetCfg().m_thickZones );
}
else if( displayMode == PCB_RENDER_SETTINGS::DZ_SHOW_OUTLINED )
{
diff --git a/pcbnew/pcb_parser.cpp b/pcbnew/pcb_parser.cpp
index 3eac4e095..58af3fb14 100644
--- a/pcbnew/pcb_parser.cpp
+++ b/pcbnew/pcb_parser.cpp
@@ -3067,9 +3067,6 @@ ZONE_CONTAINER* PCB_PARSER::parseZONE_CONTAINER()
std::unique_ptr< ZONE_CONTAINER > zone( new ZONE_CONTAINER( m_board ) );
zone->SetPriority( 0 );
- // Set to true if the filled poly outlines thickness is specified
- // if not, the thickness must be set to zone minimal thickness
- bool hasZoneOutlineThickness = false;
for( token = NextTok(); token != T_RIGHT; token = NextTok() )
{
@@ -3177,12 +3174,6 @@ ZONE_CONTAINER* PCB_PARSER::parseZONE_CONTAINER()
NeedRIGHT();
break;
- case T_outline_thickness:
- zone->SetZoneOutlineThickness( parseBoardUnits( T_outline_thickness ) );
- hasZoneOutlineThickness = true;
- NeedRIGHT();
- break;
-
case T_fill:
for( token = NextTok(); token != T_RIGHT; token = NextTok() )
{
@@ -3423,11 +3414,6 @@ ZONE_CONTAINER* PCB_PARSER::parseZONE_CONTAINER()
}
}
- // Old boards do not have a outline width set in file and
- // use the zone min thickness as outline width
- if( !hasZoneOutlineThickness )
- zone->SetZoneOutlineThickness( zone->GetMinThickness() );
-
if( zone->GetNumCorners() > 2 )
{
if( !zone->IsOnCopperLayer() )
diff --git a/pcbnew/plot_brditems_plotter.cpp b/pcbnew/plot_brditems_plotter.cpp
index 28a2827a8..b45383577 100644
--- a/pcbnew/plot_brditems_plotter.cpp
+++ b/pcbnew/plot_brditems_plotter.cpp
@@ -21,6 +21,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include <advanced_config.h>
#include <fctsys.h>
#include <common.h>
#include <plotter.h>
@@ -650,7 +651,7 @@ void BRDITEMS_PLOTTER::PlotFilledAreas( ZONE_CONTAINER* aZone )
/* Plot all filled areas: filled areas have a filled area and a thick
* outline we must plot the filled area itself ( as a filled polygon
* OR a set of segments ) and plot the thick outline itself,
- * if the thickness has meaning (at least is > 1)
+ * if the thickness is enabled
*
* in non filled mode the outline is plotted, but not the filling items
*/
@@ -668,16 +669,21 @@ void BRDITEMS_PLOTTER::PlotFilledAreas( ZONE_CONTAINER* aZone )
// Plot the current filled area and its outline
if( GetPlotMode() == FILLED )
{
- m_plotter->PlotPoly( cornerList, FILLED_SHAPE, aZone->GetZoneOutlineThickness(), &gbr_metadata );
+ int thickness = aZone->GetMinThickness();
+
+ if( !ADVANCED_CFG::GetCfg().m_thickZones )
+ thickness = 0;
+
+ m_plotter->PlotPoly( cornerList, FILLED_SHAPE, thickness, &gbr_metadata );
}
else
{
- if( aZone->GetZoneOutlineThickness() > 0 )
+ if( ADVANCED_CFG::GetCfg().m_thickZones )
{
for( unsigned jj = 1; jj < cornerList.size(); jj++ )
{
m_plotter->ThickSegment( cornerList[jj -1], cornerList[jj],
- aZone->GetZoneOutlineThickness(),
+ aZone->GetMinThickness(),
GetPlotMode(), &gbr_metadata );
}
}
diff --git a/pcbnew/zone_filler.cpp b/pcbnew/zone_filler.cpp
index 2ace2c202..f20a392d1 100644
--- a/pcbnew/zone_filler.cpp
+++ b/pcbnew/zone_filler.cpp
@@ -29,6 +29,7 @@
#include <algorithm>
#include <future>
+#include <advanced_config.h>
#include <class_board.h>
#include <class_zone.h>
#include <class_module.h>
@@ -493,13 +494,8 @@ void ZONE_FILLER::buildZoneFeatureHoleList( const ZONE_CONTAINER* aZone,
aFeatures.Append( convex_hull[ii] );
}
else
- {
- if( pad->GetShape() == PAD_SHAPE_CIRCLE ||
- pad->GetShape() == PAD_SHAPE_OVAL )
- pad->TransformShapeWithClearanceToPolygon( aFeatures, gap );
- else
- pad->TransformShapeWithClearanceToPolygon( aFeatures, gap, ARC_LOW_DEF );
- }
+ pad->TransformShapeWithClearanceToPolygon( aFeatures, gap,
+ m_board->GetDesignSettings().m_MaxError );
}
}
}
@@ -522,7 +518,8 @@ void ZONE_FILLER::buildZoneFeatureHoleList( const ZONE_CONTAINER* aZone,
if( item_boundingbox.Intersects( zone_boundingbox ) )
{
int clearance = std::max( zone_clearance, item_clearance );
- track->TransformShapeWithClearanceToPolygon( aFeatures, clearance, ARC_LOW_DEF );
+ track->TransformShapeWithClearanceToPolygon( aFeatures, clearance,
+ m_board->GetDesignSettings().m_MaxError );
}
}
@@ -811,15 +808,11 @@ void ZONE_FILLER::computeRawFilledAreas( const ZONE_CONTAINER* aZone,
SHAPE_POLY_SET th_fractured = solidAreas;
// Inflate polygon to recreate the polygon (without the too narrow areas)
- int inflate_value = outline_half_thickness - aZone->GetZoneOutlineThickness() / 2;
-
- if( inflate_value <= Millimeter2iu( 0.001 ) ) // avoid very small outline thickness
- inflate_value = 0;
-
- if( inflate_value )
+ if( !ADVANCED_CFG::GetCfg().m_thickZones &&
+ outline_half_thickness >= m_board->GetDesignSettings().m_MaxError )
{
th_fractured.Simplify( SHAPE_POLY_SET::PM_FAST );
- th_fractured.Inflate( outline_half_thickness, 16 );
+ th_fractured.Inflate( outline_half_thickness, numSegs );
}
th_fractured.Fracture( SHAPE_POLY_SET::PM_FAST );
@@ -833,15 +826,11 @@ void ZONE_FILLER::computeRawFilledAreas( const ZONE_CONTAINER* aZone,
{
SHAPE_POLY_SET areas_fractured = solidAreas;
- int inflate_value = outline_half_thickness - aZone->GetZoneOutlineThickness() / 2;
-
- if( inflate_value <= Millimeter2iu( 0.001 ) ) // avoid very small outline thickness
- inflate_value = 0;
-
- if( inflate_value )
+ if( !ADVANCED_CFG::GetCfg().m_thickZones &&
+ outline_half_thickness >= m_board->GetDesignSettings().m_MaxError )
{
areas_fractured.Simplify( SHAPE_POLY_SET::PM_FAST );
- areas_fractured.Inflate( outline_half_thickness, 16 );
+ areas_fractured.Inflate( outline_half_thickness, numSegs );
}
areas_fractured.Fracture( SHAPE_POLY_SET::PM_FAST );
diff --git a/pcbnew/zone_settings.cpp b/pcbnew/zone_settings.cpp
index 36ee8db51..aaf102222 100644
--- a/pcbnew/zone_settings.cpp
+++ b/pcbnew/zone_settings.cpp
@@ -49,8 +49,7 @@ ZONE_SETTINGS::ZONE_SETTINGS()
m_ZoneClearance = Mils2iu( ZONE_CLEARANCE_MIL );
// Min thickness value in filled areas (this is the minimum width of copper to fill solid areas) :
m_ZoneMinThickness = Mils2iu( ZONE_THICKNESS_MIL );
- m_ZoneOutlineThickness = m_ZoneMinThickness; // Legacy option: filled polygons have
- // a outline thickness = m_ZoneMinThickness
+
m_HatchFillTypeThickness = 0; // good value of grid line thickness if m_FillMode = ZFM_GRID_PATTERN
m_HatchFillTypeGap = 0; // good value of grid line gap if m_FillMode = ZFM_GRID_PATTERN
m_HatchFillTypeOrientation = 0.0; // Grid style: orientation of grid lines in degrees
@@ -86,8 +85,6 @@ ZONE_SETTINGS& ZONE_SETTINGS::operator << ( const ZONE_CONTAINER& aSource )
m_FillMode = aSource.GetFillMode();
m_ZoneClearance = aSource.GetZoneClearance();
m_ZoneMinThickness = aSource.GetMinThickness();
- m_ZoneOutlineThickness = aSource.GetZoneOutlineThickness();
- m_HatchFillTypeThickness = aSource.GetHatchFillTypeThickness();
m_HatchFillTypeGap = aSource.GetHatchFillTypeGap();
m_HatchFillTypeOrientation = aSource.GetHatchFillTypeOrientation();
m_HatchFillTypeSmoothingLevel = aSource.GetHatchFillTypeSmoothingLevel();
@@ -117,7 +114,6 @@ void ZONE_SETTINGS::ExportSetting( ZONE_CONTAINER& aTarget, bool aFullExport ) c
aTarget.SetFillMode( m_FillMode );
aTarget.SetZoneClearance( m_ZoneClearance );
aTarget.SetMinThickness( m_ZoneMinThickness );
- aTarget.SetZoneOutlineThickness( m_ZoneOutlineThickness );
aTarget.SetHatchFillTypeThickness( m_HatchFillTypeThickness );
aTarget.SetHatchFillTypeGap( m_HatchFillTypeGap );
aTarget.SetHatchFillTypeOrientation( m_HatchFillTypeOrientation );
diff --git a/pcbnew/zone_settings.h b/pcbnew/zone_settings.h
index 640849c53..ea4cb1418 100644
--- a/pcbnew/zone_settings.h
+++ b/pcbnew/zone_settings.h
@@ -63,7 +63,6 @@ public:
int m_ZoneClearance; ///< Clearance value
int m_ZoneMinThickness; ///< Min thickness value in filled areas
- int m_ZoneOutlineThickness; ///< thickness of filled polygons outlines
int m_HatchFillTypeThickness; ///< Grid style shape: thickness of lines (if 0 -> solid shape)
int m_HatchFillTypeGap; ///< Grid style shape: clearance between lines (0 -> solid shape)
double m_HatchFillTypeOrientation; ///< Grid style shape: orientation of grid lines in degrees
--
2.20.1
| Thread Previous • Date Previous • Date Next • Thread Next |
