diff --git a/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp b/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp index 7287fb3feb..e8045dfbf6 100644 --- a/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp +++ b/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -106,9 +106,9 @@ DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE::DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE( fgSizer3->SetFlexibleDirection( wxBOTH ); fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_minAmplLabel = new wxStaticText( sbSizerLower->GetStaticBox(), wxID_ANY, _("Min amplitude (Amin):"), wxDefaultPosition, wxDefaultSize, 0 ); + 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|wxRIGHT|wxLEFT, 5 ); + 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 ); @@ -117,9 +117,9 @@ DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE::DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE( 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 (Amax):"), wxDefaultPosition, wxDefaultSize, 0 ); + 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|wxRIGHT|wxLEFT, 5 ); + 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 ); @@ -130,7 +130,7 @@ DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE::DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE( 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|wxRIGHT|wxLEFT, 5 ); + 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.") ); @@ -143,7 +143,7 @@ DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE::DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE( 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|wxRIGHT|wxLEFT, 5 ); + 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 ); @@ -165,7 +165,7 @@ DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE::DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE( 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|wxALL, 5 ); + 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 ); @@ -175,7 +175,7 @@ DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE::DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE( fgSizer3->Add( m_radiusUnit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); - sbSizerLower->Add( fgSizer3, 1, wxEXPAND, 5 ); + sbSizerLower->Add( fgSizer3, 1, wxEXPAND|wxLEFT, 5 ); bMainSizer->Add( sbSizerLower, 0, wxEXPAND|wxRIGHT|wxLEFT, 10 ); diff --git a/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.fbp b/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.fbp index 5a3af814af..0d97363cc6 100644 --- a/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.fbp +++ b/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.fbp @@ -756,7 +756,7 @@ 5 - wxEXPAND + wxEXPAND|wxLEFT 1 3 @@ -772,7 +772,7 @@ 0 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxLEFT 0 1 @@ -802,7 +802,7 @@ 0 0 wxID_ANY - Min amplitude (Amin): + Min amplitude (A): 0 0 @@ -958,7 +958,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT 0 1 @@ -988,7 +988,7 @@ 0 0 wxID_ANY - Max amplitude (Amax): + Max amplitude (A): 0 0 @@ -1144,7 +1144,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT 0 1 @@ -1330,7 +1330,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT 1 1 @@ -1549,7 +1549,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALL + wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT 0 1 diff --git a/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.h b/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.h index 261af8cac8..2b402f7152 100644 --- a/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.h +++ b/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/resources/bitmaps_png/png/tune_diff_pair_length_legend.png b/resources/bitmaps_png/png/tune_diff_pair_length_legend.png index 7fb1a7e860..f50e6f45b3 100644 Binary files a/resources/bitmaps_png/png/tune_diff_pair_length_legend.png and b/resources/bitmaps_png/png/tune_diff_pair_length_legend.png differ diff --git a/resources/bitmaps_png/png/tune_single_track_length_legend.png b/resources/bitmaps_png/png/tune_single_track_length_legend.png index d0e4b4941f..fbc1e2958e 100644 Binary files a/resources/bitmaps_png/png/tune_single_track_length_legend.png and b/resources/bitmaps_png/png/tune_single_track_length_legend.png differ diff --git a/resources/bitmaps_png/sources/light/tune_diff_pair_length_legend.svg b/resources/bitmaps_png/sources/light/tune_diff_pair_length_legend.svg index 359bf5be3d..7ea7c8f695 100644 --- a/resources/bitmaps_png/sources/light/tune_diff_pair_length_legend.svg +++ b/resources/bitmaps_png/sources/light/tune_diff_pair_length_legend.svg @@ -1,20 +1,20 @@ + shape-rendering="crispEdges" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + inkscape:guide-bbox="true" + inkscape:showpageshadow="2" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1"> + id="guide1263" + inkscape:locked="false" /> @@ -320,7 +324,7 @@ image/svg+xml - + @@ -353,14 +357,14 @@ xml:space="preserve" style="font-style:normal;font-weight:normal;font-size:9.13948px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34273" x="-9.9487562" - y="285.47281" + y="280.67462" id="text1103-0" transform="scale(1.0088666,0.99121133)">Amin + y="280.67462" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:9.13948px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Bold';stroke-width:0.34273">A @@ -381,7 +385,7 @@ sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path842" - d="M -15.223508,294.59357 H 31.801121" + d="M -15.223508,287.56154 H 31.801119" style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.34273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m -11.763966,263.18714 c -0.03068,7.5552 -0.02642,20.69509 0,23.79291" + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.326286;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart);marker-end:url(#marker4484)" /> + d="m 47.635094,242.84415 6.486249,-6.71642" + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.369181;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#DotL);marker-end:url(#marker1838)" + sodipodi:nodetypes="cc" /> + d="m 39.20741,252.48828 c 5.339184,-0.0139 10.836435,0.0258 16.175115,-0.0286" + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.397499;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker1952);marker-end:url(#Arrow2Lend)" /> + d="m -11.764132,238.12011 c -0.0295,8.13543 -0.0254,20.33769 0,23.67341" + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.332007;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart-8);marker-end:url(#marker4484-0)" /> Amax + y="254.91948" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:9.13948px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Bold';stroke-width:0.34273">A s r + + + diff --git a/resources/bitmaps_png/sources/light/tune_single_track_length_legend.svg b/resources/bitmaps_png/sources/light/tune_single_track_length_legend.svg index 48da55df8a..b0d6f4311f 100644 --- a/resources/bitmaps_png/sources/light/tune_single_track_length_legend.svg +++ b/resources/bitmaps_png/sources/light/tune_single_track_length_legend.svg @@ -1,20 +1,20 @@ + shape-rendering="crispEdges" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + inkscape:guide-bbox="true" + inkscape:showpageshadow="2" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1"> + id="guide1263" + inkscape:locked="false" /> @@ -320,7 +324,7 @@ image/svg+xml - + @@ -353,14 +357,14 @@ xml:space="preserve" style="font-style:normal;font-weight:normal;font-size:9.13948px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34273" x="-9.9487562" - y="285.47281" + y="283.41644" id="text1103-0" transform="scale(1.0088666,0.99121133)">Amin + y="283.41644" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:9.13948px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Bold';stroke-width:0.34273">A + d="m -11.765519,263.17397 c -0.0281,9.40926 -0.0242,25.77369 0,29.63172" + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.348474;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart);marker-end:url(#marker4484)" /> + d="m 36.706276,255.01796 c 4.114139,-0.0157 11.662893,0.061 15.776644,0" + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.369374;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker1952);marker-end:url(#Arrow2Lend)" /> + d="m -11.765566,232.08956 c -0.02694,10.21233 -0.0232,25.52971 0,29.71702" + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.355513;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart-8);marker-end:url(#marker4484-0)" /> Amax + y="252.17766" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:9.13948px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Bold';stroke-width:0.34273">A s r + +