Updated description measurements N06 and N07. Add new measurements A23 and J10.
(grafted from cf140cecff83698ca48fcf563a5e8a857466f531) --HG-- branch : develop
This commit is contained in:
Roman Telezhynskyi
parent
f0ffbafe10
commit
f83c016c54
|
|
@ -20,6 +20,7 @@
|
||||||
- [#385] Add 'Open Recent' option in Tape.exe, 'File' dropdown menu.
|
- [#385] Add 'Open Recent' option in Tape.exe, 'File' dropdown menu.
|
||||||
|
|
||||||
# Version 0.4.4
|
# Version 0.4.4
|
||||||
|
- Updated description measurements N06 and N07. Add new measurements A23 and J10.
|
||||||
- Fixed GUI issue. After full parse some widgets was incorrectly reseted.
|
- Fixed GUI issue. After full parse some widgets was incorrectly reseted.
|
||||||
- [#464] Crash. Issue with modeling node objects.
|
- [#464] Crash. Issue with modeling node objects.
|
||||||
- [#463] Wrong export to DXF format.
|
- [#463] Wrong export to DXF format.
|
||||||
|
|
|
||||||
|
|
@ -48,6 +48,7 @@
|
||||||
<file>diagrams/Jp3.svg</file>
|
<file>diagrams/Jp3.svg</file>
|
||||||
<file>diagrams/Jp4.svg</file>
|
<file>diagrams/Jp4.svg</file>
|
||||||
<file>diagrams/Jp5.svg</file>
|
<file>diagrams/Jp5.svg</file>
|
||||||
|
<file>diagrams/Jp6.svg</file>
|
||||||
<file>diagrams/Kp1.svg</file>
|
<file>diagrams/Kp1.svg</file>
|
||||||
<file>diagrams/Kp2.svg</file>
|
<file>diagrams/Kp2.svg</file>
|
||||||
<file>diagrams/Kp3.svg</file>
|
<file>diagrams/Kp3.svg</file>
|
||||||
|
|
|
||||||
|
|
@ -9,14 +9,15 @@
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
width="279.51462"
|
width="86.524971mm"
|
||||||
height="712.23822"
|
height="200.87267mm"
|
||||||
id="svg5309"
|
viewBox="0 0 306.58454 711.75354"
|
||||||
|
id="svg6365"
|
||||||
version="1.1"
|
version="1.1"
|
||||||
inkscape:version="0.48.4 r9939"
|
inkscape:version="0.91 r"
|
||||||
sodipodi:docname="Новий документ 2">
|
sodipodi:docname="Ap2.svg">
|
||||||
<defs
|
<defs
|
||||||
id="defs5311" />
|
id="defs6367" />
|
||||||
<sodipodi:namedview
|
<sodipodi:namedview
|
||||||
id="base"
|
id="base"
|
||||||
pagecolor="#ffffff"
|
pagecolor="#ffffff"
|
||||||
|
|
@ -25,8 +26,8 @@
|
||||||
inkscape:pageopacity="0.0"
|
inkscape:pageopacity="0.0"
|
||||||
inkscape:pageshadow="2"
|
inkscape:pageshadow="2"
|
||||||
inkscape:zoom="0.35"
|
inkscape:zoom="0.35"
|
||||||
inkscape:cx="174.75732"
|
inkscape:cx="-347.422"
|
||||||
inkscape:cy="307.54767"
|
inkscape:cy="327.30534"
|
||||||
inkscape:document-units="px"
|
inkscape:document-units="px"
|
||||||
inkscape:current-layer="layer1"
|
inkscape:current-layer="layer1"
|
||||||
showgrid="false"
|
showgrid="false"
|
||||||
|
|
@ -40,7 +41,7 @@
|
||||||
inkscape:window-y="24"
|
inkscape:window-y="24"
|
||||||
inkscape:window-maximized="1" />
|
inkscape:window-maximized="1" />
|
||||||
<metadata
|
<metadata
|
||||||
id="metadata5314">
|
id="metadata6370">
|
||||||
<rdf:RDF>
|
<rdf:RDF>
|
||||||
<cc:Work
|
<cc:Work
|
||||||
rdf:about="">
|
rdf:about="">
|
||||||
|
|
@ -55,233 +56,258 @@
|
||||||
inkscape:label="Layer 1"
|
inkscape:label="Layer 1"
|
||||||
inkscape:groupmode="layer"
|
inkscape:groupmode="layer"
|
||||||
id="layer1"
|
id="layer1"
|
||||||
transform="translate(-200.24268,-127.67166)">
|
transform="translate(-192.422,-147.914)">
|
||||||
<g
|
<path
|
||||||
style="display:inline"
|
style="display:inline;fill:none;stroke:#dba981;stroke-width:1.61240005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:4.8372, 1.6124;stroke-dashoffset:0;stroke-opacity:1"
|
||||||
id="g7295"
|
d="m 306.00496,682.41395 150.5,0"
|
||||||
transform="matrix(0.8062,0,0,0.8062,-595.61132,68.609849)">
|
id="path3833-4-0-8-2-6-6-9-6-7-1-9-9-4-7-9-3"
|
||||||
<path
|
inkscape:connector-curvature="0"
|
||||||
sodipodi:nodetypes="cc"
|
sodipodi:nodetypes="cc" />
|
||||||
inkscape:connector-curvature="0"
|
<path
|
||||||
id="path3833-4-0-8-2-6-6-9-6-7-1-9-9-4-7-9-3"
|
style="display:inline;fill:none;stroke:#dba981;stroke-width:1.20039999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:3.6013, 1.2004;stroke-dashoffset:0;stroke-opacity:1"
|
||||||
d="m 1128,737.4 187,-0.2"
|
d="m 237.40495,268.41395 c 10.5,2 13.7,-4 19.4,-7 6.4,-4 12.1,-11 17.7,-11"
|
||||||
style="fill:none;stroke:#dba981;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:6, 2;stroke-dashoffset:0" />
|
id="path3992-4-65-7"
|
||||||
<path
|
inkscape:connector-curvature="0"
|
||||||
sodipodi:nodetypes="cac"
|
sodipodi:nodetypes="cac" />
|
||||||
inkscape:connector-curvature="0"
|
<path
|
||||||
id="path3992-4-65-7"
|
sodipodi:nodetypes="csscccccac"
|
||||||
d="m 1043,223.1 c 13,3 17,-5 24,-9 8,-4 15,-12.8 22,-13"
|
inkscape:connector-curvature="0"
|
||||||
style="fill:none;stroke:#dba981;stroke-width:1.48899996;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4.467, 1.489;stroke-dashoffset:0" />
|
style="display:inline;fill:none;stroke:#dba981;stroke-width:2.9999001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||||
<path
|
d="m 301.10496,809.41395 c -0.8,5 0,11 0,18 0,4 2.4,10 0,13 -2.4,3 -6.4,4 -9.70001,5 -4,2 -8,2 -12.1,3 -9.6,3 -18.5,8 -29.8,9 -4.8,1 -9.7,1 -13.7,0 -7.2,-1 -18.5,1 -20.9,-6 -0.9,-5 7.2,-8 10.4,-11 13.7,-11 38.7,-15 45.2,-27"
|
||||||
id="path6025"
|
id="path6025" />
|
||||||
d="m 1122,894.1 c -1,7 0,14 0,22 0,6 3,13 0,17 -3,4 -8,5 -12,6 -5,2 -10,2 -15,4 -12,3 -23,9 -37,11 -6,1 -12,1 -17,0 -9,-1 -23,1 -26,-8 -1,-6 9,-9.2 13,-13 17,-13.4 48,-19.1 56,-34"
|
<path
|
||||||
style="fill:none;stroke:#dba981;stroke-width:3.72099996;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
sodipodi:nodetypes="ccccsssssscsscsccsscccccccssscsccsccacccccccccc"
|
||||||
inkscape:connector-curvature="0"
|
inkscape:connector-curvature="0"
|
||||||
sodipodi:nodetypes="csscccccac" />
|
style="display:inline;fill:none;stroke:#dba981;stroke-width:2.9999001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||||
<path
|
d="m 270.50495,813.41395 c 2.4,-6 0.8,-10 0,-18 -2.4,-18 -7.3,-75 -8.9,-104 -2.4,-26 0,-14 -8,-37 -4.9,-13 -8.1,-18 -11.3,-31 -8.1,-28 -18.6,-45 -21,-73 -1.6,-16 3.2,-31 2.4,-47 -1.6,-17 -11.3,-33 -12.1,-50 0,-8 4.1,-15 3.3,-23 0,-9 -0.9,-26 -1.7,-35 0,-9 1.7,-15 0,-22 -7.2,-6 -13.4,-16 -13.4,-27 0,-10 11.8,-24 15.1,-30 1.6,-5 23.3,-42 21.7,-50 0.8,1 0,-7 -1.6,-11 -1.6,-3 -2.4,-11 -6.4,-15 -4.9,-4 -19.4,0 -23.4,-2 -1.6,-1 -2.4,-2 -3,-4 -0.8,-2 -0.8,-3 -0.8,-6 0,0 0.8,-2 0,-3 0,-1 -1.6,-1 -1.6,-2 0,-1 1.6,-2 1.6,-4 0,0 -1.6,0 -1.6,-1 0,-2 1.6,-4 0.8,-6 -0.8,-1 -3.2,-1 -4.9,-3 -0.8,-2 -2.4,-2 -1.6,-5 3.3,-3 8.7,-6 10.3,-11 0.8,-3 0,-6 0,-8 0.8,-5 0.8,-11 3.2,-15 1.6,-5 4,-7 6.4,-10 1.7,-1 2.5,-2 3.3,-3 6.4,-4 13.7,-8 20.9,-8 51.6,1 56.50001,46 37.1,77 -2.4,3 -0.8,8 -0.8,11 0,6 1.6,13 3.2,16 6.5,12 19.40001,37 23.40001,56 5.7,16 1.6,27 -0.8,41 -2.4,15 -10.50001,32 -12.90001,42 -2.4,9 -6.4,23 -5.6,32 14.50001,34 30.60001,62 30.60001,85 0,16 -14.5,35 -14.5,35 l 0,10 c 0,0 -0.8,46 0,70 0.8,15 0.8,30 2.4,44 0.8,5 2.4,12 3.2,16 2.5,12 8.1,21 8.9,34 2.4,30 -10.5,60 -11.3,91"
|
||||||
id="path8572"
|
id="path8572" />
|
||||||
d="m 1084,899.1 c 3,-7 1,-12 0,-22 -3,-22 -9,-93 -11,-129 -3,-32.2 0,-18 -10,-46 -6,-16 -10,-22 -14,-38 -10,-35 -23,-56 -26,-91 -2,-20 4,-39 3,-58 -2,-21 -14,-41 -15,-62 0,-10 5,-19 4,-29 0,-11 -1,-32 -2,-43 0,-12 2,-19 0,-27 -9,-8 -16.7,-21 -16.7,-34 0,-13 14.7,-30 18.7,-37 2,-6 29,-53 27,-62 1,1 0,-9 -2,-14 -2,-4 -3,-14 -8,-18 -6,-6 -24,0 -29,-3 -2,-1 -3,-3 -3.7,-5 -1,-2 -1,-4 -1,-7 0,-1 1,-3 0,-4 0,-1 -2,-2 -2,-3 0,-1 2,-2 2,-4 0,-1 -2,-1 -2,-2 0,-2 2,-5 1,-7 -1,-2 -4,-2 -6,-4 -1,-2 -3,-3 -2,-6 4,-4 10.7,-8 12.7,-14 1,-3 0,-7 0,-10 1,-6 1,-13 4,-19 2,-5.02 5,-8.02 8,-12.02 2,-1 3,-2 4,-2.96 8,-5 17,-10 26,-11 64,1.5 70,57.18 46,95.98 -3,4 -1,10 -1,14 0,7 2,16 4,19 8,15 24,46 29,70 7,20 2,34 -1,51 -3,18 -13,39 -16,52 -3,11 -8,29 -7,40 18,41.4 38,76.8 38,105 0,20 -18,44 -18,44 l 0,12 c 0,0 -1,57 0,87 1,18 1,37 3,54 1,6 3,14.6 4,19.6 3,16 10,26.4 11,42.4 3,38 -13,75 -14,113"
|
<path
|
||||||
style="fill:none;stroke:#dba981;stroke-width:3.72099996;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
style="display:inline;fill:none;stroke:#dba981;stroke-width:2.9999001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||||
inkscape:connector-curvature="0"
|
d="m 243.10495,292.41395 c -0.8,34 4.8,46 17.7,47 12.9,1 16.9,-16 15.3,-40 0,-5 0.8,-21 -13.7,-20 -12.9,1 -19.3,5 -19.3,13 z"
|
||||||
sodipodi:nodetypes="ccccsssssscsscsccsscccccccssscsccsccacccccccccc" />
|
id="path3009-6-3-6"
|
||||||
<path
|
inkscape:connector-curvature="0"
|
||||||
sodipodi:nodetypes="ssscs"
|
sodipodi:nodetypes="ssscs" />
|
||||||
inkscape:connector-curvature="0"
|
<path
|
||||||
id="path3009-6-3-6"
|
style="display:inline;fill:none;stroke:#dba981;stroke-width:1.20039999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:3.6013, 1.2004;stroke-dashoffset:0;stroke-opacity:1"
|
||||||
d="m 1050,253.1 c -1,42 6,57 22,58 16,1 21,-20 19,-49 0,-7 1,-27 -17,-25 -16,1 -24,6 -24,16 z"
|
d="m 260.00495,259.41395 c 0.8,4 1.6,10 -0.8,20"
|
||||||
style="fill:none;stroke:#dba981;stroke-width:3.72099996;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
|
id="path3992-4-9-7-2"
|
||||||
<path
|
inkscape:connector-curvature="0"
|
||||||
sodipodi:nodetypes="cc"
|
sodipodi:nodetypes="cc" />
|
||||||
inkscape:connector-curvature="0"
|
<path
|
||||||
id="path3992-4-9-7-2"
|
style="display:inline;fill:none;stroke:#dba981;stroke-width:1.61240005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:4.8372, 1.6124;stroke-dashoffset:0;stroke-opacity:1"
|
||||||
d="m 1071,212.1 c 1,5 2,12.4 -1,25.4"
|
d="m 276.90495,249.41395 178.60001,1"
|
||||||
style="fill:none;stroke:#dba981;stroke-width:1.48899996;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4.467, 1.489;stroke-dashoffset:0" />
|
id="path3833-4-0-8-2-6-6-9-6-7-1-9-9-4-7-9-0"
|
||||||
<path
|
inkscape:connector-curvature="0"
|
||||||
sodipodi:nodetypes="cc"
|
sodipodi:nodetypes="cc" />
|
||||||
inkscape:connector-curvature="0"
|
<path
|
||||||
id="path3833-4-0-8-2-6-6-9-6-7-1-9-9-4-7-9-0"
|
sodipodi:nodetypes="cc"
|
||||||
d="m 1092,199.9 221,0.5"
|
inkscape:connector-curvature="0"
|
||||||
style="fill:none;stroke:#dba981;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:6, 2;stroke-dashoffset:0" />
|
id="path7494-1-6-3-5-8-3-9-5-7-2-4-60-0-3-9-7"
|
||||||
<path
|
d="m 456.50496,682.41395 0,-434"
|
||||||
style="fill:none;stroke:#7dc832;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#marker7359);marker-end:url(#marker7359)"
|
style="display:inline;fill:none;stroke:#7dc832;stroke-width:2.41860008;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker7359);marker-end:url(#marker7359)" />
|
||||||
d="m 1315,736.6 0,-538.1"
|
<path
|
||||||
id="path7494-1-6-3-5-8-3-9-5-7-2-4-60-0-3-9-7"
|
sodipodi:open="true"
|
||||||
inkscape:connector-curvature="0"
|
sodipodi:end="6.278"
|
||||||
sodipodi:nodetypes="cc" />
|
sodipodi:start="0"
|
||||||
<path
|
d="m 470.92494,455.41394 a 14.42,14.42 0 0 1 -14.4013,14.41999 14.42,14.42 0 0 1 -14.43865,-14.3826 14.42,14.42 0 0 1 14.36387,-14.45728 14.42,14.42 0 0 1 14.47589,14.34512"
|
||||||
sodipodi:type="arc"
|
sodipodi:ry="14.42"
|
||||||
style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#00000f;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.94120029;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
|
sodipodi:rx="14.42"
|
||||||
id="path4050-8-0-9-9-5-9-1-2-36-7-2-2-7-7-3-9-3"
|
sodipodi:cy="455.41394"
|
||||||
sodipodi:cx="57.75"
|
sodipodi:cx="456.50494"
|
||||||
sodipodi:cy="50.32"
|
id="path4050-8-0-9-9-5-9-1-2-36-7-2-2-7-7-3-9-3"
|
||||||
sodipodi:rx="20"
|
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#00000f;stroke-width:2.16300011;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.94120029;marker:none;enable-background:accumulate"
|
||||||
sodipodi:ry="20"
|
sodipodi:type="arc" />
|
||||||
d="m 77.75,50.32 c 0,11.045695 -8.954305,20 -20,20 -11.045695,0 -20,-8.954305 -20,-20 0,-11.045695 8.954305,-20 20,-20 11.005217,0 19.942666,8.891225 19.999731,19.896294"
|
<text
|
||||||
sodipodi:start="0"
|
sodipodi:linespacing="125%"
|
||||||
sodipodi:end="6.278"
|
id="text16558-2"
|
||||||
sodipodi:open="true"
|
y="460.3429"
|
||||||
transform="matrix(0.8943,0,0,0.8943,1263,410.3)" />
|
x="448.81757"
|
||||||
<text
|
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.51159954px;line-height:125%;font-family:'Standard Symbols L';-inkscape-font-specification:'Standard Symbols L';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none"
|
||||||
xml:space="preserve"
|
xml:space="preserve"><tspan
|
||||||
style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Standard Symbols L;-inkscape-font-specification:Standard Symbols L"
|
y="460.3429"
|
||||||
x="1305.2004"
|
x="448.81757"
|
||||||
y="461.33591"
|
id="tspan16560-2"
|
||||||
id="text16558-2"
|
sodipodi:role="line">18</tspan></text>
|
||||||
sodipodi:linespacing="125%"><tspan
|
<path
|
||||||
sodipodi:role="line"
|
style="display:inline;fill:none;stroke:#dba981;stroke-width:1.61240005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:4.8372, 1.6124;stroke-dashoffset:0;stroke-opacity:1"
|
||||||
id="tspan16560-2"
|
d="m 255.20495,423.41395 131.30001,-1"
|
||||||
x="1305.2004"
|
id="path3833-4-0-8-2-6-6-9-6-7-1-9-9-4-7-9-1"
|
||||||
y="461.33591">18</tspan></text>
|
inkscape:connector-curvature="0"
|
||||||
<path
|
sodipodi:nodetypes="cc" />
|
||||||
sodipodi:nodetypes="cc"
|
<path
|
||||||
inkscape:connector-curvature="0"
|
sodipodi:nodetypes="cc"
|
||||||
id="path3833-4-0-8-2-6-6-9-6-7-1-9-9-4-7-9-1"
|
inkscape:connector-curvature="0"
|
||||||
d="m 1065,415.6 163,-1"
|
id="path7494-1-6-3-5-8-3-9-5-7-2-4-60-0-3-9-7-9"
|
||||||
style="fill:none;stroke:#dba981;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:6, 2;stroke-dashoffset:0" />
|
d="m 386.50496,682.41395 0,-260"
|
||||||
<path
|
style="display:inline;fill:none;stroke:#7dc832;stroke-width:2.41860008;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker7359);marker-end:url(#marker7359)" />
|
||||||
style="fill:none;stroke:#7dc832;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#marker7359);marker-end:url(#marker7359)"
|
<path
|
||||||
d="m 1228,737.1 0,-322.4"
|
sodipodi:open="true"
|
||||||
id="path7494-1-6-3-5-8-3-9-5-7-2-4-60-0-3-9-7-9"
|
sodipodi:end="6.278"
|
||||||
inkscape:connector-curvature="0"
|
sodipodi:start="0"
|
||||||
sodipodi:nodetypes="cc" />
|
d="m 401.92494,456.41394 a 14.42,14.42 0 0 1 -14.4013,14.41999 14.42,14.42 0 0 1 -14.43865,-14.3826 14.42,14.42 0 0 1 14.36387,-14.45728 14.42,14.42 0 0 1 14.47589,14.34512"
|
||||||
<path
|
sodipodi:ry="14.42"
|
||||||
sodipodi:type="arc"
|
sodipodi:rx="14.42"
|
||||||
style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#00000f;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.94120029;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
|
sodipodi:cy="456.41394"
|
||||||
id="path4050-8-0-9-9-5-9-1-2-36-7-2-2-7-7-3-9-3-9"
|
sodipodi:cx="387.50494"
|
||||||
sodipodi:cx="57.75"
|
id="path4050-8-0-9-9-5-9-1-2-36-7-2-2-7-7-3-9-3-9"
|
||||||
sodipodi:cy="50.32"
|
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#00000f;stroke-width:2.16300011;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.94120029;marker:none;enable-background:accumulate"
|
||||||
sodipodi:rx="20"
|
sodipodi:type="arc" />
|
||||||
sodipodi:ry="20"
|
<text
|
||||||
d="m 77.75,50.32 c 0,11.045695 -8.954305,20 -20,20 -11.045695,0 -20,-8.954305 -20,-20 0,-11.045695 8.954305,-20 20,-20 11.005217,0 19.942666,8.891225 19.999731,19.896294"
|
sodipodi:linespacing="125%"
|
||||||
sodipodi:start="0"
|
id="text16558-2-2"
|
||||||
sodipodi:end="6.278"
|
y="461.78552"
|
||||||
sodipodi:open="true"
|
x="379.09845"
|
||||||
transform="matrix(0.8943,0,0,0.8943,1177,411.9)" />
|
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.51159954px;line-height:125%;font-family:'Standard Symbols L';-inkscape-font-specification:'Standard Symbols L';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none"
|
||||||
<text
|
xml:space="preserve"><tspan
|
||||||
xml:space="preserve"
|
y="461.78552"
|
||||||
style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Standard Symbols L;-inkscape-font-specification:Standard Symbols L"
|
x="379.09845"
|
||||||
x="1218.7218"
|
id="tspan16560-2-6"
|
||||||
y="463.12518"
|
sodipodi:role="line">19</tspan></text>
|
||||||
id="text16558-2-2"
|
<path
|
||||||
sodipodi:linespacing="125%"><tspan
|
style="display:inline;fill:none;stroke:#dba981;stroke-width:1.20039999;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3.6013, 1.2004;stroke-dashoffset:0;stroke-opacity:1"
|
||||||
sodipodi:role="line"
|
d="m 256.00495,338.41395 -0.8,153"
|
||||||
id="tspan16560-2-6"
|
id="path3833-4-0-8-2-6-35-8-8"
|
||||||
x="1218.7218"
|
inkscape:connector-curvature="0"
|
||||||
y="463.12518">19</tspan></text>
|
sodipodi:nodetypes="cc" />
|
||||||
<path
|
<path
|
||||||
sodipodi:nodetypes="cc"
|
style="display:inline;fill:none;stroke:#7dc832;stroke-width:2.41860008;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker7359);marker-end:url(#marker7359)"
|
||||||
inkscape:connector-curvature="0"
|
d="m 351.90496,503.41395 -0.8,-79"
|
||||||
id="path3833-4-0-8-2-6-35-8-8"
|
id="path7494-1-6-3-5-8-3-9-0-5-6"
|
||||||
d="m 1066,310.5 -1,188.9"
|
inkscape:connector-curvature="0"
|
||||||
style="fill:none;stroke:#dba981;stroke-width:1.48899996;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4.467, 1.489;stroke-dashoffset:0;display:inline" />
|
sodipodi:nodetypes="cc" />
|
||||||
<path
|
<path
|
||||||
sodipodi:nodetypes="cc"
|
sodipodi:type="arc"
|
||||||
inkscape:connector-curvature="0"
|
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#00000f;stroke-width:2.16300011;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.94120029;marker:none;enable-background:accumulate"
|
||||||
id="path7494-1-6-3-5-8-3-9-0-5-6"
|
id="path4050-8-0-9-9-5-9-72-8-7"
|
||||||
d="m 1185,515.2 -1,-98.9"
|
sodipodi:cx="351.60492"
|
||||||
style="fill:none;stroke:#7dc832;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#marker7359);marker-end:url(#marker7359);display:inline" />
|
sodipodi:cy="456.41394"
|
||||||
<path
|
sodipodi:rx="14.42"
|
||||||
transform="matrix(0.8943,0,0,0.8943,1133,411.9)"
|
sodipodi:ry="14.42"
|
||||||
sodipodi:open="true"
|
d="m 366.02492,456.41394 a 14.42,14.42 0 0 1 -14.40131,14.41999 14.42,14.42 0 0 1 -14.43864,-14.3826 14.42,14.42 0 0 1 14.36387,-14.45728 14.42,14.42 0 0 1 14.47589,14.34512"
|
||||||
sodipodi:end="6.278"
|
sodipodi:start="0"
|
||||||
sodipodi:start="0"
|
sodipodi:end="6.278"
|
||||||
d="m 77.75,50.32 c 0,11.045695 -8.954305,20 -20,20 -11.045695,0 -20,-8.954305 -20,-20 0,-11.045695 8.954305,-20 20,-20 11.005217,0 19.942666,8.891225 19.999731,19.896294"
|
sodipodi:open="true" />
|
||||||
sodipodi:ry="20"
|
<text
|
||||||
sodipodi:rx="20"
|
sodipodi:linespacing="125%"
|
||||||
sodipodi:cy="50.32"
|
id="text9037-9"
|
||||||
sodipodi:cx="57.75"
|
y="461.74194"
|
||||||
id="path4050-8-0-9-9-5-9-72-8-7"
|
x="343.60034"
|
||||||
style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#00000f;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.94120029;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
|
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.51159954px;line-height:125%;font-family:'Standard Symbols L';-inkscape-font-specification:'Standard Symbols L';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none"
|
||||||
sodipodi:type="arc" />
|
xml:space="preserve"><tspan
|
||||||
<text
|
y="461.74194"
|
||||||
xml:space="preserve"
|
x="343.60034"
|
||||||
style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Standard Symbols L;-inkscape-font-specification:Standard Symbols L"
|
id="tspan9039-4"
|
||||||
x="1174.6904"
|
sodipodi:role="line">20</tspan></text>
|
||||||
y="463.07117"
|
<path
|
||||||
id="text9037-9"
|
style="display:inline;fill:none;stroke:#dba981;stroke-width:1.61240005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:4.8372, 1.6124;stroke-dashoffset:0;stroke-opacity:1"
|
||||||
sodipodi:linespacing="125%"><tspan
|
d="m 314.00496,503.41395 71.5,0"
|
||||||
sodipodi:role="line"
|
id="path3833-4-0-8-2-6-6-9-6-7-1-9-9-4-7-9-1-8"
|
||||||
id="tspan9039-4"
|
inkscape:connector-curvature="0"
|
||||||
x="1174.6904"
|
sodipodi:nodetypes="cc" />
|
||||||
y="463.07117">20</tspan></text>
|
|
||||||
<path
|
|
||||||
sodipodi:nodetypes="cc"
|
|
||||||
inkscape:connector-curvature="0"
|
|
||||||
id="path3833-4-0-8-2-6-6-9-6-7-1-9-9-4-7-9-1-8"
|
|
||||||
d="m 1138,514.9 89,-0.5"
|
|
||||||
style="fill:none;stroke:#dba981;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:6, 2;stroke-dashoffset:0;display:inline" />
|
|
||||||
</g>
|
|
||||||
<path
|
<path
|
||||||
sodipodi:nodetypes="ccc"
|
sodipodi:nodetypes="ccc"
|
||||||
inkscape:connector-curvature="0"
|
inkscape:connector-curvature="0"
|
||||||
id="path6129-6"
|
id="path6129-6"
|
||||||
d="m 300.62868,791.60985 1.6,8 c 0,5 0.8,4 -3.2,7"
|
d="m 292.80496,811.41395 1.6,8 c 0,5 0.8,4 -3.20001,7"
|
||||||
style="fill:none;stroke:#dba981;stroke-width:2.41849995;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
|
style="display:inline;fill:none;stroke:#dba981;stroke-width:2.41849995;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
|
||||||
<path
|
<path
|
||||||
sodipodi:nodetypes="cc"
|
sodipodi:nodetypes="cc"
|
||||||
inkscape:connector-curvature="0"
|
inkscape:connector-curvature="0"
|
||||||
id="path7494-1-6-3-5-8-3-9-0-5-6-1"
|
id="path7494-1-6-3-5-8-3-9-0-5-6-1"
|
||||||
d="m 373.02868,802.60985 -0.3,-140"
|
d="m 365.20496,822.41395 -0.3,-140"
|
||||||
style="fill:none;stroke:#7dc832;stroke-width:2.41860008;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#marker7359);marker-end:url(#marker7359);display:inline" />
|
style="display:inline;fill:none;stroke:#7dc832;stroke-width:2.41860008;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker7359);marker-end:url(#marker7359)" />
|
||||||
<path
|
<path
|
||||||
transform="matrix(0.721,0,0,0.721,330.72868,666.60985)"
|
|
||||||
sodipodi:open="true"
|
sodipodi:open="true"
|
||||||
sodipodi:end="6.278"
|
sodipodi:end="6.278"
|
||||||
sodipodi:start="0"
|
sodipodi:start="0"
|
||||||
d="m 77.75,50.32 c 0,11.045695 -8.954305,20 -20,20 -11.045695,0 -20,-8.954305 -20,-20 0,-11.045695 8.954305,-20 20,-20 11.005217,0 19.942666,8.891225 19.999731,19.896294"
|
d="m 378.96269,722.69464 a 14.42,14.42 0 0 1 -14.4013,14.41999 14.42,14.42 0 0 1 -14.43865,-14.3826 14.42,14.42 0 0 1 14.36388,-14.45728 14.42,14.42 0 0 1 14.47588,14.34512"
|
||||||
sodipodi:ry="20"
|
sodipodi:ry="14.42"
|
||||||
sodipodi:rx="20"
|
sodipodi:rx="14.42"
|
||||||
sodipodi:cy="50.32"
|
sodipodi:cy="722.69464"
|
||||||
sodipodi:cx="57.75"
|
sodipodi:cx="364.54269"
|
||||||
id="path4050-8-0-9-9-5-9-72-8-7-8"
|
id="path4050-8-0-9-9-5-9-72-8-7-8"
|
||||||
style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#00000f;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.94120029;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
|
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#00000f;stroke-width:2.16300011;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.94120029;marker:none;enable-background:accumulate"
|
||||||
sodipodi:type="arc" />
|
sodipodi:type="arc" />
|
||||||
<text
|
<text
|
||||||
xml:space="preserve"
|
xml:space="preserve"
|
||||||
style="font-size:14.51159954px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Standard Symbols L;-inkscape-font-specification:Standard Symbols L"
|
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.51159954px;line-height:125%;font-family:'Standard Symbols L';-inkscape-font-specification:'Standard Symbols L';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none"
|
||||||
x="365.72736"
|
x="357.90363"
|
||||||
y="707.8681"
|
y="727.67224"
|
||||||
id="text9037-9-9"
|
id="text9037-9-9"
|
||||||
sodipodi:linespacing="125%"><tspan
|
sodipodi:linespacing="125%"><tspan
|
||||||
sodipodi:role="line"
|
sodipodi:role="line"
|
||||||
id="tspan9039-4-0"
|
id="tspan9039-4-0"
|
||||||
x="365.72736"
|
x="357.90363"
|
||||||
y="707.8681">21</tspan></text>
|
y="727.67224">21</tspan></text>
|
||||||
<path
|
<path
|
||||||
sodipodi:nodetypes="cc"
|
sodipodi:nodetypes="cc"
|
||||||
inkscape:connector-curvature="0"
|
inkscape:connector-curvature="0"
|
||||||
id="path3833-4-0-8-2-6-6-9-6-7-1-9-9-4-7-9-1-8-9"
|
id="path3833-4-0-8-2-6-6-9-6-7-1-9-9-4-7-9-1-8-9"
|
||||||
d="m 303.72868,802.60985 69,0"
|
d="m 295.90496,822.41395 69,0"
|
||||||
style="fill:none;stroke:#dba981;stroke-width:1.61240005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4.8372, 1.6124;stroke-dashoffset:0;display:inline" />
|
style="display:inline;fill:none;stroke:#dba981;stroke-width:1.61240005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:4.8372, 1.6124;stroke-dashoffset:0;stroke-opacity:1" />
|
||||||
<path
|
<path
|
||||||
style="fill:none;stroke:#7dc832;stroke-width:2.41860008;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#marker7359);marker-end:url(#marker7359);display:inline"
|
style="display:inline;fill:none;stroke:#7dc832;stroke-width:2.41860008;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker7359);marker-end:url(#marker7359)"
|
||||||
d="m 377.22868,403.60985 0,-173"
|
d="m 369.40496,423.41395 0,-173"
|
||||||
id="path7494-1-6-3-5-8-3-9-5-7-2-4-60-0-3-9-7-0"
|
id="path7494-1-6-3-5-8-3-9-5-7-2-4-60-0-3-9-7-0"
|
||||||
inkscape:connector-curvature="0"
|
inkscape:connector-curvature="0"
|
||||||
sodipodi:nodetypes="cc" />
|
sodipodi:nodetypes="cc" />
|
||||||
<path
|
<path
|
||||||
sodipodi:type="arc"
|
sodipodi:type="arc"
|
||||||
style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#00000f;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.94120029;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
|
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#00000f;stroke-width:2.16300011;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.94120029;marker:none;enable-background:accumulate"
|
||||||
id="path4050-8-0-9-9-5-9-1-2-36-7-2-2-7-7-3-9-3-8"
|
id="path4050-8-0-9-9-5-9-1-2-36-7-2-2-7-7-3-9-3-8"
|
||||||
sodipodi:cx="57.75"
|
sodipodi:cx="368.94269"
|
||||||
sodipodi:cy="50.32"
|
sodipodi:cy="340.69467"
|
||||||
sodipodi:rx="20"
|
sodipodi:rx="14.42"
|
||||||
sodipodi:ry="20"
|
sodipodi:ry="14.42"
|
||||||
d="m 77.75,50.32 c 0,11.045695 -8.954305,20 -20,20 -11.045695,0 -20,-8.954305 -20,-20 0,-11.045695 8.954305,-20 20,-20 11.005217,0 19.942666,8.891225 19.999731,19.896294"
|
d="m 383.36269,340.69467 a 14.42,14.42 0 0 1 -14.40131,14.41999 14.42,14.42 0 0 1 -14.43864,-14.3826 14.42,14.42 0 0 1 14.36387,-14.45728 14.42,14.42 0 0 1 14.47588,14.34512"
|
||||||
sodipodi:start="0"
|
sodipodi:start="0"
|
||||||
sodipodi:end="6.278"
|
sodipodi:end="6.278"
|
||||||
sodipodi:open="true"
|
sodipodi:open="true" />
|
||||||
transform="matrix(0.721,0,0,0.721,335.12868,284.60985)" />
|
|
||||||
<text
|
<text
|
||||||
xml:space="preserve"
|
xml:space="preserve"
|
||||||
style="font-size:14.51159954px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Standard Symbols L;-inkscape-font-specification:Standard Symbols L"
|
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.51159954px;line-height:125%;font-family:'Standard Symbols L';-inkscape-font-specification:'Standard Symbols L';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none"
|
||||||
x="369.28137"
|
x="361.45764"
|
||||||
y="325.73486"
|
y="345.53897"
|
||||||
id="text16558-2-7"
|
id="text16558-2-7"
|
||||||
sodipodi:linespacing="125%"><tspan
|
sodipodi:linespacing="125%"><tspan
|
||||||
sodipodi:role="line"
|
sodipodi:role="line"
|
||||||
id="tspan16560-2-65"
|
id="tspan16560-2-65"
|
||||||
x="369.28137"
|
x="361.45764"
|
||||||
y="325.73486">22</tspan></text>
|
y="345.53897">22</tspan></text>
|
||||||
|
<path
|
||||||
|
style="display:inline;fill:none;stroke:#dba981;stroke-width:1.61240005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:4.8372, 1.6124;stroke-dashoffset:0;stroke-opacity:1"
|
||||||
|
d="m 281.10495,417.41395 201.40001,-2"
|
||||||
|
id="path3833-4-0-8-2-6-6-9-6-7-1-9-9-4-7-9-1-0"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
sodipodi:nodetypes="cc" />
|
||||||
|
<path
|
||||||
|
sodipodi:nodetypes="cc"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path7494-1-6-3-5-8-3-9-5-7-2-4-60-0-3-9-7-97"
|
||||||
|
d="m 483.50496,850.41395 0,-434"
|
||||||
|
style="display:inline;fill:none;stroke:#7dc832;stroke-width:2.41860008;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker7359);marker-end:url(#marker7359)" />
|
||||||
|
<path
|
||||||
|
sodipodi:open="true"
|
||||||
|
sodipodi:end="6.278"
|
||||||
|
sodipodi:start="0"
|
||||||
|
d="m 497.92494,719.41394 a 14.42,14.42 0 0 1 -14.4013,14.41999 14.42,14.42 0 0 1 -14.43865,-14.3826 14.42,14.42 0 0 1 14.36387,-14.45728 14.42,14.42 0 0 1 14.47589,14.34512"
|
||||||
|
sodipodi:ry="14.42"
|
||||||
|
sodipodi:rx="14.42"
|
||||||
|
sodipodi:cy="719.41394"
|
||||||
|
sodipodi:cx="483.50494"
|
||||||
|
id="path4050-8-0-9-9-5-9-1-2-36-7-2-2-7-7-3-9-3-98"
|
||||||
|
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#00000f;stroke-width:2.16300011;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.94120029;marker:none;enable-background:accumulate"
|
||||||
|
sodipodi:type="arc" />
|
||||||
|
<text
|
||||||
|
sodipodi:linespacing="125%"
|
||||||
|
id="text16558-2-1"
|
||||||
|
y="724.24646"
|
||||||
|
x="475.55804"
|
||||||
|
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.51159954px;line-height:125%;font-family:'Standard Symbols L';-inkscape-font-specification:'Standard Symbols L';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none"
|
||||||
|
xml:space="preserve"><tspan
|
||||||
|
y="724.24646"
|
||||||
|
x="475.55804"
|
||||||
|
id="tspan16560-2-2"
|
||||||
|
sodipodi:role="line">23</tspan></text>
|
||||||
</g>
|
</g>
|
||||||
</svg>
|
</svg>
|
||||||
|
|
|
||||||
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 18 KiB |
183
src/app/tape/share/resources/diagrams/Jp6.svg
Normal file
183
src/app/tape/share/resources/diagrams/Jp6.svg
Normal file
|
|
@ -0,0 +1,183 @@
|
||||||
|
<?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#"
|
||||||
|
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="46.332119mm"
|
||||||
|
height="61.211708mm"
|
||||||
|
viewBox="0 0 164.16893 216.89188"
|
||||||
|
id="svg6367"
|
||||||
|
version="1.1"
|
||||||
|
inkscape:version="0.91 r"
|
||||||
|
sodipodi:docname="Jp6.svg">
|
||||||
|
<defs
|
||||||
|
id="defs6369" />
|
||||||
|
<sodipodi:namedview
|
||||||
|
id="base"
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1.0"
|
||||||
|
inkscape:pageopacity="0.0"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:zoom="1.4"
|
||||||
|
inkscape:cx="-133.25805"
|
||||||
|
inkscape:cy="96.675365"
|
||||||
|
inkscape:document-units="px"
|
||||||
|
inkscape:current-layer="layer1"
|
||||||
|
showgrid="false"
|
||||||
|
fit-margin-top="0"
|
||||||
|
fit-margin-left="0"
|
||||||
|
fit-margin-right="0"
|
||||||
|
fit-margin-bottom="0"
|
||||||
|
inkscape:window-width="1855"
|
||||||
|
inkscape:window-height="1056"
|
||||||
|
inkscape:window-x="65"
|
||||||
|
inkscape:window-y="24"
|
||||||
|
inkscape:window-maximized="1" />
|
||||||
|
<metadata
|
||||||
|
id="metadata6372">
|
||||||
|
<rdf:RDF>
|
||||||
|
<cc:Work
|
||||||
|
rdf:about="">
|
||||||
|
<dc:format>image/svg+xml</dc:format>
|
||||||
|
<dc:type
|
||||||
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
|
<dc:title />
|
||||||
|
</cc:Work>
|
||||||
|
</rdf:RDF>
|
||||||
|
</metadata>
|
||||||
|
<g
|
||||||
|
inkscape:label="Layer 1"
|
||||||
|
inkscape:groupmode="layer"
|
||||||
|
id="layer1"
|
||||||
|
transform="translate(-277.91553,-383.91629)">
|
||||||
|
<g
|
||||||
|
id="g3379">
|
||||||
|
<path
|
||||||
|
style="fill:none;stroke:#dba981;stroke-width:2.9999001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||||
|
d="m 307.8576,599.287 c 2,-17 -6,-32 -9,-49 -3,-10 -2,-24 -7,-35 -8,-20 -20,-49 -6,-70 6,-9 30,-9 46,-18 7,-7 6,-16 4,-25 20,5 25,5 45,-1 -9,35 38,27 52,44 17,25 2,50 -7,70 -4,11 -4,25 -6,35 -3,17 -11,32 -9,49"
|
||||||
|
id="path11116-9-7-3-3-4-8"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
sodipodi:nodetypes="ccccccccccc" />
|
||||||
|
<path
|
||||||
|
sodipodi:nodetypes="cc"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path8584-1-4-6-3-4-4-4-4-7-8-0-5"
|
||||||
|
d="m 429.8576,506.287 c -4,-2 -29,5 -3,-65"
|
||||||
|
style="fill:none;stroke:#dba981;stroke-width:2.9999001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
|
||||||
|
<path
|
||||||
|
sodipodi:nodetypes="cc"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path8584-6-7-8-0-3-1-3-3-1-1-6-3-9"
|
||||||
|
d="m 289.8576,505.287 c 4,-2 30,6 4,-65"
|
||||||
|
style="fill:none;stroke:#dba981;stroke-width:2.9999001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
|
||||||
|
<path
|
||||||
|
sodipodi:nodetypes="cc"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path3992-4-77-9-5-7-1-2-90-1-4-0-9"
|
||||||
|
d="m 333.8576,426.287 c 11,9 51,6 51,-2"
|
||||||
|
style="fill:none;stroke:#dba981;stroke-width:1.20039999;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3.6013, 1.2004;stroke-dashoffset:0;stroke-opacity:1" />
|
||||||
|
<path
|
||||||
|
sodipodi:nodetypes="csc"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path3992-4-77-9-5-7-1-2-9-4-0-3-9-3"
|
||||||
|
d="m 290.8576,510.287 c 15,0 15,-20 69,-22 57,-1 49,21 69,21"
|
||||||
|
style="fill:none;stroke:#dba981;stroke-width:1.20039999;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3.6013, 1.2004;stroke-dashoffset:0;stroke-opacity:1" />
|
||||||
|
<path
|
||||||
|
sodipodi:nodetypes="cc"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path3992-4-77-9-5-7-1-2-9-8-5-7-2-7-6"
|
||||||
|
d="m 295.8576,520.287 129,0"
|
||||||
|
style="fill:none;stroke:#dba981;stroke-width:1.20039999;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3.6013, 1.2004;stroke-dashoffset:0;stroke-opacity:1" />
|
||||||
|
<path
|
||||||
|
sodipodi:nodetypes="cc"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path3992-4-77-9-5-7-1-2-9-8-8-6-68-0-6-7"
|
||||||
|
d="m 307.8576,598.287 103,0"
|
||||||
|
style="fill:none;stroke:#dba981;stroke-width:1.20039999;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3.6013, 1.2004;stroke-dashoffset:0;stroke-opacity:1" />
|
||||||
|
<path
|
||||||
|
style="fill:none;stroke:#dba981;stroke-width:1.20039999;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3.6013, 1.2004;stroke-dashoffset:0;stroke-opacity:1"
|
||||||
|
d="m 296.8576,539.287 125,1"
|
||||||
|
id="path3992-4-77-9-5-7-1-2-9-8-5-4-1-4-8-7-82"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
sodipodi:nodetypes="cc" />
|
||||||
|
<g
|
||||||
|
id="text6934-2-9-4-0-5-3-2-5"
|
||||||
|
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.51119995px;line-height:125%;font-family:'Standard Symbols L';-inkscape-font-specification:'Standard Symbols L';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none">
|
||||||
|
<path
|
||||||
|
id="path3369"
|
||||||
|
style=""
|
||||||
|
d="m 341.79742,383.91627 6.0794,0 0,1.20455 -4.64811,0 0,3.11764 4.19464,0 0,1.20454 -4.19464,0 0,5.052 -1.43129,0 0,-10.57873 z" />
|
||||||
|
<path
|
||||||
|
id="path3371"
|
||||||
|
style=""
|
||||||
|
d="m 353.65154,387.7779 q -0.21965,-0.12754 -0.48181,-0.18423 -0.25508,-0.0638 -0.56685,-0.0638 -1.10534,0 -1.70053,0.72273 -0.5881,0.71564 -0.5881,2.06189 l 0,4.18048 -1.31082,0 0,-7.93582 1.31082,0 0,1.23289 q 0.41096,-0.72273 1.06992,-1.06992 0.65896,-0.35428 1.60133,-0.35428 0.13463,0 0.2976,0.0213 0.16296,0.0142 0.36136,0.0496 l 0.007,1.33917 z" />
|
||||||
|
<path
|
||||||
|
id="path3373"
|
||||||
|
style=""
|
||||||
|
d="m 357.79659,387.47322 q -1.04866,0 -1.65802,0.82192 -0.60935,0.81484 -0.60935,2.23903 0,1.4242 0.60227,2.24612 0.60935,0.81484 1.6651,0.81484 1.04158,0 1.65093,-0.82192 0.60936,-0.82193 0.60936,-2.23904 0,-1.41002 -0.60936,-2.23194 -0.60935,-0.82901 -1.65093,-0.82901 z m 0,-1.10535 q 1.70053,0 2.67125,1.10535 0.97072,1.10534 0.97072,3.06095 0,1.94853 -0.97072,3.06096 -0.97072,1.10535 -2.67125,1.10535 -1.70762,0 -2.67834,-1.10535 -0.96363,-1.11243 -0.96363,-3.06096 0,-1.95561 0.96363,-3.06095 0.97072,-1.10535 2.67834,-1.10535 z" />
|
||||||
|
<path
|
||||||
|
id="path3375"
|
||||||
|
style=""
|
||||||
|
d="m 370.18921,389.70517 0,4.78983 -1.30374,0 0,-4.74732 q 0,-1.1266 -0.4393,-1.68636 -0.43931,-0.55976 -1.31792,-0.55976 -1.05574,0 -1.6651,0.67313 -0.60936,0.67312 -0.60936,1.83515 l 0,4.48516 -1.31082,0 0,-7.93582 1.31082,0 0,1.23289 q 0.46765,-0.71564 1.09826,-1.06992 0.6377,-0.35428 1.46671,-0.35428 1.36751,0 2.06898,0.85027 0.70147,0.84318 0.70147,2.48703 z" />
|
||||||
|
<path
|
||||||
|
id="path3377"
|
||||||
|
style=""
|
||||||
|
d="m 374.09335,384.30598 0,2.2532 2.68542,0 0,1.01324 -2.68542,0 0,4.30801 q 0,0.97072 0.26216,1.24705 0.26925,0.27634 1.08409,0.27634 l 1.33917,0 0,1.09118 -1.33917,0 q -1.50922,0 -2.08315,-0.55976 -0.57393,-0.56685 -0.57393,-2.05481 l 0,-4.30801 -0.95655,0 0,-1.01324 0.95655,0 0,-2.2532 1.31083,0 z" />
|
||||||
|
</g>
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path4864-7-25-8-4-1"
|
||||||
|
d="m 407.8576,432.287 -14,88"
|
||||||
|
style="fill:none;stroke:#000000;stroke-width:2.41880012;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||||
|
sodipodi:nodetypes="cc" />
|
||||||
|
<path
|
||||||
|
sodipodi:open="true"
|
||||||
|
sodipodi:end="6.278"
|
||||||
|
sodipodi:start="0"
|
||||||
|
d="m 413.26781,472.89819 a 12.093,12.093 0 0 1 -12.07733,12.09299 12.093,12.093 0 0 1 -12.10864,-12.06163 12.093,12.093 0 0 1 12.04594,-12.12427 12.093,12.093 0 0 1 12.13986,12.03021"
|
||||||
|
sodipodi:ry="12.093"
|
||||||
|
sodipodi:rx="12.093"
|
||||||
|
sodipodi:cy="472.89819"
|
||||||
|
sodipodi:cx="401.1748"
|
||||||
|
id="path19730-2-9-1-7-6-3"
|
||||||
|
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.20930004;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
|
||||||
|
sodipodi:type="arc" />
|
||||||
|
<text
|
||||||
|
sodipodi:linespacing="125%"
|
||||||
|
id="text8484-0-0-0-8-7-5-4-9-8-9-5"
|
||||||
|
y="477.72571"
|
||||||
|
x="393.05182"
|
||||||
|
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.51159954px;line-height:125%;font-family:'Standard Symbols L';-inkscape-font-specification:'Standard Symbols L';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
|
||||||
|
xml:space="preserve"><tspan
|
||||||
|
y="477.72571"
|
||||||
|
x="393.05182"
|
||||||
|
id="tspan8486-3-0-4-3-7-4-0-15-5-2-1"
|
||||||
|
sodipodi:role="line">10</tspan></text>
|
||||||
|
<path
|
||||||
|
sodipodi:nodetypes="cc"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path3992-4-77-9-5-7-1-2-9-8-5-4-1-4-8-7-1-3"
|
||||||
|
d="m 301.8576,562.287 115,0"
|
||||||
|
style="display:inline;fill:none;stroke:#dba981;stroke-width:1.20039999;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3.6013, 1.2004;stroke-dashoffset:0;stroke-opacity:1" />
|
||||||
|
<path
|
||||||
|
style="display:inline;fill:none;stroke:#dba981;stroke-width:0.82749999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||||
|
d="m 386.8576,513.287 14,14"
|
||||||
|
id="path8279-7-2"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
sodipodi:nodetypes="cc" />
|
||||||
|
<path
|
||||||
|
style="display:inline;fill:none;stroke:#dba981;stroke-width:0.82749999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||||
|
d="m 400.8576,513.287 -14,14"
|
||||||
|
id="path8279-3-7-8"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
sodipodi:nodetypes="cc" />
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 10 KiB |
|
|
@ -99,6 +99,7 @@ DIAGRAMS += \
|
||||||
$${PWD}/share/resources/diagrams/Jp3.svg \
|
$${PWD}/share/resources/diagrams/Jp3.svg \
|
||||||
$${PWD}/share/resources/diagrams/Jp4.svg \
|
$${PWD}/share/resources/diagrams/Jp4.svg \
|
||||||
$${PWD}/share/resources/diagrams/Jp5.svg \
|
$${PWD}/share/resources/diagrams/Jp5.svg \
|
||||||
|
$${PWD}/share/resources/diagrams/Jp6.svg \
|
||||||
$${PWD}/share/resources/diagrams/Kp1.svg \
|
$${PWD}/share/resources/diagrams/Kp1.svg \
|
||||||
$${PWD}/share/resources/diagrams/Kp2.svg \
|
$${PWD}/share/resources/diagrams/Kp2.svg \
|
||||||
$${PWD}/share/resources/diagrams/Kp3.svg \
|
$${PWD}/share/resources/diagrams/Kp3.svg \
|
||||||
|
|
|
||||||
|
|
@ -60,6 +60,7 @@ const QString heightWaistSideToKnee_M = QStringLiteral("height_waist_side_to
|
||||||
const QString heightWaistSideToHip_M = QStringLiteral("height_waist_side_to_hip"); // A20
|
const QString heightWaistSideToHip_M = QStringLiteral("height_waist_side_to_hip"); // A20
|
||||||
const QString heightKneeToAnkle_M = QStringLiteral("height_knee_to_ankle"); // A21
|
const QString heightKneeToAnkle_M = QStringLiteral("height_knee_to_ankle"); // A21
|
||||||
const QString heightNeckBackToWaistSide_M = QStringLiteral("height_neck_back_to_waist_side"); // A22
|
const QString heightNeckBackToWaistSide_M = QStringLiteral("height_neck_back_to_waist_side"); // A22
|
||||||
|
const QString heightWaistBack_M = QStringLiteral("height_waist_back"); // A23
|
||||||
// B
|
// B
|
||||||
const QString widthShoulder_M = QStringLiteral("width_shoulder"); // B01
|
const QString widthShoulder_M = QStringLiteral("width_shoulder"); // B01
|
||||||
const QString widthBust_M = QStringLiteral("width_bust"); // B02
|
const QString widthBust_M = QStringLiteral("width_bust"); // B02
|
||||||
|
|
@ -203,6 +204,7 @@ const QString bustpointNeckSideToWaist_M = QStringLiteral("bustpoint_neck_side
|
||||||
const QString bustpointToShoulderTip_M = QStringLiteral("bustpoint_to_shoulder_tip"); // J07
|
const QString bustpointToShoulderTip_M = QStringLiteral("bustpoint_to_shoulder_tip"); // J07
|
||||||
const QString bustpointToWaistFront_M = QStringLiteral("bustpoint_to_waist_front"); // J08
|
const QString bustpointToWaistFront_M = QStringLiteral("bustpoint_to_waist_front"); // J08
|
||||||
const QString bustpointToBustpointHalter_M = QStringLiteral("bustpoint_to_bustpoint_halter"); // J09
|
const QString bustpointToBustpointHalter_M = QStringLiteral("bustpoint_to_bustpoint_halter"); // J09
|
||||||
|
const QString bustpointToShoulderCenter_M = QStringLiteral("bustpoint_to_shoulder_center"); // J10
|
||||||
// K
|
// K
|
||||||
const QString shoulderTipToWaistFront_M = QStringLiteral("shoulder_tip_to_waist_front"); // K01
|
const QString shoulderTipToWaistFront_M = QStringLiteral("shoulder_tip_to_waist_front"); // K01
|
||||||
const QString neckFrontToWaistSide_M = QStringLiteral("neck_front_to_waist_side"); // K02
|
const QString neckFrontToWaistSide_M = QStringLiteral("neck_front_to_waist_side"); // K02
|
||||||
|
|
@ -603,7 +605,8 @@ QStringList ListGroupA()
|
||||||
<< heightWaistSideToKnee_M // A19
|
<< heightWaistSideToKnee_M // A19
|
||||||
<< heightWaistSideToHip_M // A20
|
<< heightWaistSideToHip_M // A20
|
||||||
<< heightKneeToAnkle_M // A21
|
<< heightKneeToAnkle_M // A21
|
||||||
<< heightNeckBackToWaistSide_M; // A22
|
<< heightNeckBackToWaistSide_M // A22
|
||||||
|
<< heightWaistBack_M; // A23
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -799,7 +802,8 @@ QStringList ListGroupJ()
|
||||||
<< bustpointNeckSideToWaist_M // J06
|
<< bustpointNeckSideToWaist_M // J06
|
||||||
<< bustpointToShoulderTip_M // J07
|
<< bustpointToShoulderTip_M // J07
|
||||||
<< bustpointToWaistFront_M // J08
|
<< bustpointToWaistFront_M // J08
|
||||||
<< bustpointToBustpointHalter_M; // J09
|
<< bustpointToBustpointHalter_M // J09
|
||||||
|
<< bustpointToShoulderCenter_M; // J10
|
||||||
|
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
@ -1136,6 +1140,8 @@ QString MapDiagrams(const QString &number)
|
||||||
case 20: // A21
|
case 20: // A21
|
||||||
V_FALLTHROUGH
|
V_FALLTHROUGH
|
||||||
case 21: // A22
|
case 21: // A22
|
||||||
|
V_FALLTHROUGH
|
||||||
|
case 22: // A23
|
||||||
return QStringLiteral("Ap2");
|
return QStringLiteral("Ap2");
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|
@ -1468,6 +1474,8 @@ QString MapDiagrams(const QString &number)
|
||||||
return QStringLiteral("Jp4");
|
return QStringLiteral("Jp4");
|
||||||
case 8: // J09
|
case 8: // J09
|
||||||
return QStringLiteral("Jp5");
|
return QStringLiteral("Jp5");
|
||||||
|
case 9: // J10
|
||||||
|
return QStringLiteral("Jp6");
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -224,6 +224,7 @@ extern const QString heightWaistSideToKnee_M; // A19
|
||||||
extern const QString heightWaistSideToHip_M; // A20
|
extern const QString heightWaistSideToHip_M; // A20
|
||||||
extern const QString heightKneeToAnkle_M; // A21
|
extern const QString heightKneeToAnkle_M; // A21
|
||||||
extern const QString heightNeckBackToWaistSide_M; // A22
|
extern const QString heightNeckBackToWaistSide_M; // A22
|
||||||
|
extern const QString heightWaistBack_M; // A23
|
||||||
// B
|
// B
|
||||||
extern const QString widthShoulder_M; // B01
|
extern const QString widthShoulder_M; // B01
|
||||||
extern const QString widthBust_M; // B02
|
extern const QString widthBust_M; // B02
|
||||||
|
|
@ -367,6 +368,7 @@ extern const QString bustpointNeckSideToWaist_M; // J06
|
||||||
extern const QString bustpointToShoulderTip_M; // J07
|
extern const QString bustpointToShoulderTip_M; // J07
|
||||||
extern const QString bustpointToWaistFront_M; // J08
|
extern const QString bustpointToWaistFront_M; // J08
|
||||||
extern const QString bustpointToBustpointHalter_M; // J09
|
extern const QString bustpointToBustpointHalter_M; // J09
|
||||||
|
extern const QString bustpointToShoulderCenter_M; // J10
|
||||||
// K
|
// K
|
||||||
extern const QString shoulderTipToWaistFront_M; // K01
|
extern const QString shoulderTipToWaistFront_M; // K01
|
||||||
extern const QString neckFrontToWaistSide_M; // K02
|
extern const QString neckFrontToWaistSide_M; // K02
|
||||||
|
|
|
||||||
|
|
@ -341,6 +341,13 @@ void VTranslateMeasurements::InitGroupA()
|
||||||
"'Height: Waist Side').", "Full measurement description.");
|
"'Height: Waist Side').", "Full measurement description.");
|
||||||
InitMeasurement(heightNeckBackToWaistSide_M, m, g, d, "A22", "(height_neck_back - height_waist_side)");
|
InitMeasurement(heightNeckBackToWaistSide_M, m, g, d, "A22", "(height_neck_back - height_waist_side)");
|
||||||
//=================================================================================================================
|
//=================================================================================================================
|
||||||
|
m = translate("VTranslateMeasurements", "height_waist_back",
|
||||||
|
"Name in a formula. Don't use math symbols and space in name!!!!");
|
||||||
|
g = translate("VTranslateMeasurements", "Height: Waist Back", "Full measurement name.");
|
||||||
|
d = translate("VTranslateMeasurements", "Vertical height from Waist Back to floor. ('Height: Waist Front'' - "
|
||||||
|
"'Leg: Crotch to floor'').", "Full measurement description.");
|
||||||
|
InitMeasurement(heightWaistBack_M, m, g, d, "A23", "(height_waist_front - leg_crotch_to_floor)");
|
||||||
|
//=================================================================================================================
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
@ -1403,6 +1410,12 @@ void VTranslateMeasurements::InitGroupJ()
|
||||||
"Full measurement description.");
|
"Full measurement description.");
|
||||||
InitMeasurement(bustpointToBustpointHalter_M, m, g, d, "J09");
|
InitMeasurement(bustpointToBustpointHalter_M, m, g, d, "J09");
|
||||||
//=================================================================================================================
|
//=================================================================================================================
|
||||||
|
m = translate("VTranslateMeasurements", "bustpoint_to_shoulder_center",
|
||||||
|
"Name in a formula. Don't use math symbols and space in name!!!!");
|
||||||
|
g = translate("VTranslateMeasurements", "Bustpoint to Shoulder Center", "Full measurement name.");
|
||||||
|
d = translate("VTranslateMeasurements", "From center of Shoulder to Bustpoint.", "Full measurement description.");
|
||||||
|
InitMeasurement(bustpointToShoulderCenter_M, m, g, d, "J10");
|
||||||
|
//=================================================================================================================
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
@ -1840,16 +1853,16 @@ void VTranslateMeasurements::InitGroupN()
|
||||||
m = translate("VTranslateMeasurements", "rise_length_b",
|
m = translate("VTranslateMeasurements", "rise_length_b",
|
||||||
"Name in a formula. Don't use math symbols and space in name!!!!");
|
"Name in a formula. Don't use math symbols and space in name!!!!");
|
||||||
g = translate("VTranslateMeasurements", "Rise length, back", "Full measurement name.");
|
g = translate("VTranslateMeasurements", "Rise length, back", "Full measurement name.");
|
||||||
d = translate("VTranslateMeasurements", "Vertical distance from Waist Back to Crotch level.",
|
d = translate("VTranslateMeasurements", "Vertical distance from Waist Back to Crotch level. "
|
||||||
"Full measurement description.");
|
"('Height: Waist Back' - 'Leg: Crotch to Floor')", "Full measurement description.");
|
||||||
InitMeasurement(riseLengthB_M, m, g, d, "N06");
|
InitMeasurement(riseLengthB_M, m, g, d, "N06", "(height_waist_back - leg_crotch_to_floor)");
|
||||||
//=================================================================================================================
|
//=================================================================================================================
|
||||||
m = translate("VTranslateMeasurements", "rise_length_f",
|
m = translate("VTranslateMeasurements", "rise_length_f",
|
||||||
"Name in a formula. Don't use math symbols and space in name!!!!");
|
"Name in a formula. Don't use math symbols and space in name!!!!");
|
||||||
g = translate("VTranslateMeasurements", "Rise length, front", "Full measurement name.");
|
g = translate("VTranslateMeasurements", "Rise length, front", "Full measurement name.");
|
||||||
d = translate("VTranslateMeasurements", "Vertical Distance from Waist Front to Crotch level.",
|
d = translate("VTranslateMeasurements", "Vertical Distance from Waist Front to Crotch level. "
|
||||||
"Full measurement description.");
|
"('Height: Waist Front' - 'Leg: Crotch to Floor')", "Full measurement description.");
|
||||||
InitMeasurement(riseLengthF_M, m, g, d, "N07");
|
InitMeasurement(riseLengthF_M, m, g, d, "N07", "(height_waist_front - leg_crotch_to_floor)");
|
||||||
//=================================================================================================================
|
//=================================================================================================================
|
||||||
m = translate("VTranslateMeasurements", "rise_length_side",
|
m = translate("VTranslateMeasurements", "rise_length_side",
|
||||||
"Name in a formula. Don't use math symbols and space in name!!!!");
|
"Name in a formula. Don't use math symbols and space in name!!!!");
|
||||||
|
|
|
||||||
|
|
@ -140,6 +140,7 @@ void TST_MeasurementRegExp::TestCorrectOrderMeasurement_data()
|
||||||
QTest::newRow("A20") << heightWaistSideToHip_M << "height_waist_side_to_hip";
|
QTest::newRow("A20") << heightWaistSideToHip_M << "height_waist_side_to_hip";
|
||||||
QTest::newRow("A21") << heightKneeToAnkle_M << "height_knee_to_ankle";
|
QTest::newRow("A21") << heightKneeToAnkle_M << "height_knee_to_ankle";
|
||||||
QTest::newRow("A22") << heightNeckBackToWaistSide_M << "height_neck_back_to_waist_side";
|
QTest::newRow("A22") << heightNeckBackToWaistSide_M << "height_neck_back_to_waist_side";
|
||||||
|
QTest::newRow("A23") << heightWaistBack_M << "height_waist_back";
|
||||||
QTest::newRow("B01") << widthShoulder_M << "width_shoulder";
|
QTest::newRow("B01") << widthShoulder_M << "width_shoulder";
|
||||||
QTest::newRow("B02") << widthBust_M << "width_bust";
|
QTest::newRow("B02") << widthBust_M << "width_bust";
|
||||||
QTest::newRow("B03") << widthWaist_M << "width_waist";
|
QTest::newRow("B03") << widthWaist_M << "width_waist";
|
||||||
|
|
@ -274,6 +275,7 @@ void TST_MeasurementRegExp::TestCorrectOrderMeasurement_data()
|
||||||
QTest::newRow("J07") << bustpointToShoulderTip_M << "bustpoint_to_shoulder_tip";
|
QTest::newRow("J07") << bustpointToShoulderTip_M << "bustpoint_to_shoulder_tip";
|
||||||
QTest::newRow("J08") << bustpointToWaistFront_M << "bustpoint_to_waist_front";
|
QTest::newRow("J08") << bustpointToWaistFront_M << "bustpoint_to_waist_front";
|
||||||
QTest::newRow("J09") << bustpointToBustpointHalter_M << "bustpoint_to_bustpoint_halter";
|
QTest::newRow("J09") << bustpointToBustpointHalter_M << "bustpoint_to_bustpoint_halter";
|
||||||
|
QTest::newRow("J10") << bustpointToShoulderCenter_M << "bustpoint_to_shoulder_center";
|
||||||
QTest::newRow("K01") << shoulderTipToWaistFront_M << "shoulder_tip_to_waist_front";
|
QTest::newRow("K01") << shoulderTipToWaistFront_M << "shoulder_tip_to_waist_front";
|
||||||
QTest::newRow("K02") << neckFrontToWaistSide_M << "neck_front_to_waist_side";
|
QTest::newRow("K02") << neckFrontToWaistSide_M << "neck_front_to_waist_side";
|
||||||
QTest::newRow("K03") << neckSideToWaistSideF_M << "neck_side_to_waist_side_f";
|
QTest::newRow("K03") << neckSideToWaistSideF_M << "neck_side_to_waist_side_f";
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user