Fix diagrams of meander dimensions.

Fixes https://gitlab.com/kicad/code/kicad/-/issues/10073
This commit is contained in:
Jeff Young 2023-07-01 17:05:23 +01:00
parent 980ef55356
commit bcfb6e4888
7 changed files with 131 additions and 102 deletions

View File

@ -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 );

View File

@ -756,7 +756,7 @@
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="flag">wxEXPAND|wxLEFT</property>
<property name="proportion">1</property>
<object class="wxFlexGridSizer" expanded="0">
<property name="cols">3</property>
@ -772,7 +772,7 @@
<property name="vgap">0</property>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="0">
<property name="BottomDockable">1</property>
@ -802,7 +802,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Min amplitude (Amin):</property>
<property name="label">Min amplitude (A):</property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
@ -958,7 +958,7 @@
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="0">
<property name="BottomDockable">1</property>
@ -988,7 +988,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Max amplitude (Amax):</property>
<property name="label">Max amplitude (A):</property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
@ -1144,7 +1144,7 @@
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="0">
<property name="BottomDockable">1</property>
@ -1330,7 +1330,7 @@
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT</property>
<property name="proportion">1</property>
<object class="wxStaticText" expanded="0">
<property name="BottomDockable">1</property>
@ -1549,7 +1549,7 @@
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="0">
<property name="BottomDockable">1</property>

View File

@ -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!

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.4 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

View File

@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="250"
height="190"
viewBox="0 0 66.145832 50.270834"
version="1.1"
id="svg8"
inkscape:version="1.0.2 (1.0.2+r75+1)"
inkscape:version="1.2.1 (9c6d41e, 2022-07-14)"
sodipodi:docname="tune_diff_pair_length_legend.svg"
shape-rendering="crispEdges">
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/">
<defs
id="defs2">
<marker
@ -284,21 +284,24 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="2.8284271"
inkscape:cx="60.307063"
inkscape:cy="69.492144"
inkscape:cx="53.916893"
inkscape:cy="74.776543"
inkscape:document-units="px"
inkscape:current-layer="g9599"
showgrid="true"
inkscape:window-width="2560"
inkscape:window-height="1371"
inkscape:window-width="1671"
inkscape:window-height="981"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:window-y="38"
inkscape:window-maximized="0"
units="px"
showborder="true"
inkscape:document-rotation="0"
showguides="true"
inkscape:guide-bbox="true">
inkscape:guide-bbox="true"
inkscape:showpageshadow="2"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1">
<inkscape:grid
type="xygrid"
id="grid1261"
@ -310,7 +313,8 @@
<sodipodi:guide
position="0,25.135417"
orientation="0,-1"
id="guide1263" />
id="guide1263"
inkscape:locked="false" />
</sodipodi:namedview>
<metadata
id="metadata5">
@ -320,7 +324,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
<dc:title />
<cc:license
rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
@ -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)"><tspan
sodipodi:role="line"
id="tspan1101-4"
x="-9.9487562"
y="285.47281"
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">Amin</tspan></text>
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</tspan></text>
<g
id="g9602"
transform="matrix(0.98527321,0,0,0.98527321,-0.00861432,4.2599054)">
@ -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" />
<path
inkscape:connector-curvature="0"
@ -391,68 +395,81 @@
<path
inkscape:connector-curvature="0"
id="path846"
d="M -15.223508,230.3868 H 47.36074"
d="M -15.223508,237.48699 H 47.360739"
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.352778;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
sodipodi:nodetypes="cc" />
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path848"
d="m -11.765815,263.16962 c -0.0276,9.81655 -0.02377,26.88934 0,30.91437"
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.352778;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 -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)" />
<path
inkscape:connector-curvature="0"
id="path1736"
d="m 47.584121,242.94212 3.557103,-3.97072"
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.352778;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#DotL);marker-end:url(#marker1838)" />
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" />
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path1942"
d="m 42.71778,256.56377 c 3.516539,-0.0167 7.137185,0.0308 10.653392,-0.0343"
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.352778;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 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)" />
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path848-1"
d="m -11.765815,230.89638 c -0.0265,10.6238 -0.02282,26.55835 0,30.91437"
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.359602;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)" />
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)" />
<text
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="250.80675"
y="254.91948"
id="text1103"
transform="scale(1.0088666,0.99121133)"><tspan
sodipodi:role="line"
id="tspan1101"
x="-9.9487562"
y="250.80675"
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">Amax</tspan></text>
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</tspan></text>
<text
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="45.393745"
y="267.24442"
x="44.708286"
y="265.8735"
id="text1103-8"
transform="scale(1.0088666,0.99121133)"><tspan
sodipodi:role="line"
id="tspan1101-3"
x="45.393745"
y="267.24442"
x="44.708286"
y="265.8735"
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">s</tspan></text>
<text
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="60.889706"
y="247.07491"
y="239.5349"
id="text1103-8-9"
transform="scale(1.0088666,0.99121133)"><tspan
sodipodi:role="line"
id="tspan1101-3-5"
x="60.889706"
y="247.07491"
y="239.5349"
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">r</tspan></text>
<path
style="fill:none;stroke:#000000;stroke-width:0.35266966;stroke-dasharray:none;stroke-opacity:1"
d="m 38.358246,249.24117 v 16.57498"
id="path708" />
<path
style="fill:none;stroke:#000000;stroke-width:0.35267;stroke-dasharray:none;stroke-opacity:1"
d="m 56.316848,249.24117 v 16.69509"
id="path708-1" />
<path
style="fill:none;stroke:#000000;stroke-width:0.367813;stroke-dasharray:none;stroke-opacity:1"
d="m 56.231062,239.44 -5.359424,-5.26563"
id="path708-8" />
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 20 KiB

View File

@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="250"
height="190"
viewBox="0 0 66.145832 50.270834"
version="1.1"
id="svg8"
inkscape:version="1.0.2 (1.0.2+r75+1)"
inkscape:version="1.2.1 (9c6d41e, 2022-07-14)"
sodipodi:docname="tune_single_track_length_legend.svg"
shape-rendering="crispEdges">
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/">
<defs
id="defs2">
<marker
@ -284,21 +284,24 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="4"
inkscape:cx="55.848049"
inkscape:cy="72.703379"
inkscape:cx="103.25"
inkscape:cy="92.375"
inkscape:document-units="px"
inkscape:current-layer="g9599"
showgrid="true"
inkscape:window-width="2560"
inkscape:window-height="1371"
inkscape:window-width="1728"
inkscape:window-height="927"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:window-y="38"
inkscape:window-maximized="0"
units="px"
showborder="true"
inkscape:document-rotation="0"
showguides="true"
inkscape:guide-bbox="true">
inkscape:guide-bbox="true"
inkscape:showpageshadow="2"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1">
<inkscape:grid
type="xygrid"
id="grid1261"
@ -310,7 +313,8 @@
<sodipodi:guide
position="0,25.135417"
orientation="0,-1"
id="guide1263" />
id="guide1263"
inkscape:locked="false" />
</sodipodi:namedview>
<metadata
id="metadata5">
@ -320,7 +324,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
<dc:title />
<cc:license
rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
@ -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)"><tspan
sodipodi:role="line"
id="tspan1101-4"
x="-9.9487562"
y="285.47281"
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">Amin</tspan></text>
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</tspan></text>
<path
sodipodi:nodetypes="cccccccccc"
inkscape:connector-curvature="0"
@ -371,80 +375,88 @@
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path842"
d="M -15.223508,294.59357 H 31.801121"
d="M -15.223508,293.54058 H 31.801121"
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" />
<path
inkscape:connector-curvature="0"
id="path844"
d="m -15.223508,262.49018 15.21385037,0"
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.352778;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M -15.223508,262.49018 H 6.7328441"
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.423801;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
sodipodi:nodetypes="cc" />
<path
inkscape:connector-curvature="0"
id="path846"
d="M -15.223508,230.3868 H 47.36074"
d="M -15.223508,231.44 H 47.36074"
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.352778;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
sodipodi:nodetypes="cc" />
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path848"
d="m -11.765815,263.16962 c -0.0276,9.81655 -0.02377,26.88934 0,30.91437"
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.352778;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 -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)" />
<path
inkscape:connector-curvature="0"
id="path1736"
d="m 44.940355,239.38933 5.18654,-6.45464"
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.34273047;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#DotL);marker-end:url(#marker5411)"
d="m 44.841874,239.49535 4.882649,-5.99381"
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.320448;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#DotL);marker-end:url(#marker5411)"
sodipodi:nodetypes="cc" />
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path1942"
d="m 38.024968,255.69582 c 3.516539,-0.0167 9.968797,0.0651 13.485004,0"
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.352778;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 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)" />
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path848-1"
d="m -11.765815,230.89638 c -0.0265,10.6238 -0.02282,26.55835 0,30.91437"
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.359602;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)" />
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)" />
<text
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="250.80675"
y="252.17766"
id="text1103"
transform="scale(1.0088666,0.99121133)"><tspan
sodipodi:role="line"
id="tspan1101"
x="-9.9487562"
y="250.80675"
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">Amax</tspan></text>
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</tspan></text>
<text
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="42.174099"
y="266.42944"
x="41.48864"
y="265.74399"
id="text1103-8"
transform="scale(1.0088666,0.99121133)"><tspan
sodipodi:role="line"
id="tspan1101-3"
x="42.174099"
y="266.42944"
x="41.48864"
y="265.74399"
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">s</tspan></text>
<text
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="55.016346"
y="242.81801"
x="54.330887"
y="239.39073"
id="text1103-8-9"
transform="scale(1.0088666,0.99121133)"><tspan
sodipodi:role="line"
id="tspan1101-3-5"
x="55.016346"
y="242.81801"
x="54.330887"
y="239.39073"
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">r</tspan></text>
<path
style="fill:none;stroke:#000000;stroke-width:0.3632943;stroke-dasharray:none;stroke-opacity:1"
d="m 35.950351,252.14231 v 12.28772"
id="path708" />
<path
style="fill:none;stroke:#000000;stroke-width:0.363294;stroke-dasharray:none;stroke-opacity:1"
d="m 53.238817,252.14236 v 12.28772"
id="path708-8" />
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 19 KiB