Merge pull request #46 from sp5wwp/master

Removed frame CRC, changed P_2 puncture pattern accordingly
pull/47/head
Wojciech Kaczmarski 2021-04-06 10:00:26 +02:00 zatwierdzone przez GitHub
commit eccb86ff4a
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
3 zmienionych plików z 80 dodań i 96 usunięć

Wyświetl plik

@ -125,9 +125,9 @@ A 48-bit (type 1) chunk of the LSF is partitioned into 4 12-bit parts and
encoded using Golay (24, 12) code. This produces 96 encoded bits
of type 2. These bits are used in the Link Information Channel (LICH).
FN, payload and CRC is 160 bits which are convolutionally encoded in a manner
analogous to that of the link setup frame. A total of 164 bits is
being encoded resulting in 328 type 2 bits. These bits are punctured
16-bit FN and 128 bits of payload (144 bits total) are convolutionally encoded in a manner
analogous to that of the link setup frame. A total of 148 bits is
being encoded resulting in 296 type 2 bits. These bits are punctured
to generate 272 type 3 bits.
96 type 2 bits of LICH are concatenated with 272 type 3 bits and
@ -204,7 +204,7 @@ scheme has to be used.
Two different puncturing schemes are used in M17 stream mode:
#. :math:`P_1` leaving 46 from 61 encoded bits
#. :math:`P_2` leaving 34 from 41 encoded bits
#. :math:`P_2` leaving 11 from 12 encoded bits
Scheme :math:`P_1` is used for the initial LICH link setup info, taking 488
bits of encoded data and selecting 368 bits. The :math:`gcd(368, 488)`
@ -214,11 +214,11 @@ polynomials. For this case the full puncture matrix should have 122
entries with 92 of them being 1.
Scheme :math:`P_2` is for frames (excluding LICH chunks, which are coded
differently). This takes 328 encoded bits and selects 272 of the
bits. The :math:`gcd(272, 328)` is 8 which results in the 34 and 41
reduced ratio. The full matrix will have 82 entries with 68 being 1.
differently). This takes 296 encoded bits and selects 272 of them.
Every 12th bit is being punctured out, leaving 272 bits.
The full matrix shall have 12 entries with 11 being 1.
The matrices can be represented more concisely by duplicating a
The matrix :math:`P_1` can be represented more concisely by duplicating a
smaller matrix with a *flattening*.
.. math::
@ -250,8 +250,8 @@ The puncturing schemes are defined by their partial puncturing matrices:
1 & 0 & 1 & 1 & 0 & 1 & 1 & 1 & 1 & 0 & 1 & 1 & 0 & 1 & 1 & 1 & 1 & 0 & 1 & 1 & 0 & 1 & 1 & 1 & 1 & 0 & 1 & 1 & 0 & 1 & X
\end{bmatrix} \\
P_2 = & \begin{bmatrix}
1 & 1 & 1 & 1 & 1 & 1 & 1 & 1 & 1 & 1 & 0 & 1 & 1 & 1 & 1 & 1 & 1 & 1 & 1 & 1 & 1 \\
1 & 1 & 0 & 1 & 1 & 0 & 1 & 1 & 0 & 1 & 1 & 0 & 1 & 1 & 0 & 1 & 1 & 0 & 1 & 1 & X
1 & 1 & 1 & 1 & 1 & 1 \\
1 & 1 & 1 & 1 & 1 & 0
\end{bmatrix}
\end{align}
@ -268,10 +268,7 @@ The complete linearized representations are:
0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1,
1, 1, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 1]
P2 = [1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1,
0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 1,
0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1]
P2 = [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0]

Plik binarny nie jest wyświetlany.

Wyświetl plik

@ -1,6 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
@ -14,7 +12,7 @@
viewBox="0 0 252.30742 120.5"
version="1.1"
id="svg8"
inkscape:version="0.92.3 (2405546, 2018-03-11)"
inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"
sodipodi:docname="frame_encoding.svg"
inkscape:export-filename="C:\Users\SP5WWP\Desktop\frame_1_encoding.png"
inkscape:export-xdpi="400"
@ -28,9 +26,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.98994949"
inkscape:cx="441.17975"
inkscape:cy="203.10694"
inkscape:zoom="2.8"
inkscape:cx="500.13245"
inkscape:cy="99.182988"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="false"
@ -39,15 +37,16 @@
inkscape:snap-bbox="true"
inkscape:snap-bbox-midpoints="true"
inkscape:bbox-nodes="true"
inkscape:window-width="1600"
inkscape:window-height="851"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-width="1920"
inkscape:window-height="1017"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
fit-margin-top="10"
fit-margin-bottom="10"
fit-margin-left="10"
fit-margin-right="10">
fit-margin-right="10"
inkscape:document-rotation="0">
<sodipodi:guide
position="25.46293,73.190479"
orientation="1,0"
@ -125,6 +124,10 @@
orientation="1,0"
id="guide4983"
inkscape:locked="false" />
<sodipodi:guide
position="131.7247,110.76711"
orientation="1,0"
id="guide97" />
</sodipodi:namedview>
<metadata
id="metadata5">
@ -152,7 +155,7 @@
y="77" />
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="21.511717"
y="84.397797"
id="text931"><tspan
@ -160,10 +163,10 @@
x="21.511717"
y="84.397797"
id="tspan929"
style="stroke-width:0.26458332"><tspan
style="stroke-width:0.264583"><tspan
x="21.511717"
y="84.397797"
style="font-size:6.3499999px;stroke-width:0.26458332"
style="font-size:6.35px;stroke-width:0.264583"
id="tspan927">SYNC</tspan></tspan></text>
<path
style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@ -179,7 +182,7 @@
sodipodi:nodetypes="cc" />
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="45.356995"
y="84.397804"
id="text949"><tspan
@ -187,14 +190,14 @@
x="45.356995"
y="84.397804"
id="tspan947"
style="stroke-width:0.26458332"><tspan
style="stroke-width:0.264583"><tspan
x="45.356995"
y="84.397804"
style="font-size:6.3499999px;stroke-width:0.26458332"
style="font-size:6.35px;stroke-width:0.264583"
id="tspan945">LICH</tspan></tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="71.418503"
y="84.397797"
id="text4565"><tspan
@ -202,44 +205,27 @@
id="tspan4563"
x="71.418503"
y="84.397797"
style="font-size:6.3499999px;stroke-width:0.26458332">FN</tspan></text>
style="font-size:6.35px;stroke-width:0.264583">FN</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
x="102.79053"
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="111.8456"
y="84.397797"
id="text4569"><tspan
sodipodi:role="line"
id="tspan4567"
x="102.79053"
x="111.8456"
y="84.397797"
style="font-size:6.3499999px;stroke-width:0.26458332">PAYLOAD</tspan></text>
style="font-size:6.35px;stroke-width:0.264583">PAYLOAD</tspan></text>
<path
style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 86.178572,77.000002 V 87.000005"
id="path3733-4-5"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path
style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 146.46577,77.000005 v 10"
id="path3733-4-5-1"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
x="149.98967"
y="84.397797"
id="text4565-7"><tspan
sodipodi:role="line"
id="tspan4563-4"
x="149.98967"
y="84.397797"
style="font-size:6.3499999px;stroke-width:0.26458332">CRC</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="172.10127"
y="84.400902"
id="text4565-79"><tspan
@ -247,7 +233,7 @@
id="tspan4563-45"
x="172.10127"
y="84.400902"
style="font-size:6.3499999px;stroke-width:0.26458332">TAIL</tspan></text>
style="font-size:6.35px;stroke-width:0.264583">TAIL</tspan></text>
<path
style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 166.49851,77.000003 V 87.000005"
@ -263,7 +249,7 @@
y="107" />
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="21.511717"
y="114.3978"
id="text925"><tspan
@ -271,10 +257,10 @@
x="21.511717"
y="114.3978"
id="tspan923"
style="stroke-width:0.26458332"><tspan
style="stroke-width:0.264583"><tspan
x="21.511717"
y="114.3978"
style="font-size:6.3499999px;stroke-width:0.26458332"
style="font-size:6.35px;stroke-width:0.264583"
id="tspan921">SYNC</tspan></tspan></text>
<path
style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@ -284,7 +270,7 @@
sodipodi:nodetypes="cc" />
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="47.495152"
y="114.3978"
id="text943"><tspan
@ -292,14 +278,14 @@
x="47.495152"
y="114.3978"
id="tspan941"
style="stroke-width:0.26458332"><tspan
style="stroke-width:0.264583"><tspan
x="47.495152"
y="114.3978"
style="font-size:6.3499999px;stroke-width:0.26458332"
style="font-size:6.35px;stroke-width:0.264583"
id="tspan939">ENC LICH </tspan></tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="137.53557"
y="114.3978"
id="text4569-7"><tspan
@ -307,7 +293,7 @@
id="tspan4567-6"
x="137.53557"
y="114.3978"
style="font-size:6.3499999px;stroke-width:0.26458332">ENC PAYLOAD</tspan></text>
style="font-size:6.35px;stroke-width:0.264583">ENC PAYLOAD</tspan></text>
<path
style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 86.178572,107 v 10"
@ -323,7 +309,7 @@
y="137" />
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="21.511715"
y="144.3978"
id="text919"><tspan
@ -331,10 +317,10 @@
x="21.511715"
y="144.3978"
id="tspan917"
style="stroke-width:0.26458332"><tspan
style="stroke-width:0.264583"><tspan
x="21.511715"
y="144.3978"
style="font-size:6.3499999px;stroke-width:0.26458332"
style="font-size:6.35px;stroke-width:0.264583"
id="tspan915">SYNC</tspan></tspan></text>
<path
style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@ -344,7 +330,7 @@
sodipodi:nodetypes="cc" />
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="47.495152"
y="144.3978"
id="text937"><tspan
@ -352,14 +338,14 @@
x="47.495152"
y="144.3978"
id="tspan935"
style="stroke-width:0.26458332"><tspan
style="stroke-width:0.264583"><tspan
x="47.495152"
y="144.3978"
style="font-size:6.3499999px;stroke-width:0.26458332"
style="font-size:6.35px;stroke-width:0.264583"
id="tspan933">ENC LICH </tspan></tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="126.04298"
y="144.3978"
id="text4569-7-0"><tspan
@ -367,7 +353,7 @@
id="tspan4567-6-3"
x="126.04298"
y="144.3978"
style="font-size:6.3499999px;stroke-width:0.26458332">ENC PAYLOAD</tspan></text>
style="font-size:6.35px;stroke-width:0.264583">ENC PAYLOAD</tspan></text>
<path
style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 86.178571,136.99999 v 10"
@ -419,7 +405,7 @@
y="167" />
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="21.511711"
y="174.3978"
id="text913"><tspan
@ -427,10 +413,10 @@
x="21.511711"
y="174.3978"
id="tspan911"
style="stroke-width:0.26458332"><tspan
style="stroke-width:0.264583"><tspan
x="21.511711"
y="174.3978"
style="font-size:6.3499999px;stroke-width:0.26458332"
style="font-size:6.35px;stroke-width:0.264583"
id="tspan909">SYNC</tspan></tspan></text>
<path
style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@ -440,7 +426,7 @@
sodipodi:nodetypes="cc" />
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="100.38509"
y="174.3978"
id="text4569-7-0-1"><tspan
@ -448,7 +434,7 @@
id="tspan4567-6-3-9"
x="100.38509"
y="174.3978"
style="font-size:6.3499999px;stroke-width:0.26458332">INT PAYLOAD</tspan></text>
style="font-size:6.35px;stroke-width:0.264583">INT PAYLOAD</tspan></text>
<path
style="fill:none;stroke:#0000ff;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.50000004, 1.50000004;stroke-dashoffset:0;stroke-opacity:1"
d="m 40,147 -6e-6,19.99999"
@ -464,52 +450,53 @@
<flowRoot
xml:space="preserve"
id="flowRoot4850"
style="font-style:normal;font-weight:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
style="font-style:normal;font-weight:normal;font-size:13.3333px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
transform="matrix(0.26458333,0,0,0.26458333,0,-103)"><flowRegion
id="flowRegion4852"
style="font-size:13.33333302px"><rect
style="font-size:13.3333px"><rect
id="rect4854"
width="213.14218"
height="41.416256"
x="913.17792"
y="740.0545"
style="font-size:13.33333302px" /></flowRegion><flowPara
id="flowPara4856" /></flowRoot> <text
id="flowPara4856" /></flowRoot>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:3.52777767px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
style="font-style:normal;font-weight:normal;font-size:3.52778px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="51.960705"
y="98.4533"
id="text4860"><tspan
sodipodi:role="line"
x="51.960705"
y="98.4533"
style="font-size:5.64444447px;stroke-width:0.26458332"
style="font-size:5.64444px;stroke-width:0.264583"
id="tspan4862">(1)</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:3.52777767px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
style="font-style:normal;font-weight:normal;font-size:3.52778px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="141.22873"
y="98.4533"
id="text4860-7"><tspan
sodipodi:role="line"
x="141.22873"
y="98.4533"
style="font-size:5.64444447px;stroke-width:0.26458332"
style="font-size:5.64444px;stroke-width:0.264583"
id="tspan4862-1">(2)</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:3.52777767px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
style="font-style:normal;font-weight:normal;font-size:3.52778px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="141.22873"
y="128.62663"
id="text4860-7-9"><tspan
sodipodi:role="line"
x="141.22873"
y="128.62663"
style="font-size:5.64444447px;stroke-width:0.26458332"
style="font-size:5.64444px;stroke-width:0.264583"
id="tspan4862-1-9">(3)</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:3.52777767px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
style="font-style:normal;font-weight:normal;font-size:3.52778px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="4.5611858"
y="83.005295"
id="text4911"><tspan
@ -517,10 +504,10 @@
id="tspan4909"
x="4.5611858"
y="83.005295"
style="stroke-width:0.26458332">Type 1</tspan></text>
style="stroke-width:0.264583">Type 1</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:3.52777767px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
style="font-style:normal;font-weight:normal;font-size:3.52778px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="4.5611858"
y="113.02855"
id="text4911-3"><tspan
@ -528,10 +515,10 @@
id="tspan4909-4"
x="4.5611858"
y="113.02855"
style="stroke-width:0.26458332">Type 2</tspan></text>
style="stroke-width:0.264583">Type 2</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:3.52777767px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
style="font-style:normal;font-weight:normal;font-size:3.52778px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="4.5474052"
y="143.00526"
id="text4911-6"><tspan
@ -539,10 +526,10 @@
id="tspan4909-0"
x="4.5474052"
y="143.00526"
style="stroke-width:0.26458332">Type 3</tspan></text>
style="stroke-width:0.264583">Type 3</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:3.52777767px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
style="font-style:normal;font-weight:normal;font-size:3.52778px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="4.5474052"
y="173.02853"
id="text4911-3-9"><tspan
@ -550,17 +537,17 @@
id="tspan4909-4-5"
x="4.5474052"
y="173.02853"
style="stroke-width:0.26458332">Type 4</tspan></text>
style="stroke-width:0.264583">Type 4</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:3.52777767px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
style="font-style:normal;font-weight:normal;font-size:3.52778px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="117.17447"
y="158.98744"
id="text4860-7-9-5"><tspan
sodipodi:role="line"
x="117.17447"
y="158.98744"
style="font-size:5.64444447px;stroke-width:0.26458332"
style="font-size:5.64444px;stroke-width:0.264583"
id="tspan4862-1-9-9">(4)</tspan></text>
</g>
</svg>

Przed

Szerokość:  |  Wysokość:  |  Rozmiar: 23 KiB

Po

Szerokość:  |  Wysokość:  |  Rozmiar: 22 KiB