commit 56c3394f3d905957f458520ba767dbf03d232090
parent 939d6a401f3a2efffaf2e32f449baf20c04f54f6
Author: Adam M <aemalone@gmail.com>
Date: Sun, 24 Feb 2019 21:45:29 -0600
Debug getting some labels
Diffstat:
5 files changed, 144 insertions(+), 82 deletions(-)
diff --git a/res/ComputerscareDebugPanel.svg b/res/ComputerscareDebugPanel.svg
@@ -34,11 +34,11 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="2.8284273"
- inkscape:cx="44.597893"
- inkscape:cy="82.710596"
+ inkscape:zoom="16.000001"
+ inkscape:cx="31.739768"
+ inkscape:cy="73.025649"
inkscape:document-units="mm"
- inkscape:current-layer="text2992"
+ inkscape:current-layer="g1669"
showgrid="false"
units="px"
inkscape:snap-bbox="true"
@@ -61,7 +61,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:Work>
</rdf:RDF>
</metadata>
@@ -70,7 +70,7 @@
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-196.45832)"
- style="display:none">
+ style="display:inline">
<path
style="opacity:1;vector-effect:none;fill:#f0f0f0;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.48607069;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
d="M 0,196.45831 H 23.8125 V 296.99999 H 0 Z"
@@ -89,18 +89,6 @@
y="295.57718"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222223px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332">computerscare</tspan></text>
<text
- transform="rotate(-5.9989835)"
- id="text1494"
- y="288.0314"
- x="-28.710276"
- 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"
- xml:space="preserve"><tspan
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222223px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332"
- y="288.0314"
- x="-28.710276"
- id="tspan1492"
- sodipodi:role="line">trg</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="20.711658"
@@ -140,7 +128,8 @@
<g
inkscape:groupmode="layer"
id="layer3"
- inkscape:label="bg" />
+ inkscape:label="bg"
+ style="display:inline" />
<g
style="display:inline"
transform="translate(0,-196.45832)"
@@ -254,7 +243,7 @@
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccccccccccccccccsccc" />
<path
- d="m -8.1057085,200.78544 0,0.2204 h -2.0717725 c 0.01959,0.31019 0.112652,0.54692 0.2791746,0.71018 0.1681581,0.16163 0.41661,0.0207 0.7153763,0.0207 0.1730559,0 0.5285984,-0.0158 0.6902261,-0.0583 0.1632603,-0.0425 0.1216975,0.11018 0.2816926,0.0253 l 0,0.42611 c -0.1616277,0.0686 -0.3273368,0.12081 -0.4971275,0.15673 -0.1697907,0.0359 -0.3420304,0.0539 -0.5167189,0.0539 -0.4375375,0 -0.7844652,-0.12734 -1.0407842,-0.38202 -0.254686,-0.25469 -0.382029,-0.59917 -0.382029,-1.03344 0,-0.44897 0.05643,-0.96829 0.298059,-1.23113 0.243258,-0.26449 0.6041467,-0.33518 1.0155627,-0.33518 0.3689682,0 0.6912145,0.22104 0.9050855,0.4594 0.2155035,0.23673 0.3232553,0.55917 0.3232553,0.96732 z m -0.4505984,-0.13224 c -0.00327,-0.24652 -0.072652,-0.44325 -0.2081568,-0.59019 -0.1338735,-0.14693 -0.3118272,-0.2204 -0.5338612,-0.2204 -0.2514209,0 -0.2716601,0.1772 -0.6048794,0.21306 -0.1501987,0.14203 -0.082078,0.28588 -0.1049347,0.54383 z"
+ d="m -8.1057085,200.78544 v 0.2204 h -2.0717725 c 0.01959,0.31019 0.112652,0.54692 0.2791746,0.71018 0.1681581,0.16163 0.41661,0.0207 0.7153763,0.0207 0.1730559,0 0.5285984,-0.0158 0.6902261,-0.0583 0.1632603,-0.0425 0.1216975,0.11018 0.2816926,0.0253 v 0.42611 c -0.1616277,0.0686 -0.3273368,0.12081 -0.4971275,0.15673 -0.1697907,0.0359 -0.3420304,0.0539 -0.5167189,0.0539 -0.4375375,0 -0.7844652,-0.12734 -1.0407842,-0.38202 -0.254686,-0.25469 -0.382029,-0.59917 -0.382029,-1.03344 0,-0.44897 0.05643,-0.96829 0.298059,-1.23113 0.243258,-0.26449 0.6041467,-0.33518 1.0155627,-0.33518 0.3689682,0 0.6912145,0.22104 0.9050855,0.4594 0.2155035,0.23673 0.3232553,0.55917 0.3232553,0.96732 z m -0.4505984,-0.13224 c -0.00327,-0.24652 -0.072652,-0.44325 -0.2081568,-0.59019 -0.1338735,-0.14693 -0.3118272,-0.2204 -0.5338612,-0.2204 -0.2514209,0 -0.2716601,0.1772 -0.6048794,0.21306 -0.1501987,0.14203 -0.082078,0.28588 -0.1049347,0.54383 z"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.01535606px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26867977"
id="path1673"
inkscape:connector-curvature="0"
@@ -334,30 +323,28 @@
inkscape:connector-curvature="0" />
</g>
<g
- aria-label="single
-internal
-poly"
+ aria-label="single internal poly"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
id="text2992"
transform="matrix(0.40498722,0,0,0.22005185,8.184542,217.4858)">
<path
- d="m -3.003362,248.58206 v 0.89917 q -0.4030762,-0.2067 -0.8371582,-0.31006 -0.434082,-0.10335 -0.8991699,-0.10335 -0.7079671,0 -1.0645344,0.21704 -0.3513998,0.21704 -0.3513998,0.65112 0,0.33073 0.2532145,0.52194 0.2532145,0.18603 1.0180257,0.35656 l 0.3255615,0.0724 q 1.0128581,0.21704 1.4366048,0.61495 0.4289144,0.39274 0.4289144,1.10071 0,0.80615 -0.6407878,1.27641 -0.6356201,0.47025 -1.751831,0.47025 -0.4650878,0 -0.9715169,-0.093 -0.5012613,-0.0879 -1.0593668,-0.26871 v -0.98186 q 0.5270996,0.27389 1.0386963,0.41342 0.5115966,0.13435 1.012858,0.13435 0.6717936,0 1.0335286,-0.22737 0.361735,-0.23255 0.361735,-0.65113 0,-0.38757 -0.2635497,-0.59427 -0.2583822,-0.20671 -1.1420492,-0.39791 l -0.3307291,-0.0775 q -0.883667,-0.18603 -1.2764079,-0.56844 -0.3927408,-0.38757 -0.3927408,-1.05936 0,-0.81649 0.578776,-1.26091 0.578776,-0.44442 1.6433105,-0.44442 0.5270996,0 0.9921875,0.0775 0.4650878,0.0775 0.8578287,0.23254 z"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.26458332"
+ d="m -4.2176575,248.74686 0.1188366,1.03918 q -0.5707857,-0.23889 -1.1697178,-0.35834 -0.5989309,-0.11944 -1.2260083,-0.11944 -0.954551,0 -1.4066261,0.25083 -0.4451079,0.25083 -0.3877385,0.75251 0.043709,0.38222 0.4103886,0.6032 0.3659952,0.21499 1.4197259,0.41207 l 0.4485253,0.0837 q 1.3943193,0.25083 2.0182453,0.7107 0.6302097,0.45388 0.723776,1.27208 0.1065419,0.93167 -0.6952802,1.47516 -0.7948571,0.54346 -2.2998428,0.54346 -0.6270772,0 -1.3221841,-0.10746 -0.6874694,-0.10161 -1.4638569,-0.31056 l -0.1297642,-1.13473 q 0.7468858,0.31653 1.4551112,0.47779 0.7075414,0.15527 1.3833914,0.15527 0.9057785,0 1.3634557,-0.26277 0.4569919,-0.26877 0.401672,-0.75252 -0.051222,-0.44791 -0.4338831,-0.68679 -0.375695,-0.23889 -1.5924123,-0.45987 l -0.4561628,-0.0896 q -1.216032,-0.21498 -1.7961048,-0.65694 -0.5807527,-0.44791 -0.6695384,-1.2243 -0.1079093,-0.94362 0.613719,-1.45724 0.7216281,-0.51361 2.1569384,-0.51361 0.7106877,0 1.3480062,0.0896 0.6373183,0.0896 1.1873416,0.26874 z"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.33027679"
id="path2998"
inkscape:connector-curvature="0" />
<path
- d="m -1.1740162,248.41153 h 0.95084631 v 5.78776 H -1.1740162 Z m 0,-2.25309 h 0.95084631 v 1.20406 H -1.1740162 Z"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.26458332"
+ d="m -1.7736899,248.54979 h 1.28202479 l 0.76491904,6.68891 H -1.0087708 Z m -0.2977722,-2.6039 h 1.28202481 l 0.15912976,1.39153 H -1.9123323 Z"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.33027679"
id="path3000"
inkscape:connector-curvature="0" />
<path
- d="m 6.5722802,250.70596 v 3.49333 H 5.6214339 v -3.46232 q 0,-0.82166 -0.3203939,-1.2299 -0.3203938,-0.40824 -0.9611816,-0.40824 -0.7699788,0 -1.2143961,0.49092 -0.4444173,0.49093 -0.4444173,1.33842 v 3.27112 H 1.725031 v -5.78776 h 0.956014 v 0.89917 q 0.3410644,-0.52193 0.8009847,-0.78031 0.4650879,-0.25839 1.0697021,-0.25839 0.9973551,0 1.5089518,0.62012 0.5115966,0.61495 0.5115966,1.81384 z"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.26458332"
+ d="m 6.5677513,251.30796 0.4500064,3.93512 H 5.903708 l -0.4460116,-3.90019 q -0.1058448,-0.92557 -0.5338205,-1.38544 -0.4279752,-0.45987 -1.1787479,-0.45987 -0.902138,0 -1.3595955,0.553 -0.4574562,0.55302 -0.3482837,1.50769 l 0.4213816,3.68481 H 1.338526 L 0.59295422,248.72335 H 1.7130586 l 0.1158295,1.01289 q 0.3323704,-0.58794 0.8379473,-0.87899 0.5116302,-0.29107 1.2200204,-0.29107 1.1685413,0 1.8478316,0.69854 0.6786242,0.69273 0.8330639,2.04324 z"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.30396181"
id="path3002"
inkscape:connector-curvature="0" />
<path
- d="m 12.287694,251.23823 q 0,-1.03353 -0.428914,-1.60197 -0.423747,-0.56844 -1.193726,-0.56844 -0.7648111,0 -1.1937255,0.56844 -0.4237467,0.56844 -0.4237467,1.60197 0,1.02836 0.4237467,1.5968 0.4289144,0.56844 1.1937255,0.56844 0.769979,0 1.193726,-0.56844 0.428914,-0.56844 0.428914,-1.5968 z m 0.950847,2.24276 q 0,1.47794 -0.656291,2.19625 -0.656291,0.72347 -2.010213,0.72347 -0.501262,0 -0.9456792,-0.0775 -0.4444173,-0.0723 -0.8629964,-0.22738 v -0.925 q 0.4185791,0.22737 0.8268229,0.33589 0.4082438,0.10852 0.8319907,0.10852 0.935343,0 1.400432,-0.49092 0.465087,-0.48576 0.465087,-1.47278 v -0.47026 q -0.294555,0.5116 -0.754476,0.76482 -0.45992,0.25321 -1.100708,0.25321 -1.0645343,0 -1.7156574,-0.81132 -0.651123,-0.81132 -0.651123,-2.14974 0,-1.34359 0.651123,-2.15491 0.6511231,-0.81132 1.7156574,-0.81132 0.640788,0 1.100708,0.25322 0.459921,0.25321 0.754476,0.76481 v -0.8785 h 0.950847 z"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.26458332"
+ d="m 12.287694,250.02332 q 0,-1.27675 -0.428914,-1.97896 -0.423747,-0.70222 -1.193726,-0.70222 -0.7648111,0 -1.1937255,0.70222 -0.4237467,0.70221 -0.4237467,1.97896 0,1.27037 0.4237467,1.97258 0.4289144,0.70222 1.1937255,0.70222 0.769979,0 1.193726,-0.70222 0.428914,-0.70221 0.428914,-1.97258 z m 0.950847,2.77056 q 0,1.82575 -0.656291,2.7131 -0.656291,0.89373 -2.010213,0.89373 -0.501262,0 -0.9456792,-0.0957 -0.4444173,-0.0893 -0.8629964,-0.28089 v -1.14268 q 0.4185791,0.28088 0.8268229,0.41493 0.4082438,0.13406 0.8319907,0.13406 0.935343,0 1.400432,-0.60645 0.465087,-0.60007 0.465087,-1.81937 v -0.58093 q -0.294555,0.632 -0.754476,0.94481 -0.45992,0.3128 -1.100708,0.3128 -1.0645343,0 -1.7156574,-1.00225 -0.651123,-1.00226 -0.651123,-2.65565 0,-1.65978 0.651123,-2.66203 0.6511231,-1.00226 1.7156574,-1.00226 0.640788,0 1.100708,0.31282 0.459921,0.31279 0.754476,0.94479 v -1.08524 h 0.950847 z"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.29407266"
id="path3004"
inkscape:connector-curvature="0" />
<path
@@ -371,65 +358,71 @@ poly"
id="path3008"
inkscape:connector-curvature="0" />
<path
- d="m -9.9683874,262.916 h 0.950847 v 5.78776 h -0.950847 z m 0,-2.2531 h 0.950847 v 1.20406 h -0.950847 z"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.26458332"
+ d="m -9.9683874,259.87149 h 0.8741825 v 8.34106 h -0.8741825 z m 0,-3.24705 h 0.8741825 v 1.73523 h -0.8741825 z"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.30455324"
id="path3010"
inkscape:connector-curvature="0" />
<path
- d="m -2.2220906,265.21043 v 3.49333 h -0.9508463 v -3.46232 q 0,-0.82166 -0.3203939,-1.2299 -0.3203939,-0.40825 -0.9611816,-0.40825 -0.7699788,0 -1.2143961,0.49093 -0.4444173,0.49092 -0.4444173,1.33842 v 3.27112 H -7.0693397 V 262.916 h 0.9560139 v 0.89917 q 0.3410644,-0.52194 0.8009846,-0.78032 0.4650879,-0.25838 1.0697022,-0.25838 0.9973551,0 1.5089517,0.62012 0.5115967,0.61495 0.5115967,1.81384 z"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.26458332"
+ d="m -2.5915671,263.08494 0.096361,6.66017 -0.9279355,-0.0555 -0.095506,-6.62305 c -0.00946,-0.65584 -0.1306433,-1.1523 -0.3465999,-1.49045 -0.2159567,-0.33814 -0.5323842,-0.51967 -0.9492826,-0.54459 -0.5009513,-0.03 -0.8914823,0.14221 -1.1715929,0.51662 -0.2801115,0.37435 -0.4123746,0.89957 -0.3967894,1.57568 l 0.090231,3.91436 -0.9329783,-0.0558 -0.1596513,-6.9259 0.9329786,0.0558 0.024803,1.076 c 0.2122992,-0.40313 0.4656857,-0.69881 0.7601596,-0.88705 0.2978363,-0.18803 0.6434364,-0.27029 1.0368003,-0.24678 0.6488822,0.0388 1.1454484,0.3155 1.4896986,0.8301 0.3441549,0.51048 0.5272559,1.24393 0.5493028,2.20036 z"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.28572556"
id="path3012"
- inkscape:connector-curvature="0" />
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccscccscccccccccc" />
<path
- d="M 0.62528077,261.27269 V 262.916 H 2.5838175 v 0.73897 H 0.62528077 v 3.14193 q 0,0.70796 0.1912028,0.9095 0.19637043,0.20154 0.79064943,0.20154 h 0.9766845 v 0.79582 H 1.607133 q -1.10070799,0 -1.51928709,-0.40825 -0.4185791,-0.41341 -0.4185791,-1.49861 v -3.14193 H -1.028365 V 262.916 h 0.69763181 v -1.64331 z"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.26458332"
+ d="m -0.06076206,257.50324 v 2.82899 H 1.7826494 v 1.27217 h -1.84341146 v 5.40892 q 0,1.21878 0.17996368,1.56573 0.18482757,0.34696 0.74417407,0.34696 H 1.7826494 v 1.37003 H 0.86337569 q -1.03600701,0 -1.42998149,-0.70283 -0.39397444,-0.71168 -0.39397444,-2.57989 V 261.6044 H -1.6172044 v -1.27217 h 0.65662416 v -2.82899 z"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.33679438"
id="path3014"
inkscape:connector-curvature="0" />
<path
- d="m 8.790157,265.57216 v 0.46509 H 4.4183309 q 0.062012,0.98185 0.5891113,1.49862 0.5322673,0.5116 1.4779459,0.5116 0.5477702,0 1.0593669,-0.13436 0.5167643,-0.13436 1.0231933,-0.40308 v 0.89917 q -0.5115967,0.21704 -1.0490315,0.33073 -0.5374349,0.11369 -1.0903727,0.11369 -1.3849284,0 -2.1962483,-0.80615 -0.8061524,-0.80616 -0.8061524,-2.18075 0,-1.4211 0.7648112,-2.25309 0.7699788,-0.83716 2.0722249,-0.83716 1.1678873,0 1.8448486,0.75448 0.6821289,0.7493 0.6821289,2.04121 z m -0.9508464,-0.27905 q -0.010335,-0.78031 -0.4392496,-1.2454 -0.4237468,-0.46509 -1.1265462,-0.46509 -0.7958171,0 -1.2764079,0.44959 -0.4754231,0.44958 -0.5477701,1.26607 z"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.26458332"
+ d="m 7.6241723,264.90491 v 0.80066 H 3.5093278 c 0.038911,1.12685 0.2237389,1.98682 0.5544826,2.57991 0.3339865,0.58716 0.1443638,0.42985 0.7377575,0.42985 0.3437144,0 1.3293925,0.37379 1.6504088,0.21958 0.3242588,-0.15421 -0.00804,-0.8364 0.3097359,-1.1448 v 1.54793 c -0.3210163,0.2491 0.00317,0.88978 -0.3340554,1.02026 -0.3372292,0.13049 -1.332635,-0.25516 -1.6795919,-0.25516 -0.8690137,0 -0.904751,-0.0117 -1.4138373,-0.93692 -0.5058438,-0.92521 -0.7587657,-2.17662 -0.7587657,-3.75423 0,-1.63097 -0.1683689,-3.75052 0.3115341,-4.70538 0.4831457,-0.9608 1.1332847,-1.44121 1.9504169,-1.44121 0.732825,0 1.7199474,1.25959 2.1447265,2.1255 0.4280217,0.85996 0.6420325,2.0313 0.6420325,3.51401 z m -1.4666031,-0.4804 c -0.00649,-0.89555 0.1415278,-1.61022 -0.1276055,-2.14399 -0.2658923,-0.53377 -0.3335101,-0.80066 -0.7745021,-0.80066 -0.4993587,0 -1.3081388,-0.56864 -1.6096995,-0.0527 -0.2983181,0.51598 -0.061855,2.06913 -0.107251,3.00621 z"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.33679438"
id="path3016"
- inkscape:connector-curvature="0" />
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="scccsccccscscscsccsccc" />
<path
- d="m 13.704585,263.80483 q -0.160196,-0.093 -0.351399,-0.13436 -0.186035,-0.0465 -0.413412,-0.0465 -0.806152,0 -1.240234,0.5271 -0.428915,0.52193 -0.428915,1.50379 v 3.04891 h -0.956014 v -5.78776 h 0.956014 v 0.89917 q 0.299723,-0.5271 0.780314,-0.78032 0.480591,-0.25838 1.167888,-0.25838 0.09818,0 0.217041,0.0155 0.118856,0.0103 0.26355,0.0362 z"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.26458332"
+ d="m 11.79589,261.15244 q -0.147279,-0.13407 -0.323066,-0.19363 -0.171036,-0.067 -0.38008,-0.067 -0.741154,0 -1.1402366,0.75962 -0.3943326,0.75218 -0.3943326,2.16721 v 4.39394 H 8.6792419 v -8.34106 h 0.8789329 v 1.29586 q 0.275557,-0.75965 0.7173992,-1.12458 0.441842,-0.37236 1.073724,-0.37236 0.09026,0 0.199541,0.0223 0.109273,0.0152 0.242301,0.0521 z"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.30455324"
id="path3018"
inkscape:connector-curvature="0" />
<path
- d="m 19.347654,265.21043 v 3.49333 h -0.950847 v -3.46232 q 0,-0.82166 -0.320393,-1.2299 -0.320394,-0.40825 -0.961182,-0.40825 -0.769979,0 -1.214396,0.49093 -0.444418,0.49092 -0.444418,1.33842 v 3.27112 H 14.500405 V 262.916 h 0.956013 v 0.89917 q 0.341065,-0.52194 0.800985,-0.78032 0.465088,-0.25838 1.069702,-0.25838 0.997355,0 1.508952,0.62012 0.511597,0.61495 0.511597,1.81384 z"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.26458332"
+ d="m 16.060048,263.17812 v 5.03443 h -0.692943 v -4.98974 q 0,-1.18413 -0.233491,-1.77248 -0.233492,-0.58834 -0.700476,-0.58834 -0.561133,0 -0.885008,0.7075 -0.323877,0.70749 -0.323877,1.92887 v 4.71419 h -0.696708 v -8.34106 h 0.696708 v 1.29586 q 0.248557,-0.75221 0.58373,-1.12458 0.33894,-0.37236 0.779561,-0.37236 0.726837,0 1.099671,0.89369 0.372833,0.88623 0.372833,2.61402 z"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.27115095"
id="path3020"
inkscape:connector-curvature="0" />
<path
- d="m 23.895178,265.79437 q -1.152384,0 -1.596802,0.26355 -0.444417,0.26355 -0.444417,0.89917 0,0.50643 0.330729,0.80615 0.335897,0.29456 0.909505,0.29456 0.79065,0 1.266073,-0.5581 0.480591,-0.56328 0.480591,-1.49345 v -0.21188 z m 1.896525,-0.39274 v 3.30213 h -0.950846 v -0.8785 q -0.325562,0.5271 -0.81132,0.78031 -0.485759,0.24805 -1.188558,0.24805 -0.888835,0 -1.415934,-0.4961 -0.521932,-0.50126 -0.521932,-1.33842 0,-0.97668 0.651123,-1.47277 0.65629,-0.4961 1.953369,-0.4961 h 1.333252 v -0.093 q 0,-0.65629 -0.434082,-1.01285 -0.428915,-0.36174 -1.209229,-0.36174 -0.496094,0 -0.966349,0.11886 -0.470256,0.11885 -0.904338,0.35656 v -0.87849 q 0.521932,-0.20154 1.012858,-0.29973 0.490926,-0.10335 0.956014,-0.10335 1.255738,0 1.875855,0.65112 0.620117,0.65113 0.620117,1.97404 z"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.26458332"
+ d="m 20.574577,264.18731 q -1.254763,0.32321 -1.759298,0.79638 -0.504534,0.47317 -0.554298,1.31368 -0.03965,0.66971 0.296994,0.97328 0.342679,0.2953 0.967246,0.13442 0.860891,-0.22175 1.422247,-1.09311 0.567389,-0.87967 0.640214,-2.1097 l 0.01659,-0.28019 z m 2.095762,-1.05127 -0.258533,4.36665 -1.03532,0.26669 0.06878,-1.16171 q -0.395754,0.78834 -0.944492,1.25942 -0.548335,0.46426 -1.313572,0.66138 -0.967799,0.24929 -1.502886,-0.2589 -0.529055,-0.51646 -0.463511,-1.62351 0.07647,-1.29153 0.824276,-2.13017 0.753436,-0.8401 2.16575,-1.2039 l 1.451699,-0.37394 0.0073,-0.12302 q 0.05139,-0.86786 -0.393348,-1.21761 -0.438699,-0.35807 -1.288337,-0.13921 -0.540167,0.13914 -1.061507,0.42823 -0.521339,0.28906 -1.012595,0.72514 l 0.06878,-1.16169 q 0.584081,-0.41291 1.126308,-0.68043 0.542633,-0.27439 1.049041,-0.40483 1.367299,-0.35221 1.991528,0.3349 0.62423,0.68711 0.520655,2.4365 z"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.31505379"
id="path3022"
inkscape:connector-curvature="0" />
<path
- d="m 27.755406,260.6629 h 0.950847 v 8.04086 h -0.950847 z"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.26458332"
+ d="m 23.407202,256.62444 h 0.874182 v 11.58811 h -0.874182 z"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.30455324"
id="path3024"
inkscape:connector-curvature="0" />
<path
- d="m -1.2980398,279.78946 v 3.06958 h -0.956014 v -7.98918 h 0.956014 v 0.8785 q 0.29972331,-0.51676 0.75447591,-0.76481 0.4599202,-0.25321 1.0955403,-0.25321 1.05419919,0 1.71048989,0.83715 0.6614583,0.83716 0.6614583,2.20142 0,1.36426 -0.6614583,2.20142 -0.6562907,0.83715 -1.71048989,0.83715 -0.6356201,0 -1.0955403,-0.24804 -0.4547526,-0.25322 -0.75447591,-0.76998 z m 3.2349446,-2.02055 q 0,-1.04903 -0.434082,-1.64331 -0.4289144,-0.59945 -1.18339029,-0.59945 -0.7544759,0 -1.1885579,0.59945 -0.42891441,0.59428 -0.42891441,1.64331 0,1.04903 0.42891441,1.64848 0.434082,0.59428 1.1885579,0.59428 0.75447589,0 1.18339029,-0.59428 0.434082,-0.59945 0.434082,-1.64848 z"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.26458332"
+ d="m -1.2980398,280.98004 v 3.79196 h -0.956014 v -9.86931 h 0.956014 v 1.08524 q 0.29972331,-0.63837 0.75447591,-0.94479 0.4599202,-0.3128 1.0955403,-0.3128 1.05419919,0 1.71048989,1.03416 0.6614583,1.03417 0.6614583,2.71949 0,1.68531 -0.6614583,2.71949 -0.6562907,1.03415 -1.71048989,1.03415 -0.6356201,0 -1.0955403,-0.30641 -0.4547526,-0.31281 -0.75447591,-0.95118 z m 3.2349446,-2.49605 q 0,-1.2959 -0.434082,-2.03004 -0.4289144,-0.74052 -1.18339029,-0.74052 -0.7544759,0 -1.1885579,0.74052 -0.42891441,0.73414 -0.42891441,2.03004 0,1.2959 0.42891441,2.03642 0.434082,0.73413 1.1885579,0.73413 0.75447589,0 1.18339029,-0.73413 0.434082,-0.74052 0.434082,-2.03642 z"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.29407263"
id="path3026"
inkscape:connector-curvature="0" />
<path
- d="m 6.7428129,275.53649 q -0.7648112,0 -1.2092285,0.59944 -0.4444173,0.59428 -0.4444173,1.63298 0,1.0387 0.4392497,1.63814 0.4444173,0.59428 1.2143961,0.59428 0.7596435,0 1.2040608,-0.59945 0.4444173,-0.59944 0.4444173,-1.63297 0,-1.02836 -0.4444173,-1.62781 -0.4444173,-0.60461 -1.2040608,-0.60461 z m 0,-0.80615 q 1.2402343,0 1.9482014,0.80615 0.7079671,0.80615 0.7079671,2.23242 0,1.4211 -0.7079671,2.23242 -0.7079671,0.80615 -1.9482014,0.80615 -1.245402,0 -1.9533691,-0.80615 -0.7027995,-0.81132 -0.7027995,-2.23242 0,-1.42627 0.7027995,-2.23242 0.7079671,-0.80615 1.9533691,-0.80615 z"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.26458332"
+ d="m 6.7428129,275.7262 q -0.7648112,0 -1.2092285,0.74051 -0.4444173,0.73414 -0.4444173,2.01728 0,1.28314 0.4392497,2.02365 0.4444173,0.73413 1.2143961,0.73413 0.7596435,0 1.2040608,-0.74052 0.4444173,-0.74051 0.4444173,-2.01726 0,-1.27037 -0.4444173,-2.01089 -0.4444173,-0.7469 -1.2040608,-0.7469 z m 0,-0.99586 q 1.2402343,0 1.9482014,0.99586 0.7079671,0.99587 0.7079671,2.75779 0,1.75553 -0.7079671,2.75778 -0.7079671,0.99586 -1.9482014,0.99586 -1.245402,0 -1.9533691,-0.99586 -0.7027995,-1.00225 -0.7027995,-2.75778 0,-1.76192 0.7027995,-2.75779 0.7079671,-0.99586 1.9533691,-0.99586 z"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.29407263"
id="path3028"
inkscape:connector-curvature="0" />
<path
- d="m 10.969945,272.61677 h 0.950847 v 8.04085 h -0.950847 z"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.26458332"
+ d="m 10.458906,275.12337 1.50898,-0.28092 1.127661,7.93658 -1.508982,0.28091 z"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.33549315"
id="path3030"
inkscape:connector-curvature="0" />
<path
- d="m 16.313289,281.19506 q -0.403076,1.03353 -0.785482,1.34875 -0.382406,0.31523 -1.023193,0.31523 H 13.74497 v -0.79582 h 0.558106 q 0.39274,0 0.609781,-0.18603 0.217041,-0.18604 0.480591,-0.8785 l 0.170532,-0.43409 -2.340942,-5.69474 h 1.007691 l 1.808675,4.52686 1.808675,-4.52686 h 1.00769 z"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.26458332"
+ d="m 20.141754,282.01178 q -0.494734,1.13921 -1.0574,1.56332 -0.562664,0.42412 -1.579585,0.61344 l -1.205545,0.22442 -0.1116,-0.7855 0.885709,-0.16488 q 0.623272,-0.11603 0.941624,-0.36377 0.31835,-0.24775 0.63949,-1.00909 l 0.209754,-0.47885 -4.513681,-4.92928 1.599191,-0.29771 3.505197,3.9338 2.23549,-5.0025 1.59919,-0.29771 z"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.33549315"
id="path3032"
inkscape:connector-curvature="0" />
</g>
</g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="pencil" />
</svg>
diff --git a/res/vertical-x-1.svg b/res/vertical-x-1.svg
@@ -25,9 +25,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="5.6"
- inkscape:cx="14.48155"
- inkscape:cy="34.214325"
+ inkscape:zoom="11.2"
+ inkscape:cx="-17.482736"
+ inkscape:cy="47.517896"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="false"
@@ -44,7 +44,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:Work>
</rdf:RDF>
</metadata>
@@ -64,5 +64,15 @@
id="path2905"
inkscape:connector-curvature="0"
sodipodi:nodetypes="csc" />
+ <path
+ style="fill:#24c9a6;stroke:#24c9a6;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+ d="M 0.47247023,282.35342 5.0554315,280.48716"
+ id="path2212"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.665;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+ d="m 0.76893342,279.48105 c 3.74315718,3.77007 3.76678078,3.77007 3.76678078,3.77007"
+ id="path2210"
+ inkscape:connector-curvature="0" />
</g>
</svg>
diff --git a/res/vertical-x-2.svg b/res/vertical-x-2.svg
@@ -25,9 +25,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="5.6"
- inkscape:cx="14.48155"
- inkscape:cy="34.214325"
+ inkscape:zoom="7.9195959"
+ inkscape:cx="3.0529786"
+ inkscape:cy="14.571468"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="false"
@@ -35,7 +35,8 @@
inkscape:window-height="855"
inkscape:window-x="0"
inkscape:window-y="1"
- inkscape:window-maximized="1" />
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false" />
<metadata
id="metadata2347">
<rdf:RDF>
@@ -44,7 +45,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:Work>
</rdf:RDF>
</metadata>
@@ -54,15 +55,67 @@
id="layer1"
transform="translate(0,-279)">
<path
- style="fill:none;stroke:#000000;stroke-width:0.28717566;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;stroke:#000000;stroke-width:0.34;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0.29366929,288.22652 C 5.763447,284.41449 5.763447,284.41449 5.763447,284.41449 v 0 0"
id="path2903"
inkscape:connector-curvature="0" />
<path
- style="fill:none;stroke:#000000;stroke-width:0.28717566;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;stroke:#000000;stroke-width:0.34;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 0.62719235,284.48923 c 0.59516195,0.48977 1.18954555,1.03911 1.54989935,1.46084 2.1838762,2.55584 2.7525477,2.0962 2.7525477,2.0962"
id="path2905"
inkscape:connector-curvature="0"
sodipodi:nodetypes="csc" />
+ <path
+ sodipodi:nodetypes="csc"
+ inkscape:connector-curvature="0"
+ id="path2764"
+ d="m 0.62719235,284.48923 c 0.59516195,0.48977 1.18954555,1.03911 1.54989935,1.46084 2.1838762,2.55584 2.7525477,2.0962 2.7525477,2.0962"
+ style="fill:none;stroke:#000000;stroke-width:0.34;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path2766"
+ d="m 0.58498385,288.02593 c 4.51965295,-3.47676 4.51965295,-3.47676 4.51965295,-3.47676 v 0 0"
+ style="fill:none;stroke:#000000;stroke-width:0.34;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ inkscape:transform-center-x="-0.46448021"
+ inkscape:transform-center-y="0.46151976" />
+ <path
+ inkscape:transform-center-y="0.46151976"
+ inkscape:transform-center-x="-0.46448021"
+ style="fill:none;stroke:#24c9a6;stroke-width:0.34;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 0.58498385,288.02593 c 4.51965295,-3.47676 4.51965295,-3.47676 4.51965295,-3.47676 v 0 0"
+ id="path2772"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="csc"
+ inkscape:connector-curvature="0"
+ id="path2768"
+ d="m 1.0095044,284.29566 c 0.4533423,0.52971 0.9035332,1.11917 1.1726996,1.56558 1.6312472,2.70532 2.1038282,2.2803 2.1038282,2.2803"
+ style="fill:none;stroke:#000000;stroke-width:0.25725111;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ inkscape:transform-center-x="-0.26743818"
+ inkscape:transform-center-y="0.40471737" />
+ <path
+ inkscape:transform-center-y="0.40471737"
+ inkscape:transform-center-x="-0.26743818"
+ sodipodi:nodetypes="csc"
+ inkscape:connector-curvature="0"
+ id="path2776"
+ d="m 0.80905225,284.52952 c 0.45334235,0.52971 0.90353325,1.11917 1.17269965,1.56558 1.6312472,2.70532 2.1038282,2.2803 2.1038282,2.2803"
+ style="fill:none;stroke:#24c9a6;stroke-width:0.34;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ inkscape:transform-center-y="0.40471737"
+ inkscape:transform-center-x="-0.26743818"
+ style="fill:none;stroke:#24c9a6;stroke-width:0.25725111;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 1.0095044,284.29566 c 0.4533423,0.52971 0.9035332,1.11917 1.1726996,1.56558 1.6312472,2.70532 2.1038282,2.2803 2.1038282,2.2803"
+ id="path2774"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="csc" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.25725111;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 1.0095044,284.29566 c 0.4533423,0.52971 0.9035332,1.11917 1.1726996,1.56558 1.6312472,2.70532 2.1038282,2.2803 2.1038282,2.2803"
+ id="path2770"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="csc"
+ inkscape:transform-center-x="-0.26743818"
+ inkscape:transform-center-y="0.40471737" />
</g>
</svg>
diff --git a/src/Computerscare.hpp b/src/Computerscare.hpp
@@ -230,14 +230,7 @@ struct SmallSnapKnob : RoundBlackSnapKnob {
SmallSnapKnob() {
setSvg(APP->window->loadSvg(asset::plugin(pluginInstance, "res/computerscare-small-knob-effed.svg")));
}
- /*void draw(const DrawArgs &args) {
- if(visible) {
- Widget::draw(args);
- }
- else {
- //Widget::draw(args);
- }
- };*/
+
};
struct BigSmoothKnob : RoundKnob {
BigSmoothKnob() {
diff --git a/src/ComputerscareDebug.cpp b/src/ComputerscareDebug.cpp
@@ -71,6 +71,9 @@ struct ComputerscareDebug : Module {
params[INPUT_CHANNEL_FOCUS].config(0.f,15.f,0.f,"Input Channel Selector");
outputs[POLY_OUTPUT].setChannels(16);
+ params[MANUAL_TRIGGER].randomizable=false;
+ params[MANUAL_CLEAR_TRIGGER].randomizable=false;
+
}
void step() override;
@@ -234,7 +237,19 @@ struct StringDisplayWidget3 : Widget {
}
};
-
+struct ConnectedSmallLetter : SmallLetterDisplay {
+ ComputerscareDebug *module;
+ int index;
+ ConnectedSmallLetter(int dex) {
+ index = dex;
+ value = std::to_string(dex+1);
+ }
+ void draw(const DrawArgs &ctx) override {
+ baseColor = (module->clockMode == 0) && (module->clockChannel == index) ? COLOR_COMPUTERSCARE_LIGHT_GREEN : COLOR_COMPUTERSCARE_TRANSPARENT;
+ value = (module->inputMode == 0) && (module->inputChannel == index) ? std::to_string(index+1) + "<" : std::to_string(index+1);
+ SmallLetterDisplay::draw(ctx);
+ }
+};
struct ComputerscareDebugWidget : ModuleWidget {
ComputerscareDebugWidget(ComputerscareDebug *module) {
@@ -257,7 +272,6 @@ struct ComputerscareDebugWidget : ModuleWidget {
HidableSmallSnapKnob *clockKnob = createParam<HidableSmallSnapKnob>(Vec(6,305),module,ComputerscareDebug::CLOCK_CHANNEL_FOCUS);
- //clockKnob->visible = (module->clockMode == 0);
clockKnob->module = module;
clockKnob->hackIndex = 0;
addParam(clockKnob);
@@ -265,7 +279,6 @@ struct ComputerscareDebugWidget : ModuleWidget {
HidableSmallSnapKnob *inputKnob =createParam<HidableSmallSnapKnob>(Vec(66,305),module,ComputerscareDebug::INPUT_CHANNEL_FOCUS);
inputKnob->module = module;
inputKnob->hackIndex = 1;
-
addParam(inputKnob);
addOutput(createOutput<OutPort>(Vec(57, 1), module, ComputerscareDebug::POLY_OUTPUT));
@@ -277,12 +290,12 @@ struct ComputerscareDebugWidget : ModuleWidget {
addChild(stringDisplay);
for(int i = 0; i < 16; i++) {
- SmallLetterDisplay *sld = new SmallLetterDisplay();
+ ConnectedSmallLetter *sld = new ConnectedSmallLetter(i);
sld->fontSize = 15;
sld->textAlign=1;
sld->box.pos = Vec(-4,33.8+15.08*i);
- sld->box.size = Vec(8, 10);
- sld->value=std::to_string(i+1);
+ sld->box.size = Vec(18, 20);
+ sld->module = module;
addChild(sld);
}
}
