aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authors-ol <s-ol@users.noreply.github.com>2017-12-08 21:41:45 +0000
committers-ol <s-ol@users.noreply.github.com>2017-12-08 21:41:45 +0000
commitc1982fc035558905d9923e6ec7b4d74507f393d9 (patch)
tree2b8b72aaefff5b84370841976fef3640b59f08e1
parentadd LICENSE (diff)
downloadvcvmods-c1982fc035558905d9923e6ec7b4d74507f393d9.tar.gz
vcvmods-c1982fc035558905d9923e6ec7b4d74507f393d9.zip
smaller pannels and VC modulo gainv0.5.1
-rw-r--r--res/CircleVCO.svg171
-rw-r--r--res/Modulo.svg225
-rw-r--r--res/WrapComp.svg23
-rw-r--r--src/CircleVCO.cpp14
-rw-r--r--src/Modulo.cpp15
-rw-r--r--src/WrapComp.cpp10
6 files changed, 240 insertions, 218 deletions
diff --git a/res/CircleVCO.svg b/res/CircleVCO.svg
index 8531d4c..ca4daa8 100644
--- a/res/CircleVCO.svg
+++ b/res/CircleVCO.svg
@@ -9,9 +9,9 @@
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="90"
+ width="60"
height="380"
- viewBox="0 0 23.812501 100.54167"
+ viewBox="0 0 15.875001 100.54167"
version="1.1"
id="svg8"
inkscape:version="0.92.2 5c3e80d, 2017-08-06"
@@ -26,8 +26,8 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.4"
- inkscape:cx="27.681321"
- inkscape:cy="199.25832"
+ inkscape:cx="-79.818679"
+ inkscape:cy="170.68689"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
@@ -37,9 +37,9 @@
inkscape:bbox-nodes="true"
inkscape:snap-bbox-edge-midpoints="true"
inkscape:window-width="1358"
- inkscape:window-height="744"
+ inkscape:window-height="730"
inkscape:window-x="0"
- inkscape:window-y="16"
+ inkscape:window-y="34"
inkscape:window-maximized="0"
showguides="false" />
<metadata
@@ -61,71 +61,15 @@
transform="translate(0,-196.45832)"
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"
+ style="opacity:1;vector-effect:none;fill:#f0f0f0;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.39687505;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 15.875001 V 296.99999 H 0 Z"
id="rect817"
inkscape:connector-curvature="0" />
<g
- aria-label="My Module"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.88055563px;line-height:6.61458302px;font-family:DINPro;-inkscape-font-specification:DINPro;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.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- id="text925"
- transform="translate(8.646165,-4.7625)">
- <g
- aria-label="Circle VCO"
- 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.07000434px"
- id="text3853">
- <path
- d="m -3.8144185,209.88405 v 0.3669 q -0.1756999,-0.16364 -0.3755154,-0.2446 -0.198093,-0.081 -0.4220242,-0.081 -0.4409722,0 -0.6752387,0.27044 -0.2342665,0.26872 -0.2342665,0.77859 0,0.50815 0.2342665,0.77859 0.2342665,0.26872 0.6752387,0.26872 0.2239312,0 0.4220242,-0.081 0.1998155,-0.081 0.3755154,-0.2446 v 0.36346 q -0.1825901,0.12402 -0.3875732,0.18603 -0.2032607,0.062 -0.430637,0.062 -0.5839436,0 -0.9198404,-0.35656 -0.3358968,-0.35829 -0.3358968,-0.97669 0,-0.62011 0.3358968,-0.97668 0.3358968,-0.35829 0.9198404,-0.35829 0.2308214,0 0.4340821,0.062 0.2049831,0.0603 0.3841281,0.18259 z"
- style="font-size:3.52777767px;stroke-width:0.07000434px"
- id="path7945"
- inkscape:connector-curvature="0" />
- <path
- d="M -3.2873188,210.32847 H -2.97037 v 1.92925 h -0.3169488 z m 0,-0.75103 H -2.97037 v 0.40135 h -0.3169488 z"
- style="font-size:3.52777767px;stroke-width:0.07000434px"
- id="path7947"
- inkscape:connector-curvature="0" />
- <path
- d="m -1.1909782,210.62475 q -0.053399,-0.031 -0.1171333,-0.0448 -0.062012,-0.0155 -0.1378038,-0.0155 -0.2687174,0 -0.4134114,0.1757 -0.1429715,0.17397 -0.1429715,0.50126 v 1.0163 h -0.3186713 v -1.92925 h 0.3186713 v 0.29972 q 0.099908,-0.1757 0.2601047,-0.2601 0.160197,-0.0861 0.3892958,-0.0861 0.032728,0 0.072347,0.005 0.039619,0.003 0.08785,0.0121 z"
- style="font-size:3.52777767px;stroke-width:0.07000434px"
- id="path7949"
- inkscape:connector-curvature="0" />
- <path
- d="m 0.45749971,210.40254 v 0.29628 q -0.13435872,-0.0741 -0.27043999,-0.11025 -0.13435872,-0.0379 -0.27216254,-0.0379 -0.30833603,0 -0.47886825,0.19637 -0.17053223,0.19464 -0.17053223,0.54777 0,0.35312 0.17053223,0.54949 0.17053222,0.19465 0.47886825,0.19465 0.13780382,0 0.27216254,-0.0362 0.13608127,-0.0379 0.27043999,-0.11196 v 0.29283 q -0.13263618,0.062 -0.27560763,0.093 -0.14124891,0.031 -0.30144585,0.031 -0.43580457,0 -0.69246417,-0.27388 -0.25665956,-0.27389 -0.25665956,-0.73897 0,-0.47198 0.25838211,-0.74242 0.2601047,-0.27044 0.71141219,-0.27044 0.14641656,0 0.28594292,0.031 0.13952636,0.0293 0.27043999,0.0896 z"
- style="font-size:3.52777767px;stroke-width:0.07000434px"
- id="path7951"
- inkscape:connector-curvature="0" />
- <path
- d="m 1.0121604,209.57744 h 0.3169488 v 2.68028 H 1.0121604 Z"
- style="font-size:3.52777767px;stroke-width:0.07000434px"
- id="path7953"
- inkscape:connector-curvature="0" />
- <path
- d="m 3.640768,211.21386 v 0.15503 H 2.1834927 q 0.020671,0.32728 0.1963704,0.49954 0.1774224,0.17053 0.4926487,0.17053 0.18259,0 0.3531222,-0.0448 0.1722548,-0.0448 0.3410645,-0.13436 v 0.29973 q -0.1705322,0.0723 -0.3496772,0.11024 -0.179145,0.0379 -0.3634576,0.0379 -0.4616427,0 -0.7320827,-0.26871 -0.2687175,-0.26872 -0.2687175,-0.72692 0,-0.4737 0.2549371,-0.75103 0.2566596,-0.27905 0.6907416,-0.27905 0.3892958,0 0.6149495,0.25149 0.2273763,0.24977 0.2273763,0.68041 z m -0.3169487,-0.093 q -0.00345,-0.26011 -0.1464166,-0.41513 -0.1412489,-0.15503 -0.3755154,-0.15503 -0.2652723,0 -0.4254693,0.14986 -0.1584744,0.14986 -0.18259,0.42202 z"
- style="font-size:3.52777767px;stroke-width:0.07000434px"
- id="path7955"
- inkscape:connector-curvature="0" />
- <path
- d="m 5.96104,212.25772 -0.9818522,-2.57176 h 0.3634576 l 0.814765,2.16524 0.8164876,-2.16524 h 0.361735 l -0.9801296,2.57176 z"
- style="font-size:3.52777767px;stroke-width:0.07000434px"
- id="path7957"
- inkscape:connector-curvature="0" />
- <path
- d="m 9.6352342,209.88405 v 0.3669 q -0.1756999,-0.16364 -0.3755154,-0.2446 -0.198093,-0.081 -0.4220242,-0.081 -0.4409722,0 -0.6752387,0.27044 -0.2342665,0.26872 -0.2342665,0.77859 0,0.50815 0.2342665,0.77859 0.2342665,0.26872 0.6752387,0.26872 0.2239312,0 0.4220242,-0.081 0.1998155,-0.081 0.3755154,-0.2446 v 0.36346 q -0.1825901,0.12402 -0.3875733,0.18603 -0.2032606,0.062 -0.4306369,0.062 -0.5839436,0 -0.9198404,-0.35656 -0.3358968,-0.35829 -0.3358968,-0.97669 0,-0.62011 0.3358968,-0.97668 0.3358968,-0.35829 0.9198404,-0.35829 0.2308214,0 0.434082,0.062 0.2049832,0.0603 0.3841282,0.18259 z"
- style="font-size:3.52777767px;stroke-width:0.07000434px"
- id="path7959"
- inkscape:connector-curvature="0" />
- <path
- d="m 11.219978,209.92195 q -0.378961,0 -0.602892,0.28249 -0.222208,0.2825 -0.222208,0.76998 0,0.48576 0.222208,0.76826 0.223931,0.2825 0.602892,0.2825 0.37896,0 0.599447,-0.2825 0.222208,-0.2825 0.222208,-0.76826 0,-0.48748 -0.222208,-0.76998 -0.220487,-0.28249 -0.599447,-0.28249 z m 0,-0.2825 q 0.54088,0 0.864719,0.36346 0.323839,0.36173 0.323839,0.97151 0,0.60806 -0.323839,0.97152 -0.323839,0.36173 -0.864719,0.36173 -0.542603,0 -0.868164,-0.36173 -0.323839,-0.36174 -0.323839,-0.97152 0,-0.60978 0.323839,-0.97151 0.325561,-0.36346 0.868164,-0.36346 z"
- style="font-size:3.52777767px;stroke-width:0.07000434px"
- id="path7961"
- inkscape:connector-curvature="0" />
- </g>
- </g>
- <g
aria-label="Pitch"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222223px;line-height:6.61458302px;font-family:DINPro;-inkscape-font-specification:DINPro;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.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
id="text946"
- transform="translate(0,-6.3499998)">
+ transform="translate(-3.9625765,-8.4666666)">
<path
d="m 10.343313,234.08358 c 0,-0.36124 -0.254,-0.58984 -0.6208893,-0.58984 H 8.9745348 v 2.00942 h 0.2144889 v -0.82691 h 0.5334 c 0.3668893,0 0.6208893,-0.23142 0.6208893,-0.59267 z m -0.214489,0 c 0,0.26529 -0.174978,0.40076 -0.4261558,0.40076 H 9.1890237 v -0.79869 h 0.5136445 c 0.2511778,0 0.4261558,0.13264 0.4261558,0.39793 z"
style="font-size:2.82222223px;text-align:center;text-anchor:middle;stroke-width:0.26458332px"
@@ -156,7 +100,7 @@
aria-label="1V/oct"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222223px;line-height:6.61458302px;font-family:DINPro;-inkscape-font-specification:DINPro;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.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
id="text950"
- transform="translate(0,-11.37796)">
+ transform="translate(-3.943361,-21.436551)">
<path
d="m 8.7942542,262.66519 v -2.00942 h -0.2032 l -0.3753555,0.32455 v 0.23143 l 0.3753555,-0.3302 v 1.78364 z"
style="font-size:2.82222223px;text-align:center;text-anchor:middle;stroke-width:0.26458332px"
@@ -191,32 +135,8 @@
<g
aria-label="Phase Ramp"
style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:2;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
- id="text3831">
- <path
- d="m 3.6469776,284.31319 v 0.77308 h 0.3500217 q 0.1943034,0 0.3004123,-0.1006 0.106109,-0.1006 0.106109,-0.28663 0,-0.18466 -0.106109,-0.28525 -0.1061089,-0.1006 -0.3004123,-0.1006 z m -0.2783637,-0.22876 h 0.6283854 q 0.3458876,0 0.5222765,0.1571 0.1777669,0.15572 0.1777669,0.45751 0,0.30455 -0.1777669,0.46026 -0.1763889,0.15572 -0.5222765,0.15572 H 3.6469776 v 0.82683 H 3.3686139 Z"
- style="font-size:2.82222223px;line-height:2;text-align:center;text-anchor:middle;stroke-width:0.26458332"
- id="path7926"
- inkscape:connector-curvature="0" />
- <path
- d="m 6.3437983,285.21029 v 0.93156 h -0.253559 v -0.92329 q 0,-0.21911 -0.085438,-0.32797 -0.085438,-0.10887 -0.2563151,-0.10887 -0.2053277,0 -0.323839,0.13092 -0.1185113,0.13091 -0.1185113,0.35691 v 0.8723 h -0.254937 v -2.14423 h 0.254937 v 0.8406 q 0.090951,-0.13918 0.213596,-0.20808 0.1240234,-0.0689 0.2852539,-0.0689 0.2659613,0 0.4023871,0.16536 0.1364258,0.16399 0.1364254,0.48369 z"
- style="font-size:2.82222223px;line-height:2;text-align:center;text-anchor:middle;stroke-width:0.26458332"
- id="path7928"
- inkscape:connector-curvature="0" />
- <path
- d="m 7.5537157,285.36601 q -0.3073025,0 -0.4258138,0.0703 -0.1185113,0.0703 -0.1185113,0.23978 0,0.13505 0.088195,0.21497 0.089573,0.0786 0.2425347,0.0786 0.2108399,0 0.3376194,-0.14883 0.1281575,-0.1502 0.1281575,-0.39825 v -0.0565 z m 0.50574,-0.10473 v 0.88057 h -0.253559 v -0.23427 q -0.086816,0.14056 -0.216352,0.20808 -0.1295356,0.0661 -0.3169488,0.0661 -0.2370225,0 -0.3775824,-0.13229 -0.1391819,-0.13367 -0.1391819,-0.35691 0,-0.26045 0.1736328,-0.39275 0.1750109,-0.13229 0.5208985,-0.13229 h 0.3555338 v -0.0248 q 0,-0.17501 -0.1157552,-0.2701 -0.1143772,-0.0965 -0.3224609,-0.0965 -0.1322917,0 -0.2576932,0.0317 -0.1254014,0.0317 -0.2411567,0.0951 v -0.23427 q 0.1391819,-0.0537 0.2700955,-0.0799 0.1309137,-0.0276 0.2549371,-0.0276 0.3348633,0 0.5002279,0.17363 0.1653645,0.17363 0.1653645,0.52641 z"
- style="font-size:2.82222223px;line-height:2;text-align:center;text-anchor:middle;stroke-width:0.26458332"
- id="path7930"
- inkscape:connector-curvature="0" />
- <path
- d="m 9.5670299,284.64392 v 0.23978 q -0.107487,-0.0551 -0.2232422,-0.0827 -0.1157552,-0.0276 -0.2397786,-0.0276 -0.1887912,0 -0.2838759,0.0579 -0.093707,0.0579 -0.093707,0.17363 0,0.0882 0.067524,0.13919 0.067524,0.0496 0.2714735,0.0951 l 0.086816,0.0193 q 0.2700955,0.0579 0.3830946,0.16399 0.1143772,0.10473 0.1143772,0.29352 0,0.21498 -0.1708767,0.34038 -0.1694987,0.1254 -0.467155,0.1254 -0.1240234,0 -0.2590712,-0.0248 -0.1336697,-0.0234 -0.2824978,-0.0716 v -0.26183 q 0.1405599,0.073 0.2769857,0.11024 0.1364258,0.0358 0.2700955,0.0358 0.1791449,0 0.2756076,-0.0606 0.096463,-0.062 0.096463,-0.17364 0,-0.10335 -0.07028,-0.15847 -0.068902,-0.0551 -0.3045464,-0.10611 l -0.088194,-0.0207 q -0.2356446,-0.0496 -0.3403755,-0.15158 -0.1047309,-0.10336 -0.1047309,-0.2825 0,-0.21773 0.1543403,-0.33624 0.1543403,-0.11851 0.4382161,-0.11851 0.1405599,0 0.2645834,0.0207 0.1240234,0.0207 0.2287543,0.062 z"
- style="font-size:2.82222223px;line-height:2;text-align:center;text-anchor:middle;stroke-width:0.26458332"
- id="path7932"
- inkscape:connector-curvature="0" />
- <path
- d="m 11.375016,285.30675 v 0.12403 h -1.165821 q 0.01654,0.26183 0.157097,0.39963 0.141938,0.13642 0.394119,0.13642 0.146072,0 0.282498,-0.0358 0.137803,-0.0358 0.272851,-0.10749 v 0.23978 q -0.136426,0.0579 -0.279742,0.0882 -0.143316,0.0303 -0.290766,0.0303 -0.369314,0 -0.585666,-0.21498 -0.2149739,-0.21497 -0.2149739,-0.58153 0,-0.37896 0.2039499,-0.60082 0.205327,-0.22324 0.552593,-0.22324 0.311437,0 0.49196,0.20119 0.181901,0.19982 0.181901,0.54432 z m -0.253559,-0.0744 q -0.0028,-0.20808 -0.117133,-0.33211 -0.113,-0.12402 -0.300413,-0.12402 -0.212218,0 -0.340375,0.11989 -0.12678,0.11989 -0.146072,0.33762 z"
- style="font-size:2.82222223px;line-height:2;text-align:center;text-anchor:middle;stroke-width:0.26458332"
- id="path7934"
- inkscape:connector-curvature="0" />
+ id="text3831"
+ transform="translate(-8.6347871,0.21693435)">
<path
d="m 13.67634,285.17722 q 0.08957,0.0303 0.173633,0.12953 0.08544,0.0992 0.170877,0.27286 l 0.282497,0.56224 h -0.299034 l -0.263205,-0.52779 q -0.101975,-0.20671 -0.198438,-0.27423 -0.09508,-0.0675 -0.260449,-0.0675 h -0.303168 v 0.86955 h -0.278364 v -2.05742 h 0.628385 q 0.352778,0 0.526411,0.14745 0.173633,0.14745 0.173633,0.44511 0,0.1943 -0.09095,0.32246 -0.08957,0.12816 -0.261827,0.17777 z m -0.697287,-0.86403 v 0.73036 h 0.350021 q 0.201194,0 0.303169,-0.0923 0.103353,-0.0937 0.103353,-0.27423 0,-0.18052 -0.103353,-0.27147 -0.101975,-0.0923 -0.303169,-0.0923 z"
style="font-size:2.82222223px;line-height:2;text-align:center;text-anchor:middle;stroke-width:0.26458332"
@@ -241,7 +161,8 @@
<g
aria-label="Sin Cos "
style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:2;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
- id="text3831-3">
+ id="text3831-3"
+ transform="translate(1.4331605,-8.5950003)">
<path
d="m 5.8601074,267.05259 v 0.27148 q -0.1584744,-0.0758 -0.2990343,-0.113 -0.1405599,-0.0372 -0.2714735,-0.0372 -0.2273763,0 -0.3513998,0.0882 -0.1226454,0.0882 -0.1226454,0.2508 0,0.13642 0.081304,0.2067 0.082682,0.0689 0.3114366,0.11162 l 0.1681207,0.0345 q 0.3114366,0.0593 0.4588867,0.20946 0.1488281,0.14883 0.1488281,0.39963 0,0.29903 -0.2011935,0.45337 -0.1998156,0.15434 -0.5870443,0.15434 -0.1460721,0 -0.3114366,-0.0331 -0.1639866,-0.0331 -0.3403755,-0.0978 v -0.28663 q 0.1694987,0.0951 0.3321072,0.14331 0.1626085,0.0482 0.3197049,0.0482 0.2384006,0 0.3679362,-0.0937 0.1295356,-0.0937 0.1295356,-0.26734 0,-0.15158 -0.093707,-0.23702 -0.092329,-0.0854 -0.3045465,-0.12816 l -0.1694987,-0.0331 q -0.3114366,-0.062 -0.4506185,-0.19431 -0.1391818,-0.13229 -0.1391818,-0.36793 0,-0.27285 0.1915473,-0.42995 0.1929253,-0.1571 0.5305447,-0.1571 0.144694,0 0.2949002,0.0262 0.1502061,0.0262 0.3073025,0.0785 z"
style="font-size:2.82222223px;line-height:2;text-align:center;text-anchor:middle;stroke-width:0.26458332"
@@ -257,21 +178,67 @@
style="font-size:2.82222223px;line-height:2;text-align:center;text-anchor:middle;stroke-width:0.26458332"
id="path7917"
inkscape:connector-curvature="0" />
+ </g>
+ <g
+ aria-label="Circle
+VCO"
+ style="font-style:normal;font-weight:normal;font-size:2.82222247px;line-height:1.25;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458335"
+ id="text5403">
+ <path
+ d="m 5.2468805,203.04859 v 0.3669 q -0.1756999,-0.16364 -0.3755154,-0.2446 -0.198093,-0.081 -0.4220243,-0.081 -0.4409722,0 -0.6752387,0.27044 -0.2342665,0.26871 -0.2342665,0.77859 0,0.50815 0.2342665,0.77859 0.2342665,0.26872 0.6752387,0.26872 0.2239313,0 0.4220243,-0.081 0.1998155,-0.081 0.3755154,-0.2446 v 0.36345 q -0.1825901,0.12403 -0.3875733,0.18604 -0.2032606,0.062 -0.4306369,0.062 -0.5839437,0 -0.9198406,-0.35657 -0.3358968,-0.35829 -0.3358968,-0.97668 0,-0.62012 0.3358968,-0.97669 0.3358969,-0.35829 0.9198406,-0.35829 0.2308214,0 0.434082,0.062 0.2049832,0.0603 0.3841282,0.18259 z"
+ style="font-size:3.52777791px;line-height:1.25;stroke-width:0.26458335"
+ id="path5407" />
+ <path
+ d="m 5.77398,203.493 h 0.3169488 v 1.92926 H 5.77398 Z m 0,-0.75103 h 0.3169488 v 0.40136 H 5.77398 Z"
+ style="font-size:3.52777791px;line-height:1.25;stroke-width:0.26458335"
+ id="path5409" />
+ <path
+ d="m 7.8703207,203.78928 q -0.053399,-0.031 -0.1171332,-0.0448 -0.062012,-0.0155 -0.1378039,-0.0155 -0.2687174,0 -0.4134114,0.1757 -0.1429715,0.17398 -0.1429715,0.50126 v 1.01631 H 6.7403294 V 203.493 h 0.3186713 v 0.29973 q 0.099908,-0.1757 0.2601047,-0.26011 0.160197,-0.0861 0.3892958,-0.0861 0.032728,0 0.072347,0.005 0.039619,0.003 0.08785,0.0121 z"
+ style="font-size:3.52777791px;line-height:1.25;stroke-width:0.26458335"
+ id="path5411" />
+ <path
+ d="m 9.5187991,203.56707 v 0.29628 q -0.1343587,-0.0741 -0.27044,-0.11024 -0.1343587,-0.0379 -0.2721625,-0.0379 -0.3083361,0 -0.4788683,0.19637 -0.1705323,0.19465 -0.1705323,0.54777 0,0.35312 0.1705323,0.54949 0.1705322,0.19465 0.4788683,0.19465 0.1378038,0 0.2721625,-0.0362 0.1360813,-0.0379 0.27044,-0.11197 v 0.29284 q -0.1326362,0.062 -0.2756076,0.093 -0.1412489,0.031 -0.3014459,0.031 -0.4358046,0 -0.6924642,-0.27388 -0.2566596,-0.27389 -0.2566596,-0.73898 0,-0.47198 0.2583821,-0.74242 0.2601048,-0.27044 0.7114123,-0.27044 0.1464166,0 0.2859429,0.031 0.1395264,0.0293 0.27044,0.0896 z"
+ style="font-size:3.52777791px;line-height:1.25;stroke-width:0.26458335"
+ id="path5413" />
+ <path
+ d="m 10.073459,202.74197 h 0.316949 v 2.68029 h -0.316949 z"
+ style="font-size:3.52777791px;line-height:1.25;stroke-width:0.26458335"
+ id="path5415" />
+ <path
+ d="m 12.702067,204.37839 v 0.15503 h -1.457275 q 0.02067,0.32729 0.19637,0.49954 0.177423,0.17053 0.492649,0.17053 0.18259,0 0.353122,-0.0448 0.172255,-0.0448 0.341065,-0.13436 v 0.29972 q -0.170532,0.0724 -0.349677,0.11024 -0.179145,0.0379 -0.363458,0.0379 -0.461643,0 -0.732083,-0.26872 -0.268717,-0.26871 -0.268717,-0.72691 0,-0.4737 0.254937,-0.75103 0.25666,-0.27906 0.690742,-0.27906 0.389295,0 0.614949,0.2515 0.227376,0.24977 0.227376,0.6804 z m -0.316948,-0.093 q -0.0034,-0.2601 -0.146417,-0.41513 -0.141249,-0.15503 -0.375515,-0.15503 -0.265273,0 -0.42547,0.14986 -0.158474,0.14986 -0.18259,0.42203 z"
+ style="font-size:3.52777791px;line-height:1.25;stroke-width:0.26458335"
+ id="path5417" />
+ <path
+ d="m 5.1142443,209.83198 -0.9818522,-2.57177 h 0.3634575 l 0.8147652,2.16525 0.8164876,-2.16525 h 0.3617351 l -0.9801297,2.57177 z"
+ style="font-size:3.52777791px;line-height:1.25;stroke-width:0.26458335"
+ id="path5419" />
+ <path
+ d="m 8.7884388,207.45831 v 0.3669 q -0.1756999,-0.16364 -0.3755154,-0.2446 -0.198093,-0.081 -0.4220242,-0.081 -0.4409723,0 -0.6752388,0.27044 -0.2342665,0.26872 -0.2342665,0.77859 0,0.50815 0.2342665,0.77859 0.2342665,0.26872 0.6752388,0.26872 0.2239312,0 0.4220242,-0.081 0.1998155,-0.081 0.3755154,-0.2446 v 0.36346 q -0.18259,0.12402 -0.3875732,0.18603 -0.2032607,0.062 -0.430637,0.062 -0.5839437,0 -0.9198405,-0.35656 -0.3358968,-0.35829 -0.3358968,-0.97669 0,-0.62012 0.3358968,-0.97668 0.3358968,-0.35829 0.9198405,-0.35829 0.2308214,0 0.4340821,0.062 0.2049831,0.0603 0.3841281,0.18259 z"
+ style="font-size:3.52777791px;line-height:1.25;stroke-width:0.26458335"
+ id="path5421" />
+ <path
+ d="m 10.373183,207.4962 q -0.3789608,0 -0.602892,0.2825 -0.2222087,0.2825 -0.2222087,0.76998 0,0.48576 0.2222087,0.76826 0.2239312,0.28249 0.602892,0.28249 0.37896,0 0.599446,-0.28249 0.222209,-0.2825 0.222209,-0.76826 0,-0.48748 -0.222209,-0.76998 -0.220486,-0.2825 -0.599446,-0.2825 z m 0,-0.28249 q 0.54088,0 0.864719,0.36345 0.323839,0.36174 0.323839,0.97152 0,0.60806 -0.323839,0.97152 -0.323839,0.36173 -0.864719,0.36173 -0.5426028,0 -0.8681644,-0.36173 -0.3238389,-0.36174 -0.3238389,-0.97152 0,-0.60978 0.3238389,-0.97152 0.3255616,-0.36345 0.8681644,-0.36345 z"
+ style="font-size:3.52777791px;line-height:1.25;stroke-width:0.26458335"
+ id="path5423" />
+ </g>
+ <g
+ id="g5450"
+ transform="translate(-21.166668,5.320467)">
<path
- d="m 15.923921,267.14354 v 0.29353 q -0.14056,-0.13092 -0.300413,-0.19569 -0.158474,-0.0648 -0.337619,-0.0648 -0.352778,0 -0.540191,0.21635 -0.187413,0.21497 -0.187413,0.62287 0,0.40652 0.187413,0.62288 0.187413,0.21497 0.540191,0.21497 0.179145,0 0.337619,-0.0648 0.159853,-0.0648 0.300413,-0.19568 v 0.29077 q -0.146072,0.0992 -0.310059,0.14882 -0.162608,0.0496 -0.344509,0.0496 -0.467155,0 -0.735873,-0.28525 -0.268717,-0.28663 -0.268717,-0.78135 0,-0.49609 0.268717,-0.78135 0.268718,-0.28663 0.735873,-0.28663 0.184657,0 0.347265,0.0496 0.163987,0.0482 0.307303,0.14607 z"
- style="font-size:2.82222223px;line-height:2;text-align:center;text-anchor:middle;stroke-width:0.26458332"
+ inkscape:connector-curvature="0"
id="path7919"
- inkscape:connector-curvature="0" />
+ style="font-style:normal;font-weight:normal;font-size:2.82222223px;line-height:2;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+ d="m 28.326958,266.45729 v 0.29353 q -0.14056,-0.13092 -0.300413,-0.19569 -0.158474,-0.0648 -0.337619,-0.0648 -0.352778,0 -0.540191,0.21635 -0.187413,0.21497 -0.187413,0.62287 0,0.40652 0.187413,0.62288 0.187413,0.21497 0.540191,0.21497 0.179145,0 0.337619,-0.0648 0.159853,-0.0648 0.300413,-0.19568 v 0.29077 q -0.146072,0.0992 -0.310059,0.14882 -0.162608,0.0496 -0.344509,0.0496 -0.467155,0 -0.735873,-0.28525 -0.268717,-0.28663 -0.268717,-0.78135 0,-0.49609 0.268717,-0.78135 0.268718,-0.28663 0.735873,-0.28663 0.184657,0 0.347265,0.0496 0.163987,0.0482 0.307303,0.14607 z" />
<path
- d="m 16.943669,267.67684 q -0.20395,0 -0.322461,0.15986 -0.118511,0.15847 -0.118511,0.43546 0,0.27698 0.117133,0.43684 0.118511,0.15847 0.323839,0.15847 0.202571,0 0.321083,-0.15985 0.118511,-0.15986 0.118511,-0.43546 0,-0.27423 -0.118511,-0.43408 -0.118512,-0.16124 -0.321083,-0.16124 z m 0,-0.21497 q 0.330729,0 0.51952,0.21497 0.188791,0.21498 0.188791,0.59532 0,0.37896 -0.188791,0.59531 -0.188791,0.21497 -0.51952,0.21497 -0.332107,0 -0.520899,-0.21497 -0.187413,-0.21635 -0.187413,-0.59531 0,-0.38034 0.187413,-0.59532 0.188792,-0.21497 0.520899,-0.21497 z"
- style="font-size:2.82222223px;line-height:2;text-align:center;text-anchor:middle;stroke-width:0.26458332"
+ inkscape:connector-curvature="0"
id="path7921"
- inkscape:connector-curvature="0" />
+ style="font-style:normal;font-weight:normal;font-size:2.82222223px;line-height:2;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+ d="m 29.346706,266.99059 q -0.20395,0 -0.322461,0.15986 -0.118511,0.15847 -0.118511,0.43546 0,0.27698 0.117133,0.43684 0.118511,0.15847 0.323839,0.15847 0.202571,0 0.321083,-0.15985 0.118511,-0.15986 0.118511,-0.43546 0,-0.27423 -0.118511,-0.43408 -0.118512,-0.16124 -0.321083,-0.16124 z m 0,-0.21497 q 0.330729,0 0.51952,0.21497 0.188791,0.21498 0.188791,0.59532 0,0.37896 -0.188791,0.59531 -0.188791,0.21497 -0.51952,0.21497 -0.332107,0 -0.520899,-0.21497 -0.187413,-0.21635 -0.187413,-0.59531 0,-0.38034 0.187413,-0.59532 0.188792,-0.21497 0.520899,-0.21497 z" />
<path
- d="m 19.054823,267.54455 v 0.23978 q -0.107487,-0.0551 -0.223242,-0.0827 -0.115755,-0.0276 -0.239779,-0.0276 -0.188791,0 -0.283876,0.0579 -0.09371,0.0579 -0.09371,0.17363 0,0.0882 0.06752,0.13918 0.06752,0.0496 0.271473,0.0951 l 0.08682,0.0193 q 0.270095,0.0579 0.383094,0.16398 0.114377,0.10474 0.114377,0.29353 0,0.21497 -0.170876,0.34037 -0.169499,0.1254 -0.467155,0.1254 -0.124024,0 -0.259071,-0.0248 -0.13367,-0.0234 -0.282498,-0.0717 v -0.26183 q 0.14056,0.073 0.276985,0.11025 0.136426,0.0358 0.270096,0.0358 0.179145,0 0.275607,-0.0606 0.09646,-0.062 0.09646,-0.17363 0,-0.10335 -0.07028,-0.15848 -0.0689,-0.0551 -0.304546,-0.1061 l -0.0882,-0.0207 q -0.235644,-0.0496 -0.340375,-0.15159 -0.104731,-0.10335 -0.104731,-0.2825 0,-0.21773 0.15434,-0.33624 0.154341,-0.11851 0.438216,-0.11851 0.14056,0 0.264584,0.0207 0.124023,0.0207 0.228754,0.062 z"
- style="font-size:2.82222223px;line-height:2;text-align:center;text-anchor:middle;stroke-width:0.26458332"
+ inkscape:connector-curvature="0"
id="path7923"
- inkscape:connector-curvature="0" />
+ style="font-style:normal;font-weight:normal;font-size:2.82222223px;line-height:2;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+ d="m 31.45786,266.8583 v 0.23978 q -0.107487,-0.0551 -0.223242,-0.0827 -0.115755,-0.0276 -0.239779,-0.0276 -0.188791,0 -0.283876,0.0579 -0.09371,0.0579 -0.09371,0.17363 0,0.0882 0.06752,0.13918 0.06752,0.0496 0.271472,0.0951 l 0.08682,0.0193 q 0.270095,0.0579 0.383094,0.16398 0.114377,0.10474 0.114377,0.29353 0,0.21497 -0.170876,0.34037 -0.169499,0.1254 -0.467155,0.1254 -0.124024,0 -0.259071,-0.0248 -0.13367,-0.0234 -0.282498,-0.0717 v -0.26183 q 0.14056,0.073 0.276985,0.11025 0.136426,0.0358 0.270096,0.0358 0.179145,0 0.275607,-0.0606 0.09646,-0.062 0.09646,-0.17363 0,-0.10335 -0.07028,-0.15848 -0.0689,-0.0551 -0.304546,-0.1061 l -0.0882,-0.0207 q -0.235644,-0.0496 -0.340375,-0.15159 -0.104731,-0.10335 -0.104731,-0.2825 0,-0.21773 0.15434,-0.33624 0.154341,-0.11851 0.438216,-0.11851 0.14056,0 0.264584,0.0207 0.124023,0.0207 0.228754,0.062 z" />
</g>
</g>
</svg>
diff --git a/res/Modulo.svg b/res/Modulo.svg
index 0423036..bafe2c1 100644
--- a/res/Modulo.svg
+++ b/res/Modulo.svg
@@ -15,23 +15,10 @@
version="1.1"
id="svg8"
inkscape:version="0.92.2 5c3e80d, 2017-08-06"
- sodipodi:docname="Modulo.svg">
+ sodipodi:docname="Modulo.svg"
+ enable-background="new">
<defs
- id="defs2">
- <filter
- inkscape:collect="always"
- style="color-interpolation-filters:sRGB"
- id="filter8023"
- x="-0.044000003"
- width="1.088"
- y="-0.0069473684"
- height="1.0138947">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="0.2910417"
- id="feGaussianBlur8025" />
- </filter>
- </defs>
+ id="defs2" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
@@ -39,9 +26,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="1.4"
- inkscape:cx="-6.679139"
- inkscape:cy="176.12905"
+ inkscape:zoom="1.979899"
+ inkscape:cx="-52.229151"
+ inkscape:cy="312.75684"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
@@ -51,9 +38,9 @@
inkscape:bbox-nodes="false"
inkscape:snap-bbox-edge-midpoints="false"
inkscape:window-width="1358"
- inkscape:window-height="744"
+ inkscape:window-height="730"
inkscape:window-x="0"
- inkscape:window-y="16"
+ inkscape:window-y="34"
inkscape:window-maximized="0"
showguides="false"
inkscape:snap-global="false"
@@ -76,13 +63,12 @@
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-196.45832)"
- style="display:inline">
+ style="display:inline;">
<path
- style="opacity:1;vector-effect:none;fill:#f0f0f0;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.39687505;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;filter:url(#filter8023)"
- d="M 0,196.45831 H 15.875001 V 296.99999 H 0 Z"
+ style="opacity:1;vector-effect:none;fill:#f0f0f0;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.39687505;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.45832 H 15.875001 V 296.99999 H 0 Z"
id="rect817"
- inkscape:connector-curvature="0"
- transform="matrix(1.2697693,0,0,1.0155352,0.05487952,-4.9031397)" />
+ inkscape:connector-curvature="0" />
<g
aria-label="My Module"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.88055563px;line-height:6.61458302px;font-family:DINPro;-inkscape-font-specification:DINPro;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;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@@ -157,114 +143,181 @@
style="font-size:2.82222247px;text-align:center;text-anchor:middle;stroke-width:0.26458335"
id="path8117" />
</g>
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.26458335px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m -0.26189716,278.76186 5.54584306,-5.54585 v 5.94675 l 2.706104,-2.7061 v 2.7061 l 6.0970861,-6.09708 v 5.96345 l 2.777055,-1.60334"
+ id="path8101"
+ inkscape:connector-curvature="0" />
<g
- aria-label="Staircase"
+ transform="translate(4.9988429,-5.5115638)"
+ id="g3824"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.88055563px;line-height:6.61458302px;font-family:DINPro;-inkscape-font-specification:DINPro;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;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ aria-label="My Module">
+ <g
+ id="g3822"
+ style="font-style:normal;font-weight:normal;font-size:3.88055563px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.07000434px"
+ aria-label="Modulo">
+ <path
+ inkscape:connector-curvature="0"
+ id="path3810"
+ style="font-size:3.88055563px;stroke-width:0.07000434px"
+ d="m -3.8144185,210.92532 h 0.5703355 l 0.7219198,1.92512 0.7257094,-1.92512 h 0.5703355 v 2.82894 h -0.3732761 v -2.48409 l -0.7294989,1.94028 h -0.384645 l -0.7294989,-1.94028 v 2.48409 h -0.3713813 z" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path3812"
+ style="font-size:3.88055563px;stroke-width:0.07000434px"
+ d="m 0.34277822,211.87651 q -0.28043078,0 -0.4433838,0.21979 -0.16295302,0.21791 -0.16295302,0.59876 0,0.38086 0.16105822,0.60065 0.16295302,0.21791 0.4452786,0.21791 0.27853598,0 0.441489,-0.2198 0.16295302,-0.2198 0.16295302,-0.59876 0,-0.37706 -0.16295302,-0.59686 -0.16295302,-0.22169 -0.441489,-0.22169 z m 0,-0.29559 q 0.45475261,0 0.71434058,0.29559 0.2595879,0.29559 0.2595879,0.81855 0,0.52107 -0.2595879,0.81856 -0.25958797,0.29559 -0.71434058,0.29559 -0.45664741,0 -0.71623536,-0.29559 -0.25769315,-0.29749 -0.25769315,-0.81856 0,-0.52296 0.25769315,-0.81855 0.25958795,-0.29559 0.71623536,-0.29559 z" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path3814"
+ style="font-size:3.88055563px;stroke-width:0.07000434px"
+ d="m 3.2891959,211.95419 v -1.14825 h 0.3486437 v 2.94832 H 3.2891959 v -0.31833 q -0.1098985,0.18948 -0.278536,0.28233 -0.1667426,0.091 -0.4016981,0.091 -0.3846449,0 -0.6271796,-0.30696 -0.24064,-0.30696 -0.24064,-0.80719 0,-0.50023 0.24064,-0.80718 0.2425347,-0.30696 0.6271796,-0.30696 0.2349555,0 0.4016981,0.0928 0.1686375,0.091 0.278536,0.28043 z m -1.1880412,0.74087 q 0,0.38465 0.1572686,0.60444 0.1591634,0.21791 0.4358046,0.21791 0.2766412,0 0.4358046,-0.21791 0.1591634,-0.21979 0.1591634,-0.60444 0,-0.38464 -0.1591634,-0.60254 -0.1591634,-0.2198 -0.4358046,-0.2198 -0.2766412,0 -0.4358046,0.2198 -0.1572686,0.2179 -0.1572686,0.60254 z" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path3816"
+ style="font-size:3.88055563px;stroke-width:0.07000434px"
+ d="m 4.3199687,212.91675 v -1.28467 h 0.3486436 v 1.27141 q 0,0.30127 0.1174778,0.45286 0.1174778,0.14969 0.3524333,0.14969 0.2823256,0 0.4452786,-0.18001 0.1648478,-0.18 0.1648478,-0.49075 v -1.2032 h 0.3486437 v 2.12218 H 5.7486498 v -0.32591 q -0.1269518,0.19327 -0.2955892,0.28801 -0.1667426,0.0928 -0.3884345,0.0928 -0.3656969,0 -0.5551772,-0.22738 -0.1894802,-0.22738 -0.1894802,-0.66508 z m 0.8772935,-1.33583 z" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path3818"
+ style="font-size:3.88055563px;stroke-width:0.07000434px"
+ d="m 6.8192134,210.80594 h 0.3486437 v 2.94832 H 6.8192134 Z" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path3820"
+ style="font-size:3.88055563px;stroke-width:0.07000434px"
+ d="m 8.7178049,211.87651 q -0.2804308,0 -0.4433838,0.21979 -0.162953,0.21791 -0.162953,0.59876 0,0.38086 0.1610582,0.60065 0.162953,0.21791 0.4452786,0.21791 0.278536,0 0.441489,-0.2198 0.162953,-0.2198 0.162953,-0.59876 0,-0.37706 -0.162953,-0.59686 -0.162953,-0.22169 -0.441489,-0.22169 z m 0,-0.29559 q 0.4547526,0 0.7143406,0.29559 0.2595879,0.29559 0.2595879,0.81855 0,0.52107 -0.2595879,0.81856 -0.259588,0.29559 -0.7143406,0.29559 -0.4566474,0 -0.7162353,-0.29559 -0.2576932,-0.29749 -0.2576932,-0.81856 0,-0.52296 0.2576932,-0.81855 0.2595879,-0.29559 0.7162353,-0.29559 z" />
+ </g>
+ </g>
+ <g
+ id="g3860"
style="font-style:normal;font-weight:normal;font-size:2.82222247px;line-height:1.25;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458335"
- id="text8052">
+ aria-label="Staircase"
+ transform="translate(0,-3.1748906)">
<path
- d="m 2.9255753,263.41395 v 0.27148 q -0.1584744,-0.0758 -0.2990343,-0.113 -0.1405599,-0.0372 -0.2714735,-0.0372 -0.2273764,0 -0.3513998,0.0882 -0.1226454,0.0882 -0.1226454,0.25081 0,0.13642 0.081304,0.2067 0.082682,0.0689 0.3114367,0.11162 l 0.1681207,0.0344 q 0.3114366,0.0593 0.4588867,0.20947 0.1488282,0.14882 0.1488282,0.39963 0,0.29903 -0.2011936,0.45337 -0.1998156,0.15434 -0.5870443,0.15434 -0.1460721,0 -0.3114367,-0.0331 -0.1639866,-0.0331 -0.3403755,-0.0978 v -0.28663 q 0.1694987,0.0951 0.3321073,0.14331 0.1626085,0.0482 0.3197049,0.0482 0.2384006,0 0.3679362,-0.0937 0.1295356,-0.0937 0.1295356,-0.26734 0,-0.15159 -0.093707,-0.23702 -0.092329,-0.0854 -0.3045465,-0.12816 l -0.1694987,-0.0331 q -0.3114367,-0.062 -0.4506185,-0.1943 -0.1391819,-0.13229 -0.1391819,-0.36793 0,-0.27286 0.1915473,-0.42995 0.1929254,-0.1571 0.5305448,-0.1571 0.144694,0 0.2949002,0.0262 0.1502062,0.0262 0.3073025,0.0786 z"
+ id="path3842"
style="font-size:2.82222247px;text-align:center;text-anchor:middle;stroke-width:0.26458335"
- id="path8120" />
+ d="m 2.9255753,263.41395 v 0.27148 q -0.1584744,-0.0758 -0.2990343,-0.113 -0.1405599,-0.0372 -0.2714735,-0.0372 -0.2273764,0 -0.3513998,0.0882 -0.1226454,0.0882 -0.1226454,0.25081 0,0.13642 0.081304,0.2067 0.082682,0.0689 0.3114367,0.11162 l 0.1681207,0.0344 q 0.3114366,0.0593 0.4588867,0.20947 0.1488282,0.14882 0.1488282,0.39963 0,0.29903 -0.2011936,0.45337 -0.1998156,0.15434 -0.5870443,0.15434 -0.1460721,0 -0.3114367,-0.0331 -0.1639866,-0.0331 -0.3403755,-0.0978 v -0.28663 q 0.1694987,0.0951 0.3321073,0.14331 0.1626085,0.0482 0.3197049,0.0482 0.2384006,0 0.3679362,-0.0937 0.1295356,-0.0937 0.1295356,-0.26734 0,-0.15159 -0.093707,-0.23702 -0.092329,-0.0854 -0.3045465,-0.12816 l -0.1694987,-0.0331 q -0.3114367,-0.062 -0.4506185,-0.1943 -0.1391819,-0.13229 -0.1391819,-0.36793 0,-0.27286 0.1915473,-0.42995 0.1929254,-0.1571 0.5305448,-0.1571 0.144694,0 0.2949002,0.0262 0.1502062,0.0262 0.3073031,0.0786 z"
+ inkscape:connector-curvature="0" />
<path
- d="m 3.7234595,263.42222 v 0.43822 H 4.245736 v 0.19706 H 3.7234595 v 0.83784 q 0,0.18879 0.050987,0.24254 0.052366,0.0537 0.2108399,0.0537 H 4.245736 v 0.21222 H 3.9852868 q -0.2935222,0 -0.4051433,-0.10887 -0.1116211,-0.11024 -0.1116211,-0.39963 V 264.0575 H 3.2824872 v -0.19706 h 0.1860352 v -0.43822 z"
+ id="path3844"
style="font-size:2.82222247px;text-align:center;text-anchor:middle;stroke-width:0.26458335"
- id="path8122" />
+ d="m 3.7234595,263.42222 v 0.43822 H 4.245736 v 0.19706 H 3.7234595 v 0.83784 q 0,0.18879 0.050987,0.24254 0.052366,0.0537 0.2108399,0.0537 H 4.245736 v 0.21222 H 3.9852868 q -0.2935222,0 -0.4051433,-0.10887 -0.1116211,-0.11024 -0.1116211,-0.39963 v -0.8378 H 3.2824872 v -0.19706 h 0.1860352 v -0.43822 z"
+ inkscape:connector-curvature="0" />
<path
- d="m 5.2820208,264.628 q -0.3073025,0 -0.4258138,0.0703 -0.1185113,0.0703 -0.1185113,0.23978 0,0.13505 0.088195,0.21498 0.089572,0.0785 0.2425347,0.0785 0.2108399,0 0.3376194,-0.14882 0.1281575,-0.15021 0.1281575,-0.39826 v -0.0565 z m 0.5057401,-0.10473 v 0.88057 H 5.5342018 v -0.23427 q -0.086816,0.14056 -0.216352,0.20809 -0.1295356,0.0661 -0.3169488,0.0661 -0.2370226,0 -0.3775825,-0.13229 -0.1391819,-0.13367 -0.1391819,-0.35691 0,-0.26045 0.1736329,-0.39274 0.1750108,-0.13229 0.5208985,-0.13229 h 0.3555338 v -0.0248 q 0,-0.17501 -0.1157552,-0.27009 -0.1143772,-0.0965 -0.3224609,-0.0965 -0.1322917,0 -0.2576932,0.0317 -0.1254015,0.0317 -0.2411567,0.0951 v -0.23426 q 0.1391819,-0.0538 0.2700955,-0.0799 0.1309136,-0.0276 0.2549371,-0.0276 0.3348633,0 0.5002279,0.17363 0.1653646,0.17363 0.1653646,0.52641 z"
+ id="path3846"
style="font-size:2.82222247px;text-align:center;text-anchor:middle;stroke-width:0.26458335"
- id="path8124" />
+ d="m 5.2820208,264.628 q -0.3073025,0 -0.4258138,0.0703 -0.1185113,0.0703 -0.1185113,0.23978 0,0.13505 0.088195,0.21498 0.089572,0.0785 0.2425347,0.0785 0.2108399,0 0.3376194,-0.14882 0.1281575,-0.15021 0.1281575,-0.39826 v -0.0565 z m 0.5057401,-0.10473 v 0.88057 H 5.5342018 v -0.23427 q -0.086816,0.14056 -0.216352,0.20809 -0.1295356,0.0661 -0.3169488,0.0661 -0.2370226,0 -0.3775825,-0.13229 -0.1391819,-0.13367 -0.1391819,-0.35691 0,-0.26045 0.1736329,-0.39274 0.1750108,-0.13229 0.5208985,-0.13229 h 0.3555338 v -0.0248 q 0,-0.17501 -0.1157552,-0.27009 -0.1143772,-0.0965 -0.3224609,-0.0965 -0.1322917,0 -0.2576932,0.0317 -0.1254015,0.0317 -0.2411567,0.0951 v -0.23426 q 0.1391819,-0.0538 0.2700955,-0.0799 0.1309136,-0.0276 0.2549371,-0.0276 0.3348633,0 0.5002279,0.17363 0.1653646,0.17363 0.1653646,0.52641 z"
+ inkscape:connector-curvature="0" />
<path
- d="m 6.3114157,263.86044 h 0.253559 v 1.5434 h -0.253559 z m 0,-0.60083 h 0.253559 v 0.32108 h -0.253559 z"
+ id="path3848"
style="font-size:2.82222247px;text-align:center;text-anchor:middle;stroke-width:0.26458335"
- id="path8126" />
+ d="m 6.3114157,263.86044 h 0.253559 v 1.5434 h -0.253559 z m 0,-0.60083 h 0.253559 v 0.32108 h -0.253559 z"
+ inkscape:connector-curvature="0" />
<path
- d="m 7.9884879,264.09746 q -0.042719,-0.0248 -0.093707,-0.0358 -0.049609,-0.0124 -0.1102431,-0.0124 -0.214974,0 -0.3307292,0.14056 -0.1143772,0.13918 -0.1143772,0.40101 v 0.81304 h -0.254937 v -1.5434 h 0.254937 v 0.23977 q 0.079926,-0.14056 0.2080838,-0.20808 0.1281576,-0.0689 0.3114367,-0.0689 0.026183,0 0.057878,0.004 0.031695,0.003 0.07028,0.01 z"
+ id="path3850"
style="font-size:2.82222247px;text-align:center;text-anchor:middle;stroke-width:0.26458335"
- id="path8128" />
+ d="m 7.9884879,264.09746 q -0.042719,-0.0248 -0.093707,-0.0358 -0.049609,-0.0124 -0.1102431,-0.0124 -0.214974,0 -0.3307292,0.14056 -0.1143772,0.13918 -0.1143772,0.40101 v 0.81304 h -0.254937 v -1.5434 h 0.254937 v 0.23977 q 0.079926,-0.14056 0.2080838,-0.20808 0.1281576,-0.0689 0.3114367,-0.0689 0.026183,0 0.057878,0.004 0.031695,0.003 0.07028,0.01 z"
+ inkscape:connector-curvature="0" />
<path
- d="m 9.3072707,263.91969 v 0.23702 q -0.107487,-0.0592 -0.216352,-0.0882 -0.107487,-0.0303 -0.21773,-0.0303 -0.2466689,0 -0.3830947,0.1571 -0.1364258,0.15572 -0.1364258,0.43822 0,0.28249 0.1364258,0.43959 0.1364258,0.15572 0.3830947,0.15572 0.110243,0 0.21773,-0.0289 0.108865,-0.0303 0.216352,-0.0896 v 0.23426 q -0.1061089,0.0496 -0.2204861,0.0744 -0.1129991,0.0248 -0.2411567,0.0248 -0.3486437,0 -0.5539714,-0.21911 -0.2053277,-0.2191 -0.2053277,-0.59117 0,-0.37759 0.2067057,-0.59394 0.2080838,-0.21635 0.5691299,-0.21635 0.1171332,0 0.2287543,0.0248 0.1116211,0.0234 0.216352,0.0717 z"
+ id="path3852"
style="font-size:2.82222247px;text-align:center;text-anchor:middle;stroke-width:0.26458335"
- id="path8130" />
+ d="m 9.3072707,263.91969 v 0.23702 q -0.107487,-0.0592 -0.216352,-0.0882 -0.107487,-0.0303 -0.21773,-0.0303 -0.2466689,0 -0.3830947,0.1571 -0.1364258,0.15572 -0.1364258,0.43822 0,0.28249 0.1364258,0.43959 0.1364258,0.15572 0.3830947,0.15572 0.110243,0 0.21773,-0.0289 0.108865,-0.0303 0.216352,-0.0896 v 0.23426 q -0.1061089,0.0496 -0.2204861,0.0744 -0.1129991,0.0248 -0.2411567,0.0248 -0.3486437,0 -0.5539714,-0.21911 -0.2053277,-0.2191 -0.2053277,-0.59117 0,-0.37759 0.2067057,-0.59394 0.2080838,-0.21635 0.5691299,-0.21635 0.1171332,0 0.2287543,0.0248 0.1116211,0.0234 0.216352,0.0717 z"
+ inkscape:connector-curvature="0" />
<path
- d="m 10.452421,264.628 q -0.307303,0 -0.425814,0.0703 -0.1185112,0.0703 -0.1185112,0.23978 0,0.13505 0.088195,0.21498 0.089573,0.0785 0.2425347,0.0785 0.21084,0 0.337619,-0.14882 0.128158,-0.15021 0.128158,-0.39826 v -0.0565 z m 0.50574,-0.10473 v 0.88057 h -0.253559 v -0.23427 q -0.08682,0.14056 -0.216352,0.20809 -0.129536,0.0661 -0.316949,0.0661 -0.2370224,0 -0.3775823,-0.13229 -0.1391819,-0.13367 -0.1391819,-0.35691 0,-0.26045 0.1736328,-0.39274 0.1750104,-0.13229 0.5208984,-0.13229 h 0.355534 v -0.0248 q 0,-0.17501 -0.115755,-0.27009 -0.114377,-0.0965 -0.322461,-0.0965 -0.132292,0 -0.257693,0.0317 -0.1254018,0.0317 -0.2411571,0.0951 v -0.23426 q 0.1391819,-0.0538 0.2700951,-0.0799 0.130914,-0.0276 0.254938,-0.0276 0.334863,0 0.500227,0.17363 0.165365,0.17363 0.165365,0.52641 z"
+ id="path3854"
style="font-size:2.82222247px;text-align:center;text-anchor:middle;stroke-width:0.26458335"
- id="path8132" />
+ d="m 10.452421,264.628 q -0.307303,0 -0.425814,0.0703 -0.1185112,0.0703 -0.1185112,0.23978 0,0.13505 0.088195,0.21498 0.089573,0.0785 0.2425342,0.0785 0.21084,0 0.337619,-0.14882 0.128159,-0.15021 0.128159,-0.39826 v -0.0565 z m 0.50574,-0.10473 v 0.88057 h -0.253559 v -0.23427 q -0.08682,0.14056 -0.216352,0.20809 -0.129536,0.0661 -0.316949,0.0661 -0.2370224,0 -0.3775823,-0.13229 -0.1391819,-0.13367 -0.1391819,-0.35691 0,-0.26045 0.1736328,-0.39274 0.1750104,-0.13229 0.5208984,-0.13229 h 0.355534 v -0.0248 q 0,-0.17501 -0.115755,-0.27009 -0.114377,-0.0965 -0.322461,-0.0965 -0.132292,0 -0.257693,0.0317 -0.1254018,0.0317 -0.2411571,0.0951 v -0.23426 q 0.1391819,-0.0538 0.2700951,-0.0799 0.130914,-0.0276 0.254938,-0.0276 0.334863,0 0.500227,0.17363 0.165365,0.17363 0.165365,0.52641 z"
+ inkscape:connector-curvature="0" />
<path
- d="m 12.465735,263.90591 v 0.23978 q -0.107487,-0.0551 -0.223242,-0.0827 -0.115756,-0.0276 -0.239779,-0.0276 -0.188791,0 -0.283876,0.0579 -0.09371,0.0579 -0.09371,0.17364 0,0.0882 0.06752,0.13918 0.06752,0.0496 0.271474,0.0951 l 0.08682,0.0193 q 0.270096,0.0579 0.383095,0.16398 0.114377,0.10473 0.114377,0.29353 0,0.21497 -0.170877,0.34037 -0.169498,0.1254 -0.467155,0.1254 -0.124023,0 -0.259071,-0.0248 -0.13367,-0.0234 -0.282498,-0.0717 v -0.26183 q 0.14056,0.073 0.276986,0.11025 0.136426,0.0358 0.270095,0.0358 0.179145,0 0.275608,-0.0606 0.09646,-0.062 0.09646,-0.17363 0,-0.10336 -0.07028,-0.15848 -0.0689,-0.0551 -0.304547,-0.10611 l -0.08819,-0.0207 q -0.235645,-0.0496 -0.340376,-0.15158 -0.10473,-0.10335 -0.10473,-0.2825 0,-0.21773 0.15434,-0.33624 0.15434,-0.11851 0.438216,-0.11851 0.14056,0 0.264583,0.0207 0.124024,0.0207 0.228755,0.062 z"
+ id="path3856"
style="font-size:2.82222247px;text-align:center;text-anchor:middle;stroke-width:0.26458335"
- id="path8134" />
+ d="m 12.465735,263.90591 v 0.23978 q -0.107487,-0.0551 -0.223242,-0.0827 -0.115756,-0.0276 -0.239779,-0.0276 -0.188791,0 -0.283876,0.0579 -0.09371,0.0579 -0.09371,0.17364 0,0.0882 0.06752,0.13918 0.06752,0.0496 0.271474,0.0951 l 0.08682,0.0193 q 0.270096,0.0579 0.383095,0.16398 0.114377,0.10473 0.114377,0.29353 0,0.21497 -0.170877,0.34037 -0.169498,0.1254 -0.467155,0.1254 -0.124023,0 -0.259071,-0.0248 -0.13367,-0.0234 -0.282498,-0.0717 v -0.26183 q 0.14056,0.073 0.276986,0.11025 0.136426,0.0358 0.270095,0.0358 0.179145,0 0.275608,-0.0606 0.09646,-0.062 0.09646,-0.17363 0,-0.10336 -0.07028,-0.15848 -0.0689,-0.0551 -0.304547,-0.10611 l -0.08819,-0.0207 q -0.235645,-0.0496 -0.340376,-0.15158 -0.10473,-0.10335 -0.10473,-0.2825 0,-0.21773 0.15434,-0.33624 0.15434,-0.11851 0.438216,-0.11851 0.14056,0 0.264583,0.0207 0.124024,0.0207 0.228755,0.062 z"
+ inkscape:connector-curvature="0" />
<path
- d="m 14.273721,264.56875 v 0.12402 H 13.1079 q 0.01654,0.26183 0.157097,0.39963 0.141938,0.13643 0.394119,0.13643 0.146072,0 0.282497,-0.0358 0.137804,-0.0358 0.272852,-0.10749 v 0.23978 q -0.136426,0.0579 -0.279742,0.0882 -0.143316,0.0303 -0.290766,0.0303 -0.369314,0 -0.585666,-0.21497 -0.214974,-0.21498 -0.214974,-0.58153 0,-0.37896 0.20395,-0.60083 0.205327,-0.22324 0.552593,-0.22324 0.311437,0 0.49196,0.20119 0.181901,0.19982 0.181901,0.54433 z m -0.253559,-0.0744 q -0.0028,-0.20808 -0.117134,-0.3321 -0.112999,-0.12403 -0.300412,-0.12403 -0.212218,0 -0.340376,0.11989 -0.126779,0.11989 -0.146072,0.33762 z"
+ id="path3858"
style="font-size:2.82222247px;text-align:center;text-anchor:middle;stroke-width:0.26458335"
- id="path8136" />
+ d="m 14.273721,264.56875 v 0.12402 H 13.1079 q 0.01654,0.26183 0.157097,0.39963 0.141938,0.13643 0.394119,0.13643 0.146072,0 0.282497,-0.0358 0.137804,-0.0358 0.272852,-0.10749 v 0.23978 q -0.136426,0.0579 -0.279742,0.0882 -0.143316,0.0303 -0.290766,0.0303 -0.369314,0 -0.585666,-0.21497 -0.214974,-0.21498 -0.214974,-0.58153 0,-0.37896 0.20395,-0.60083 0.205327,-0.22324 0.552593,-0.22324 0.311437,0 0.49196,0.20119 0.181901,0.19982 0.181901,0.54433 z m -0.253559,-0.0744 q -0.0028,-0.20808 -0.117134,-0.3321 -0.112999,-0.12403 -0.300412,-0.12403 -0.212218,0 -0.340376,0.11989 -0.126779,0.11989 -0.146072,0.33762 z"
+ inkscape:connector-curvature="0" />
</g>
<g
- aria-label="Input"
+ id="g3872"
style="font-style:normal;font-weight:normal;font-size:2.82222247px;line-height:1.25;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458335"
- id="text8056">
+ aria-label="Input"
+ transform="translate(0,-16.933335)">
<path
- d="m 4.4531304,238.72062 h 0.2783638 v 2.05741 H 4.4531304 Z"
+ id="path3862"
style="font-size:2.82222247px;text-align:center;text-anchor:middle;stroke-width:0.26458335"
- id="path8139" />
+ d="m 4.4531304,238.72062 h 0.2783638 v 2.05741 H 4.4531304 Z"
+ inkscape:connector-curvature="0" />
<path
- d="m 6.5573949,239.84648 v 0.93155 h -0.253559 v -0.92329 q 0,-0.2191 -0.085438,-0.32797 -0.085438,-0.10886 -0.2563151,-0.10886 -0.2053277,0 -0.323839,0.13091 -0.1185113,0.13091 -0.1185113,0.35691 v 0.8723 H 5.264795 v -1.5434 h 0.2549371 v 0.23978 q 0.09095,-0.13919 0.2135959,-0.20809 0.1240235,-0.0689 0.2852539,-0.0689 0.2659614,0 0.4023872,0.16537 0.1364258,0.16398 0.1364258,0.48369 z"
+ id="path3864"
style="font-size:2.82222247px;text-align:center;text-anchor:middle;stroke-width:0.26458335"
- id="path8141" />
+ d="m 6.5573949,239.84648 v 0.93155 h -0.253559 v -0.92329 q 0,-0.2191 -0.085438,-0.32797 -0.085438,-0.10886 -0.2563151,-0.10886 -0.2053277,0 -0.323839,0.13091 -0.1185113,0.13091 -0.1185113,0.35691 v 0.8723 H 5.264795 v -1.5434 h 0.2549371 v 0.23978 q 0.09095,-0.13919 0.2135959,-0.20809 0.1240235,-0.0689 0.2852539,-0.0689 0.2659614,0 0.4023872,0.16537 0.1364258,0.16398 0.1364258,0.48369 z"
+ inkscape:connector-curvature="0" />
<path
- d="m 7.311182,240.54652 v 0.81855 H 7.0562449 v -2.13044 H 7.311182 v 0.23426 q 0.079926,-0.1378 0.2011936,-0.20395 0.1226454,-0.0675 0.2921441,-0.0675 0.2811198,0 0.4561307,0.22324 0.1763889,0.22324 0.1763889,0.58705 0,0.3638 -0.1763889,0.58704 -0.1750109,0.22324 -0.4561307,0.22324 -0.1694987,0 -0.2921441,-0.0661 -0.1212674,-0.0675 -0.2011936,-0.20533 z m 0.862652,-0.53881 q 0,-0.27974 -0.1157553,-0.43822 -0.1143771,-0.15985 -0.3155707,-0.15985 -0.2011936,0 -0.3169489,0.15985 -0.1143771,0.15848 -0.1143771,0.43822 0,0.27974 0.1143771,0.43959 0.1157553,0.15848 0.3169489,0.15848 0.2011936,0 0.3155707,-0.15848 0.1157553,-0.15985 0.1157553,-0.43959 z"
+ id="path3866"
style="font-size:2.82222247px;text-align:center;text-anchor:middle;stroke-width:0.26458335"
- id="path8143" />
+ d="m 7.311182,240.54652 v 0.81855 H 7.0562449 v -2.13044 H 7.311182 v 0.23426 q 0.079926,-0.1378 0.2011936,-0.20395 0.1226454,-0.0675 0.2921441,-0.0675 0.2811198,0 0.4561307,0.22324 0.1763889,0.22324 0.1763889,0.58705 0,0.3638 -0.1763889,0.58704 -0.1750109,0.22324 -0.4561307,0.22324 -0.1694987,0 -0.2921441,-0.0661 -0.1212674,-0.0675 -0.2011936,-0.20533 z m 0.862652,-0.53881 q 0,-0.27974 -0.1157553,-0.43822 -0.1143771,-0.15985 -0.3155707,-0.15985 -0.2011936,0 -0.3169489,0.15985 -0.1143771,0.15848 -0.1143771,0.43822 0,0.27974 0.1143771,0.43959 0.1157553,0.15848 0.3169489,0.15848 0.2011936,0 0.3155707,-0.15848 0.1157553,-0.15985 0.1157553,-0.43959 z"
+ inkscape:connector-curvature="0" />
<path
- d="m 8.831158,240.16894 v -0.93431 h 0.253559 v 0.92466 q 0,0.21911 0.085438,0.32935 0.085438,0.10887 0.2563151,0.10887 0.2053277,0 0.323839,-0.13092 0.1198894,-0.13091 0.1198894,-0.35691 v -0.87505 h 0.2535591 v 1.5434 H 9.8701989 v -0.23702 q -0.092329,0.14056 -0.214974,0.20946 -0.1212674,0.0675 -0.2824979,0.0675 -0.2659614,0 -0.4037652,-0.16536 -0.1378038,-0.16537 -0.1378038,-0.48369 z m 0.6380317,-0.97152 z"
+ id="path3868"
style="font-size:2.82222247px;text-align:center;text-anchor:middle;stroke-width:0.26458335"
- id="path8145" />
+ d="m 8.831158,240.16894 v -0.93431 h 0.253559 v 0.92466 q 0,0.21911 0.085438,0.32935 0.085438,0.10887 0.2563151,0.10887 0.2053277,0 0.323839,-0.13092 0.1198894,-0.13091 0.1198894,-0.35691 v -0.87505 h 0.2535595 v 1.5434 H 9.8701989 v -0.23702 q -0.092329,0.14056 -0.214974,0.20946 -0.1212674,0.0675 -0.2824979,0.0675 -0.2659614,0 -0.4037652,-0.16536 -0.1378038,-0.16537 -0.1378038,-0.48369 z m 0.6380317,-0.97152 z"
+ inkscape:connector-curvature="0" />
<path
- d="m 10.899594,238.79641 v 0.43822 h 0.522276 v 0.19706 h -0.522276 v 0.83784 q 0,0.1888 0.05099,0.24254 0.05237,0.0537 0.21084,0.0537 h 0.260449 v 0.21222 h -0.260449 q -0.293522,0 -0.405143,-0.10886 -0.111621,-0.11025 -0.111621,-0.39964 v -0.83784 h -0.186036 v -0.19706 h 0.186036 v -0.43822 z"
+ id="path3870"
style="font-size:2.82222247px;text-align:center;text-anchor:middle;stroke-width:0.26458335"
- id="path8147" />
+ d="m 10.899594,238.79641 v 0.43822 h 0.522276 v 0.19706 h -0.522276 v 0.83784 q 0,0.1888 0.05099,0.24254 0.05237,0.0537 0.21084,0.0537 h 0.260449 v 0.21222 h -0.260449 q -0.293522,0 -0.405143,-0.10886 -0.111621,-0.11025 -0.111621,-0.39964 v -0.83784 h -0.186036 v -0.19706 h 0.186036 v -0.43822 z"
+ inkscape:connector-curvature="0" />
</g>
<g
- aria-label="Gain"
+ id="g3882"
style="font-style:normal;font-weight:normal;font-size:2.82222247px;line-height:1.25;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458335"
- id="text8060">
+ aria-label="Gain"
+ transform="translate(0,10.054167)">
<path
- d="m 6.4127012,229.06108 v -0.5526 H 5.9579486 v -0.22875 h 0.7303603 v 0.88332 q -0.1612305,0.11438 -0.3555339,0.17363 -0.1943034,0.0579 -0.4147895,0.0579 -0.4823134,0 -0.755165,-0.28112 -0.2714736,-0.2825 -0.2714736,-0.78548 0,-0.50436 0.2714736,-0.78548 0.2728516,-0.2825 0.755165,-0.2825 0.2011936,0 0.3817166,0.0496 0.1819011,0.0496 0.3348633,0.14607 v 0.29628 q -0.1543403,-0.13091 -0.3279731,-0.19706 -0.1736328,-0.0661 -0.3651802,-0.0661 -0.3775825,0 -0.5677517,0.21083 -0.1887913,0.21084 -0.1887913,0.62839 0,0.41617 0.1887913,0.62701 0.1901692,0.21084 0.5677517,0.21084 0.1474501,0 0.2632054,-0.0248 0.1157552,-0.0262 0.2080837,-0.0799 z"
+ id="path3874"
style="font-size:2.82222247px;text-align:center;text-anchor:middle;stroke-width:0.26458335"
- id="path8150" />
+ d="m 6.4127012,229.06108 v -0.5526 H 5.9579486 v -0.22875 h 0.7303603 v 0.88332 q -0.1612305,0.11438 -0.3555339,0.17363 -0.1943034,0.0579 -0.4147895,0.0579 -0.4823134,0 -0.755165,-0.28112 -0.2714736,-0.2825 -0.2714736,-0.78548 0,-0.50436 0.2714736,-0.78548 0.2728516,-0.2825 0.755165,-0.2825 0.2011936,0 0.3817166,0.0496 0.1819011,0.0496 0.3348633,0.14607 v 0.29628 q -0.1543403,-0.13091 -0.3279731,-0.19706 -0.1736328,-0.0661 -0.3651802,-0.0661 -0.3775825,0 -0.5677517,0.21083 -0.1887913,0.21084 -0.1887913,0.62839 0,0.41617 0.1887913,0.62701 0.1901692,0.21084 0.5677517,0.21084 0.1474501,0 0.2632054,-0.0248 0.1157552,-0.0262 0.2080837,-0.0799 z"
+ inkscape:connector-curvature="0" />
<path
- d="m 7.8885804,228.57876 q -0.3073026,0 -0.4258139,0.0703 -0.1185113,0.0703 -0.1185113,0.23978 0,0.13505 0.088195,0.21498 0.089573,0.0785 0.2425347,0.0785 0.2108399,0 0.3376194,-0.14882 0.1281576,-0.15021 0.1281576,-0.39826 v -0.0565 z m 0.50574,-0.10473 v 0.88057 h -0.253559 v -0.23427 q -0.086816,0.14056 -0.216352,0.20809 -0.1295356,0.0661 -0.3169489,0.0661 -0.2370225,0 -0.3775825,-0.13229 -0.1391818,-0.13367 -0.1391818,-0.35691 0,-0.26045 0.1736328,-0.39274 0.1750109,-0.13229 0.5208985,-0.13229 h 0.3555339 v -0.0248 q 0,-0.17501 -0.1157552,-0.27009 -0.1143772,-0.0965 -0.322461,-0.0965 -0.1322917,0 -0.2576932,0.0317 -0.1254015,0.0317 -0.2411567,0.0951 v -0.23426 q 0.1391819,-0.0538 0.2700955,-0.0799 0.1309137,-0.0276 0.2549371,-0.0276 0.3348633,0 0.5002279,0.17363 0.1653646,0.17363 0.1653646,0.52641 z"
+ id="path3876"
style="font-size:2.82222247px;text-align:center;text-anchor:middle;stroke-width:0.26458335"
- id="path8152" />
+ d="m 7.8885804,228.57876 q -0.3073026,0 -0.4258139,0.0703 -0.1185113,0.0703 -0.1185113,0.23978 0,0.13505 0.088195,0.21498 0.089573,0.0785 0.2425347,0.0785 0.2108399,0 0.3376194,-0.14882 0.1281576,-0.15021 0.1281576,-0.39826 v -0.0565 z m 0.50574,-0.10473 v 0.88057 h -0.253559 v -0.23427 q -0.086816,0.14056 -0.216352,0.20809 -0.1295356,0.0661 -0.3169489,0.0661 -0.2370225,0 -0.3775825,-0.13229 -0.1391818,-0.13367 -0.1391818,-0.35691 0,-0.26045 0.1736328,-0.39274 0.1750109,-0.13229 0.5208985,-0.13229 h 0.3555339 v -0.0248 q 0,-0.17501 -0.1157552,-0.27009 -0.1143772,-0.0965 -0.322461,-0.0965 -0.1322917,0 -0.2576932,0.0317 -0.1254015,0.0317 -0.2411567,0.0951 v -0.23426 q 0.1391819,-0.0538 0.2700955,-0.0799 0.1309137,-0.0276 0.2549371,-0.0276 0.3348633,0 0.5002279,0.17363 0.1653646,0.17363 0.1653646,0.52641 z"
+ inkscape:connector-curvature="0" />
<path
- d="m 8.917975,227.8112 h 0.253559 v 1.5434 H 8.917975 Z m 0,-0.60083 h 0.253559 v 0.32108 H 8.917975 Z"
+ id="path3878"
style="font-size:2.82222247px;text-align:center;text-anchor:middle;stroke-width:0.26458335"
- id="path8154" />
+ d="m 8.917975,227.8112 h 0.253559 v 1.5434 H 8.917975 Z m 0,-0.60083 h 0.253559 v 0.32108 H 8.917975 Z"
+ inkscape:connector-curvature="0" />
<path
- d="m 10.983654,228.42305 v 0.93155 h -0.253559 v -0.92329 q 0,-0.2191 -0.08544,-0.32797 -0.08544,-0.10886 -0.256315,-0.10886 -0.205328,0 -0.323839,0.13091 -0.1185116,0.13091 -0.1185116,0.35691 v 0.8723 H 9.6910543 v -1.5434 h 0.2549371 v 0.23977 q 0.090951,-0.13918 0.2135956,-0.20808 0.124024,-0.0689 0.285254,-0.0689 0.265962,0 0.402387,0.16536 0.136426,0.16399 0.136426,0.4837 z"
+ id="path3880"
style="font-size:2.82222247px;text-align:center;text-anchor:middle;stroke-width:0.26458335"
- id="path8156" />
+ d="m 10.983654,228.42305 v 0.93155 h -0.253559 v -0.92329 q 0,-0.2191 -0.08544,-0.32797 -0.08544,-0.10886 -0.256315,-0.10886 -0.205328,0 -0.323839,0.13091 -0.1185116,0.13091 -0.1185116,0.35691 v 0.8723 H 9.6910543 v -1.5434 h 0.2549371 v 0.23977 q 0.090951,-0.13918 0.2135956,-0.20808 0.124024,-0.0689 0.285254,-0.0689 0.265962,0 0.402387,0.16536 0.136426,0.16399 0.136426,0.4837 z"
+ inkscape:connector-curvature="0" />
</g>
<path
- style="fill:none;stroke:#000000;stroke-width:0.26458335px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m -0.52916667,249.72013 8.68626027,-6.01357 v 6.41447 l 9.8202274,-5.66971"
- id="path8062"
- inkscape:connector-curvature="0" />
+ inkscape:connector-curvature="0"
+ id="path3884"
+ d="m -0.52916667,220.08676 8.68626027,-6.01357 v 6.41447 l 9.8202274,-5.66971"
+ style="fill:none;stroke:#000000;stroke-width:0.26458335px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
- style="fill:none;stroke:#000000;stroke-width:0.26458335px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m -0.26189716,278.76186 5.54584306,-5.54585 v 5.94675 l 2.706104,-2.7061 v 2.7061 l 6.0970861,-6.09708 v 5.96345 l 2.777055,-1.60334"
- id="path8101"
- inkscape:connector-curvature="0" />
+ inkscape:connector-curvature="0"
+ id="path3888"
+ d="M -0.46772171,258.0486 H 5.0113039 v -3.47451 h 3.0067823 v 3.34087 h 5.8799298 v -2.53906 h 2.539061"
+ style="fill:none;stroke:#000000;stroke-width:0.26458335px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
- style="fill:none;stroke:#000000;stroke-width:0.26458335px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M -0.46772171,261.22349 H 5.0113039 v -3.47451 h 3.0067823 v 3.34087 h 5.8799298 v -2.53906 h 2.539061"
- id="path8103"
+ style="fill:none;stroke:#000000;stroke-width:0.52916669;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+ d="M 4.6772171,244.08062 H 13.363477"
+ id="path3894"
inkscape:connector-curvature="0" />
</g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="widgets"
- style="display:none">
+ style="display:none;opacity:0.98999999">
<rect
style="opacity:1;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:0.33033794"
id="PHASE"
@@ -283,14 +336,6 @@
inkscape:label="PITCH" />
<rect
style="display:inline;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:0.33033794"
- id="PHASE-5"
- width="8.3556299"
- height="8.3556299"
- x="12.964597"
- y="60.49678"
- inkscape:label="COS" />
- <rect
- style="display:inline;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:0.33033794"
id="PHASE-5-4"
width="8.3556299"
height="8.3556299"
@@ -298,8 +343,8 @@
y="60.49678"
inkscape:label="SIN" />
<rect
- y="19.521294"
- x="7.728435"
+ y="15.456871"
+ x="3.7596855"
height="8.3556299"
width="8.3556299"
id="PITCH_CTL"
diff --git a/res/WrapComp.svg b/res/WrapComp.svg
index 1303baf..fcc2779 100644
--- a/res/WrapComp.svg
+++ b/res/WrapComp.svg
@@ -26,8 +26,8 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.979899"
- inkscape:cx="-67.260536"
- inkscape:cy="101.47594"
+ inkscape:cx="-86.200896"
+ inkscape:cy="202.49119"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
@@ -37,9 +37,9 @@
inkscape:bbox-nodes="true"
inkscape:snap-bbox-edge-midpoints="true"
inkscape:window-width="1358"
- inkscape:window-height="744"
+ inkscape:window-height="730"
inkscape:window-x="0"
- inkscape:window-y="16"
+ inkscape:window-y="34"
inkscape:window-maximized="0"
showguides="false" />
<metadata
@@ -50,7 +50,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>
@@ -66,8 +66,7 @@
id="rect817"
inkscape:connector-curvature="0" />
<g
- aria-label="Wrapping
-Comparator"
+ aria-label="Wrapping Comparator"
style="font-style:normal;font-weight:normal;font-size:6.35000038px;line-height:1.25;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458335"
id="text8343">
<path
@@ -266,5 +265,15 @@ Comparator"
style="stroke-width:0.26458335"
id="path8486" />
</g>
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.50270838;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 6.1471991,232.1903 H 17.238885"
+ id="path4701"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.5291667;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 5.7462951,252.02082 H 17.238885"
+ id="path4703"
+ inkscape:connector-curvature="0" />
</g>
</svg>
diff --git a/src/CircleVCO.cpp b/src/CircleVCO.cpp
index 849d1e4..b1bbaab 100644
--- a/src/CircleVCO.cpp
+++ b/src/CircleVCO.cpp
@@ -52,20 +52,18 @@ CircleVCOWidget::CircleVCOWidget() {
setPanel(SVG::load(assetPlugin(plugin, "res/CircleVCO.svg")));
addChild(createScrew<ScrewSilver>(Vec(RACK_GRID_WIDTH, 0)));
- addChild(createScrew<ScrewSilver>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0)));
- addChild(createScrew<ScrewSilver>(Vec(RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));
addChild(createScrew<ScrewSilver>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));
PJ301MPort p;
- Davies1900hBlackKnob k;
+ RoundSmallBlackKnob k;
Vec center = Vec(box.size.x, 0).minus(p.box.size).div(2);
Vec kcenter = Vec(box.size.x, 0).minus(k.box.size).div(2);
- addParam(createParam<Davies1900hBlackKnob>(kcenter.plus(Vec(0, 90)), module, CircleVCO::PITCH_PARAM, 0.0, 1.0, 0.0));
+ addParam(createParam<RoundSmallBlackKnob>(kcenter.plus(Vec(0, 90)), module, CircleVCO::PITCH_PARAM, 0.0, 1.0, 0.0));
- addInput(createInput<PJ301MPort>(center.plus(Vec(0, 180)), module, CircleVCO::PITCH_INPUT));
+ addInput(createInput<PJ301MPort>(center.plus(Vec(0, 144)), module, CircleVCO::PITCH_INPUT));
- addOutput(createOutput<PJ301MPort>(center.plus(Vec(-18, 250)), module, CircleVCO::SIN_OUTPUT));
- addOutput(createOutput<PJ301MPort>(center.plus(Vec( 18, 250)), module, CircleVCO::COS_OUTPUT));
- addOutput(createOutput<PJ301MPort>(center.plus(Vec(0, 315)), module, CircleVCO::PHS_OUTPUT));
+ addOutput(createOutput<PJ301MPort>(center.plus(Vec(0, 218)), module, CircleVCO::SIN_OUTPUT));
+ addOutput(createOutput<PJ301MPort>(center.plus(Vec(0, 268)), module, CircleVCO::COS_OUTPUT));
+ addOutput(createOutput<PJ301MPort>(center.plus(Vec(0, 318)), module, CircleVCO::PHS_OUTPUT));
}
diff --git a/src/Modulo.cpp b/src/Modulo.cpp
index 8b2cb6a..838f3ae 100644
--- a/src/Modulo.cpp
+++ b/src/Modulo.cpp
@@ -7,6 +7,7 @@ struct Modulo : Module {
};
enum InputIds {
SIGNAL_INPUT,
+ GAIN_INPUT,
NUM_INPUTS
};
enum OutputIds {
@@ -24,7 +25,7 @@ struct Modulo : Module {
void Modulo::step() {
- float gain = powf(2.0, params[GAIN_PARAM].value);
+ float gain = powf(2.0, params[GAIN_PARAM].value) + inputs[GAIN_INPUT].value;
float val = inputs[SIGNAL_INPUT].value * gain;
float stair = floorf(val);
float wrap = val - stair;
@@ -43,14 +44,16 @@ ModuloWidget::ModuloWidget() {
addChild(createScrew<ScrewSilver>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));
PJ301MPort p;
- Davies1900hBlackKnob k;
+ RoundSmallBlackKnob k;
Vec center = Vec(box.size.x, 0).minus(p.box.size).div(2);
Vec kcenter = Vec(box.size.x, 0).minus(k.box.size).div(2);
- addParam(createParam<Davies1900hBlackKnob>(kcenter.plus(Vec(0, 90)), module, Modulo::GAIN_PARAM, -3.0, 3.0, 0.0));
- addInput(createInput<PJ301MPort>(center.plus(Vec(0, 145)), module, Modulo::SIGNAL_INPUT));
+ addInput(createInput<PJ301MPort>(center.plus(Vec(0, 120)), module, Modulo::SIGNAL_INPUT));
+ addInput(createInput<PJ301MPort>(center.plus(Vec(-15, 180)), module, Modulo::GAIN_INPUT));
- addOutput(createOutput<PJ301MPort>(center.plus(Vec(0, 275)), module, Modulo::STAIR_OUTPUT));
- addOutput(createOutput<PJ301MPort>(center.plus(Vec(0, 347)), module, Modulo::WRAP_OUTPUT));
+ addParam(createParam<RoundSmallBlackKnob>(kcenter.plus(Vec(15, 180)), module, Modulo::GAIN_PARAM, -3.0, 3.0, 0.0));
+
+ addOutput(createOutput<PJ301MPort>(center.plus(Vec(0, 265)), module, Modulo::STAIR_OUTPUT));
+ addOutput(createOutput<PJ301MPort>(center.plus(Vec(0, 345)), module, Modulo::WRAP_OUTPUT));
}
diff --git a/src/WrapComp.cpp b/src/WrapComp.cpp
index f8240eb..3da185d 100644
--- a/src/WrapComp.cpp
+++ b/src/WrapComp.cpp
@@ -57,7 +57,7 @@ WrapCompWidget::WrapCompWidget() {
addChild(createScrew<ScrewSilver>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));
PJ301MPort p;
- Davies1900hBlackKnob k;
+ RoundSmallBlackKnob k;
MediumLight<RedLight> l;
Vec center = Vec(box.size.x, 0).minus(p.box.size).div(2);
Vec kcenter = Vec(box.size.x, 0).minus(k.box.size).div(2);
@@ -65,17 +65,17 @@ WrapCompWidget::WrapCompWidget() {
addInput(createInput<PJ301MPort>(center.plus(Vec(0, 70)), module, WrapComp::SIGNAL_INPUT));
- addParam(createParam<Davies1900hBlackKnob>(kcenter.plus(Vec(25, 135)), module, WrapComp::OFFSET_PARAM, -5.0, 5.0, 0.0));
+ addParam(createParam<RoundSmallBlackKnob>(kcenter.plus(Vec(25, 135)), module, WrapComp::OFFSET_PARAM, -5.0, 5.0, 0.0));
addInput(createInput<PJ301MPort>(center.plus(Vec(-25, 135)), module, WrapComp::OFFSET_INPUT));
- addParam(createParam<Davies1900hBlackKnob>(kcenter.plus(Vec(25, 210)), module, WrapComp::RANGE_PARAM, -5.0, 5.0, 0.0));
+ addParam(createParam<RoundSmallBlackKnob>(kcenter.plus(Vec(25, 210)), module, WrapComp::RANGE_PARAM, -5.0, 5.0, 0.0));
addInput(createInput<PJ301MPort>(center.plus(Vec(-25, 210)), module, WrapComp::RANGE_INPUT));
addChild(createLight<MediumLight<RedLight>>(lcenter.plus(Vec(-15, 255)), module, WrapComp::A_LIGHT));
addChild(createLight<MediumLight<RedLight>>(lcenter.plus(Vec( 15, 255)), module, WrapComp::B_LIGHT));
- addParam(createParam<Davies1900hBlackKnob>(kcenter.plus(Vec(-25, 280)), module, WrapComp::A_OUT_PARAM, -8.0, 8.0, 1.0));
- addParam(createParam<Davies1900hBlackKnob>(kcenter.plus(Vec( 25, 280)), module, WrapComp::B_OUT_PARAM, -8.0, 8.0, 0.0));
+ addParam(createParam<RoundSmallBlackKnob>(kcenter.plus(Vec(-25, 280)), module, WrapComp::A_OUT_PARAM, -8.0, 8.0, 1.0));
+ addParam(createParam<RoundSmallBlackKnob>(kcenter.plus(Vec( 25, 280)), module, WrapComp::B_OUT_PARAM, -8.0, 8.0, 0.0));
addOutput(createOutput<PJ301MPort>(center.plus(Vec(0, 315)), module, WrapComp::MAIN_OUTPUT));
}