From da3fda8dee29a3c41ec3e57597584f8562d8099d Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Mon, 16 Aug 2021 12:43:54 +0100 Subject: [PATCH] Fix typo in non-copper zone fill pattern, and cleanup spacing. Also makes better use of UNIT_BINDER and fixes some other naming inconsistencies with copper zone dialog. --- .../dialog_non_copper_zones_properties.cpp | 47 ++++++----- ...ialog_non_copper_zones_properties_base.cpp | 82 +++++++++---------- ...ialog_non_copper_zones_properties_base.fbp | 64 +++++++-------- .../dialog_non_copper_zones_properties_base.h | 22 ++--- 4 files changed, 107 insertions(+), 108 deletions(-) diff --git a/pcbnew/dialogs/dialog_non_copper_zones_properties.cpp b/pcbnew/dialogs/dialog_non_copper_zones_properties.cpp index 4189d39459..d48095dda3 100644 --- a/pcbnew/dialogs/dialog_non_copper_zones_properties.cpp +++ b/pcbnew/dialogs/dialog_non_copper_zones_properties.cpp @@ -1,12 +1,9 @@ -/** - * @file dialog_non_copper_zones_properties.cpp - */ /* * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2019 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2014 SoftPLC Corporation, Dick Hollenbeck - * Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 1992-2021 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -43,9 +40,9 @@ private: ZONE_SETTINGS* m_ptr; ZONE_SETTINGS m_settings; // working copy of zone settings UNIT_BINDER m_minWidth; - UNIT_BINDER m_gridStyleRotation; - UNIT_BINDER m_gridStyleThickness; - UNIT_BINDER m_gridStyleGap; + UNIT_BINDER m_hatchRotation; + UNIT_BINDER m_hatchWidth; + UNIT_BINDER m_hatchGap; int m_cornerSmoothingType; UNIT_BINDER m_cornerRadius; @@ -74,9 +71,9 @@ DIALOG_NON_COPPER_ZONES_EDITOR::DIALOG_NON_COPPER_ZONES_EDITOR( PCB_BASE_FRAME* ZONE_SETTINGS* aSettings ) : DIALOG_NONCOPPER_ZONES_PROPERTIES_BASE( aParent ), m_minWidth( aParent, m_MinWidthLabel, m_MinWidthCtrl, m_MinWidthUnits ), - m_gridStyleRotation( aParent, m_staticTextGrindOrient, m_tcGridStyleOrientation, m_staticTextRotUnits ), - m_gridStyleThickness( aParent, m_staticTextStyleThickness, m_tcGridStyleThickness, m_GridStyleThicknessUnits), - m_gridStyleGap( aParent, m_staticTextGridGap, m_tcGridStyleGap, m_GridStyleGapUnits ), + m_hatchRotation( aParent, m_hatchOrientLabel, m_hatchOrientCtrl, m_hatchOrientUnits ), + m_hatchWidth( aParent, m_hatchWidthLabel, m_hatchWidthCtrl, m_hatchWidthUnits), + m_hatchGap( aParent, m_hatchGapLabel, m_hatchGapCtrl, m_hatchGapUnits ), m_cornerSmoothingType( ZONE_SETTINGS::SMOOTHING_UNDEFINED ), m_cornerRadius( aParent, m_cornerRadiusLabel, m_cornerRadiusCtrl, m_cornerRadiusUnits ) { @@ -132,8 +129,8 @@ bool DIALOG_NON_COPPER_ZONES_EDITOR::TransferDataToWindow() default: m_GridStyleCtrl->SetSelection( 0 ); break; } - m_gridStyleRotation.SetUnits( EDA_UNITS::DEGREES ); - m_gridStyleRotation.SetValue( m_settings.m_HatchOrientation * 10 ); // IU is decidegree + m_hatchRotation.SetUnits( EDA_UNITS::DEGREES ); + m_hatchRotation.SetValue( m_settings.m_HatchOrientation * 10 ); // IU is decidegree // Gives a reasonable value to grid style parameters, if currently there are no defined // parameters for grid pattern thickness and gap (if the value is 0) @@ -143,17 +140,17 @@ bool DIALOG_NON_COPPER_ZONES_EDITOR::TransferDataToWindow() // or 1.5 mm int bestvalue = m_settings.m_HatchThickness; - if( bestvalue <= 0 ) // No defined value for m_hatchThickness + if( bestvalue <= 0 ) // No defined value for m_hatchWidth bestvalue = std::max( m_settings.m_ZoneMinThickness * 4, Millimeter2iu( 1.0 ) ); - m_gridStyleThickness.SetValue( std::max( bestvalue, m_settings.m_ZoneMinThickness ) ); + m_hatchWidth.SetValue( std::max( bestvalue, m_settings.m_ZoneMinThickness ) ); bestvalue = m_settings.m_HatchGap; if( bestvalue <= 0 ) // No defined value for m_hatchGap bestvalue = std::max( m_settings.m_ZoneMinThickness * 6, Millimeter2iu( 1.5 ) ); - m_gridStyleGap.SetValue( std::max( bestvalue, m_settings.m_ZoneMinThickness ) ); + m_hatchGap.SetValue( std::max( bestvalue, m_settings.m_ZoneMinThickness ) ); m_spinCtrlSmoothLevel->SetValue( m_settings.m_HatchSmoothingLevel ); m_spinCtrlSmoothValue->SetValue( m_settings.m_HatchSmoothingValue ); @@ -169,10 +166,12 @@ bool DIALOG_NON_COPPER_ZONES_EDITOR::TransferDataToWindow() void DIALOG_NON_COPPER_ZONES_EDITOR::OnStyleSelection( wxCommandEvent& event ) { bool enable = m_GridStyleCtrl->GetSelection() >= 1; - m_tcGridStyleThickness->Enable( enable ); - m_tcGridStyleGap->Enable( enable ); - m_tcGridStyleOrientation->Enable( enable ); + m_hatchRotation.Enable( enable ); + m_hatchWidth.Enable( enable ); + m_hatchGap.Enable( enable ); + m_smoothLevelLabel->Enable( enable ); m_spinCtrlSmoothLevel->Enable( enable ); + m_smoothValueLabel->Enable( enable ); m_spinCtrlSmoothValue->Enable( enable ); } @@ -198,7 +197,7 @@ bool DIALOG_NON_COPPER_ZONES_EDITOR::TransferDataFromWindow() m_settings.SetCornerRadius( m_settings.GetCornerSmoothingType() == ZONE_SETTINGS::SMOOTHING_NONE ? 0 : m_cornerRadius.GetValue() ); - if( !m_gridStyleRotation.Validate( -1800, 1800 ) ) + if( !m_hatchRotation.Validate( -1800, 1800 ) ) return false; m_settings.m_ZoneMinThickness = m_minWidth.GetValue(); @@ -220,17 +219,17 @@ bool DIALOG_NON_COPPER_ZONES_EDITOR::TransferDataFromWindow() { int minThickness = m_minWidth.GetValue(); - if( !m_gridStyleThickness.Validate( minThickness, INT_MAX ) ) + if( !m_hatchWidth.Validate( minThickness, INT_MAX ) ) return false; - if( !m_gridStyleGap.Validate( minThickness, INT_MAX ) ) + if( !m_hatchGap.Validate( minThickness, INT_MAX ) ) return false; } - m_settings.m_HatchOrientation = m_gridStyleRotation.GetValue() / 10.0; // value is returned in deci-degree - m_settings.m_HatchThickness = m_gridStyleThickness.GetValue(); - m_settings.m_HatchGap = m_gridStyleGap.GetValue(); + m_settings.m_HatchOrientation = m_hatchRotation.GetValue() / 10.0; // value is returned in deci-degree + m_settings.m_HatchThickness = m_hatchWidth.GetValue(); + m_settings.m_HatchGap = m_hatchGap.GetValue(); m_settings.m_HatchSmoothingLevel = m_spinCtrlSmoothLevel->GetValue(); m_settings.m_HatchSmoothingValue = m_spinCtrlSmoothValue->GetValue(); diff --git a/pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp b/pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp index 18c63444b4..51f81ad339 100644 --- a/pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp +++ b/pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp @@ -62,7 +62,7 @@ DIALOG_NONCOPPER_ZONES_PROPERTIES_BASE::DIALOG_NONCOPPER_ZONES_PROPERTIES_BASE( int m_OutlineDisplayCtrlNChoices = sizeof( m_OutlineDisplayCtrlChoices ) / sizeof( wxString ); m_OutlineDisplayCtrl = new wxChoice( sbShape->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_OutlineDisplayCtrlNChoices, m_OutlineDisplayCtrlChoices, 0 ); m_OutlineDisplayCtrl->SetSelection( 0 ); - gbSizer1->Add( m_OutlineDisplayCtrl, wxGBPosition( 2, 1 ), wxGBSpan( 1, 1 ), wxALL|wxEXPAND, 5 ); + gbSizer1->Add( m_OutlineDisplayCtrl, wxGBPosition( 2, 1 ), wxGBSpan( 1, 1 ), wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); m_MinWidthLabel = new wxStaticText( sbShape->GetStaticBox(), wxID_ANY, _("Minimum width:"), wxDefaultPosition, wxDefaultSize, 0 ); m_MinWidthLabel->Wrap( -1 ); @@ -75,7 +75,7 @@ DIALOG_NONCOPPER_ZONES_PROPERTIES_BASE::DIALOG_NONCOPPER_ZONES_PROPERTIES_BASE( m_MinWidthUnits->Wrap( -1 ); gbSizer1->Add( m_MinWidthUnits, wxGBPosition( 3, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); - m_staticTextSmoothing = new wxStaticText( sbShape->GetStaticBox(), wxID_ANY, _("Outline smooth:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextSmoothing = new wxStaticText( sbShape->GetStaticBox(), wxID_ANY, _("Corner smoothing:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextSmoothing->Wrap( -1 ); gbSizer1->Add( m_staticTextSmoothing, wxGBPosition( 4, 0 ), wxGBSpan( 1, 1 ), wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); @@ -102,7 +102,7 @@ DIALOG_NONCOPPER_ZONES_PROPERTIES_BASE::DIALOG_NONCOPPER_ZONES_PROPERTIES_BASE( sbShape->Add( gbSizer1, 0, wxEXPAND, 5 ); - bSizerMiddle->Add( sbShape, 1, wxEXPAND, 5 ); + bSizerMiddle->Add( sbShape, 0, wxEXPAND, 5 ); wxStaticBoxSizer* sbFill; sbFill = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Fill") ), wxVERTICAL ); @@ -115,77 +115,77 @@ DIALOG_NONCOPPER_ZONES_PROPERTIES_BASE::DIALOG_NONCOPPER_ZONES_PROPERTIES_BASE( m_staticTextGridFillType = new wxStaticText( sbFill->GetStaticBox(), wxID_ANY, _("Fill type:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextGridFillType->Wrap( -1 ); - fgSizer1->Add( m_staticTextGridFillType, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizer1->Add( m_staticTextGridFillType, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - wxString m_GridStyleCtrlChoices[] = { _("Solid shape"), _("HatchBorder pattern") }; + wxString m_GridStyleCtrlChoices[] = { _("Solid fill"), _("Hatch pattern") }; int m_GridStyleCtrlNChoices = sizeof( m_GridStyleCtrlChoices ) / sizeof( wxString ); m_GridStyleCtrl = new wxChoice( sbFill->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_GridStyleCtrlNChoices, m_GridStyleCtrlChoices, 0 ); m_GridStyleCtrl->SetSelection( 0 ); - fgSizer1->Add( m_GridStyleCtrl, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + fgSizer1->Add( m_GridStyleCtrl, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); fgSizer1->Add( 0, 0, 1, wxEXPAND, 5 ); - m_staticTextGrindOrient = new wxStaticText( sbFill->GetStaticBox(), wxID_ANY, _("Orientation:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextGrindOrient->Wrap( -1 ); - fgSizer1->Add( m_staticTextGrindOrient, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + m_hatchOrientLabel = new wxStaticText( sbFill->GetStaticBox(), wxID_ANY, _("Orientation:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_hatchOrientLabel->Wrap( -1 ); + fgSizer1->Add( m_hatchOrientLabel, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - m_tcGridStyleOrientation = new wxTextCtrl( sbFill->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer1->Add( m_tcGridStyleOrientation, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + m_hatchOrientCtrl = new wxTextCtrl( sbFill->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + fgSizer1->Add( m_hatchOrientCtrl, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); - m_staticTextRotUnits = new wxStaticText( sbFill->GetStaticBox(), wxID_ANY, _("degree"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextRotUnits->Wrap( -1 ); - fgSizer1->Add( m_staticTextRotUnits, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 ); + m_hatchOrientUnits = new wxStaticText( sbFill->GetStaticBox(), wxID_ANY, _("degree"), wxDefaultPosition, wxDefaultSize, 0 ); + m_hatchOrientUnits->Wrap( -1 ); + fgSizer1->Add( m_hatchOrientUnits, 0, wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 ); - m_staticTextStyleThickness = new wxStaticText( sbFill->GetStaticBox(), wxID_ANY, _("Hatch width:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextStyleThickness->Wrap( -1 ); - fgSizer1->Add( m_staticTextStyleThickness, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + m_hatchWidthLabel = new wxStaticText( sbFill->GetStaticBox(), wxID_ANY, _("Hatch width:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_hatchWidthLabel->Wrap( -1 ); + fgSizer1->Add( m_hatchWidthLabel, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - m_tcGridStyleThickness = new wxTextCtrl( sbFill->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer1->Add( m_tcGridStyleThickness, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + m_hatchWidthCtrl = new wxTextCtrl( sbFill->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + fgSizer1->Add( m_hatchWidthCtrl, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); - m_GridStyleThicknessUnits = new wxStaticText( sbFill->GetStaticBox(), wxID_ANY, _("units"), wxDefaultPosition, wxDefaultSize, 0 ); - m_GridStyleThicknessUnits->Wrap( -1 ); - fgSizer1->Add( m_GridStyleThicknessUnits, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 ); + m_hatchWidthUnits = new wxStaticText( sbFill->GetStaticBox(), wxID_ANY, _("units"), wxDefaultPosition, wxDefaultSize, 0 ); + m_hatchWidthUnits->Wrap( -1 ); + fgSizer1->Add( m_hatchWidthUnits, 0, wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 ); - m_staticTextGridGap = new wxStaticText( sbFill->GetStaticBox(), wxID_ANY, _("Hatch gap:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextGridGap->Wrap( -1 ); - fgSizer1->Add( m_staticTextGridGap, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + m_hatchGapLabel = new wxStaticText( sbFill->GetStaticBox(), wxID_ANY, _("Hatch gap:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_hatchGapLabel->Wrap( -1 ); + fgSizer1->Add( m_hatchGapLabel, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - m_tcGridStyleGap = new wxTextCtrl( sbFill->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer1->Add( m_tcGridStyleGap, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + m_hatchGapCtrl = new wxTextCtrl( sbFill->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + fgSizer1->Add( m_hatchGapCtrl, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); - m_GridStyleGapUnits = new wxStaticText( sbFill->GetStaticBox(), wxID_ANY, _("units"), wxDefaultPosition, wxDefaultSize, 0 ); - m_GridStyleGapUnits->Wrap( -1 ); - fgSizer1->Add( m_GridStyleGapUnits, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 ); + m_hatchGapUnits = new wxStaticText( sbFill->GetStaticBox(), wxID_ANY, _("units"), wxDefaultPosition, wxDefaultSize, 0 ); + m_hatchGapUnits->Wrap( -1 ); + fgSizer1->Add( m_hatchGapUnits, 0, wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 ); - m_staticTextGridSmoothingLevel = new wxStaticText( sbFill->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)") ); + m_smoothLevelLabel = new wxStaticText( sbFill->GetStaticBox(), wxID_ANY, _("Smoothing effort:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_smoothLevelLabel->Wrap( -1 ); + m_smoothLevelLabel->SetToolTip( _("Value of smoothing effort\n0 = no smoothing\n1 = chamfer\n2 = round corners\n3 = round corners (finer shape)") ); - fgSizer1->Add( m_staticTextGridSmoothingLevel, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizer1->Add( m_smoothLevelLabel, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); m_spinCtrlSmoothLevel = new wxSpinCtrl( sbFill->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 3, 0 ); - fgSizer1->Add( m_spinCtrlSmoothLevel, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + fgSizer1->Add( m_spinCtrlSmoothLevel, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); fgSizer1->Add( 0, 0, 1, wxEXPAND, 5 ); - m_staticTextGridSmootingVal = new wxStaticText( sbFill->GetStaticBox(), wxID_ANY, _("Smooth amount:"), 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)") ); + m_smoothValueLabel = new wxStaticText( sbFill->GetStaticBox(), wxID_ANY, _("Smoothing amount:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_smoothValueLabel->Wrap( -1 ); + m_smoothValueLabel->SetToolTip( _("Ratio between smoothed corners size and the gap between lines\n0 = no smoothing\n1.0 = max radius/chamfer size (half gap value)") ); - fgSizer1->Add( m_staticTextGridSmootingVal, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizer1->Add( m_smoothValueLabel, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 ); m_spinCtrlSmoothValue = new wxSpinCtrlDouble( sbFill->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 1, 0.1, 0.1 ); m_spinCtrlSmoothValue->SetDigits( 2 ); - fgSizer1->Add( m_spinCtrlSmoothValue, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + fgSizer1->Add( m_spinCtrlSmoothValue, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); sbFill->Add( fgSizer1, 0, wxEXPAND, 5 ); - bSizerMiddle->Add( sbFill, 1, wxEXPAND|wxTOP|wxBOTTOM, 10 ); + bSizerMiddle->Add( sbFill, 0, wxEXPAND|wxTOP|wxBOTTOM, 10 ); m_UpperSizer->Add( bSizerMiddle, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); diff --git a/pcbnew/dialogs/dialog_non_copper_zones_properties_base.fbp b/pcbnew/dialogs/dialog_non_copper_zones_properties_base.fbp index 087fe526fb..4eb6e1bbf4 100644 --- a/pcbnew/dialogs/dialog_non_copper_zones_properties_base.fbp +++ b/pcbnew/dialogs/dialog_non_copper_zones_properties_base.fbp @@ -190,7 +190,7 @@ 5 wxEXPAND - 1 + 0 wxID_ANY Shape @@ -416,7 +416,7 @@ 5 1 1 - wxALL|wxEXPAND + wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL 2 1 @@ -709,7 +709,7 @@ 0 0 wxID_ANY - Outline smooth: + Corner smoothing: 0 0 @@ -1007,7 +1007,7 @@ 10 wxEXPAND|wxTOP|wxBOTTOM - 1 + 0 wxID_ANY Fill @@ -1034,7 +1034,7 @@ 0 5 - wxTOP|wxRIGHT|wxLEFT + wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL 0 1 @@ -1095,7 +1095,7 @@ 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND + wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL 0 1 @@ -1111,7 +1111,7 @@ 1 0 - "Solid shape" "HatchBorder pattern" + "Solid fill" "Hatch pattern" 1 1 @@ -1170,7 +1170,7 @@ 5 - wxTOP|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT 0 1 @@ -1209,7 +1209,7 @@ 0 1 - m_staticTextGrindOrient + m_hatchOrientLabel 1 @@ -1231,7 +1231,7 @@ 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND + wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL 0 1 @@ -1269,7 +1269,7 @@ 0 1 - m_tcGridStyleOrientation + m_hatchOrientCtrl 1 @@ -1295,7 +1295,7 @@ 5 - wxTOP|wxBOTTOM|wxRIGHT + wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL 0 1 @@ -1334,7 +1334,7 @@ 0 1 - m_staticTextRotUnits + m_hatchOrientUnits 1 @@ -1356,7 +1356,7 @@ 5 - wxTOP|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT 0 1 @@ -1395,7 +1395,7 @@ 0 1 - m_staticTextStyleThickness + m_hatchWidthLabel 1 @@ -1417,7 +1417,7 @@ 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND + wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL 0 1 @@ -1455,7 +1455,7 @@ 0 1 - m_tcGridStyleThickness + m_hatchWidthCtrl 1 @@ -1481,7 +1481,7 @@ 5 - wxTOP|wxBOTTOM|wxRIGHT + wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL 0 1 @@ -1520,7 +1520,7 @@ 0 1 - m_GridStyleThicknessUnits + m_hatchWidthUnits 1 @@ -1542,7 +1542,7 @@ 5 - wxTOP|wxRIGHT|wxLEFT + wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL 0 1 @@ -1581,7 +1581,7 @@ 0 1 - m_staticTextGridGap + m_hatchGapLabel 1 @@ -1603,7 +1603,7 @@ 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND + wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL 0 1 @@ -1641,7 +1641,7 @@ 0 1 - m_tcGridStyleGap + m_hatchGapCtrl 1 @@ -1667,7 +1667,7 @@ 5 - wxTOP|wxBOTTOM|wxRIGHT + wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL 0 1 @@ -1706,7 +1706,7 @@ 0 1 - m_GridStyleGapUnits + m_hatchGapUnits 1 @@ -1728,7 +1728,7 @@ 5 - wxTOP|wxRIGHT|wxLEFT + wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL 0 1 @@ -1767,7 +1767,7 @@ 0 1 - m_staticTextGridSmoothingLevel + m_smoothLevelLabel 1 @@ -1789,7 +1789,7 @@ 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND + wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL 0 1 @@ -1861,7 +1861,7 @@ 5 - wxTOP|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT 0 1 @@ -1891,7 +1891,7 @@ 0 0 wxID_ANY - Smooth amount: + Smoothing amount: 0 0 @@ -1900,7 +1900,7 @@ 0 1 - m_staticTextGridSmootingVal + m_smoothValueLabel 1 @@ -1922,7 +1922,7 @@ 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND + wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT 0 1 diff --git a/pcbnew/dialogs/dialog_non_copper_zones_properties_base.h b/pcbnew/dialogs/dialog_non_copper_zones_properties_base.h index 0783b723f9..27f76f5a92 100644 --- a/pcbnew/dialogs/dialog_non_copper_zones_properties_base.h +++ b/pcbnew/dialogs/dialog_non_copper_zones_properties_base.h @@ -55,18 +55,18 @@ class DIALOG_NONCOPPER_ZONES_PROPERTIES_BASE : public DIALOG_SHIM wxStaticText* m_cornerRadiusUnits; wxStaticText* m_staticTextGridFillType; wxChoice* m_GridStyleCtrl; - wxStaticText* m_staticTextGrindOrient; - wxTextCtrl* m_tcGridStyleOrientation; - wxStaticText* m_staticTextRotUnits; - wxStaticText* m_staticTextStyleThickness; - wxTextCtrl* m_tcGridStyleThickness; - wxStaticText* m_GridStyleThicknessUnits; - wxStaticText* m_staticTextGridGap; - wxTextCtrl* m_tcGridStyleGap; - wxStaticText* m_GridStyleGapUnits; - wxStaticText* m_staticTextGridSmoothingLevel; + wxStaticText* m_hatchOrientLabel; + wxTextCtrl* m_hatchOrientCtrl; + wxStaticText* m_hatchOrientUnits; + wxStaticText* m_hatchWidthLabel; + wxTextCtrl* m_hatchWidthCtrl; + wxStaticText* m_hatchWidthUnits; + wxStaticText* m_hatchGapLabel; + wxTextCtrl* m_hatchGapCtrl; + wxStaticText* m_hatchGapUnits; + wxStaticText* m_smoothLevelLabel; wxSpinCtrl* m_spinCtrlSmoothLevel; - wxStaticText* m_staticTextGridSmootingVal; + wxStaticText* m_smoothValueLabel; wxSpinCtrlDouble* m_spinCtrlSmoothValue; wxStaticLine* m_staticline1; wxStdDialogButtonSizer* m_sdbSizerButtons;