From 2450250ae74fde84fed75611642e5194ab68dee3 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Sun, 15 Oct 2023 17:02:15 +0100 Subject: [PATCH] Use "tuning pattern" in the GUI. --- pcbnew/CMakeLists.txt | 10 +- pcbnew/board_design_settings.cpp | 20 +- pcbnew/dialogs/dialog_board_setup.cpp | 16 +- pcbnew/dialogs/dialog_board_setup.h | 2 +- .../dialog_pns_length_tuning_settings.cpp | 149 -- .../dialog_pns_length_tuning_settings.h | 62 - ...dialog_pns_length_tuning_settings_base.cpp | 200 -- ...dialog_pns_length_tuning_settings_base.fbp | 1761 ----------------- .../dialog_pns_length_tuning_settings_base.h | 81 - ...p => dialog_tuning_pattern_properties.cpp} | 18 +- ...s.h => dialog_tuning_pattern_properties.h} | 16 +- ...dialog_tuning_pattern_properties_base.cpp} | 12 +- ...dialog_tuning_pattern_properties_base.fbp} | 8 +- ...> dialog_tuning_pattern_properties_base.h} | 8 +- ...rs.cpp => panel_setup_tuning_patterns.cpp} | 16 +- ...anders.h => panel_setup_tuning_patterns.h} | 12 +- ...p => panel_setup_tuning_patterns_base.cpp} | 24 +- ...p => panel_setup_tuning_patterns_base.fbp} | 24 +- ...e.h => panel_setup_tuning_patterns_base.h} | 8 +- pcbnew/generators/pcb_generator_meanders.cpp | 72 +- pcbnew/router/CMakeLists.txt | 1 - pcbnew/router/pns_tune_status_popup.cpp | 71 - pcbnew/router/pns_tune_status_popup.h | 47 - pcbnew/tools/drawing_tool.cpp | 16 +- pcbnew/tools/drawing_tool.h | 4 +- pcbnew/tools/pcb_actions.cpp | 8 +- .../libs/kimath/geometry/test_shape_arc.cpp | 2 +- 27 files changed, 148 insertions(+), 2520 deletions(-) delete mode 100644 pcbnew/dialogs/dialog_pns_length_tuning_settings.cpp delete mode 100644 pcbnew/dialogs/dialog_pns_length_tuning_settings.h delete mode 100644 pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp delete mode 100644 pcbnew/dialogs/dialog_pns_length_tuning_settings_base.fbp delete mode 100644 pcbnew/dialogs/dialog_pns_length_tuning_settings_base.h rename pcbnew/dialogs/{dialog_meander_properties.cpp => dialog_tuning_pattern_properties.cpp} (85%) rename pcbnew/dialogs/{dialog_meander_properties.h => dialog_tuning_pattern_properties.h} (73%) rename pcbnew/dialogs/{dialog_meander_properties_base.cpp => dialog_tuning_pattern_properties_base.cpp} (90%) rename pcbnew/dialogs/{dialog_meander_properties_base.fbp => dialog_tuning_pattern_properties_base.fbp} (99%) rename pcbnew/dialogs/{dialog_meander_properties_base.h => dialog_tuning_pattern_properties_base.h} (81%) rename pcbnew/dialogs/{panel_setup_meanders.cpp => panel_setup_tuning_patterns.cpp} (89%) rename pcbnew/dialogs/{panel_setup_meanders.h => panel_setup_tuning_patterns.h} (85%) rename pcbnew/dialogs/{panel_setup_meanders_base.cpp => panel_setup_tuning_patterns_base.cpp} (93%) rename pcbnew/dialogs/{panel_setup_meanders_base.fbp => panel_setup_tuning_patterns_base.fbp} (99%) rename pcbnew/dialogs/{panel_setup_meanders_base.h => panel_setup_tuning_patterns_base.h} (88%) delete mode 100644 pcbnew/router/pns_tune_status_popup.cpp delete mode 100644 pcbnew/router/pns_tune_status_popup.h diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt index 78d697ee63..b303fe2d02 100644 --- a/pcbnew/CMakeLists.txt +++ b/pcbnew/CMakeLists.txt @@ -109,8 +109,6 @@ set( PCBNEW_DIALOGS dialogs/dialog_rule_area_properties.cpp dialogs/dialog_rule_area_properties_base.cpp dialogs/dialog_layer_selection_base.cpp - dialogs/dialog_meander_properties.cpp - dialogs/dialog_meander_properties_base.cpp dialogs/dialog_move_exact.cpp dialogs/dialog_move_exact_base.cpp dialogs/dialog_net_inspector.cpp @@ -125,8 +123,6 @@ set( PCBNEW_DIALOGS dialogs/dialog_plot_base.cpp dialogs/dialog_pns_diff_pair_dimensions.cpp dialogs/dialog_pns_diff_pair_dimensions_base.cpp - dialogs/dialog_pns_length_tuning_settings.cpp - dialogs/dialog_pns_length_tuning_settings_base.cpp dialogs/dialog_pns_settings.cpp dialogs/dialog_pns_settings_base.cpp dialogs/dialog_position_relative.cpp @@ -144,6 +140,8 @@ set( PCBNEW_DIALOGS dialogs/dialog_track_via_properties_base.cpp dialogs/dialog_track_via_size.cpp dialogs/dialog_track_via_size_base.cpp + dialogs/dialog_tuning_pattern_properties.cpp + dialogs/dialog_tuning_pattern_properties_base.cpp dialogs/dialog_unused_pad_layers.cpp dialogs/dialog_unused_pad_layers_base.cpp dialogs/dialog_update_pcb.cpp @@ -170,8 +168,6 @@ set( PCBNEW_DIALOGS dialogs/panel_setup_formatting_base.cpp dialogs/panel_setup_mask_and_paste.cpp dialogs/panel_setup_mask_and_paste_base.cpp - dialogs/panel_setup_meanders.cpp - dialogs/panel_setup_meanders_base.cpp dialogs/panel_setup_layers.cpp dialogs/panel_setup_layers_base.cpp dialogs/panel_setup_rules.cpp @@ -182,6 +178,8 @@ set( PCBNEW_DIALOGS dialogs/panel_setup_text_and_graphics_base.cpp dialogs/panel_setup_tracks_and_vias.cpp dialogs/panel_setup_tracks_and_vias_base.cpp + dialogs/panel_setup_tuning_patterns.cpp + dialogs/panel_setup_tuning_patterns_base.cpp footprint_wizard.cpp footprint_wizard_frame.cpp footprint_wizard_frame_functions.cpp diff --git a/pcbnew/board_design_settings.cpp b/pcbnew/board_design_settings.cpp index b73b99cab9..0a1a30ec1d 100644 --- a/pcbnew/board_design_settings.cpp +++ b/pcbnew/board_design_settings.cpp @@ -596,7 +596,7 @@ BOARD_DESIGN_SETTINGS::BOARD_DESIGN_SETTINGS( JSON_SETTINGS* aParent, const std: }, {} ) ); - m_params.emplace_back( new PARAM_LAMBDA( "meander_settings", + m_params.emplace_back( new PARAM_LAMBDA( "tuning_pattern_settings", [&]() -> nlohmann::json { nlohmann::json js = {}; @@ -616,9 +616,9 @@ BOARD_DESIGN_SETTINGS::BOARD_DESIGN_SETTINGS( JSON_SETTINGS* aParent, const std: return entry; }; - js["single_track_meander_defaults"] = make_settings( m_singleTrackMeanderSettings ); - js["diff_pair_meander_defaults"] = make_settings( m_diffPairMeanderSettings ); - js["skew_meander_defaults"] = make_settings( m_skewMeanderSettings ); + js["single_track_defaults"] = make_settings( m_singleTrackMeanderSettings ); + js["diff_pair_defaults"] = make_settings( m_diffPairMeanderSettings ); + js["diff_pair_skew_defaults"] = make_settings( m_skewMeanderSettings ); return js; }, @@ -653,14 +653,14 @@ BOARD_DESIGN_SETTINGS::BOARD_DESIGN_SETTINGS( JSON_SETTINGS* aParent, const std: return settings; }; - if( aObj.contains( "single_track_meander_defaults" ) ) - m_singleTrackMeanderSettings = read_settings( aObj["single_track_meander_defaults"] ); + if( aObj.contains( "single_track_defaults" ) ) + m_singleTrackMeanderSettings = read_settings( aObj["single_track_defaults"] ); - if( aObj.contains( "diff_pair_meander_defaults" ) ) - m_diffPairMeanderSettings = read_settings( aObj["diff_pair_meander_defaults"] ); + if( aObj.contains( "diff_pair_defaults" ) ) + m_diffPairMeanderSettings = read_settings( aObj["diff_pair_defaults"] ); - if( aObj.contains( "skew_meander_defaults" ) ) - m_skewMeanderSettings = read_settings( aObj["skew_meander_defaults"] ); + if( aObj.contains( "diff_pair_skew_defaults" ) ) + m_skewMeanderSettings = read_settings( aObj["diff_pair_skew_defaults"] ); }, {} ) ); diff --git a/pcbnew/dialogs/dialog_board_setup.cpp b/pcbnew/dialogs/dialog_board_setup.cpp index 3b07e2a8c4..12ee771d8e 100644 --- a/pcbnew/dialogs/dialog_board_setup.cpp +++ b/pcbnew/dialogs/dialog_board_setup.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include @@ -67,7 +67,7 @@ DIALOG_BOARD_SETUP::DIALOG_BOARD_SETUP( PCB_EDIT_FRAME* aFrame ) : m_constraintsPage( 0 ), m_tracksAndViasPage( 0 ), m_teardropsPage( 0 ), - m_meandersPage( 0 ), + m_tuningPatternsPage( 0 ), m_netclassesPage( 0 ), m_severitiesPage( 0 ) @@ -160,17 +160,17 @@ DIALOG_BOARD_SETUP::DIALOG_BOARD_SETUP( PCB_EDIT_FRAME* aFrame ) : return new PANEL_SETUP_TEARDROPS( aParent, m_frame ); }, _( "Teardrops" ) ); - m_meandersPage = m_treebook->GetPageCount(); + m_tuningPatternsPage = m_treebook->GetPageCount(); m_treebook->AddLazySubPage( [this]( wxWindow* aParent ) -> wxWindow* { BOARD_DESIGN_SETTINGS& bds = m_frame->GetBoard()->GetDesignSettings(); - return new PANEL_SETUP_MEANDERS( aParent, m_frame, - bds.m_singleTrackMeanderSettings, - bds.m_diffPairMeanderSettings, - bds.m_skewMeanderSettings ); - }, _( "Length Tuning Patterns" ) ); + return new PANEL_SETUP_TUNING_PATTERNS( aParent, m_frame, + bds.m_singleTrackMeanderSettings, + bds.m_diffPairMeanderSettings, + bds.m_skewMeanderSettings ); + }, _( "Length-tuning Patterns" ) ); m_netclassesPage = m_treebook->GetPageCount(); m_treebook->AddLazySubPage( diff --git a/pcbnew/dialogs/dialog_board_setup.h b/pcbnew/dialogs/dialog_board_setup.h index cea6d242a5..e6fde7c86b 100644 --- a/pcbnew/dialogs/dialog_board_setup.h +++ b/pcbnew/dialogs/dialog_board_setup.h @@ -68,7 +68,7 @@ private: size_t m_constraintsPage; size_t m_tracksAndViasPage; size_t m_teardropsPage; - size_t m_meandersPage; + size_t m_tuningPatternsPage; size_t m_netclassesPage; size_t m_severitiesPage; }; diff --git a/pcbnew/dialogs/dialog_pns_length_tuning_settings.cpp b/pcbnew/dialogs/dialog_pns_length_tuning_settings.cpp deleted file mode 100644 index 6372121da7..0000000000 --- a/pcbnew/dialogs/dialog_pns_length_tuning_settings.cpp +++ /dev/null @@ -1,149 +0,0 @@ -/* - * KiRouter - a push-and-(sometimes-)shove PCB router - * - * Copyright (C) 2014-2018 CERN - * Copyright (C) 2016 KiCad Developers, see AUTHORS.txt for contributors. - * Author: Tomasz Wlostowski - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -/** - * Length tuner settings dialog. - */ - -#include "dialog_pns_length_tuning_settings.h" -#include -#include -#include -#include - -DIALOG_PNS_LENGTH_TUNING_SETTINGS::DIALOG_PNS_LENGTH_TUNING_SETTINGS( EDA_DRAW_FRAME* aParent, - PNS::MEANDER_SETTINGS& aSettings, - PNS::ROUTER_MODE aMode ) : - DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE( aParent ), - m_minAmpl( aParent, m_minAmplLabel, m_minAmplText, m_minAmplUnit ), - m_maxAmpl( aParent, m_maxAmplLabel, m_maxAmplText, m_maxAmplUnit ), - m_spacing( aParent, m_spacingLabel, m_spacingText, m_spacingUnit ), - m_targetLength( aParent, m_targetLengthLabel, m_targetLengthText, m_targetLengthUnit ), - m_radius( aParent, m_radiusLabel, m_radiusText, m_radiusUnit ), - m_settings( aSettings ), - m_mode( aMode ) -{ - m_targetLengthText->SetSelection( -1, -1 ); - m_targetLengthText->SetFocus(); - m_radius.SetUnits( EDA_UNITS::PERCENT ); - - SetupStandardButtons(); - - GetSizer()->SetSizeHints(this); - Centre(); -} - - -bool DIALOG_PNS_LENGTH_TUNING_SETTINGS::TransferDataToWindow() -{ - - if( !wxDialog::TransferDataToWindow() ) - return false; - - if( m_mode == PNS::PNS_MODE_TUNE_DIFF_PAIR ) - { - // TODO: fix diff-pair meandering so we can use non-100% radii - m_radiusText->SetValue( wxT( "100" ) ); - m_radiusText->Enable( false ); - } - else - { - m_radiusText->SetValue( wxString::Format( wxT( "%i" ), m_settings.m_cornerRadiusPercentage ) ); - } - - m_minAmpl.SetValue( m_settings.m_minAmplitude ); - m_maxAmpl.SetValue( m_settings.m_maxAmplitude ); - m_spacing.SetValue( m_settings.m_spacing ); - m_singleSidedCheck->SetValue( m_settings.m_singleSided ); - m_miterStyle->SetSelection( m_settings.m_cornerStyle == PNS::MEANDER_STYLE_ROUND ? 1 : 0 ); - - switch( m_mode ) - { - case PNS::PNS_MODE_TUNE_SINGLE: - SetTitle( _( "Single Track Length Tuning" ) ); - m_legend->SetBitmap( KiBitmap( BITMAPS::tune_single_track_length_legend ) ); - m_targetLength.SetValue( m_settings.m_targetLength ); - break; - - case PNS::PNS_MODE_TUNE_DIFF_PAIR: - SetTitle( _( "Differential Pair Length Tuning" ) ); - m_legend->SetBitmap( KiBitmap( BITMAPS::tune_diff_pair_length_legend ) ); - m_targetLength.SetValue( m_settings.m_targetLength ); - break; - - case PNS::PNS_MODE_TUNE_DIFF_PAIR_SKEW: - SetTitle( _( "Differential Pair Skew Tuning" ) ); - m_legend->SetBitmap( KiBitmap( BITMAPS::tune_diff_pair_skew_legend ) ); - m_targetLengthLabel->SetLabel( _( "Target skew:" ) + wxS( " " ) ); - m_targetLength.SetValue( m_settings.m_targetSkew ); - break; - - default: - break; - } - - // Bitmap has a new size, so recalculate sizes - GetSizer()->SetSizeHints(this); - - return true; -} - - -bool DIALOG_PNS_LENGTH_TUNING_SETTINGS::AcceptOptions( ) -{ - if( !m_minAmpl.Validate( 0, std::numeric_limits::max() ) ) - return false; - if( !m_maxAmpl.Validate( m_minAmpl.GetValue(), std::numeric_limits::max() ) ) - return false; - if( !m_spacing.Validate( 0, std::numeric_limits::max() ) ) - return false; - if( !m_targetLength.Validate( 0, static_cast( std::numeric_limits::max() ) ) ) - return false; - if( !m_radius.Validate( 0, 100 ) ) - return false; - - return true; -} - -bool DIALOG_PNS_LENGTH_TUNING_SETTINGS::TransferDataFromWindow() -{ - if( !AcceptOptions() || !wxDialog::TransferDataToWindow() ) - return false; - - m_settings.m_minAmplitude = m_minAmpl.GetValue(); - m_settings.m_maxAmplitude = m_maxAmpl.GetValue(); - m_settings.m_spacing = m_spacing.GetValue(); - m_settings.m_cornerRadiusPercentage = m_radius.GetValue(); - - if( m_mode == PNS::PNS_MODE_TUNE_DIFF_PAIR_SKEW ) - m_settings.m_targetSkew = m_targetLength.GetValue(); - else - m_settings.m_targetLength = m_targetLength.GetValue(); - - if( m_settings.m_maxAmplitude < m_settings.m_minAmplitude ) - m_settings.m_maxAmplitude = m_settings.m_minAmplitude; - - m_settings.m_singleSided = m_singleSidedCheck->GetValue(); - m_settings.m_cornerStyle = m_miterStyle->GetSelection() ? - PNS::MEANDER_STYLE_ROUND : PNS::MEANDER_STYLE_CHAMFER; - - return true; -} diff --git a/pcbnew/dialogs/dialog_pns_length_tuning_settings.h b/pcbnew/dialogs/dialog_pns_length_tuning_settings.h deleted file mode 100644 index 0306efe1a7..0000000000 --- a/pcbnew/dialogs/dialog_pns_length_tuning_settings.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - * KiRouter - a push-and-(sometimes-)shove PCB router - * - * Copyright (C) 2014-2018 CERN - * Copyright (C) 2016 KiCad Developers, see AUTHORS.txt for contributors. - * Author: Maciej Suminski - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -/** - * Push and Shove router settings dialog. - */ - -#ifndef __dialog_pns_length_tuning_settings__ -#define __dialog_pns_length_tuning_settings__ - -#include "dialog_pns_length_tuning_settings_base.h" - -#include - -#include - -namespace PNS { - -class MEANDER_SETTINGS; - -} - -class DIALOG_PNS_LENGTH_TUNING_SETTINGS : public DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE -{ -public: - DIALOG_PNS_LENGTH_TUNING_SETTINGS( EDA_DRAW_FRAME* aParent, PNS::MEANDER_SETTINGS& aSettings, PNS::ROUTER_MODE aMode ); - -private: - bool TransferDataToWindow() override; - bool TransferDataFromWindow() override; - - bool AcceptOptions(); - - UNIT_BINDER m_minAmpl; - UNIT_BINDER m_maxAmpl; - UNIT_BINDER m_spacing; - UNIT_BINDER m_targetLength; - UNIT_BINDER m_radius; - - PNS::MEANDER_SETTINGS& m_settings; - PNS::ROUTER_MODE m_mode; -}; - -#endif // __dialog_pns_settings__ diff --git a/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp b/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp deleted file mode 100644 index e8045dfbf6..0000000000 --- a/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp +++ /dev/null @@ -1,200 +0,0 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) -// http://www.wxformbuilder.org/ -// -// PLEASE DO *NOT* EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#include "widgets/text_ctrl_eval.h" - -#include "dialog_pns_length_tuning_settings_base.h" - -/////////////////////////////////////////////////////////////////////////// - -DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE::DIALOG_PNS_LENGTH_TUNING_SETTINGS_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( wxSize( -1,-1 ), wxDefaultSize ); - - wxBoxSizer* bMainSizer; - bMainSizer = new wxBoxSizer( wxVERTICAL ); - - wxStaticBoxSizer* sbSizerUpper; - sbSizerUpper = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Length / Skew") ), wxVERTICAL ); - - wxFlexGridSizer* fgSizerLenSkew; - fgSizerLenSkew = new wxFlexGridSizer( 0, 3, 0, 0 ); - fgSizerLenSkew->AddGrowableCol( 1 ); - fgSizerLenSkew->SetFlexibleDirection( wxBOTH ); - fgSizerLenSkew->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - m_staticText4 = new wxStaticText( sbSizerUpper->GetStaticBox(), wxID_ANY, _("Tune from:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText4->Wrap( -1 ); - m_staticText4->Hide(); - - fgSizerLenSkew->Add( m_staticText4, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - - wxArrayString m_choicePathFromChoices; - m_choicePathFrom = new wxChoice( sbSizerUpper->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choicePathFromChoices, 0 ); - m_choicePathFrom->SetSelection( 0 ); - m_choicePathFrom->Hide(); - - fgSizerLenSkew->Add( m_choicePathFrom, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - - - fgSizerLenSkew->Add( 0, 0, 0, 0, 5 ); - - m_staticText15 = new wxStaticText( sbSizerUpper->GetStaticBox(), wxID_ANY, _("Tune to:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText15->Wrap( -1 ); - m_staticText15->Hide(); - - fgSizerLenSkew->Add( m_staticText15, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 ); - - wxArrayString m_choice4Choices; - m_choice4 = new wxChoice( sbSizerUpper->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choice4Choices, 0 ); - m_choice4->SetSelection( 0 ); - m_choice4->Hide(); - - fgSizerLenSkew->Add( m_choice4, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - - - fgSizerLenSkew->Add( 0, 0, 0, 0, 5 ); - - m_staticText3 = new wxStaticText( sbSizerUpper->GetStaticBox(), wxID_ANY, _("Constraint:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText3->Wrap( -1 ); - m_staticText3->Hide(); - - fgSizerLenSkew->Add( m_staticText3, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 ); - - wxString m_constraintSourceChoices[] = { _("From Design Rules"), _("Manual") }; - int m_constraintSourceNChoices = sizeof( m_constraintSourceChoices ) / sizeof( wxString ); - m_constraintSource = new wxChoice( sbSizerUpper->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_constraintSourceNChoices, m_constraintSourceChoices, 0 ); - m_constraintSource->SetSelection( 1 ); - m_constraintSource->Enable( false ); - m_constraintSource->Hide(); - - fgSizerLenSkew->Add( m_constraintSource, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - - - fgSizerLenSkew->Add( 0, 0, 0, 0, 5 ); - - m_targetLengthLabel = new wxStaticText( sbSizerUpper->GetStaticBox(), wxID_ANY, _("Target length:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_targetLengthLabel->Wrap( -1 ); - fgSizerLenSkew->Add( m_targetLengthLabel, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - m_targetLengthText = new wxTextCtrl( sbSizerUpper->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerLenSkew->Add( m_targetLengthText, 0, wxALL|wxEXPAND, 5 ); - - m_targetLengthUnit = new wxStaticText( sbSizerUpper->GetStaticBox(), wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); - m_targetLengthUnit->Wrap( -1 ); - fgSizerLenSkew->Add( m_targetLengthUnit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); - - - sbSizerUpper->Add( fgSizerLenSkew, 1, wxEXPAND, 5 ); - - - bMainSizer->Add( sbSizerUpper, 0, wxEXPAND|wxALL, 10 ); - - wxStaticBoxSizer* sbSizerLower; - sbSizerLower = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Meandering") ), wxHORIZONTAL ); - - m_legend = new wxStaticBitmap( sbSizerLower->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - sbSizerLower->Add( m_legend, 0, wxALL|wxEXPAND, 5 ); - - wxFlexGridSizer* fgSizer3; - fgSizer3 = new wxFlexGridSizer( 0, 3, 0, 0 ); - fgSizer3->AddGrowableCol( 1 ); - fgSizer3->SetFlexibleDirection( wxBOTH ); - fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - m_minAmplLabel = new wxStaticText( sbSizerLower->GetStaticBox(), wxID_ANY, _("Min amplitude (A):"), wxDefaultPosition, wxDefaultSize, 0 ); - m_minAmplLabel->Wrap( -1 ); - fgSizer3->Add( m_minAmplLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); - - m_minAmplText = new wxTextCtrl( sbSizerLower->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer3->Add( m_minAmplText, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - - m_minAmplUnit = new wxStaticText( sbSizerLower->GetStaticBox(), wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); - m_minAmplUnit->Wrap( -1 ); - fgSizer3->Add( m_minAmplUnit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5 ); - - m_maxAmplLabel = new wxStaticText( sbSizerLower->GetStaticBox(), wxID_ANY, _("Max amplitude (A):"), wxDefaultPosition, wxDefaultSize, 0 ); - m_maxAmplLabel->Wrap( -1 ); - fgSizer3->Add( m_maxAmplLabel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); - - m_maxAmplText = new wxTextCtrl( sbSizerLower->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer3->Add( m_maxAmplText, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - - m_maxAmplUnit = new wxStaticText( sbSizerLower->GetStaticBox(), wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); - m_maxAmplUnit->Wrap( -1 ); - fgSizer3->Add( m_maxAmplUnit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5 ); - - m_spacingLabel = new wxStaticText( sbSizerLower->GetStaticBox(), wxID_ANY, _("Min spacing (s):"), wxDefaultPosition, wxDefaultSize, 0 ); - m_spacingLabel->Wrap( -1 ); - fgSizer3->Add( m_spacingLabel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); - - m_spacingText = new wxTextCtrl( sbSizerLower->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_spacingText->SetToolTip( _("Minimum spacing between adjacent meander segments. The resulting spacing may be greater based on design rules.") ); - - fgSizer3->Add( m_spacingText, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - - m_spacingUnit = new wxStaticText( sbSizerLower->GetStaticBox(), wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); - m_spacingUnit->Wrap( -1 ); - fgSizer3->Add( m_spacingUnit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5 ); - - m_staticText14 = new wxStaticText( sbSizerLower->GetStaticBox(), wxID_ANY, _("Miter style:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText14->Wrap( -1 ); - fgSizer3->Add( m_staticText14, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); - - wxString m_miterStyleChoices[] = { _("45 degree"), _("arc") }; - int m_miterStyleNChoices = sizeof( m_miterStyleChoices ) / sizeof( wxString ); - m_miterStyle = new wxChoice( sbSizerLower->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_miterStyleNChoices, m_miterStyleChoices, 0 ); - m_miterStyle->SetSelection( 0 ); - fgSizer3->Add( m_miterStyle, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - - - fgSizer3->Add( 0, 0, 1, wxEXPAND, 5 ); - - - fgSizer3->Add( 0, 0, 1, wxEXPAND, 5 ); - - m_singleSidedCheck = new wxCheckBox( sbSizerLower->GetStaticBox(), wxID_ANY, _("Single-sided"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer3->Add( m_singleSidedCheck, 0, wxALL|wxEXPAND, 5 ); - - - fgSizer3->Add( 0, 0, 1, wxEXPAND, 5 ); - - m_radiusLabel = new wxStaticText( sbSizerLower->GetStaticBox(), wxID_ANY, _("Miter radius (r):"), wxDefaultPosition, wxDefaultSize, 0 ); - m_radiusLabel->Wrap( -1 ); - fgSizer3->Add( m_radiusLabel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); - - m_radiusText = new TEXT_CTRL_EVAL( sbSizerLower->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer3->Add( m_radiusText, 0, wxALL|wxEXPAND, 5 ); - - m_radiusUnit = new wxStaticText( sbSizerLower->GetStaticBox(), wxID_ANY, _("%"), wxDefaultPosition, wxDefaultSize, 0 ); - m_radiusUnit->Wrap( -1 ); - fgSizer3->Add( m_radiusUnit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); - - - sbSizerLower->Add( fgSizer3, 1, wxEXPAND|wxLEFT, 5 ); - - - bMainSizer->Add( sbSizerLower, 0, wxEXPAND|wxRIGHT|wxLEFT, 10 ); - - m_stdButtons = new wxStdDialogButtonSizer(); - m_stdButtonsOK = new wxButton( this, wxID_OK ); - m_stdButtons->AddButton( m_stdButtonsOK ); - m_stdButtonsCancel = new wxButton( this, wxID_CANCEL ); - m_stdButtons->AddButton( m_stdButtonsCancel ); - m_stdButtons->Realize(); - - bMainSizer->Add( m_stdButtons, 0, wxEXPAND|wxALL, 5 ); - - - this->SetSizer( bMainSizer ); - this->Layout(); - bMainSizer->Fit( this ); -} - -DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE::~DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE() -{ -} diff --git a/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.fbp b/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.fbp deleted file mode 100644 index 0d97363cc6..0000000000 --- a/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.fbp +++ /dev/null @@ -1,1761 +0,0 @@ - - - - - - C++ - 1 - source_name - 0 - 0 - /home/twl/Kicad-dev/kicad-git/bitmaps_png/cpp_other - UTF-8 - connect - dialog_pns_length_tuning_settings_base - 1000 - none - - - 1 - DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE - - . - - 1 - 1 - 1 - 1 - UI - 0 - 0 - 0 - - 0 - wxAUI_MGR_DEFAULT - - - - 1 - 1 - impl_virtual - - - - 0 - wxID_ANY - - -1,-1 - DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE - - -1,-1 - wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - DIALOG_SHIM; dialog_shim.h - Trace Length Tuning - - 0 - - - - - - bMainSizer - wxVERTICAL - none - - 10 - wxEXPAND|wxALL - 0 - - wxID_ANY - Length / Skew - - sbSizerUpper - wxVERTICAL - 1 - none - - 5 - wxEXPAND - 1 - - 3 - wxBOTH - 1 - - 0 - - fgSizerLenSkew - wxFLEX_GROWMODE_SPECIFIED - none - 0 - 0 - - 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 1 - wxID_ANY - Tune from: - 0 - - 0 - - - 0 - - 1 - m_staticText4 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - 5 - wxEXPAND|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 1 - wxID_ANY - - 0 - - - 0 - - 1 - m_choicePathFrom - 1 - - - protected - 1 - - Resizable - 0 - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - - 0 - - 0 - protected - 0 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 1 - wxID_ANY - Tune to: - 0 - - 0 - - - 0 - - 1 - m_staticText15 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - 5 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 1 - wxID_ANY - - 0 - - - 0 - - 1 - m_choice4 - 1 - - - protected - 1 - - Resizable - 0 - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - - 0 - - 0 - protected - 0 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 1 - wxID_ANY - Constraint: - 0 - - 0 - - - 0 - - 1 - m_staticText3 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - 5 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "From Design Rules" "Manual" - 1 - - 1 - 0 - Dock - 0 - Left - 0 - - 1 - - 0 - 1 - wxID_ANY - - 0 - - - 0 - - 1 - m_constraintSource - 1 - - - protected - 1 - - Resizable - 1 - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - - 0 - - 0 - protected - 0 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Target length: - 0 - - 0 - - - 0 - - 1 - m_targetLengthLabel - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - - 1 - m_targetLengthText - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - unit - 0 - - 0 - - - 0 - - 1 - m_targetLengthUnit - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - 10 - wxEXPAND|wxRIGHT|wxLEFT - 0 - - wxID_ANY - Meandering - - sbSizerLower - wxHORIZONTAL - 1 - none - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - Load From Resource; - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_legend - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - - - - - - 5 - wxEXPAND|wxLEFT - 1 - - 3 - wxBOTH - 1 - - 0 - - fgSizer3 - wxFLEX_GROWMODE_SPECIFIED - none - 0 - 0 - - 5 - wxALIGN_CENTER_VERTICAL|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Min amplitude (A): - 0 - - 0 - - - 0 - - 1 - m_minAmplLabel - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - 5 - wxEXPAND|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - - 1 - m_minAmplText - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - unit - 0 - - 0 - - - 0 - - 1 - m_minAmplUnit - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Max amplitude (A): - 0 - - 0 - - - 0 - - 1 - m_maxAmplLabel - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - 5 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - - 1 - m_maxAmplText - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - unit - 0 - - 0 - - - 0 - - 1 - m_maxAmplUnit - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Min spacing (s): - 0 - - 0 - - - 0 - - 1 - m_spacingLabel - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - 5 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - - 1 - m_spacingText - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - Minimum spacing between adjacent meander segments. The resulting spacing may be greater based on design rules. - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - unit - 0 - - 0 - - - 0 - - 1 - m_spacingUnit - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Miter style: - 0 - - 0 - - - 0 - - 1 - m_staticText14 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - 5 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "45 degree" "arc" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_miterStyle - 1 - - - protected - 1 - - Resizable - 0 - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Single-sided - - 0 - - - 0 - - 1 - m_singleSidedCheck - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Miter radius (r): - 0 - - 0 - - - 0 - - 1 - m_radiusLabel - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - - 1 - m_radiusText - 1 - - - protected - 1 - - Resizable - 1 - - - TEXT_CTRL_EVAL; widgets/text_ctrl_eval.h - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - % - 0 - - 0 - - - 0 - - 1 - m_radiusUnit - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - 5 - wxEXPAND|wxALL - 0 - - 0 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - m_stdButtons - protected - - - - - - diff --git a/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.h b/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.h deleted file mode 100644 index 2b402f7152..0000000000 --- a/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.h +++ /dev/null @@ -1,81 +0,0 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) -// http://www.wxformbuilder.org/ -// -// PLEASE DO *NOT* EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#pragma once - -#include -#include -#include -class TEXT_CTRL_EVAL; - -#include "dialog_shim.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/////////////////////////////////////////////////////////////////////////// - - -/////////////////////////////////////////////////////////////////////////////// -/// Class DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE -/////////////////////////////////////////////////////////////////////////////// -class DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE : public DIALOG_SHIM -{ - private: - - protected: - wxStaticText* m_staticText4; - wxChoice* m_choicePathFrom; - wxStaticText* m_staticText15; - wxChoice* m_choice4; - wxStaticText* m_staticText3; - wxChoice* m_constraintSource; - wxStaticText* m_targetLengthLabel; - wxTextCtrl* m_targetLengthText; - wxStaticText* m_targetLengthUnit; - wxStaticBitmap* m_legend; - wxStaticText* m_minAmplLabel; - wxTextCtrl* m_minAmplText; - wxStaticText* m_minAmplUnit; - wxStaticText* m_maxAmplLabel; - wxTextCtrl* m_maxAmplText; - wxStaticText* m_maxAmplUnit; - wxStaticText* m_spacingLabel; - wxTextCtrl* m_spacingText; - wxStaticText* m_spacingUnit; - wxStaticText* m_staticText14; - wxChoice* m_miterStyle; - wxCheckBox* m_singleSidedCheck; - wxStaticText* m_radiusLabel; - TEXT_CTRL_EVAL* m_radiusText; - wxStaticText* m_radiusUnit; - wxStdDialogButtonSizer* m_stdButtons; - wxButton* m_stdButtonsOK; - wxButton* m_stdButtonsCancel; - - public: - - DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Trace Length Tuning"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); - - ~DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE(); - -}; - diff --git a/pcbnew/dialogs/dialog_meander_properties.cpp b/pcbnew/dialogs/dialog_tuning_pattern_properties.cpp similarity index 85% rename from pcbnew/dialogs/dialog_meander_properties.cpp rename to pcbnew/dialogs/dialog_tuning_pattern_properties.cpp index d7aac47c43..8c361a1eca 100644 --- a/pcbnew/dialogs/dialog_meander_properties.cpp +++ b/pcbnew/dialogs/dialog_tuning_pattern_properties.cpp @@ -17,18 +17,18 @@ * with this program. If not, see . */ -#include "dialog_meander_properties.h" +#include "dialog_tuning_pattern_properties.h" #include #include #include #include -DIALOG_MEANDER_PROPERTIES::DIALOG_MEANDER_PROPERTIES( PCB_BASE_EDIT_FRAME* aFrame, - PNS::MEANDER_SETTINGS& aSettings, - PNS::ROUTER_MODE aMeanderType, - const DRC_CONSTRAINT& aConstraint ) : - DIALOG_MEANDER_PROPERTIES_BASE( aFrame ), +DIALOG_TUNING_PATTERN_PROPERTIES::DIALOG_TUNING_PATTERN_PROPERTIES( PCB_BASE_EDIT_FRAME* aFrame, + PNS::MEANDER_SETTINGS& aSettings, + PNS::ROUTER_MODE aMeanderType, + const DRC_CONSTRAINT& aConstraint ) : + DIALOG_TUNING_PATTERN_PROPERTIES_BASE( aFrame ), m_frame( aFrame ), m_constraint( aConstraint ), m_targetLength( aFrame, m_targetLengthLabel, m_targetLengthCtrl, m_targetLengthUnits ), @@ -70,7 +70,7 @@ DIALOG_MEANDER_PROPERTIES::DIALOG_MEANDER_PROPERTIES( PCB_BASE_EDIT_FRAME* aFram } -bool DIALOG_MEANDER_PROPERTIES::TransferDataToWindow() +bool DIALOG_TUNING_PATTERN_PROPERTIES::TransferDataToWindow() { if( m_mode == PNS::PNS_MODE_TUNE_DIFF_PAIR_SKEW ) m_targetLength.SetValue( m_settings.m_targetSkew ); @@ -97,7 +97,7 @@ bool DIALOG_MEANDER_PROPERTIES::TransferDataToWindow() } -bool DIALOG_MEANDER_PROPERTIES::TransferDataFromWindow() +bool DIALOG_TUNING_PATTERN_PROPERTIES::TransferDataFromWindow() { if( m_mode == PNS::PNS_MODE_TUNE_DIFF_PAIR_SKEW ) m_settings.m_targetSkew = m_targetLength.GetIntValue(); @@ -118,7 +118,7 @@ bool DIALOG_MEANDER_PROPERTIES::TransferDataFromWindow() } -void DIALOG_MEANDER_PROPERTIES::onOverrideCustomRules( wxCommandEvent& event ) +void DIALOG_TUNING_PATTERN_PROPERTIES::onOverrideCustomRules( wxCommandEvent& event ) { m_targetLength.Enable( event.IsChecked() || m_constraint.IsNull() ); diff --git a/pcbnew/dialogs/dialog_meander_properties.h b/pcbnew/dialogs/dialog_tuning_pattern_properties.h similarity index 73% rename from pcbnew/dialogs/dialog_meander_properties.h rename to pcbnew/dialogs/dialog_tuning_pattern_properties.h index bda4324d40..a9990e7799 100644 --- a/pcbnew/dialogs/dialog_meander_properties.h +++ b/pcbnew/dialogs/dialog_tuning_pattern_properties.h @@ -17,10 +17,10 @@ * with this program. If not, see . */ -#ifndef DIALOG_MEANDER_PROPERTIES_H -#define DIALOG_MEANDER_PROPERTIES_H +#ifndef DIALOG_TUNING_PATTERN_PROPERTIES_H +#define DIALOG_TUNING_PATTERN_PROPERTIES_H -#include "dialog_meander_properties_base.h" +#include "dialog_tuning_pattern_properties_base.h" #include @@ -36,11 +36,13 @@ class PCB_BASE_EDIT_FRAME; class DRC_CONSTRAINT; -class DIALOG_MEANDER_PROPERTIES : public DIALOG_MEANDER_PROPERTIES_BASE +class DIALOG_TUNING_PATTERN_PROPERTIES : public DIALOG_TUNING_PATTERN_PROPERTIES_BASE { public: - DIALOG_MEANDER_PROPERTIES( PCB_BASE_EDIT_FRAME* aParent, PNS::MEANDER_SETTINGS& aSettings, - PNS::ROUTER_MODE aMeanderType, const DRC_CONSTRAINT& aConstraint ); + DIALOG_TUNING_PATTERN_PROPERTIES( PCB_BASE_EDIT_FRAME* aParent, + PNS::MEANDER_SETTINGS& aSettings, + PNS::ROUTER_MODE aMeanderType, + const DRC_CONSTRAINT& aConstraint ); private: bool TransferDataToWindow() override; @@ -62,4 +64,4 @@ private: PNS::ROUTER_MODE m_mode; }; -#endif // DIALOG_MEANDER_PROPERTIES_H +#endif // DIALOG_TUNING_PATTERN_PROPERTIES_H diff --git a/pcbnew/dialogs/dialog_meander_properties_base.cpp b/pcbnew/dialogs/dialog_tuning_pattern_properties_base.cpp similarity index 90% rename from pcbnew/dialogs/dialog_meander_properties_base.cpp rename to pcbnew/dialogs/dialog_tuning_pattern_properties_base.cpp index c1b7790f47..8d19d759a7 100644 --- a/pcbnew/dialogs/dialog_meander_properties_base.cpp +++ b/pcbnew/dialogs/dialog_tuning_pattern_properties_base.cpp @@ -5,11 +5,11 @@ // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#include "dialog_meander_properties_base.h" +#include "dialog_tuning_pattern_properties_base.h" /////////////////////////////////////////////////////////////////////////// -DIALOG_MEANDER_PROPERTIES_BASE::DIALOG_MEANDER_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) +DIALOG_TUNING_PATTERN_PROPERTIES_BASE::DIALOG_TUNING_PATTERN_PROPERTIES_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( wxSize( -1,-1 ), wxDefaultSize ); @@ -73,7 +73,7 @@ DIALOG_MEANDER_PROPERTIES_BASE::DIALOG_MEANDER_PROPERTIES_BASE( wxWindow* parent gbSizer1->Add( m_spacingLabel, wxGBPosition( 5, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); m_spacingCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_spacingCtrl->SetToolTip( _("Minimum spacing between adjacent meander segments. The resulting spacing may be greater based on design rules.") ); + m_spacingCtrl->SetToolTip( _("Minimum spacing between adjacent tuning segments. The resulting spacing may be greater based on design rules.") ); gbSizer1->Add( m_spacingCtrl, wxGBPosition( 5, 1 ), wxGBSpan( 1, 1 ), wxEXPAND, 5 ); @@ -129,12 +129,12 @@ DIALOG_MEANDER_PROPERTIES_BASE::DIALOG_MEANDER_PROPERTIES_BASE( wxWindow* parent bMainSizer->Fit( this ); // Connect Events - m_overrideCustomRules->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_MEANDER_PROPERTIES_BASE::onOverrideCustomRules ), NULL, this ); + m_overrideCustomRules->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_TUNING_PATTERN_PROPERTIES_BASE::onOverrideCustomRules ), NULL, this ); } -DIALOG_MEANDER_PROPERTIES_BASE::~DIALOG_MEANDER_PROPERTIES_BASE() +DIALOG_TUNING_PATTERN_PROPERTIES_BASE::~DIALOG_TUNING_PATTERN_PROPERTIES_BASE() { // Disconnect Events - m_overrideCustomRules->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_MEANDER_PROPERTIES_BASE::onOverrideCustomRules ), NULL, this ); + m_overrideCustomRules->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_TUNING_PATTERN_PROPERTIES_BASE::onOverrideCustomRules ), NULL, this ); } diff --git a/pcbnew/dialogs/dialog_meander_properties_base.fbp b/pcbnew/dialogs/dialog_tuning_pattern_properties_base.fbp similarity index 99% rename from pcbnew/dialogs/dialog_meander_properties_base.fbp rename to pcbnew/dialogs/dialog_tuning_pattern_properties_base.fbp index 5274ed0311..e155cefe54 100644 --- a/pcbnew/dialogs/dialog_meander_properties_base.fbp +++ b/pcbnew/dialogs/dialog_tuning_pattern_properties_base.fbp @@ -11,13 +11,13 @@ UTF-8 connect - dialog_meander_properties_base + dialog_tuning_pattern_properties_base 1000 none 1 - DIALOG_MEANDER_PROPERTIES_BASE + DIALOG_TUNING_PATTERN_PROPERTIES_BASE . @@ -45,7 +45,7 @@ wxID_ANY -1,-1 - DIALOG_MEANDER_PROPERTIES_BASE + DIALOG_TUNING_PATTERN_PROPERTIES_BASE -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER @@ -980,7 +980,7 @@ ; ; forward_declare 0 - Minimum spacing between adjacent meander segments. The resulting spacing may be greater based on design rules. + Minimum spacing between adjacent tuning segments. The resulting spacing may be greater based on design rules. wxFILTER_NONE wxDefaultValidator diff --git a/pcbnew/dialogs/dialog_meander_properties_base.h b/pcbnew/dialogs/dialog_tuning_pattern_properties_base.h similarity index 81% rename from pcbnew/dialogs/dialog_meander_properties_base.h rename to pcbnew/dialogs/dialog_tuning_pattern_properties_base.h index 03e2a811dc..b03c71d453 100644 --- a/pcbnew/dialogs/dialog_meander_properties_base.h +++ b/pcbnew/dialogs/dialog_tuning_pattern_properties_base.h @@ -33,9 +33,9 @@ /////////////////////////////////////////////////////////////////////////////// -/// Class DIALOG_MEANDER_PROPERTIES_BASE +/// Class DIALOG_TUNING_PATTERN_PROPERTIES_BASE /////////////////////////////////////////////////////////////////////////////// -class DIALOG_MEANDER_PROPERTIES_BASE : public DIALOG_SHIM +class DIALOG_TUNING_PATTERN_PROPERTIES_BASE : public DIALOG_SHIM { private: @@ -71,9 +71,9 @@ class DIALOG_MEANDER_PROPERTIES_BASE : public DIALOG_SHIM public: - DIALOG_MEANDER_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Tuning Pattern Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_TUNING_PATTERN_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Tuning Pattern Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); - ~DIALOG_MEANDER_PROPERTIES_BASE(); + ~DIALOG_TUNING_PATTERN_PROPERTIES_BASE(); }; diff --git a/pcbnew/dialogs/panel_setup_meanders.cpp b/pcbnew/dialogs/panel_setup_tuning_patterns.cpp similarity index 89% rename from pcbnew/dialogs/panel_setup_meanders.cpp rename to pcbnew/dialogs/panel_setup_tuning_patterns.cpp index 5d948b3f45..c0f64d43b8 100644 --- a/pcbnew/dialogs/panel_setup_meanders.cpp +++ b/pcbnew/dialogs/panel_setup_tuning_patterns.cpp @@ -17,17 +17,17 @@ * with this program. If not, see . */ -#include +#include #include #include #include #include -PANEL_SETUP_MEANDERS::PANEL_SETUP_MEANDERS( wxWindow* aParent, EDA_DRAW_FRAME* aFrame, - PNS::MEANDER_SETTINGS& aTrackSettings, - PNS::MEANDER_SETTINGS& aDiffPairSettings, - PNS::MEANDER_SETTINGS& aSkewSettings ) : - PANEL_SETUP_MEANDERS_BASE( aParent ), +PANEL_SETUP_TUNING_PATTERNS::PANEL_SETUP_TUNING_PATTERNS( wxWindow* aParent, EDA_DRAW_FRAME* aFrame, + PNS::MEANDER_SETTINGS& aTrackSettings, + PNS::MEANDER_SETTINGS& aDiffPairSettings, + PNS::MEANDER_SETTINGS& aSkewSettings ) : + PANEL_SETUP_TUNING_PATTERNS_BASE( aParent ), m_track_minA( aFrame, m_track_minALabel, m_track_minACtrl, m_track_minAUnits ), m_track_maxA( aFrame, m_track_maxALabel, m_track_maxACtrl, m_track_maxAUnits ), m_track_spacing( aFrame, m_track_spacingLabel, m_track_spacingCtrl, m_track_spacingUnits ), @@ -54,7 +54,7 @@ PANEL_SETUP_MEANDERS::PANEL_SETUP_MEANDERS( wxWindow* aParent, EDA_DRAW_FRAME* a } -bool PANEL_SETUP_MEANDERS::TransferDataToWindow() +bool PANEL_SETUP_TUNING_PATTERNS::TransferDataToWindow() { m_track_minA.SetValue( m_trackSettings.m_minAmplitude ); m_track_maxA.SetValue( m_trackSettings.m_maxAmplitude ); @@ -80,7 +80,7 @@ bool PANEL_SETUP_MEANDERS::TransferDataToWindow() } -bool PANEL_SETUP_MEANDERS::TransferDataFromWindow() +bool PANEL_SETUP_TUNING_PATTERNS::TransferDataFromWindow() { m_trackSettings.m_minAmplitude = m_track_minA.GetIntValue(); m_trackSettings.m_maxAmplitude = m_track_maxA.GetIntValue(); diff --git a/pcbnew/dialogs/panel_setup_meanders.h b/pcbnew/dialogs/panel_setup_tuning_patterns.h similarity index 85% rename from pcbnew/dialogs/panel_setup_meanders.h rename to pcbnew/dialogs/panel_setup_tuning_patterns.h index c78fe67778..287710fe0e 100644 --- a/pcbnew/dialogs/panel_setup_meanders.h +++ b/pcbnew/dialogs/panel_setup_tuning_patterns.h @@ -17,10 +17,10 @@ * with this program. If not, see . */ -#ifndef PANEL_SETUP_MEANDERS_H -#define PANEL_SETUP_MEANDERS_H +#ifndef PANEL_SETUP_TUNING_PATTERNS_H +#define PANEL_SETUP_TUNING_PATTERNS_H -#include +#include #include @@ -30,10 +30,10 @@ class MEANDER_SETTINGS; } -class PANEL_SETUP_MEANDERS : public PANEL_SETUP_MEANDERS_BASE +class PANEL_SETUP_TUNING_PATTERNS : public PANEL_SETUP_TUNING_PATTERNS_BASE { public: - PANEL_SETUP_MEANDERS( wxWindow* aParent, EDA_DRAW_FRAME* aFrame, + PANEL_SETUP_TUNING_PATTERNS( wxWindow* aParent, EDA_DRAW_FRAME* aFrame, PNS::MEANDER_SETTINGS& aTrackSettings, PNS::MEANDER_SETTINGS& aDiffPairSettings, PNS::MEANDER_SETTINGS& aSkewSettings ); @@ -63,4 +63,4 @@ private: PNS::MEANDER_SETTINGS& m_skewSettings; }; -#endif // PANEL_SETUP_MEANDERS_H +#endif // PANEL_SETUP_TUNING_PATTERNS_H diff --git a/pcbnew/dialogs/panel_setup_meanders_base.cpp b/pcbnew/dialogs/panel_setup_tuning_patterns_base.cpp similarity index 93% rename from pcbnew/dialogs/panel_setup_meanders_base.cpp rename to pcbnew/dialogs/panel_setup_tuning_patterns_base.cpp index 56da665b4c..24d695c4d5 100644 --- a/pcbnew/dialogs/panel_setup_meanders_base.cpp +++ b/pcbnew/dialogs/panel_setup_tuning_patterns_base.cpp @@ -7,16 +7,16 @@ #include "widgets/text_ctrl_eval.h" -#include "panel_setup_meanders_base.h" +#include "panel_setup_tuning_patterns_base.h" /////////////////////////////////////////////////////////////////////////// -PANEL_SETUP_MEANDERS_BASE::PANEL_SETUP_MEANDERS_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name ) +PANEL_SETUP_TUNING_PATTERNS_BASE::PANEL_SETUP_TUNING_PATTERNS_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name ) { wxBoxSizer* bMainSizer; bMainSizer = new wxBoxSizer( wxVERTICAL ); - m_singleTrackLabel = new wxStaticText( this, wxID_ANY, _("Default properties for single-track meanders:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_singleTrackLabel = new wxStaticText( this, wxID_ANY, _("Default properties for single-track tuning:"), wxDefaultPosition, wxDefaultSize, 0 ); m_singleTrackLabel->Wrap( -1 ); bMainSizer->Add( m_singleTrackLabel, 0, wxTOP|wxRIGHT|wxLEFT, 8 ); @@ -71,7 +71,7 @@ PANEL_SETUP_MEANDERS_BASE::PANEL_SETUP_MEANDERS_BASE( wxWindow* parent, wxWindow bSizer9 = new wxBoxSizer( wxHORIZONTAL ); m_track_spacingCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_track_spacingCtrl->SetToolTip( _("Minimum spacing between adjacent meander segments. The resulting spacing may be greater based on design rules.") ); + m_track_spacingCtrl->SetToolTip( _("Minimum spacing between adjacent tuning segments. The resulting spacing may be greater based on design rules.") ); bSizer9->Add( m_track_spacingCtrl, 1, wxALIGN_CENTER_VERTICAL, 5 ); @@ -137,7 +137,7 @@ PANEL_SETUP_MEANDERS_BASE::PANEL_SETUP_MEANDERS_BASE( wxWindow* parent, wxWindow fgSizer3->Add( 0, 0, 1, wxEXPAND, 5 ); - singleTrackSizer->Add( fgSizer3, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + singleTrackSizer->Add( fgSizer3, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); bMainSizer->Add( singleTrackSizer, 0, wxEXPAND|wxRIGHT, 5 ); @@ -145,7 +145,7 @@ PANEL_SETUP_MEANDERS_BASE::PANEL_SETUP_MEANDERS_BASE( wxWindow* parent, wxWindow bMainSizer->Add( 0, 10, 0, wxEXPAND, 5 ); - m_diffPairsLabel = new wxStaticText( this, wxID_ANY, _("Default properties for differential-pair meanders:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_diffPairsLabel = new wxStaticText( this, wxID_ANY, _("Default properties for differential-pairs:"), wxDefaultPosition, wxDefaultSize, 0 ); m_diffPairsLabel->Wrap( -1 ); bMainSizer->Add( m_diffPairsLabel, 0, wxTOP|wxRIGHT|wxLEFT, 8 ); @@ -200,7 +200,7 @@ PANEL_SETUP_MEANDERS_BASE::PANEL_SETUP_MEANDERS_BASE( wxWindow* parent, wxWindow bSizer91 = new wxBoxSizer( wxHORIZONTAL ); m_dp_spacingCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_dp_spacingCtrl->SetToolTip( _("Minimum spacing between adjacent meander segments. The resulting spacing may be greater based on design rules.") ); + m_dp_spacingCtrl->SetToolTip( _("Minimum spacing between adjacent tuning segments. The resulting spacing may be greater based on design rules.") ); bSizer91->Add( m_dp_spacingCtrl, 1, wxALIGN_CENTER_VERTICAL, 5 ); @@ -272,7 +272,7 @@ PANEL_SETUP_MEANDERS_BASE::PANEL_SETUP_MEANDERS_BASE( wxWindow* parent, wxWindow fgSizer32->Add( 0, 0, 1, wxEXPAND, 5 ); - diffPairSizer->Add( fgSizer32, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + diffPairSizer->Add( fgSizer32, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); bMainSizer->Add( diffPairSizer, 0, wxEXPAND|wxRIGHT, 5 ); @@ -335,7 +335,7 @@ PANEL_SETUP_MEANDERS_BASE::PANEL_SETUP_MEANDERS_BASE( wxWindow* parent, wxWindow bSizer92 = new wxBoxSizer( wxHORIZONTAL ); m_skew_spacingCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_skew_spacingCtrl->SetToolTip( _("Minimum spacing between adjacent meander segments. The resulting spacing may be greater based on design rules.") ); + m_skew_spacingCtrl->SetToolTip( _("Minimum spacing between adjacent tuning segments. The resulting spacing may be greater based on design rules.") ); bSizer92->Add( m_skew_spacingCtrl, 1, wxALIGN_CENTER_VERTICAL, 5 ); @@ -392,10 +392,10 @@ PANEL_SETUP_MEANDERS_BASE::PANEL_SETUP_MEANDERS_BASE( wxWindow* parent, wxWindow fgSizer31->Add( m_skew_rUnits, 0, wxALIGN_CENTER_VERTICAL, 5 ); - skewSizer->Add( fgSizer31, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + skewSizer->Add( fgSizer31, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - bMainSizer->Add( skewSizer, 0, wxEXPAND|wxRIGHT, 5 ); + bMainSizer->Add( skewSizer, 0, wxEXPAND|wxBOTTOM|wxRIGHT, 5 ); this->SetSizer( bMainSizer ); @@ -403,6 +403,6 @@ PANEL_SETUP_MEANDERS_BASE::PANEL_SETUP_MEANDERS_BASE( wxWindow* parent, wxWindow bMainSizer->Fit( this ); } -PANEL_SETUP_MEANDERS_BASE::~PANEL_SETUP_MEANDERS_BASE() +PANEL_SETUP_TUNING_PATTERNS_BASE::~PANEL_SETUP_TUNING_PATTERNS_BASE() { } diff --git a/pcbnew/dialogs/panel_setup_meanders_base.fbp b/pcbnew/dialogs/panel_setup_tuning_patterns_base.fbp similarity index 99% rename from pcbnew/dialogs/panel_setup_meanders_base.fbp rename to pcbnew/dialogs/panel_setup_tuning_patterns_base.fbp index 9eaf09d56d..bbf0c290bf 100644 --- a/pcbnew/dialogs/panel_setup_meanders_base.fbp +++ b/pcbnew/dialogs/panel_setup_tuning_patterns_base.fbp @@ -11,13 +11,13 @@ UTF-8 connect - panel_setup_meanders_base + panel_setup_tuning_patterns_base 1000 none 1 - PANEL_SETUP_MEANDERS_BASE + PANEL_SETUP_TUNING_PATTERNS_BASE . @@ -43,7 +43,7 @@ wxID_ANY - PANEL_SETUP_MEANDERS_BASE + PANEL_SETUP_TUNING_PATTERNS_BASE -1,-1 ; ; forward_declare @@ -89,7 +89,7 @@ 0 0 wxID_ANY - Default properties for single-track meanders: + Default properties for single-track tuning: 0 0 @@ -245,7 +245,7 @@ 5 - wxEXPAND|wxRIGHT|wxLEFT + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 5 @@ -765,7 +765,7 @@ ; ; forward_declare 0 - Minimum spacing between adjacent meander segments. The resulting spacing may be greater based on design rules. + Minimum spacing between adjacent tuning segments. The resulting spacing may be greater based on design rules. wxFILTER_NONE wxDefaultValidator @@ -1360,7 +1360,7 @@ 0 0 wxID_ANY - Default properties for differential-pair meanders: + Default properties for differential-pairs: 0 0 @@ -1516,7 +1516,7 @@ 5 - wxEXPAND|wxRIGHT|wxLEFT + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 5 @@ -2036,7 +2036,7 @@ ; ; forward_declare 0 - Minimum spacing between adjacent meander segments. The resulting spacing may be greater based on design rules. + Minimum spacing between adjacent tuning segments. The resulting spacing may be greater based on design rules. wxFILTER_NONE wxDefaultValidator @@ -2720,7 +2720,7 @@ 5 - wxEXPAND|wxRIGHT + wxEXPAND|wxBOTTOM|wxRIGHT 0 @@ -2787,7 +2787,7 @@ 5 - wxEXPAND|wxRIGHT|wxLEFT + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 5 @@ -3307,7 +3307,7 @@ ; ; forward_declare 0 - Minimum spacing between adjacent meander segments. The resulting spacing may be greater based on design rules. + Minimum spacing between adjacent tuning segments. The resulting spacing may be greater based on design rules. wxFILTER_NONE wxDefaultValidator diff --git a/pcbnew/dialogs/panel_setup_meanders_base.h b/pcbnew/dialogs/panel_setup_tuning_patterns_base.h similarity index 88% rename from pcbnew/dialogs/panel_setup_meanders_base.h rename to pcbnew/dialogs/panel_setup_tuning_patterns_base.h index 973f128b78..623832d45f 100644 --- a/pcbnew/dialogs/panel_setup_meanders_base.h +++ b/pcbnew/dialogs/panel_setup_tuning_patterns_base.h @@ -33,9 +33,9 @@ class TEXT_CTRL_EVAL; /////////////////////////////////////////////////////////////////////////////// -/// Class PANEL_SETUP_MEANDERS_BASE +/// Class PANEL_SETUP_TUNING_PATTERNS_BASE /////////////////////////////////////////////////////////////////////////////// -class PANEL_SETUP_MEANDERS_BASE : public wxPanel +class PANEL_SETUP_TUNING_PATTERNS_BASE : public wxPanel { private: @@ -96,9 +96,9 @@ class PANEL_SETUP_MEANDERS_BASE : public wxPanel public: - PANEL_SETUP_MEANDERS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); + PANEL_SETUP_TUNING_PATTERNS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); - ~PANEL_SETUP_MEANDERS_BASE(); + ~PANEL_SETUP_TUNING_PATTERNS_BASE(); }; diff --git a/pcbnew/generators/pcb_generator_meanders.cpp b/pcbnew/generators/pcb_generator_meanders.cpp index 5d799e76d2..fa5b90ae74 100644 --- a/pcbnew/generators/pcb_generator_meanders.cpp +++ b/pcbnew/generators/pcb_generator_meanders.cpp @@ -32,6 +32,7 @@ #include #include #include +#include #include #include @@ -57,9 +58,8 @@ #include #include #include -#include -#include +#include enum LENGTH_TUNING_MODE @@ -317,7 +317,7 @@ static PNS::MEANDER_SIDE sideFromString( const std::string& aStr ) return PNS::MEANDER_SIDE_RIGHT; else { - wxFAIL_MSG( wxS( "Unknown meander side token" ) ); + wxFAIL_MSG( wxS( "Unknown length-tuning side token" ) ); return PNS::MEANDER_SIDE_DEFAULT; } } @@ -849,7 +849,7 @@ void PCB_GENERATOR_MEANDERS::Remove( GENERATOR_TOOL* aTool, BOARD* aBoard, aCommit->Add( item ); } - aCommit->Push( "Remove Meander", undoFlags ); + aCommit->Push( "Remove Tuning Pattern", undoFlags ); } @@ -1088,7 +1088,7 @@ void PCB_GENERATOR_MEANDERS::EditPush( GENERATOR_TOOL* aTool, BOARD* aBoard, bool isNew = IsNew(); if( aCommitMsg.IsEmpty() ) - aCommit->Push( _( "Edit Meander" ), aCommitFlags ); + aCommit->Push( _( "Edit Tuning Pattern" ), aCommitFlags ); else aCommit->Push( aCommitMsg, aCommitFlags ); @@ -1417,7 +1417,7 @@ void PCB_GENERATOR_MEANDERS::ShowPropertiesDialog( PCB_BASE_EDIT_FRAME* aEditFra settings.m_targetLength = constraint.GetValue().Opt(); } - DIALOG_MEANDER_PROPERTIES dlg( aEditFrame, settings, toPNSMode(), constraint ); + DIALOG_TUNING_PATTERN_PROPERTIES dlg( aEditFrame, settings, toPNSMode(), constraint ); if( dlg.ShowModal() == wxID_OK ) { @@ -1426,7 +1426,7 @@ void PCB_GENERATOR_MEANDERS::ShowPropertiesDialog( PCB_BASE_EDIT_FRAME* aEditFra fromMeanderSettings( settings ); - commit.Push( _( "Edit Meander Properties" ) ); + commit.Push( _( "Edit Tuning Pattern" ) ); } aEditFrame->GetToolManager()->PostAction( PCB_ACTIONS::regenerateItem, this ); @@ -1677,10 +1677,10 @@ int DRAWING_TOOL::PlaceMeander( const TOOL_EVENT& aEvent ) GENERAL_COLLECTORS_GUIDE guide = m_frame->GetCollectorsGuide(); GENERATOR_TOOL* generatorTool = m_toolMgr->GetTool(); PNS::ROUTER* router = generatorTool->Router(); - SCOPED_DRAW_MODE scopedDrawMode( m_mode, MODE::MEANDER ); + SCOPED_DRAW_MODE scopedDrawMode( m_mode, MODE::TUNING ); m_pickerItem = nullptr; - m_meander = nullptr; + m_tuningPattern = nullptr; // Add a VIEW_GROUP that serves as a preview for the new item m_preview.Clear(); @@ -1696,17 +1696,17 @@ int DRAWING_TOOL::PlaceMeander( const TOOL_EVENT& aEvent ) auto updateMeander = [&]() { - if( m_meander && m_meander->GetPosition() != m_meander->GetEnd() ) + if( m_tuningPattern && m_tuningPattern->GetPosition() != m_tuningPattern->GetEnd() ) { - m_meander->EditStart( generatorTool, m_board, m_frame, nullptr ); - m_meander->Update( generatorTool, m_board, m_frame, nullptr ); + m_tuningPattern->EditStart( generatorTool, m_board, m_frame, nullptr ); + m_tuningPattern->Update( generatorTool, m_board, m_frame, nullptr ); m_statusPopup->Popup(); canvas()->SetStatusPopup( m_statusPopup.get() ); m_view->Update( &m_preview ); - m_meander->UpdateStatus( generatorTool, m_frame, m_statusPopup.get() ); + m_tuningPattern->UpdateStatus( generatorTool, m_frame, m_statusPopup.get() ); m_statusPopup->Move( KIPLATFORM::UI::GetMousePosition() + wxPoint( 20, 20 ) ); } }; @@ -1721,22 +1721,22 @@ int DRAWING_TOOL::PlaceMeander( const TOOL_EVENT& aEvent ) if( evt->IsCancelInteractive() || evt->IsActivate() ) { - if( m_meander ) + if( m_tuningPattern ) { // First click already made; clean up meander preview - m_meander->EditRevert( generatorTool, m_board, m_frame, nullptr ); + m_tuningPattern->EditRevert( generatorTool, m_board, m_frame, nullptr ); m_preview.Clear(); - delete m_meander; - m_meander = nullptr; + delete m_tuningPattern; + m_tuningPattern = nullptr; } break; } else if( evt->IsMotion() ) { - if( !m_meander ) + if( !m_tuningPattern ) { // First click not yet made; we're in highlight-net-under-cursor mode @@ -1764,20 +1764,20 @@ int DRAWING_TOOL::PlaceMeander( const TOOL_EVENT& aEvent ) { // First click already made; we're in preview-meander mode - m_meander->SetEnd( cursorPos ); + m_tuningPattern->SetEnd( cursorPos ); updateMeander(); } } else if( evt->IsClick( BUT_LEFT ) ) { - if( m_pickerItem && !m_meander ) + if( m_pickerItem && !m_tuningPattern ) { // First click; create a meander generatorTool->HighlightNets( nullptr ); m_frame->SetActiveLayer( m_pickerItem->GetLayer() ); - m_meander = PCB_GENERATOR_MEANDERS::CreateNew( generatorTool, m_frame, + m_tuningPattern = PCB_GENERATOR_MEANDERS::CreateNew( generatorTool, m_frame, m_pickerItem, mode ); int dummyDist; @@ -1786,19 +1786,19 @@ int DRAWING_TOOL::PlaceMeander( const TOOL_EVENT& aEvent ) m_pickerItem->GetEffectiveShape()->Collide( cursorPos, dummyClearance, &dummyDist, &closestPt ); - m_meander->SetPosition( closestPt ); - m_meander->SetEnd( closestPt ); + m_tuningPattern->SetPosition( closestPt ); + m_tuningPattern->SetEnd( closestPt ); - m_preview.Add( m_meander ); + m_preview.Add( m_tuningPattern ); } - else if( m_pickerItem && m_meander ) + else if( m_pickerItem && m_tuningPattern ) { // Second click; we're done BOARD_COMMIT commit( m_frame ); - m_meander->EditStart( generatorTool, m_board, m_frame, &commit ); - m_meander->Update( generatorTool, m_board, m_frame, &commit ); - m_meander->EditPush( generatorTool, m_board, m_frame, &commit, _( "Tune" ) ); + m_tuningPattern->EditStart( generatorTool, m_board, m_frame, &commit ); + m_tuningPattern->Update( generatorTool, m_board, m_frame, &commit ); + m_tuningPattern->EditPush( generatorTool, m_board, m_frame, &commit, _( "Tune" ) ); break; } @@ -1811,24 +1811,24 @@ int DRAWING_TOOL::PlaceMeander( const TOOL_EVENT& aEvent ) else if( evt->IsAction( &PCB_ACTIONS::spacingIncrease ) || evt->IsAction( &PCB_ACTIONS::spacingDecrease ) ) { - if( m_meander ) + if( m_tuningPattern ) { auto* placer = static_cast( router->Placer() ); placer->SpacingStep( evt->IsAction( &PCB_ACTIONS::spacingIncrease ) ? 1 : -1 ); - m_meander->SetSpacing( placer->MeanderSettings().m_spacing ); + m_tuningPattern->SetSpacing( placer->MeanderSettings().m_spacing ); updateMeander(); } } else if( evt->IsAction( &PCB_ACTIONS::amplIncrease ) || evt->IsAction( &PCB_ACTIONS::amplDecrease ) ) { - if( m_meander ) + if( m_tuningPattern ) { auto* placer = static_cast( router->Placer() ); placer->AmplitudeStep( evt->IsAction( &PCB_ACTIONS::amplIncrease ) ? 1 : -1 ); - m_meander->SetMaxAmplitude( placer->MeanderSettings().m_maxAmplitude ); + m_tuningPattern->SetMaxAmplitude( placer->MeanderSettings().m_maxAmplitude ); updateMeander(); } } @@ -1843,8 +1843,8 @@ int DRAWING_TOOL::PlaceMeander( const TOOL_EVENT& aEvent ) evt->SetPassEvent(); } - controls->CaptureCursor( m_meander != nullptr ); - controls->SetAutoPan( m_meander != nullptr ); + controls->CaptureCursor( m_tuningPattern != nullptr ); + controls->SetAutoPan( m_tuningPattern != nullptr ); } controls->CaptureCursor( false ); @@ -1863,8 +1863,8 @@ int DRAWING_TOOL::PlaceMeander( const TOOL_EVENT& aEvent ) m_frame->GetCanvas()->Refresh(); - if( m_meander ) - selectionTool->AddItemToSel( m_meander ); + if( m_tuningPattern ) + selectionTool->AddItemToSel( m_tuningPattern ); m_frame->PopTool( aEvent ); return 0; diff --git a/pcbnew/router/CMakeLists.txt b/pcbnew/router/CMakeLists.txt index 0927267c9a..7500ecfe89 100644 --- a/pcbnew/router/CMakeLists.txt +++ b/pcbnew/router/CMakeLists.txt @@ -40,7 +40,6 @@ set( PCBNEW_PNS_SRCS pns_solid.cpp pns_tool_base.cpp pns_topology.cpp - pns_tune_status_popup.cpp pns_utils.cpp pns_via.cpp pns_walkaround.cpp diff --git a/pcbnew/router/pns_tune_status_popup.cpp b/pcbnew/router/pns_tune_status_popup.cpp deleted file mode 100644 index 8c9dad738d..0000000000 --- a/pcbnew/router/pns_tune_status_popup.cpp +++ /dev/null @@ -1,71 +0,0 @@ -/* - * This program source code file is part of KiCad, a free EDA CAD application. - * - * Copyright (C) 2014-2015 CERN - * Copyright (C) 2016-2022 KiCad Developers, see AUTHORS.txt for contributors. - * Author: Tomasz Wlostowski - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#include "eda_draw_frame.h" -#include "pns_tune_status_popup.h" -#include "pns_router.h" -#include "pns_meander_placer.h" -#include - -void PNS_TUNE_STATUS_POPUP::UpdateStatus( PNS::ROUTER* aRouter ) -{ - PNS::MEANDER_PLACER_BASE* placer = dynamic_cast( aRouter->Placer() ); - - if( !placer ) - return; - - EDA_DRAW_FRAME* frame = static_cast( GetParent() ); - - SetText( placer->TuningInfo( frame->GetUserUnits() ) ); - - // Determine the background color first and choose a contrasting value - COLOR4D bg( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); - double h, s, l; - bg.ToHSL( h, s, l ); - - switch( placer->TuningStatus() ) - { - case PNS::MEANDER_PLACER::TUNED: - if( l < 0.5 ) - SetTextColor( wxColor( 127, 200, 127 ) ); - else - SetTextColor( wxColor( 0, 92, 0 ) ); - - break; - - case PNS::MEANDER_PLACER::TOO_SHORT: - if( l < 0.5 ) - SetTextColor( wxColor( 242, 100, 126 ) ); - else - SetTextColor( wxColor( 122, 0, 0 ) ); - - break; - - case PNS::MEANDER_PLACER::TOO_LONG: - if( l < 0.5 ) - SetTextColor( wxColor( 66, 184, 235 ) ); - else - SetTextColor( wxColor( 19, 19, 195 ) ); - - break; - } -} - diff --git a/pcbnew/router/pns_tune_status_popup.h b/pcbnew/router/pns_tune_status_popup.h deleted file mode 100644 index 628c3ce580..0000000000 --- a/pcbnew/router/pns_tune_status_popup.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * This program source code file is part of KiCad, a free EDA CAD application. - * - * Copyright (C) 2015 CERN - * Copyright (C) 2016 KiCad Developers, see AUTHORS.txt for contributors. - * Author: Tomasz Wlostowski - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, you may find one here: - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html - * or you may search the http://www.gnu.org website for the version 2 license, - * or you may write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __PNS_TUNE_STATUS_POPUP_H_ -#define __PNS_TUNE_STATUS_POPUP_H_ - -#include - -namespace PNS { - -class ROUTER; - -} - -class PNS_TUNE_STATUS_POPUP : public STATUS_TEXT_POPUP -{ -public: - PNS_TUNE_STATUS_POPUP( wxWindow* aParent ) : - STATUS_TEXT_POPUP( aParent ) - { } - - void UpdateStatus( PNS::ROUTER* aRouter ); -}; - -#endif /* __PNS_TUNE_STATUS_POPUP_H_*/ diff --git a/pcbnew/tools/drawing_tool.cpp b/pcbnew/tools/drawing_tool.cpp index 2f6a26e6f6..51d6f8e217 100644 --- a/pcbnew/tools/drawing_tool.cpp +++ b/pcbnew/tools/drawing_tool.cpp @@ -174,7 +174,7 @@ DRAWING_TOOL::DRAWING_TOOL() : m_layer( UNDEFINED_LAYER ), m_stroke( 1, PLOT_DASH_TYPE::DEFAULT, COLOR4D::UNSPECIFIED ), m_pickerItem( nullptr ), - m_meander( nullptr ) + m_tuningPattern( nullptr ) { } @@ -231,10 +231,10 @@ bool DRAWING_TOOL::Init() return m_mode == MODE::VIA; }; - auto meanderToolActive = + auto tuningToolActive = [this]( const SELECTION& aSel ) { - return m_mode == MODE::MEANDER; + return m_mode == MODE::TUNING; }; CONDITIONAL_MENU& ctxMenu = m_menu.GetMenu(); @@ -250,12 +250,12 @@ bool DRAWING_TOOL::Init() ctxMenu.AddItem( PCB_ACTIONS::closeOutline, canCloseOutline, 200 ); ctxMenu.AddItem( PCB_ACTIONS::deleteLastPoint, canUndoPoint, 200 ); ctxMenu.AddItem( PCB_ACTIONS::arcPosture, arcToolActive, 200 ); - ctxMenu.AddItem( PCB_ACTIONS::spacingIncrease, meanderToolActive, 200 ); - ctxMenu.AddItem( PCB_ACTIONS::spacingDecrease, meanderToolActive, 200 ); - ctxMenu.AddItem( PCB_ACTIONS::amplIncrease, meanderToolActive, 200 ); - ctxMenu.AddItem( PCB_ACTIONS::amplDecrease, meanderToolActive, 200 ); + ctxMenu.AddItem( PCB_ACTIONS::spacingIncrease, tuningToolActive, 200 ); + ctxMenu.AddItem( PCB_ACTIONS::spacingDecrease, tuningToolActive, 200 ); + ctxMenu.AddItem( PCB_ACTIONS::amplIncrease, tuningToolActive, 200 ); + ctxMenu.AddItem( PCB_ACTIONS::amplDecrease, tuningToolActive, 200 ); - ctxMenu.AddCheckItem( PCB_ACTIONS::toggleHV45Mode, !meanderToolActive, 250 ); + ctxMenu.AddCheckItem( PCB_ACTIONS::toggleHV45Mode, !tuningToolActive, 250 ); ctxMenu.AddSeparator( 500 ); std::shared_ptr viaSizeMenu = std::make_shared(); diff --git a/pcbnew/tools/drawing_tool.h b/pcbnew/tools/drawing_tool.h index e8de64926b..7cad3d1011 100644 --- a/pcbnew/tools/drawing_tool.h +++ b/pcbnew/tools/drawing_tool.h @@ -80,7 +80,7 @@ public: ZONE, GRAPHIC_POLYGON, VIA, - MEANDER + TUNING }; /** @@ -356,7 +356,7 @@ private: PCB_SELECTION m_preview; BOARD_CONNECTED_ITEM* m_pickerItem; - PCB_GENERATOR_MEANDERS* m_meander; + PCB_GENERATOR_MEANDERS* m_tuningPattern; std::unique_ptr m_statusPopup; diff --git a/pcbnew/tools/pcb_actions.cpp b/pcbnew/tools/pcb_actions.cpp index 111a09ee73..63b253c775 100644 --- a/pcbnew/tools/pcb_actions.cpp +++ b/pcbnew/tools/pcb_actions.cpp @@ -192,7 +192,7 @@ TOOL_ACTION PCB_ACTIONS::spacingIncrease( TOOL_ACTION_ARGS() .DefaultHotkey( '1' ) .LegacyHotkeyName( "Increase meander spacing by one step." ) .MenuText( _( "Increase Spacing" ) ) - .Tooltip( _( "Increase meander spacing by one step." ) ) + .Tooltip( _( "Increase tuning pattern spacing by one step." ) ) .Icon( BITMAPS::router_len_tuner_dist_incr ) ); TOOL_ACTION PCB_ACTIONS::spacingDecrease( TOOL_ACTION_ARGS() @@ -201,7 +201,7 @@ TOOL_ACTION PCB_ACTIONS::spacingDecrease( TOOL_ACTION_ARGS() .DefaultHotkey( '2' ) .LegacyHotkeyName( "Decrease meander spacing by one step." ) .MenuText( _( "Decrease Spacing" ) ) - .Tooltip( _( "Decrease meander spacing by one step." ) ) + .Tooltip( _( "Decrease tuning pattern spacing by one step." ) ) .Icon( BITMAPS::router_len_tuner_dist_decr ) ); TOOL_ACTION PCB_ACTIONS::amplIncrease( TOOL_ACTION_ARGS() @@ -210,7 +210,7 @@ TOOL_ACTION PCB_ACTIONS::amplIncrease( TOOL_ACTION_ARGS() .DefaultHotkey( '3' ) .LegacyHotkeyName( "Increase meander amplitude by one step." ) .MenuText( _( "Increase Amplitude" ) ) - .Tooltip( _( "Increase meander amplitude by one step." ) ) + .Tooltip( _( "Increase tuning pattern amplitude by one step." ) ) .Icon( BITMAPS::router_len_tuner_amplitude_incr ) ); TOOL_ACTION PCB_ACTIONS::amplDecrease( TOOL_ACTION_ARGS() @@ -219,7 +219,7 @@ TOOL_ACTION PCB_ACTIONS::amplDecrease( TOOL_ACTION_ARGS() .DefaultHotkey( '4' ) .LegacyHotkeyName( "Decrease meander amplitude by one step." ) .MenuText( _( "Decrease Amplitude" ) ) - .Tooltip( _( "Decrease meander amplitude by one step." ) ) + .Tooltip( _( "Decrease tuning pattern amplitude by one step." ) ) .Icon( BITMAPS::router_len_tuner_amplitude_decr ) ); diff --git a/qa/tests/libs/kimath/geometry/test_shape_arc.cpp b/qa/tests/libs/kimath/geometry/test_shape_arc.cpp index 70cf0d76a3..f1b8c373d4 100644 --- a/qa/tests/libs/kimath/geometry/test_shape_arc.cpp +++ b/qa/tests/libs/kimath/geometry/test_shape_arc.cpp @@ -794,7 +794,7 @@ static const std::vector arc_arc_collide_cases = { { 86.063537, 88.295989, 84.968628, 87.581351, -255.5, 0.2 }, 0, true }, - { "case 12: Simulated differential pair meander", + { "case 12: Simulated differential pair length-tuning", { 94.6551, 88.296, 95.6551, 88.296, 90.0, 0.1 }, { 94.6551, 88.296, 95.8551, 88.296, 90.0, 0.1 }, 0.1,