computerscare-vcv-modules

computerscare modules for VCV Rack
Log | Files | Refs

commit e0232190bf11e16bda192afc8b12cc04c94fcc6d
parent 08c67c06ababc09ea593c6fc88f81dec754184a1
Author: Adam M <aemalone@gmail.com>
Date:   Sun, 17 Feb 2019 23:15:21 -0600

Knoly pobs

Diffstat:
MMakefile | 2++
Ares/ComputerscareKnolyPobsPanel.svg | 343+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Mres/computerscare-rst-text-red.svg | 45+++++++++++++++++++++++++++++++++++----------
Mres/computerscare-rst-text.svg | 42+++++++++++++++++++++++++++++++-----------
Msrc/Computerscare.cpp | 1+
Msrc/Computerscare.hpp | 25+++++++++++++++++++++----
Msrc/ComputerscareDebug.cpp | 45+++++++++++++++++++++++++++++++++++++--------
Msrc/ComputerscareIso.cpp | 2--
Asrc/ComputerscareKnolyPobs.cpp | 123+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Asrc/ComputerscareSvgPort.cpp | 35+++++++++++++++++++++++++++++++++++
10 files changed, 628 insertions(+), 35 deletions(-)

diff --git a/Makefile b/Makefile @@ -13,8 +13,10 @@ LDFLAGS += # Add .cpp and .c files to the build #SOURCES += $(wildcard src/*.cpp) SOURCES += $(wildcard src/ComputerscareSVGPanel.cpp) +SOURCES += $(wildcard src/ComputerscareSvgPort.cpp) SOURCES += $(wildcard src/ComputerscareIso.cpp) +SOURCES += $(wildcard src/ComputerscareKnolyPobs.cpp) SOURCES += $(wildcard src/ComputerscareDebug.cpp) diff --git a/res/ComputerscareKnolyPobsPanel.svg b/res/ComputerscareKnolyPobsPanel.svg @@ -0,0 +1,343 @@ +<?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="60" + height="380" + viewBox="0 0 15.875 100.54167" + version="1.1" + id="svg8" + inkscape:version="0.92.2 5c3e80d, 2017-08-06" + sodipodi:docname="ComputerscareKnolyPobsPanel.svg" + style="enable-background:new"> + <defs + id="defs2" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="2.0000001" + inkscape:cx="1.3617748" + inkscape:cy="116.27309" + inkscape:document-units="mm" + inkscape:current-layer="g1669" + showgrid="false" + units="px" + inkscape:snap-bbox="true" + inkscape:snap-page="true" + inkscape:bbox-nodes="true" + inkscape:snap-bbox-edge-midpoints="true" + inkscape:window-width="1440" + inkscape:window-height="856" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="0" + inkscape:snap-global="false" + showguides="false" + inkscape:lockguides="false" /> + <metadata + id="metadata5"> + <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></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-196.45832)" + style="display:none"> + <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" + id="rect817" + inkscape:connector-curvature="0" /> + <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="8.2147436" + y="295.57718" + id="text1490" + transform="rotate(1.4468834)"><tspan + sodipodi:role="line" + id="tspan1488" + x="8.2147436" + 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" + y="288.87244" + id="text1498" + transform="rotate(1.9714728)"><tspan + sodipodi:role="line" + id="tspan1496" + x="20.711658" + y="288.87244" + 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">in</tspan></text> + <text + transform="rotate(0.49746114)" + id="text1521" + y="289.16214" + x="20.314623" + 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:3.17499995px;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="289.16214" + x="20.314623" + id="tspan1519" + sodipodi:role="line">clr</tspan></text> + <text + transform="matrix(1.0139335,-0.02825079,0.06854811,0.98434808,0,0)" + id="text1645" + y="204.61243" + x="-10.296249" + style="font-style:normal;font-weight:normal;font-size:10.74719143px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26867977" + xml:space="preserve"><tspan + 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" + y="204.61243" + x="-10.296249" + id="tspan1643" + sodipodi:role="line">debug</tspan></text> + </g> + <g + inkscape:groupmode="layer" + id="layer3" + inkscape:label="bg" /> + <g + style="display:inline" + transform="translate(0,-196.45832)" + id="g1669" + inkscape:groupmode="layer" + inkscape:label="Layer 1 copy"> + <path + inkscape:connector-curvature="0" + id="path1647" + d="m 0,198.04581 h 13.522624 v 98.95418 H 0 Z" + style="opacity:1;vector-effect:none;fill:#e0e0e0;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.263;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" /> + <rect + style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.27700001;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect888" + width="13.791405" + height="7.7059889" + x="2.0505207" + y="196.55754" /> + <g + aria-label="computerscare" + transform="matrix(0.579664,-0.0209809,0.12827949,1.4870391,-42.202497,-142.90507)" + 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" + id="text1651"> + <path + d="m 9.6564066,294.11837 -0.022491,0.23707 q -0.1028223,-0.0489 -0.2099211,-0.0673 -0.1055806,-0.0199 -0.2168506,-0.009 -0.2488775,0.0238 -0.4014201,0.19401 -0.1524199,0.16888 -0.1792271,0.45145 -0.026804,0.28254 0.095932,0.42654 0.1228661,0.14262 0.371738,0.11887 0.1112317,-0.0106 0.2224055,-0.0498 0.1127112,-0.0408 0.2267849,-0.11044 l -0.022229,0.23431 q -0.111772,0.0599 -0.2295122,0.0956 -0.1163563,0.0357 -0.2456588,0.048 -0.3517468,0.0335 -0.5381239,-0.16582 -0.1863704,-0.19938 -0.1510635,-0.57153 0.035829,-0.37767 0.2649098,-0.61397 0.2304697,-0.23642 0.5947391,-0.27118 0.1181718,-0.0112 0.2283935,0.003 0.110394,0.0127 0.2114822,0.0509 z" + 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" + id="path1701" + inkscape:connector-curvature="0" /> + <path + d="m 10.696255,294.13661 q -0.205776,0.0197 -0.340506,0.19093 -0.134608,0.16992 -0.160888,0.44696 -0.02628,0.27705 0.07673,0.42565 0.104532,0.1471 0.311691,0.12734 0.204372,-0.0195 0.339118,-0.1908 0.134737,-0.1713 0.160888,-0.44696 0.02602,-0.27428 -0.07838,-0.42277 -0.10427,-0.14986 -0.308651,-0.13035 z m 0.0204,-0.21501 q 0.333675,-0.0318 0.503758,0.16499 0.170076,0.19686 0.133987,0.57727 -0.03596,0.37905 -0.246966,0.61361 -0.210875,0.23319 -0.544555,0.26503 -0.335078,0.032 -0.505151,-0.16486 -0.1685548,-0.19836 -0.1325956,-0.5774 0.036091,-0.38042 0.2455756,-0.61348 0.210875,-0.23319 0.545947,-0.26516 z" + 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" + id="path1703" + inkscape:connector-curvature="0" /> + <path + d="m 13.143759,294.1394 q 0.109103,-0.20599 0.261143,-0.30389 0.152033,-0.0979 0.358066,-0.0977 0.277351,3.4e-4 0.428154,0.205 0.150801,0.203 0.151243,0.57869 l 0.0013,1.12376 -0.2932,-3.3e-4 -0.0013,-1.1138 q -3.15e-4,-0.26763 -0.0908,-0.39742 -0.0905,-0.12977 -0.275921,-0.13 -0.226635,-2.7e-4 -0.357993,0.15747 -0.131357,0.15777 -0.131036,0.4304 l 0.0012,1.05229 -0.2932,-3.4e-4 -0.0013,-1.1138 q -3.17e-4,-0.2693 -0.0908,-0.39742 -0.0905,-0.12976 -0.279091,-0.13 -0.223465,-2.8e-4 -0.354821,0.15914 -0.131357,0.15777 -0.131039,0.42874 l 0.0012,1.05227 -0.293194,-3.3e-4 -0.0022,-1.86186 0.293199,3.4e-4 3.42e-4,0.28924 q 0.09965,-0.17108 0.239016,-0.25238 0.139373,-0.0812 0.331141,-0.081 0.193354,2.3e-4 0.328188,0.10342 0.136421,0.10314 0.201631,0.29946 z" + 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.31164581" + id="path1705" + inkscape:connector-curvature="0" /> + <path + d="m 14.742929,294.81667 v 0.81855 h -0.254937 v -2.13044 h 0.254937 v 0.23426 q 0.07993,-0.1378 0.201194,-0.20395 0.122645,-0.0675 0.292144,-0.0675 0.28112,0 0.45613,0.22324 0.176389,0.22324 0.176389,0.58705 0,0.3638 -0.176389,0.58704 -0.17501,0.22324 -0.45613,0.22324 -0.169499,0 -0.292144,-0.0661 -0.121268,-0.0675 -0.201194,-0.20533 z m 0.862652,-0.53881 q 0,-0.27975 -0.115755,-0.43822 -0.114377,-0.15985 -0.315571,-0.15985 -0.201193,0 -0.316949,0.15985 -0.114377,0.15847 -0.114377,0.43822 0,0.27974 0.114377,0.43959 0.115756,0.15847 0.316949,0.15847 0.201194,0 0.315571,-0.15847 0.115755,-0.15985 0.115755,-0.43959 z" + 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" + id="path1707" + inkscape:connector-curvature="0" /> + <path + d="m 16.276561,294.97975 -1.52e-4,-0.94031 0.251931,-0.0648 1.5e-4,0.9306 q 3.6e-5,0.22051 0.08495,0.30972 0.08491,0.0878 0.254686,0.0444 0.204008,-0.052 0.321737,-0.21413 0.119098,-0.16225 0.119061,-0.38971 l -1.43e-4,-0.88065 0.251931,-0.0648 2.51e-4,1.55331 -0.25193,0.0648 -3.9e-5,-0.23855 q -0.09172,0.16493 -0.213559,0.26548 -0.120476,0.0987 -0.280672,0.13983 -0.264253,0.0678 -0.401197,-0.0637 -0.136946,-0.13139 -0.136998,-0.45174 z" + 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" + id="path1709" + inkscape:connector-curvature="0" /> + <path + d="m 18.344702,293.59556 v 0.43822 h 0.522277 v 0.19706 h -0.522277 v 0.83784 q 0,0.18879 0.05099,0.24254 0.05237,0.0537 0.21084,0.0537 h 0.260449 v 0.21222 H 18.60653 q -0.293522,0 -0.405144,-0.10887 -0.111621,-0.11024 -0.111621,-0.39963 V 294.2308 H 17.90373 v -0.19706 h 0.186035 v -0.43822 z" + 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" + id="path1711" + inkscape:connector-curvature="0" /> + <path + d="m 20.508346,294.20141 2.1e-5,0.12482 -1.158332,0.29657 q 0.01648,0.25929 0.156153,0.36223 0.141049,0.1012 0.391609,0.037 0.145134,-0.0376 0.280676,-0.10793 0.136913,-0.0711 0.271081,-0.17758 l 4e-5,0.24133 q -0.135541,0.093 -0.277931,0.15998 -0.14239,0.0669 -0.288893,0.10441 -0.366941,0.094 -0.581938,-0.0673 -0.213628,-0.16169 -0.213688,-0.53061 -6.1e-5,-0.38138 0.202543,-0.65655 0.203972,-0.2769 0.549007,-0.36523 0.309435,-0.0789 0.488832,0.0774 0.180765,0.15485 0.18082,0.50156 z m -0.251942,-0.0103 q -0.0028,-0.2087 -0.116435,-0.30445 -0.112293,-0.0961 -0.298502,-0.0484 -0.210854,0.0537 -0.338169,0.20723 -0.125945,0.15291 -0.145079,0.37694 z" + 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" + id="path1713" + inkscape:connector-curvature="0" /> + <path + d="m 21.832517,294.2708 q -0.04272,-0.0248 -0.09371,-0.0358 -0.04961,-0.0124 -0.110243,-0.0124 -0.214974,0 -0.330729,0.14056 -0.114377,0.13918 -0.114377,0.40101 v 0.81304 h -0.254937 v -1.5434 h 0.254937 v 0.23977 q 0.07993,-0.14056 0.208084,-0.20808 0.128157,-0.0689 0.311436,-0.0689 0.02618,0 0.05788,0.004 0.03169,0.003 0.07028,0.01 z" + 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" + id="path1715" + inkscape:connector-curvature="0" /> + <path + d="m 23.185447,294.16269 -0.03488,0.23723 q -0.09833,-0.0702 -0.208837,-0.11429 -0.110508,-0.0442 -0.233212,-0.0622 -0.186783,-0.0275 -0.289279,0.016 -0.101136,0.0437 -0.117973,0.15816 -0.01283,0.0873 0.04655,0.14753 0.05959,0.0589 0.254751,0.13358 l 0.08309,0.0317 q 0.258799,0.0966 0.355164,0.21797 0.09793,0.12025 0.07046,0.30705 -0.03127,0.21268 -0.218575,0.31189 -0.185938,0.0994 -0.480428,0.0561 -0.122703,-0.018 -0.252707,-0.0622 -0.128844,-0.0426 -0.269062,-0.11204 l 0.03809,-0.25904 q 0.128445,0.0927 0.258001,0.14937 0.129765,0.0553 0.262013,0.0747 0.17724,0.0261 0.281492,-0.0199 0.104454,-0.0473 0.120693,-0.15775 0.01504,-0.10226 -0.04648,-0.16702 -0.06015,-0.0645 -0.285871,-0.14928 l -0.08424,-0.0333 q -0.225922,-0.0833 -0.314703,-0.19949 -0.08858,-0.11748 -0.06252,-0.29473 0.03167,-0.21541 0.201614,-0.31021 0.169938,-0.0948 0.450794,-0.0535 0.139065,0.0204 0.258757,0.059 0.119693,0.0385 0.217301,0.0946 z" + 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" + id="path1717" + inkscape:connector-curvature="0" /> + <path + d="m 24.74878,294.2652 c -0.08645,0.15984 -0.310959,-0.0317 -0.546114,0.002 -0.163883,0.0136 -0.286821,0.0763 -0.368812,0.1882 -0.08207,0.11097 -0.115323,0.2603 -0.09977,0.44799 0.01555,0.18768 0.07297,0.32995 0.172262,0.42682 0.09921,0.096 0.230762,0.13713 0.394645,0.12355 0.07324,-0.006 0.144777,-0.0216 0.2146,-0.0468 0.07066,-0.0261 0.140065,-0.0618 0.208213,-0.10716 l 0.01935,0.23346 c -0.06777,0.0388 -0.138962,0.0696 -0.213589,0.0923 -0.07371,0.0227 -0.153138,0.0376 -0.238284,0.0446 -0.231635,0.0192 -0.421693,-0.0383 -0.570174,-0.17261 -0.14848,-0.13426 -0.232962,-0.32499 -0.253446,-0.57219 -0.02079,-0.25087 0.03153,-0.45386 0.15695,-0.60898 0.126338,-0.1552 0.309444,-0.24274 0.549319,-0.26262 0.07782,-0.007 0.154496,-0.005 0.230021,0.006 0.07545,0.009 0.411602,0.13108 0.483843,0.15738 z" + 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" + id="path1719" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccccccccccccccc" /> + <path + d="m 24.81823,294.75924 c -0.297765,0.0229 -0.512808,0.0705 -0.64513,0.14291 -0.132332,0.0724 -0.219561,0.18524 -0.261686,0.33845 -0.03363,0.12213 -0.01763,0.21604 0.04798,0.28174 0.06728,0.0643 0.175023,0.0907 0.323232,0.0794 0.204311,-0.0157 0.386389,-0.0956 0.546234,-0.23957 0.161537,-0.14536 0.273146,-0.33019 0.334829,-0.55448 l 0.02101,-0.0766 z m 0.774145,-0.19853 -0.328455,1.19434 -0.368516,0.0282 0.08737,-0.31774 c -0.119089,0.13356 -0.249784,0.2357 -0.392086,0.30641 -0.141957,0.0694 -0.303742,0.11113 -0.485354,0.12512 -0.229693,0.0177 -0.39618,-0.0281 -0.499459,-0.13726 -0.101626,-0.1105 -0.124676,-0.26669 -0.06915,-0.46856 0.06476,-0.2355 0.197713,-0.41952 0.398859,-0.55206 0.202482,-0.13265 0.471302,-0.21186 0.806461,-0.23762 l 0.516775,-0.0398 0.0092,-0.0335 c 0.04352,-0.15825 0.02102,-0.27605 -0.0675,-0.35341 -0.08684,-0.0787 -0.231074,-0.11031 -0.4327,-0.0948 -0.128187,0.01 -0.256984,0.0338 -0.386391,0.0718 -0.129384,0.038 -0.22788,0.0181 -0.35582,0.0841 l 0.0572,-0.24589 c 0.148221,-0.0589 0.289013,-0.10504 0.422378,-0.13852 0.133697,-0.0347 0.260649,-0.0566 0.380855,-0.0659 0.324493,-0.025 0.54526,0.0349 0.662301,0.17963 0.117059,0.14469 0.131725,0.37653 0.044,0.69552 z" + 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.36754596" + id="path1721" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccccccccccccccccccccccccccc" /> + <path + d="m 27.811045,294.03187 q -0.04765,-0.0359 -0.114148,-0.0521 -0.06379,-0.0182 -0.149723,-0.0183 -0.304614,-6.2e-4 -0.541819,0.20246 -0.234523,0.20105 -0.370837,0.57993 l -0.423324,1.17649 -0.361236,-7.4e-4 0.803473,-2.23334 0.361237,7.5e-4 -0.124848,0.34694 q 0.186434,-0.20316 0.403183,-0.30051 0.217505,-0.0995 0.47719,-0.0989 0.0371,8e-5 0.07992,0.006 0.04318,0.005 0.09438,0.0146 z" + 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.37900135" + id="path1723" + inkscape:connector-curvature="0" /> + <path + d="m 29.712571,294.7854 -0.06094,0.16877 -1.603439,0.13193 c -0.07023,0.23754 -0.110719,0.28611 -0.02315,0.41121 0.08941,0.12391 0.253311,0.18583 0.491653,0.18595 0.138059,6e-5 0.277401,-0.016 0.418108,-0.0485 0.14201,-0.0325 0.508333,-0.14208 0.659478,-0.20707 l -0.117939,0.32633 c -0.147934,0.0525 -0.514377,0.15339 -0.659762,0.18081 -0.145379,0.0275 -0.287764,0.0411 -0.427099,0.041 -0.349049,-1.8e-4 -0.590562,-0.0978 -0.724584,-0.29298 -0.132697,-0.19514 -0.138963,-0.459 -0.01879,-0.79157 0.12432,-0.34382 0.319099,-0.61634 0.584612,-0.81755 0.267249,-0.20244 0.56498,-0.30358 0.893191,-0.30341 0.29435,1.4e-4 0.493835,0.0916 0.598514,0.27415 0.106411,0.18138 0.103144,0.42835 -0.0098,0.74092 z m -0.322894,-0.1014 c 0.06552,-0.18878 0.06466,-0.33947 -0.0028,-0.45204 -0.06612,-0.1126 -0.187772,-0.16891 -0.364898,-0.16901 -0.200575,-10e-5 -0.381115,0.0543 -0.541512,0.16293 -0.159132,0.1087 -0.116464,0.24257 -0.206093,0.4401 z" + 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.36754596" + id="path1725" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccscccsscscscccccsccc" /> + </g> + <g + id="g9547" + transform="matrix(0.21334155,-0.05917659,0,0.23311691,-1.9826542,289.22115)"> + <g + style="display:inline" + inkscape:label="Layer 1" + id="layer4" /> + <path + id="rect5872" + d="m 11.987289,9.3234482 h 7.991524 v 3.9957608 h -7.991524 z" + style="opacity:1;fill:#0f0f00;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:connector-curvature="0" /> + <path + id="rect5874" + d="m 14.667374,10.662096 h 3.995763 v 1.331921 h -3.995763 z" + style="opacity:1;fill:#ffffff;fill-opacity:0.98571424;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:connector-curvature="0" /> + <path + id="rect5878" + d="m -29.323654,9.3234482 h 7.989551 v 3.9957608 h -7.989551 z" + style="opacity:1;fill:#0c0c00;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + transform="scale(-1,1)" + inkscape:connector-curvature="0" /> + <path + id="rect5880" + d="m 26.64423,10.662096 -3.171232,0.209056 v 1.331921 l 3.171232,-0.209056 z" + style="opacity:1;fill:#ffffff;fill-opacity:0.98571424;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:connector-curvature="0" /> + <path + id="rect5882" + d="m 19.995058,14.667374 h 1.331921 v 3.995762 h -1.331921 z" + style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:connector-curvature="0" /> + <path + id="rect5884" + d="m 20.888507,17.21991 2.579094,0.32072 v 1.33192 l -2.579094,-0.32072 z" + style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:connector-curvature="0" /> + <path + id="rect5886" + d="m 11.954803,20.011301 h 2.696328 v 2.663842 h -2.696328 z" + style="opacity:1;fill:#000200;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:connector-curvature="0" /> + <path + id="rect5888" + d="m 27.970341,20.011301 h 2.696327 v 2.663842 h -2.696327 z" + style="opacity:1;fill:#000200;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:connector-curvature="0" /> + <path + id="rect5890" + d="m 14.651131,20.011301 h 13.351695 v 1.33192 H 14.651131 Z" + style="opacity:1;fill:#000200;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:connector-curvature="0" /> + </g> + <path + style="fill:none;stroke:#dadada;stroke-width:0.30698216;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 2.7900557,198.8813 0.1810466,-1.94464 -0.2632421,-0.0154 -0.1048935,2.82045 0.6339358,-1.61065 1.5029883,1.40056 -1.8853796,-1.40054 1.7836213,-1.12069 v 0 0" + id="path870" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccccccc" /> + <path + style="fill:none;stroke:#dadada;stroke-width:0.461;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 5.1505587,197.63661 0.2821815,2.32627 0.1612468,-1.95897 1.3705962,0.57138 -0.5643632,1.26516" + id="path872" + inkscape:connector-curvature="0" /> + <path + style="fill:none;stroke:#dadada;stroke-width:0.5413155;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 7.9955378,197.36502 -0.8336691,2.5577 2.2509065,0.16323 0.3334678,-1.57816 z" + id="path874" + inkscape:connector-curvature="0" /> + <path + style="fill:none;stroke:#dadada;stroke-width:0.48511115;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 10.459266,196.91411 0.573608,2.94745 -0.229446,-0.10342" + id="path876" + inkscape:connector-curvature="0" /> + <path + style="fill:none;stroke:#dadada;stroke-width:0.68092787;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 12.694902,196.93179 1.128406,2.34083 1.241248,-1.85498 -1.354089,1.89915 -1.861871,0.97166 -0.05642,0.13247" + id="path878" + inkscape:connector-curvature="0" /> + <path + style="fill:none;stroke:#dadada;stroke-width:0.38047731;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 2.4766957,200.56743 0.2336598,3.20154 v -3.27963 l 1.6356202,1.01511 -0.444637,0.65145 -1.2844471,-0.14389 v 0" + id="path880" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccc" /> + <path + style="fill:none;stroke:#dadada;stroke-width:0.82054484;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 5.9117535,200.94593 -1.1717131,1.847 0.8201994,0.3144 2.0700265,-0.55018 -0.5127879,-1.436 z" + id="path882" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccc" /> + <path + style="fill:none;stroke:#dadada;stroke-width:0.35956258;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 8.7611915,200.96908 8.2781722,203.5874 10.80686,203.5465 9.9595593,202.72828 8.5579071,202.15554" + id="path884" + inkscape:connector-curvature="0" + inkscape:transform-center-x="-1.0897816" + inkscape:transform-center-y="-0.51580917" /> + <path + style="fill:none;stroke:#dadada;stroke-width:0.44900391;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 14.191933,200.69006 -2.503516,1.02309 1.728618,0.63942 1.549797,0.4263 -3.576453,0.68206" + id="path886" + inkscape:connector-curvature="0" /> + <path + style="fill:#afafaf;fill-opacity:1;stroke:#1b1b1b;stroke-width:0.25639352;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 1.8914544,196.56293 -1.86467979,1.5485 -0.03107799,7.38009 1.92683588,-1.21903 z" + id="path890" + inkscape:connector-curvature="0" /> + <path + style="fill:#626262;fill-opacity:1;stroke:#000000;stroke-width:0.265;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 2.0791512,204.23033 13.7298278,0.0331 -2.343312,1.38931 -13.4657925835,-0.16539 z" + id="path892" + inkscape:connector-curvature="0" /> + </g> +</svg> diff --git a/res/computerscare-rst-text-red.svg b/res/computerscare-rst-text-red.svg @@ -25,9 +25,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="11.2" - inkscape:cx="31.428572" - inkscape:cy="16.512059" + inkscape:zoom="22.4" + inkscape:cx="21.607143" + inkscape:cy="3.4177152" inkscape:document-units="mm" inkscape:current-layer="text1460" showgrid="false" @@ -36,7 +36,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="metadata887"> <rdf:RDF> @@ -59,18 +60,42 @@ style="font-style:normal;font-weight:normal;font-size:6.29599571px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.15739989" id="text1460"> <path - d="m 3.1741321,293.87751 q -0.09872,-0.0559 -0.2142721,-0.084 -0.1126317,-0.0309 -0.2484227,-0.037 -0.4814513,-0.0219 -0.7234135,0.25827 -0.2390457,0.27745 -0.2068562,0.82132 l 0.099956,1.68886 -0.5709549,-0.026 -0.1897489,-3.20597 0.5709551,0.026 0.029479,0.49807 q 0.1617211,-0.28382 0.4404383,-0.41103 0.2785477,-0.13006 0.6890162,-0.11138 0.058653,0.003 0.1301158,0.0143 0.071266,0.008 0.158587,0.0272 z" - style="fill:#b63900;fill-opacity:1;stroke-width:0.15197389" + sodipodi:nodetypes="ccccc" + inkscape:connector-curvature="0" + id="path2434" + d="m 0.95659426,292.68898 -0.0111558,3.91358 8.14423548,0.19878 -0.034522,-4.03983 z" + style="fill:#848484;fill-opacity:1;stroke:#000000;stroke-width:0.25272471;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + style="fill:#dedede;fill-opacity:1;stroke:#000000;stroke-width:0.03266888;stroke-opacity:1" + d="m 1.6845928,293.59372 7.2968297,0.2008 -0.011812,2.89105 -7.285018,-0.18899 z" + id="rect2390" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccc" /> + <path + style="fill:#adadad;fill-opacity:1;stroke:#000000;stroke-width:0.13618915;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 0.90968224,292.76446 0.73334076,0.86093 0.011269,2.93259 -0.70917519,-0.02 z" + id="path2394" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccc" /> + <path + style="fill:#848484;fill-opacity:1;stroke:#000000;stroke-width:0.1530488;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 1.0451761,292.78158 0.6137626,0.78031 7.388625,0.179 -0.030176,-1.00553 z" + id="path2396" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccc" /> + <path + d="m 3.932639,294.47602 q -0.078403,-0.0382 -0.1701734,-0.0574 -0.089452,-0.021 -0.1972956,-0.0253 -0.3823651,-0.015 -0.5745297,0.17642 -0.1898484,0.18952 -0.1642838,0.56104 l 0.079384,1.15365 -0.4534483,-0.0178 -0.1506973,-2.18997 0.4534485,0.0178 0.023412,0.34022 q 0.1284376,-0.19387 0.3497929,-0.28077 0.2212206,-0.0888 0.5472118,-0.0761 0.046582,0.002 0.1033369,0.01 0.056599,0.006 0.1259487,0.0185 z" + style="fill:#000000;fill-opacity:1;stroke-width:0.11193644" id="path1462" inkscape:connector-curvature="0" /> <path - d="m 5.9131608,293.30639 0.036975,0.51822 q -0.2482889,-0.11913 -0.5107727,-0.17869 -0.2624845,-0.0596 -0.539164,-0.0596 -0.4211677,0 -0.6243636,0.12509 -0.2001212,0.12509 -0.1822718,0.37526 0.013603,0.19061 0.172099,0.30081 0.1582865,0.10721 0.6202832,0.2055 l 0.1966489,0.0417 q 0.6114707,0.12508 0.8799193,0.35441 0.2713097,0.22635 0.300422,0.63438 0.033149,0.4646 -0.3287158,0.73563 -0.3587914,0.27102 -1.0228222,0.27102 -0.2766795,0 -0.5817774,-0.0536 -0.3018108,-0.0506 -0.6412646,-0.15488 l -0.040375,-0.56587 q 0.3248324,0.15785 0.6349175,0.23826 0.3098682,0.0774 0.6080672,0.0774 0.3996482,0 0.6054941,-0.13104 0.2056321,-0.13402 0.1884201,-0.37526 -0.015937,-0.22338 -0.1812227,-0.34251 -0.1622107,-0.11913 -0.6957639,-0.22932 l -0.199936,-0.0446 q -0.5333408,-0.10722 -0.7827061,-0.32761 -0.2495781,-0.22338 -0.2772031,-0.61056 -0.033574,-0.47056 0.2924631,-0.72669 0.3260373,-0.25613 0.9593259,-0.25613 0.3135701,0 0.5934356,0.0446 0.2798656,0.0447 0.5198822,0.13402 z" - style="fill:#b63900;fill-opacity:1;stroke-width:0.15492441" + d="m 6.299147,294.20189 0.029365,0.35399 q -0.1971891,-0.0814 -0.4056519,-0.12206 -0.2084634,-0.0407 -0.4282002,-0.0407 -0.3344884,0 -0.4958652,0.0855 -0.1589347,0.0855 -0.1447589,0.25634 0.010803,0.1302 0.1366798,0.20548 0.12571,0.0732 0.4926246,0.14037 l 0.1561771,0.0285 q 0.4856255,0.0855 0.6988256,0.2421 0.2154722,0.15461 0.238593,0.43333 0.026326,0.31737 -0.2610638,0.5025 -0.2849496,0.18514 -0.812318,0.18514 -0.2197369,0 -0.4620435,-0.0366 -0.2396959,-0.0346 -0.5092877,-0.1058 l -0.032066,-0.38655 q 0.2579795,0.10783 0.5042468,0.16276 0.2460951,0.0528 0.4829226,0.0528 0.3173978,0 0.4808791,-0.0895 0.1633116,-0.0915 0.149642,-0.25633 -0.012657,-0.15259 -0.1439258,-0.23397 -0.1288266,-0.0814 -0.5525707,-0.15664 l -0.1587877,-0.0304 q -0.4235755,-0.0732 -0.6216196,-0.22378 -0.1982132,-0.1526 -0.2201528,-0.41707 -0.026664,-0.32144 0.2322722,-0.4964 0.2589365,-0.17496 0.7618896,-0.17496 0.2490352,0 0.4713024,0.0304 0.2222672,0.0305 0.4128867,0.0916 z" + style="fill:#000000;fill-opacity:1;stroke-width:0.11410964" id="path1464" inkscape:connector-curvature="0" /> <path - d="m 7.1675079,292.41989 0.1355192,0.91257 1.3146089,0.031 0.060941,0.41037 -1.3146088,-0.031 0.2591037,1.74479 q 0.058385,0.39316 0.2033443,0.5081 0.1484277,0.11502 0.5473191,0.12441 l 0.6555643,0.0154 0.065629,0.44194 -0.6555642,-0.0154 q -0.7388215,-0.0174 -1.0534413,-0.25071 -0.3150515,-0.23619 -0.4045461,-0.83884 l -0.2591058,-1.7448 -0.4682615,-0.011 -0.060941,-0.41037 0.4682617,0.011 -0.1355192,-0.91257 z" - style="fill:#b63900;fill-opacity:1;stroke-width:0.16125326" + d="m 7.3515732,293.89157 0.1076284,0.62337 1.0440529,0.0211 0.048399,0.28032 -1.0440529,-0.0211 0.2057783,1.19185 q 0.046369,0.26856 0.1614946,0.34708 0.1178803,0.0785 0.4346769,0.085 l 0.5206447,0.0106 0.052121,0.30189 -0.5206446,-0.0106 q -0.5867649,-0.0119 -0.8366336,-0.17126 -0.2502117,-0.16134 -0.3212877,-0.573 l -0.2057799,-1.19186 -0.37189,-0.007 -0.048399,-0.28033 0.3718901,0.007 -0.1076284,-0.62337 z" + style="fill:#000000;fill-opacity:1;stroke-width:0.11877116" id="path1466" inkscape:connector-curvature="0" /> </g> diff --git a/res/computerscare-rst-text.svg b/res/computerscare-rst-text.svg @@ -25,9 +25,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="11.2" - inkscape:cx="31.428572" - inkscape:cy="16.512059" + inkscape:zoom="22.4" + inkscape:cx="18.080358" + inkscape:cy="6.7659295" inkscape:document-units="mm" inkscape:current-layer="text1460" showgrid="false" @@ -36,7 +36,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="metadata887"> <rdf:RDF> @@ -45,7 +46,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> @@ -58,19 +59,38 @@ aria-label="rst" style="font-style:normal;font-weight:normal;font-size:6.29599571px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.15739989" id="text1460"> + <rect + style="fill:#dedede;fill-opacity:1;stroke:#000000;stroke-width:0.03916021;stroke-opacity:1" + id="rect2390" + width="7.7864323" + height="3.7822468" + x="0.21136901" + y="292.08505" /> <path - d="m 3.1741321,293.87751 q -0.09872,-0.0559 -0.2142721,-0.084 -0.1126317,-0.0309 -0.2484227,-0.037 -0.4814513,-0.0219 -0.7234135,0.25827 -0.2390457,0.27745 -0.2068562,0.82132 l 0.099956,1.68886 -0.5709549,-0.026 -0.1897489,-3.20597 0.5709551,0.026 0.029479,0.49807 q 0.1617211,-0.28382 0.4404383,-0.41103 0.2785477,-0.13006 0.6890162,-0.11138 0.058653,0.003 0.1301158,0.0143 0.071266,0.008 0.158587,0.0272 z" - style="fill:#000000;fill-opacity:1;stroke-width:0.15197389" + style="fill:#adadad;fill-opacity:1;stroke:#000000;stroke-width:0.13618915;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 7.9731123,292.09119 1.1703757,0.58926 0.058516,4.13739 -1.2288925,-1.00035 z" + id="path2394" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccc" /> + <path + style="fill:#848484;fill-opacity:1;stroke:#000000;stroke-width:0.1530488;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 0.3010355,295.89989 0.61376262,0.78031 8.14457738,0.19081 -1.1050461,-1.01734 z" + id="path2396" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccc" /> + <path + d="m 2.360965,292.97654 q -0.082343,-0.0428 -0.1787258,-0.0643 -0.093947,-0.0236 -0.2072111,-0.0283 -0.4015818,-0.0168 -0.6034041,0.19762 -0.1993896,0.2123 -0.1725402,0.62846 l 0.083374,1.29229 -0.47623734,-0.0199 -0.1582709,-2.45315 0.47623754,0.0199 0.024589,0.38111 q 0.1348926,-0.21717 0.3673726,-0.31451 0.2323385,-0.0995 0.5747131,-0.0852 0.048923,0.002 0.1085304,0.0109 0.059443,0.006 0.1322785,0.0208 z" + style="fill:#000000;fill-opacity:1;stroke-width:0.12141213" id="path1462" inkscape:connector-curvature="0" /> <path - d="m 5.9131608,293.30639 0.036975,0.51822 q -0.2482889,-0.11913 -0.5107727,-0.17869 -0.2624845,-0.0596 -0.539164,-0.0596 -0.4211677,0 -0.6243636,0.12509 -0.2001212,0.12509 -0.1822718,0.37526 0.013603,0.19061 0.172099,0.30081 0.1582865,0.10721 0.6202832,0.2055 l 0.1966489,0.0417 q 0.6114707,0.12508 0.8799193,0.35441 0.2713097,0.22635 0.300422,0.63438 0.033149,0.4646 -0.3287158,0.73563 -0.3587914,0.27102 -1.0228222,0.27102 -0.2766795,0 -0.5817774,-0.0536 -0.3018108,-0.0506 -0.6412646,-0.15488 l -0.040375,-0.56587 q 0.3248324,0.15785 0.6349175,0.23826 0.3098682,0.0774 0.6080672,0.0774 0.3996482,0 0.6054941,-0.13104 0.2056321,-0.13402 0.1884201,-0.37526 -0.015937,-0.22338 -0.1812227,-0.34251 -0.1622107,-0.11913 -0.6957639,-0.22932 l -0.199936,-0.0446 q -0.5333408,-0.10722 -0.7827061,-0.32761 -0.2495781,-0.22338 -0.2772031,-0.61056 -0.033574,-0.47056 0.2924631,-0.72669 0.3260373,-0.25613 0.9593259,-0.25613 0.3135701,0 0.5934356,0.0446 0.2798656,0.0447 0.5198822,0.13402 z" - style="fill:#000000;fill-opacity:1;stroke-width:0.15492441" + d="m 4.8464073,292.66946 0.030841,0.39653 q -0.2070994,-0.0912 -0.426039,-0.13673 -0.2189401,-0.0456 -0.4497203,-0.0456 -0.3512989,0 -0.520786,0.0957 -0.1669224,0.0957 -0.1520341,0.28714 0.011346,0.14585 0.1435489,0.23018 0.1320279,0.082 0.5173825,0.15724 l 0.1640262,0.0319 q 0.5100318,0.0957 0.7339467,0.27119 0.2263012,0.1732 0.250584,0.48541 0.02765,0.35551 -0.2741841,0.56289 -0.2992704,0.20738 -0.853143,0.20738 -0.2307802,0 -0.4852645,-0.041 -0.2517424,-0.0387 -0.5348831,-0.11851 l -0.033677,-0.433 q 0.2709449,0.12079 0.529589,0.18232 0.2584632,0.0592 0.507193,0.0592 0.3333493,0 0.5050468,-0.10027 0.1715191,-0.10255 0.1571625,-0.28714 -0.013293,-0.17093 -0.1511591,-0.26208 -0.1353011,-0.0912 -0.5803414,-0.17547 l -0.166768,-0.0341 q -0.4448632,-0.082 -0.6528605,-0.25068 -0.2081748,-0.17093 -0.231217,-0.46719 -0.028004,-0.36007 0.2439455,-0.55605 0.2719499,-0.19599 0.8001802,-0.19599 0.261551,0 0.4949887,0.0341 0.2334378,0.0342 0.4336373,0.10255 z" + style="fill:#000000;fill-opacity:1;stroke-width:0.12376931" id="path1464" inkscape:connector-curvature="0" /> <path - d="m 7.1675079,292.41989 0.1355192,0.91257 1.3146089,0.031 0.060941,0.41037 -1.3146088,-0.031 0.2591037,1.74479 q 0.058385,0.39316 0.2033443,0.5081 0.1484277,0.11502 0.5473191,0.12441 l 0.6555643,0.0154 0.065629,0.44194 -0.6555642,-0.0154 q -0.7388215,-0.0174 -1.0534413,-0.25071 -0.3150515,-0.23619 -0.4045461,-0.83884 l -0.2591058,-1.7448 -0.4682615,-0.011 -0.060941,-0.41037 0.4682617,0.011 -0.1355192,-0.91257 z" - style="fill:#000000;fill-opacity:1;stroke-width:0.16125326" + d="m 5.9517256,292.32185 0.1130375,0.69828 1.0965242,0.0237 0.050831,0.31401 -1.0965241,-0.0237 0.2161201,1.33508 q 0.048699,0.30084 0.1696109,0.38879 0.1238046,0.088 0.4565226,0.0952 l 0.5468106,0.0118 0.054742,0.33817 -0.5468105,-0.0118 q -0.6162561,-0.0133 -0.8786826,-0.19184 -0.2627866,-0.18073 -0.3374347,-0.64186 l -0.2161219,-1.33509 -0.3905801,-0.008 -0.050831,-0.31401 0.3905803,0.008 -0.1130375,-0.69828 z" + style="fill:#000000;fill-opacity:1;stroke-width:0.12882543" id="path1466" inkscape:connector-curvature="0" /> </g> diff --git a/src/Computerscare.cpp b/src/Computerscare.cpp @@ -12,4 +12,5 @@ void init(Plugin *p) { //p->addModel(modelComputerscareILoveCookies); //p->addModel(modelComputerscareOhPeas); p->addModel(modelComputerscareIso); + p->addModel(modelComputerscareKnolyPobs); } diff --git a/src/Computerscare.hpp b/src/Computerscare.hpp @@ -7,9 +7,12 @@ #include "widget/TransparentWidget.hpp" #include "widget/FramebufferWidget.hpp" #include "widget/SvgWidget.hpp" +#include "app/PortWidget.hpp" +#include "app/CircularShadow.hpp" #include "app.hpp" + using namespace rack; // Forward-declare the Plugin, defined in Template.cpp @@ -17,11 +20,13 @@ extern Plugin *pluginInstance; // Forward-declare each Model, defined in each module source file extern Model *modelComputerscareDebug; + //extern Model *modelComputerscarePatchSequencer; //extern Model *modelComputerscareLaundrySoup; //extern Model *modelComputerscareILoveCookies; //extern Model *modelComputerscareOhPeas; extern Model *modelComputerscareIso; +extern Model *modelComputerscareKnolyPobs; static const NVGcolor COLOR_COMPUTERSCARE_LIGHT_GREEN = nvgRGB(0xC0, 0xE7, 0xDE); static const NVGcolor COLOR_COMPUTERSCARE_GREEN = nvgRGB(0x24, 0xc9, 0xa6); @@ -44,8 +49,21 @@ struct ComputerscareSVGPanel : widget::FramebufferWidget { void setBackground(std::shared_ptr<Svg> svg); }; -} -} + +struct ComputerscareSvgPort : PortWidget { + widget::FramebufferWidget *fb; + widget::SvgWidget *sw; + CircularShadow *shadow; + + ComputerscareSvgPort(); + void setSvg(std::shared_ptr<Svg> svg); + DEPRECATED void setSVG(std::shared_ptr<Svg> svg) {setSvg(svg);} +}; + + + +} // namespace app +} // namespace rack struct IsoButton : SvgSwitch { @@ -129,11 +147,10 @@ struct ComputerscareSmallLight : BASE { */ -struct OutPort : SvgPort { +struct OutPort : ComputerscareSvgPort { OutPort() { setSvg(APP->window->loadSvg(asset::plugin(pluginInstance, "res/computerscare-pentagon-jack-1-outline-flipped.svg"))); //background->wrap(); - //box.size = background->box.size; } }; diff --git a/src/ComputerscareDebug.cpp b/src/ComputerscareDebug.cpp @@ -16,6 +16,7 @@ struct ComputerscareDebug : Module { MANUAL_CLEAR_TRIGGER, CHANNEL_FOCUS, SWITCH_VIEW, + USE_CLOCK, NUM_PARAMS }; enum InputIds { @@ -52,10 +53,11 @@ struct ComputerscareDebug : Module { ComputerscareDebug() { config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS); - params[MANUAL_TRIGGER].config(0.0f, 1.0f, 0.0f); - params[MANUAL_CLEAR_TRIGGER].config(0.0f, 1.0f, 0.0f); - params[SWITCH_VIEW].config(0.0f, 1.0f, 0.0f); - params[CHANNEL_FOCUS].config(0.f,15.f,0.f); + params[MANUAL_TRIGGER].config(0.0f, 1.0f, 0.0f, "Manual Trigger"); + params[MANUAL_CLEAR_TRIGGER].config(0.0f, 1.0f, 0.0f, "Clear"); + params[SWITCH_VIEW].config(0.0f, 1.0f, 0.0f, "Single / All Channels"); + params[USE_CLOCK].config(0.0f, 1.0f, 0.0f, "Use Clock?"); + params[CHANNEL_FOCUS].config(0.f,15.f,0.f,"Input Channel Selector"); outputs[POLY_OUTPUT].setChannels(16); } @@ -73,7 +75,9 @@ struct ComputerscareDebug : Module { void ComputerscareDebug::step() { std::string thisVal; bool polyViewMode = params[SWITCH_VIEW].value < 0.5; - if (clockTrigger.process(inputs[TRG_INPUT].getVoltage() / 2.f) || manualClockTrigger.process(params[MANUAL_TRIGGER].value) || polyViewMode) { + bool useExternalClock = params[USE_CLOCK].value > 0.5; + if(useExternalClock) { + if (clockTrigger.process(inputs[TRG_INPUT].getVoltage() / 2.f) || manualClockTrigger.process(params[MANUAL_TRIGGER].value) ) { if(polyViewMode) { for(int i = 0; i < 16; i++) { logLines[i] = inputs[VAL_INPUT].getVoltage(i); @@ -93,6 +97,19 @@ void ComputerscareDebug::step() { } + } + else { + if(polyViewMode) { + for(int i = 0; i < 16; i++) { + logLines[i] = inputs[VAL_INPUT].getVoltage(i); + } + } + else { + inputChannel = floor(params[CHANNEL_FOCUS].value); + logLines[inputChannel] = inputs[VAL_INPUT].getVoltage(inputChannel); + } + } + if(clearTrigger.process(inputs[CLR_INPUT].getVoltage() / 2.f) || manualClearTrigger.process(params[MANUAL_CLEAR_TRIGGER].value)) { for( unsigned int a = 0; a < NUM_LINES; a++ ) { @@ -179,13 +196,25 @@ struct ComputerscareDebugWidget : ModuleWidget { addParam(createParam<MediumSnapKnob>(Vec(36,290),module,ComputerscareDebug::CHANNEL_FOCUS)); addOutput(createOutput<OutPort>(Vec(57, 1), module, ComputerscareDebug::POLY_OUTPUT)); - StringDisplayWidget3 *stringDisplay = createWidget<StringDisplayWidget3>(Vec(11,34)); - stringDisplay->box.size = Vec(77, 245); + StringDisplayWidget3 *stringDisplay = createWidget<StringDisplayWidget3>(Vec(15,34)); + stringDisplay->box.size = Vec(73, 245); stringDisplay->module = module; addChild(stringDisplay); + + printf("ujj\n"); + for(int i = 0; i < 16; i++) { + SmallLetterDisplay *sld = new SmallLetterDisplay(); + sld->fontSize = 15; + sld->textAlign=1; + sld->box.pos = Vec(-4,34+15.14*i); + sld->box.size = Vec(8, 10); + sld->value=std::to_string(i+1); + addChild(sld); + } + addParam(createParam<IsoButton>(Vec(4,279),module,ComputerscareDebug::SWITCH_VIEW)); - + addParam(createParam<IsoButton>(Vec(64,279),module,ComputerscareDebug::USE_CLOCK)); } }; diff --git a/src/ComputerscareIso.cpp b/src/ComputerscareIso.cpp @@ -103,8 +103,6 @@ struct ComputerscareIsoWidget : ModuleWidget { } void addLabeledKnob(std::string label,int x, int y, ComputerscareIso *module,int index,int type) { - - float ru = random::uniform(); smallLetterDisplay = new SmallLetterDisplay(); smallLetterDisplay->box.size = Vec(60, 30); smallLetterDisplay->value = label; diff --git a/src/ComputerscareKnolyPobs.cpp b/src/ComputerscareKnolyPobs.cpp @@ -0,0 +1,123 @@ +#include "Computerscare.hpp" + +struct ComputerscareKnolyPobs; + +const int numKnobs = 16; + +const int numToggles = 16; +const int numOutputs = 16; + +struct ComputerscareKnolyPobs : Module { + int counter = 0; + ComputerscareSVGPanel* panelRef; + enum ParamIds { + KNOB, + TOGGLES = KNOB + numKnobs, + NUM_PARAMS = TOGGLES+numToggles + + }; + enum InputIds { + CHANNEL_INPUT, + NUM_INPUTS + }; + enum OutputIds { + POLY_OUTPUT, + NUM_OUTPUTS=POLY_OUTPUT + numOutputs + }; + enum LightIds { + NUM_LIGHTS + }; + + + ComputerscareKnolyPobs() { + + config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS); + + for (int i = 0; i < numKnobs; i++) { + params[KNOB + i].config(0.0f, 10.0f, 0.0f); + params[KNOB+i].config(0.f, 10.f, 0.f, "Channel "+std::to_string(i+1) + " Voltage", " Volts"); + } + params[TOGGLES].config(0.0f, 1.0f, 0.0f); + outputs[POLY_OUTPUT].setChannels(16); + } + void step() override { + counter++; + if(counter > 5012) { + //printf("%f \n",random::uniform()); + counter = 0; + //rect4032 + //south facing high wall + } + for (int i = 0; i < numKnobs; i++) { + outputs[POLY_OUTPUT].setVoltage(params[KNOB+i].getValue(),i); + } + } + +}; + +struct ComputerscareKnolyPobsWidget : ModuleWidget { + ComputerscareKnolyPobsWidget(ComputerscareKnolyPobs *module) { + + setModule(module); + //setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/ComputerscareKnolyPobsPanel.svg"))); + box.size = Vec(4*15, 380); + { + ComputerscareSVGPanel *panel = new ComputerscareSVGPanel(); + panel->box.size = box.size; + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance,"res/ComputerscareKnolyPobsPanel.svg"))); + + //module->panelRef = panel; + + addChild(panel); + + } + float xx; + float yy; + for(int i = 0; i < numKnobs; i++) { + xx=0+25*(i%2); + yy=64 + 18.5*(i-i%2) + 11.3*(i%2); + addLabeledKnob(std::to_string(i+1),xx,yy,module,i,0); + } + + + + addOutput(createOutput<OutPort>(Vec(16, 34), module, ComputerscareKnolyPobs::POLY_OUTPUT)); + +} +void addLabeledKnob(std::string label,int x, int y, ComputerscareKnolyPobs *module,int index,int type) { + + smallLetterDisplay = new SmallLetterDisplay(); + smallLetterDisplay->box.size = Vec(60, 30); + smallLetterDisplay->value = label; + if(type == 0) { + addParam(createParam<SmoothKnob>(Vec(x,y),module,ComputerscareKnolyPobs::KNOB+index)); + smallLetterDisplay->box.pos = Vec(x,y-12); + } + else if(type ==1) { + addParam(createParam<SmallKnob>(Vec(x,y),module,ComputerscareKnolyPobs::KNOB+index)); + smallLetterDisplay->box.pos = Vec(x+12,y-10); + } + else if(type==2) { + addParam(createParam<BigSmoothKnob>(Vec(x,y),module,ComputerscareKnolyPobs::KNOB+index)); + smallLetterDisplay->box.pos = Vec(x+22,y-12); + } + else if (type==3) { + addParam(createParam<LrgKnob>(Vec(x,y),module,ComputerscareKnolyPobs::KNOB+index)); + smallLetterDisplay->box.pos = Vec(x+22,y-12); + } + else if (type==4) { + addParam(createParam<BigSmoothKnob>(Vec(x,y),module,ComputerscareKnolyPobs::KNOB+index)); + smallLetterDisplay->box.pos = Vec(x+22,y-12); + } + + else { + addParam(createParam<MediumSnapKnob>(Vec(x,y),module,ComputerscareKnolyPobs::KNOB+index)); + smallLetterDisplay->box.pos = Vec(x+12,y-10); + } + addChild(smallLetterDisplay); + +} +SmallLetterDisplay* smallLetterDisplay; +}; + +Model *modelComputerscareKnolyPobs = createModel<ComputerscareKnolyPobs, ComputerscareKnolyPobsWidget>("KnolyPobs"); diff --git a/src/ComputerscareSvgPort.cpp b/src/ComputerscareSvgPort.cpp @@ -0,0 +1,35 @@ +#include "app/SvgPort.hpp" +#include "Computerscare.hpp" + +namespace rack { +namespace app { + + +ComputerscareSvgPort::ComputerscareSvgPort() { + fb = new widget::FramebufferWidget; + addChild(fb); + + shadow = new CircularShadow; + fb->addChild(shadow); + // Avoid breakage if plugins fail to call setSvg() + // In that case, just disable the shadow. + shadow->box.size = math::Vec(0,0); + + sw = new widget::SvgWidget; + fb->addChild(sw); +} + +void ComputerscareSvgPort::setSvg(std::shared_ptr<Svg> svg) { + sw->setSvg(svg); + fb->box.size = sw->box.size; + box.size = sw->box.size; + shadow->box.size = math::Vec(0,0); + // Move shadow downward by 10% + shadow->box.pos = math::Vec(0, sw->box.size.y * 0.10); + // shadow->box = shadow->box.grow(math::Vec(2, 2)); + fb->dirty = true; +} + + +} // namespace app +} // namespace rack