commit e450c5390c76cefcae5001693c28906091677660
parent 7bea78f1acc943d07bbc94ca3a78b82676806688
Author: Adam M <[email protected]>
Date: Thu, 2 Apr 2020 23:08:53 -0500
Merge branch 'master' into goly-penerator
Diffstat:
5 files changed, 272 insertions(+), 36 deletions(-)
diff --git a/res/ComputerscareKnolyPobsPanel.svg b/res/ComputerscareKnolyPobsPanel.svg
@@ -26,9 +26,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="5.6568545"
- inkscape:cx="33.322451"
- inkscape:cy="321.91702"
+ inkscape:zoom="8.0000004"
+ inkscape:cx="27.305316"
+ inkscape:cy="336.88022"
inkscape:document-units="mm"
inkscape:current-layer="g1669"
showgrid="false"
@@ -53,7 +53,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>
@@ -146,7 +146,7 @@
style="opacity:1;vector-effect:none;fill:#e0e0e0;fill-opacity:1;fill-rule:evenodd;stroke:none;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" />
<path
style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.37162125;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 2.0835936,196.45833 H 15.874998 v 13.86979 H 9.0738 l -5.2596363,-1.91766 -1.7305701,-2.9436 z"
+ d="M 2.0835936,196.45833 H 15.874998 v 13.86979 H 9.0738 l -7.7404456,-3.00771 -0.1427295,-1.75433 z"
id="rect888"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccc" />
@@ -285,7 +285,7 @@
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"
+ style="fill:none;stroke:#fafafa;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" />
@@ -305,13 +305,13 @@
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"
+ style="fill:none;stroke:#dadada;stroke-width:0.43041685;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 2.50159,200.23606 0.272901,3.508 v -3.59356 l 1.910309,1.11227 -0.5193101,0.71381 -1.5001593,-0.15766 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"
+ style="fill:none;stroke:#b7b7b7;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"
@@ -331,13 +331,13 @@
inkscape:connector-curvature="0" />
<path
style="fill:#afafaf;fill-opacity:1;stroke:none;stroke-width:0.36093959;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 2.0866913,196.46789 -2.08978901,1.62471 -0.01490492,11.57492 1.95193293,0.58729 1.9176098,-1.89929 -1.7424637,-2.84178 z"
+ d="m 2.0866913,196.46789 -2.08978901,1.62471 -0.01490492,11.57492 1.95193293,0.58729 -0.584701,-2.92828 0.065316,-1.91201 z"
id="path890"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccc" />
<path
style="fill:#626262;fill-opacity:1;stroke:none;stroke-width:0.42375344;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 3.8438817,208.34875 5.3235432,1.97489 6.6994311,0.01 -2.381744,1.9334 -11.7078953,-2.05413 z"
+ d="m 1.3416925,207.31988 7.8257324,3.00376 6.6994311,0.01 -2.381744,1.9334 -11.7078953,-2.05413 z"
id="path892"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccc" />
diff --git a/res/computerscare-channels-empty-knob.svg b/res/computerscare-channels-empty-knob.svg
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+ id="Layer_1"
+ data-name="Layer 1"
+ viewBox="0 0 18 18"
+ version="1.1"
+ sodipodi:docname="computerscare-channels-empty-knob.svg"
+ inkscape:version="0.92.2 5c3e80d, 2017-08-06"
+ width="18"
+ height="18">
+ <metadata
+ id="metadata1289">
+ <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>01 Big Knob</dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1398"
+ inkscape:window-height="834"
+ id="namedview1287"
+ showgrid="false"
+ inkscape:zoom="31.647281"
+ inkscape:cx="8.4242681"
+ inkscape:cy="11.314634"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="Big_Knob"
+ inkscape:snap-global="false" />
+ <defs
+ id="defs1279">
+ <style
+ id="style1277">.cls-1{fill:#245559;}.cls-2{fill:none;stroke:#24c9a6;stroke-miterlimit:10;stroke-width:3px;}</style>
+ </defs>
+ <title
+ id="title1281">01 Big Knob</title>
+ <g
+ id="Big_Knob"
+ data-name="Big Knob"
+ transform="translate(0,-42)">
+ <path
+ sodipodi:nodetypes="ccccccccccccccccc"
+ inkscape:connector-curvature="0"
+ id="path1623"
+ d="m 4.5808552,43.048284 c -0.916995,0.776532 -1.6722965,1.803125 -1.9013601,3.031798 -0.5431233,2.168432 -0.4358872,4.429132 -0.5395994,6.645897 0.036253,1.148227 0.7926187,2.062573 1.410674,2.938392 0.7968887,0.857174 2.0119906,0.865255 3.0251773,1.270916 1.136957,-0.01439 2.0164644,0.595913 2.750354,0.670576 1.570628,-0.13174 1.855081,0.101175 3.049879,0.287472 1.151066,0.157815 1.854001,0.671787 2.426802,-0.144803 0.448227,-0.952378 0.917889,-1.929294 0.971381,-3.009072 0.06756,-0.932379 0.610671,-1.738462 0.626678,-2.683326 0.05254,-1.041607 0.08676,-2.098552 -0.02634,-3.134093 -0.119858,-1.021423 -0.668707,-1.886466 -0.817907,-2.88858 -0.386676,-0.862701 -0.6563,-1.904954 -1.530782,-2.37809 -0.789007,-0.637386 -1.719449,-1.034032 -2.735757,-0.896557 -1.223655,-0.191187 -2.4577279,-0.05624 -3.6867338,-0.01441 -1.0038807,0.03353 -2.0628646,0.04852 -3.0224776,0.303872 z"
+ style="fill:#ffffff;stroke:#f2f2f2;stroke-width:0.48204279;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill-opacity:1" />
+ <path
+ style="fill:none;stroke:#5b5b5b;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 4.2899263,43.063729 c -0.9705151,0.789392 -1.7698995,1.832986 -2.0123323,3.082008 -0.5748226,2.204344 -0.4613277,4.502483 -0.5710931,6.75596 0.03837,1.167243 0.8388798,2.096731 1.4930076,2.987054 0.8433989,0.87137 2.1294198,0.879586 3.2017409,1.291965 1.2033151,-0.01462 1.9856308,-0.335365 2.7289111,0.382967 1.1941025,0.476388 2.1453185,0.401565 3.4098495,0.590947 1.218249,0.160429 1.96221,0.682913 2.568443,-0.147201 0.474388,-0.96815 0.971461,-1.961245 1.028075,-3.058906 0.07151,-0.947819 0.646313,-1.767252 0.663254,-2.727765 0.05561,-1.058857 0.09182,-2.133305 -0.02787,-3.185996 -0.126854,-1.038339 -0.707737,-1.917709 -0.865645,-2.936419 -0.409243,-0.876986 -0.694604,-1.936501 -1.620124,-2.417472 -0.835058,-0.647942 -1.819806,-1.051157 -2.895429,-0.911406 -1.295073,-0.194353 -2.6011726,-0.05717 -3.9019091,-0.01464 -1.0624719,0.03408 -2.183263,0.04933 -3.1988836,0.308904 z"
+ id="path1618"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccccccccccccc" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 8.669226,42.795608 c 0.061818,0.03123 0.3288925,-0.02443 0.4021806,0 0.014131,0.0047 0,0.02979 0,0.04469 0.029791,0.02979 0.049404,0.07605 0.089373,0.08937 0.019985,0.0067 0.024702,-0.03802 0.044687,-0.04469 0.053097,-0.0177 0.1405251,0.0065 0.1787469,0.04469 0.010533,0.01053 -0.044687,-0.0149 -0.044687,0 0,0.02107 0.023621,0.04469 0.044687,0.04469 0.014896,0 0,-0.05958 0,-0.04469 0,0.05958 0,0.119165 0,0.178747 0,0.0149 0.013323,0.03802 0,0.04469 -0.1191646,0.05958 -0.089374,-0.08937 -0.089374,0.08937 0,0.05958 0.014896,-0.163851 -0.044687,-0.04469 -0.013323,0.02665 0.021066,0.06831 0,0.08937 -0.014896,0.0149 -0.025845,-0.03527 -0.044687,-0.04469 -0.013323,-0.0067 -0.044687,0.0149 -0.044687,0 0,-0.0149 0.038025,-0.01332 0.044687,0 0.013323,0.02665 0,0.05958 0,0.08937 0,0.0149 0,-0.05958 0,-0.04469 0,0.02979 0.013323,0.06273 0,0.08937 -0.026706,0.05341 -0.089374,-0.08607 -0.089374,0.04469 0,0.0149 0.034154,-0.01053 0.044687,0 0.010533,0.01053 0.010533,0.03415 0,0.04469 -0.010533,0.01053 -0.044687,0.0149 -0.044687,0 0,-0.0149 0.034154,0.01053 0.044687,0 0.074478,-0.07448 -0.1638513,-0.04469 0.089373,-0.04469"
+ id="path1581"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 7.6861179,43.912776 c -0.2085381,0 -0.4170762,0 -0.6256143,0 -0.059582,0 -0.1196247,0.0074 -0.1787469,0 -0.060942,-0.0076 -0.1175831,-0.05025 -0.1787469,-0.04469 -0.4019063,0.03654 -0.1982843,0.05992 -0.4021806,0.13406 -0.132804,0.04829 -0.2757874,0.07086 -0.4021806,0.13406 -0.029791,0.0149 -0.018041,0.06939 -0.044687,0.08937 -0.5773028,0.432977 -0.1154523,0.01035 -0.4468673,0.26812 -0.091832,0.07142 -0.1713212,0.158901 -0.2681204,0.223434 -0.039193,0.02613 -0.1007527,0.01138 -0.1340602,0.04469 -0.047104,0.0471 -0.059582,0.119165 -0.089374,0.178747 -0.059582,0.04469 -0.1191646,0.08937 -0.1787469,0.134061"
+ id="path1583"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 10.412009,43.465909 c 0.05958,-0.0149 0.117706,-0.03791 0.178746,-0.04469 0.07402,-0.0082 0.148956,0 0.223434,0 0.119165,0 0.238329,0 0.357494,0 0.07448,0 0.148956,0 0.223434,0 0.05958,0 0.122958,-0.02092 0.178747,0 0.0062,0.0023 0.342489,0.259118 0.357493,0.268121 0.01277,0.0077 0.03191,-0.0077 0.04469,0 0.06386,0.03832 0.116778,0.09275 0.178747,0.13406 0.02771,0.01848 0.06273,0.0247 0.08937,0.04469 0.0337,0.02528 0.05567,0.06409 0.08937,0.08937 0.02665,0.01998 0.06273,0.0247 0.08937,0.04469 0.03371,0.02528 0.05958,0.05958 0.08937,0.08937 0.02979,0.02979 0.05958,0.05958 0.08937,0.08937"
+ id="path1585"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path1616"
+ d="m 9.8981071,43.778682 c -0.059582,0.07448 -0.1536493,0.131429 -0.1787449,0.223451 -0.023839,0.08741 0.035671,0.177964 0.044687,0.26812 0.057559,0.575585 -0.090998,-0.243745 0.089374,0.357494 0.026036,0.08679 0.018041,0.181521 0.044687,0.268121 0.084346,0.274124 0.1912528,0.335989 0.2234338,0.625614 0.0037,0.0331 -0.04836,0.05627 -0.04469,0.08937 0.01197,0.107778 0.06307,0.207603 0.08937,0.312807 0.01842,0.07368 0.02979,0.148956 0.04469,0.223434 0.0149,0.07448 0.03527,0.148067 0.04469,0.223433 0.0055,0.04434 0,0.08937 0,0.134061 v 0.312807 c 0,0.0149 -0.0036,0.03024 0,0.04469 0.01142,0.0457 0.03326,0.08836 0.04469,0.13406 0.0036,0.01445 -0.182589,0.344874 0,0.04469 0.0077,-0.01273 -0.01282,-0.03711 0,-0.04469 l 0.276485,-0.163416"
+ style="fill:#bfbfbf;stroke:#fb2020;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+ sodipodi:nodetypes="ccccccccccssccssc" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;paint-order:markers fill stroke"
+ d="m 9.2501515,43.421205 c -0.059582,0.07448 -0.1536493,0.131429 -0.1787449,0.223451 -0.023839,0.08741 0.035671,0.177964 0.044687,0.26812 0.057559,0.575585 -0.090998,-0.243745 0.089374,0.357494 0.026036,0.08679 0.018041,0.181521 0.044687,0.268121 0.084346,0.274124 0.1912531,0.335989 0.2234337,0.625614 0.00368,0.0331 -0.048365,0.05627 -0.044687,0.08937 0.011975,0.107778 0.063073,0.207603 0.089374,0.312807 0.018421,0.07368 0.029791,0.148956 0.044687,0.223434 0.014896,0.07448 0.035266,0.148067 0.044687,0.223433 0.00554,0.04434 0,0.08937 0,0.134061 0,0.104269 0,0.208538 0,0.312807 0,0.0149 -0.00361,0.03024 0,0.04469 0.011424,0.0457 0.033262,0.08836 0.044687,0.13406 0.00361,0.01445 0.014896,0.04469 0,0.04469 -0.014896,0 0,-0.05958 0,-0.04469 0,0.02979 0,0.05958 0,0.08937"
+ id="path1587"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path1610"
+ d="m 9.3171816,43.153085 c 0.061818,0.03123 0.3288925,-0.02443 0.4021806,0 0.014131,0.0047 0,0.02979 0,0.04469 0.029791,0.02979 0.049404,0.07605 0.089373,0.08937 0.019985,0.0067 0.024702,-0.03802 0.044687,-0.04469 0.053097,-0.0177 0.1405251,0.0065 0.1787468,0.04469 0.01053,0.01053 -0.044687,-0.0149 -0.044687,0 0,0.02107 0.023621,0.04469 0.044687,0.04469 0.0149,0 0,-0.05958 0,-0.04469 0,0.05958 0,0.119165 0,0.178747 0,0.0149 0.01332,0.03802 0,0.04469 -0.1191645,0.05958 -0.089374,-0.08937 -0.089374,0.08937 0,0.05958 0.014896,-0.163851 -0.044687,-0.04469 -0.013323,0.02665 0.021066,0.06831 0,0.08937 -0.014896,0.0149 -0.025845,-0.03527 -0.044687,-0.04469 -0.013323,-0.0067 -0.044687,0.0149 -0.044687,0 0,-0.0149 0.038025,-0.01332 0.044687,0 0.013323,0.02665 0,0.05958 0,0.08937 0,0.0149 0,-0.05958 0,-0.04469 0,0.02979 0.013323,0.06273 0,0.08937 -0.026706,0.05341 -0.089374,-0.08607 -0.089374,0.04469 0,0.0149 0.034154,-0.01053 0.044687,0 0.010533,0.01053 0.010533,0.03415 0,0.04469 -0.010533,0.01053 -0.044687,0.0149 -0.044687,0 0,-0.0149 0.034154,0.01053 0.044687,0 0.074478,-0.07448 -0.1638513,-0.04469 0.089373,-0.04469"
+ style="fill:none;stroke:#cacaca;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path1612"
+ d="m 8.3340735,44.252013 c -0.2085381,0 -0.4170762,0 -0.6256143,0 -0.059582,0 -0.1196247,0.0044 -0.1787469,0 -0.060942,-0.0045 -0.1175831,-0.02997 -0.1787469,-0.02665 -0.4019063,0.02179 -0.1982843,0.03573 -0.4021806,0.07995 -0.132804,0.0288 -0.2757874,0.04226 -0.4021806,0.07995 -0.029791,0.0089 -0.018041,0.04138 -0.044687,0.0533 -0.5773028,0.258204 -0.1154523,0.0062 -0.4468673,0.159892 -0.091832,0.04259 -0.1713212,0.09476 -0.2681204,0.133244 -0.039193,0.01558 -0.1007527,0.0068 -0.1340602,0.02665 -0.047104,0.02809 -0.059582,0.07106 -0.089374,0.106595 -0.059582,0.02665 -0.1191646,0.05329 -0.1787469,0.07995"
+ style="fill:none;stroke:#cacaca;stroke-width:0.7722345px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path1614"
+ d="m 11.059964,44.129328 c 0.05958,-0.0085 0.117706,-0.02169 0.178746,-0.02557 0.07402,-0.0047 0.148956,0 0.223434,0 0.119165,0 0.238329,0 0.357494,0 0.07448,0 0.148956,0 0.223434,0 0.05958,0 0.122958,-0.01197 0.178747,0 0.0062,0.0013 0.342489,0.148241 0.357493,0.153392 0.01277,0.0044 0.03191,-0.0044 0.04469,0 0.06386,0.02192 0.116778,0.05306 0.178747,0.0767 0.02771,0.01057 0.06273,0.01413 0.08937,0.02557 0.0337,0.01446 0.05567,0.03666 0.08937,0.05113 0.02665,0.01143 0.06273,0.01413 0.08937,0.02557 0.03371,0.01446 0.05958,0.03409 0.08937,0.05113 0.02979,0.01704 0.05958,0.03408 0.08937,0.05113"
+ style="fill:none;stroke:#cacaca;stroke-width:0.7563718px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ </g>
+</svg>
diff --git a/res/computerscare-medium-knob-disabled.svg b/res/computerscare-medium-knob-disabled.svg
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+ id="Layer_1"
+ data-name="Layer 1"
+ viewBox="0 0 28 28"
+ version="1.1"
+ sodipodi:docname="computerscare-medium-knob-disabled.svg"
+ inkscape:version="0.92.2 5c3e80d, 2017-08-06"
+ width="28"
+ height="28">
+ <metadata
+ id="metadata1289">
+ <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>01 Big Knob</dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1398"
+ inkscape:window-height="834"
+ id="namedview1287"
+ showgrid="false"
+ inkscape:zoom="15.733333"
+ inkscape:cx="11.595259"
+ inkscape:cy="14.442801"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="Big_Knob" />
+ <defs
+ id="defs1279">
+ <style
+ id="style1277">.cls-1{fill:#245559;}.cls-2{fill:none;stroke:#24c9a6;stroke-miterlimit:10;stroke-width:3px;}</style>
+ </defs>
+ <title
+ id="title1281">01 Big Knob</title>
+ <g
+ id="Big_Knob"
+ data-name="Big Knob"
+ transform="translate(0,-32)">
+ <path
+ style="fill:#aab8ba;fill-opacity:1;stroke:#000000;stroke-width:0.40182629;stroke-opacity:1"
+ d="M 26.070695,46.000183 C 26.8195,54.886007 21.041648,58.72213 14.412029,58.111561 8.3158,57.550115 0.70880207,52.393697 2.3572418,46.056772 4.5715647,37.544481 9.5039577,33.504308 14.412029,34.001984 c 3.677562,0.372903 5.413953,1.519566 9.012194,3.842931 2.236175,1.443886 2.438189,5.683646 2.646472,8.155268 z"
+ id="Big_Button_Circle"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ssssss" />
+ <path
+ style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#586e69;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25012431;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+ d="m 14.237539,34.504377 c -0.805644,0.558027 -0.691444,3.009458 -0.691444,3.009458 l -0.407053,0.80561 -0.465831,0.818822 -0.03646,1.006865 0.740245,0.763454 -0.378082,0.879472 -0.51384,2.783426 C 13.86087,44.294338 13.873915,43.70924 16.2374,43.918996 l -0.824782,-1.602788 -0.426925,-1.313821 -0.03457,-1.287464 0.272428,-0.557398 0.03944,-0.694762 -0.230216,-4.138167 c -0.655513,-0.05738 -0.744387,-0.07207 -0.749803,0.01842 -0.0038,0.06 0,0 -0.04534,0.161355 0,0 -0.06874,0.05423 -0.08683,0.03536 -0.01817,-0.01885 0.08676,-0.03536 0.08676,-0.03536 z"
+ id="Button_Pointer"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccccccccscacc" />
+ </g>
+</svg>
diff --git a/src/Computerscare.hpp b/src/Computerscare.hpp
@@ -318,12 +318,20 @@ struct MediumDotSnapKnob : RoundBlackSnapKnob {
setSvg(APP->window->loadSvg(asset::plugin(pluginInstance, "res/computerscare-medium-knob-dot-indicator.svg")));
}
};
+struct TinyChannelsSnapKnob: RoundBlackSnapKnob {
+ TinyChannelsSnapKnob() {
+ setSvg(APP->window->loadSvg(asset::plugin(pluginInstance, "res/computerscare-channels-empty-knob.svg")));
+ }
+ void randomize() override {return;}
+};
struct SmoothKnob : RoundKnob {
SmoothKnob() {
setSvg(APP->window->loadSvg(asset::plugin(pluginInstance, "res/computerscare-medium-knob-effed.svg")));
}
+
};
+
struct SmallKnob : RoundKnob {
SmallKnob() {
setSvg(APP->window->loadSvg(asset::plugin(pluginInstance, "res/computerscare-small-knob-effed.svg")));
diff --git a/src/ComputerscareKnolyPobs.cpp b/src/ComputerscareKnolyPobs.cpp
@@ -4,16 +4,16 @@ struct ComputerscareKnolyPobs;
const int numKnobs = 16;
-const int numToggles = 16;
-const int numOutputs = 16;
-
struct ComputerscareKnolyPobs : Module {
- int counter = 0;
+ int counterPeriod = 64;
+ int counter = counterPeriod + 1;
+ int polyChannels = 16;
+
ComputerscareSVGPanel* panelRef;
enum ParamIds {
KNOB,
- TOGGLES = KNOB + numKnobs,
- NUM_PARAMS = TOGGLES + numToggles
+ POLY_CHANNELS = KNOB + numKnobs,
+ NUM_PARAMS
};
enum InputIds {
@@ -22,7 +22,7 @@ struct ComputerscareKnolyPobs : Module {
};
enum OutputIds {
POLY_OUTPUT,
- NUM_OUTPUTS = POLY_OUTPUT + numOutputs
+ NUM_OUTPUTS
};
enum LightIds {
NUM_LIGHTS
@@ -34,25 +34,55 @@ struct ComputerscareKnolyPobs : Module {
config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS);
for (int i = 0; i < numKnobs; i++) {
- configParam(KNOB + i, 0.0f, 10.0f, 0.0f);
- configParam(KNOB + i, 0.f, 10.f, 0.f, "Channel " + std::to_string(i + 1) + " Voltage", " Volts");
+ configParam(KNOB + i, 0.f, 10.f, 0.f, "Channel " + std::to_string(i + 1));
}
-
+ configParam(POLY_CHANNELS, 1.f, 16.f, 16.f, "Poly Channels");
}
void process(const ProcessArgs &args) override {
counter++;
- if (counter > 5012) {
- //printf("%f \n",random::uniform());
+ if (counter > counterPeriod) {
+ checkPoly();
counter = 0;
- //rect4032
- //south facing high wall
}
- outputs[POLY_OUTPUT].setChannels(16);
- for (int i = 0; i < numKnobs; i++) {
+
+ for (int i = 0; i < polyChannels; i++) {
outputs[POLY_OUTPUT].setVoltage(params[KNOB + i].getValue(), i);
}
}
+ void checkPoly() {
+ float candidate = params[POLY_CHANNELS].getValue();
+ if (polyChannels != candidate) {
+ polyChannels = candidate;
+ outputs[POLY_OUTPUT].setChannels(polyChannels);
+ }
+ }
+};
+
+struct DisableableSmoothKnob : RoundKnob {
+ std::shared_ptr<Svg> enabledSvg = APP->window->loadSvg(asset::plugin(pluginInstance, "res/computerscare-medium-knob-effed.svg"));
+ std::shared_ptr<Svg> disabledSvg = APP->window->loadSvg(asset::plugin(pluginInstance, "res/computerscare-medium-knob-disabled.svg"));
+ int channel = 0;
+ bool disabled = false;
+ ComputerscareKnolyPobs *module;
+
+ DisableableSmoothKnob() {
+ setSvg(enabledSvg);
+ }
+
+ void draw(const DrawArgs& args) override {
+ if (module) {
+ bool candidate = channel > module->polyChannels - 1;
+ if (disabled != candidate) {
+ setSvg(candidate ? disabledSvg : enabledSvg);
+ dirtyValue = -20.f;
+ disabled = candidate;
+ }
+ }
+ else {
+ }
+ RoundKnob::draw(args);
+ }
};
struct ComputerscareKnolyPobsWidget : ModuleWidget {
@@ -67,20 +97,18 @@ struct ComputerscareKnolyPobsWidget : ModuleWidget {
panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/ComputerscareKnolyPobsPanel.svg")));
//module->panelRef = panel;
-
addChild(panel);
-
}
+
+ addParam(createParam<TinyChannelsSnapKnob>(Vec(8, 26), module, ComputerscareKnolyPobs::POLY_CHANNELS));
+
float xx;
float yy;
for (int i = 0; i < numKnobs; i++) {
- xx = 1.4f + 24.3 * (i-i % 8)/8;
- yy = 64 + 37.5 * (i % 8) + 14.3 * (i - i % 8)/8;
- addLabeledKnob(std::to_string(i + 1), xx, yy, module, i, (i-i%8)*1.2-2, 0);
+ xx = 1.4f + 24.3 * (i - i % 8) / 8;
+ yy = 64 + 37.5 * (i % 8) + 14.3 * (i - i % 8) / 8;
+ addLabeledKnob(std::to_string(i + 1), xx, yy, module, i, (i - i % 8) * 1.2 - 2, 0);
}
-
-
-
addOutput(createOutput<PointingUpPentagonPort>(Vec(28, 24), module, ComputerscareKnolyPobs::POLY_OUTPUT));
}
@@ -92,13 +120,23 @@ struct ComputerscareKnolyPobsWidget : ModuleWidget {
smallLetterDisplay->value = label;
smallLetterDisplay->textAlign = 1;
- addParam(createParam<SmoothKnob>(Vec(x, y), module, ComputerscareKnolyPobs::KNOB + index));
+ ParamWidget* pob = createParam<DisableableSmoothKnob>(Vec(x, y), module, ComputerscareKnolyPobs::KNOB + index);
+
+ DisableableSmoothKnob* fader = dynamic_cast<DisableableSmoothKnob*>(pob);
+
+ fader->module = module;
+ fader->channel = index;
+
+ addParam(fader);
+
+
smallLetterDisplay->box.pos = Vec(x + labelDx, y - 12 + labelDy);
addChild(smallLetterDisplay);
}
+ DisableableSmoothKnob* fader;
SmallLetterDisplay* smallLetterDisplay;
};
