commit 73310223ead4d9de1c3273a89206ba662fce456e
parent 0e69e570ed7fcacc3bf79f00803dbc01211f4f14
Author: Adam M <[email protected]>
Date: Thu, 23 Aug 2018 17:25:07 -0500
re-arrange reset and clock inputs and buttons
Diffstat:
2 files changed, 36 insertions(+), 18 deletions(-)
diff --git a/res/ComputerscarePatchSequencerPanel.svg b/res/ComputerscarePatchSequencerPanel.svg
@@ -34,9 +34,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="11.313709"
- inkscape:cx="52.648188"
- inkscape:cy="354.55281"
+ inkscape:zoom="5.6568543"
+ inkscape:cx="215.88935"
+ inkscape:cy="310.41067"
inkscape:document-units="mm"
inkscape:current-layer="g1669"
showgrid="false"
@@ -215,7 +215,7 @@
id="path1031"
inkscape:connector-curvature="0" />
<path
- d="m 38.974713,205.46002 v 1.02319 h -0.318672 v -2.66306 h 0.318672 v 0.29283 q 0.09991,-0.17225 0.251492,-0.25493 0.153306,-0.0844 0.36518,-0.0844 0.3514,0 0.570163,0.27906 0.220486,0.27905 0.220486,0.7338 0,0.45475 -0.220486,0.73381 -0.218763,0.27905 -0.570163,0.27905 -0.211874,0 -0.36518,-0.0827 -0.151584,-0.0844 -0.251492,-0.25666 z m 1.078315,-0.67352 q 0,-0.34968 -0.144694,-0.54777 -0.142972,-0.19981 -0.394464,-0.19981 -0.251492,0 -0.396186,0.19981 -0.142971,0.19809 -0.142971,0.54777 0,0.34968 0.142971,0.54949 0.144694,0.1981 0.396186,0.1981 0.251492,0 0.394464,-0.1981 0.144694,-0.19981 0.144694,-0.54949 z"
+ d="m 39.013257,205.06261 0.231078,1.01308 -0.307795,0.0616 -0.60143,-2.63673 0.307796,-0.0616 0.06613,0.28993 q 0.0576,-0.18987 0.185334,-0.30105 0.129013,-0.11321 0.333656,-0.15419 0.339406,-0.068 0.613726,0.16602 0.275982,0.23364 0.378683,0.6839 0.102702,0.45025 -0.04724,0.7692 -0.148276,0.3186 -0.487682,0.38657 -0.204643,0.041 -0.371394,-0.0113 -0.165471,-0.0542 -0.300873,-0.20548 z m 0.889402,-0.87542 q -0.07897,-0.34622 -0.263464,-0.51437 -0.183218,-0.17018 -0.426127,-0.12153 -0.242908,0.0486 -0.337538,0.27446 -0.09335,0.22378 -0.01438,0.57 0.07897,0.34623 0.262189,0.51641 0.184494,0.16815 0.427403,0.11951 0.242908,-0.0486 0.336261,-0.27244 0.09463,-0.22582 0.01566,-0.57204 z"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332"
id="path1033"
inkscape:connector-curvature="0" />
@@ -361,12 +361,6 @@
d="m 61.882318,204.53301 1.28679,1.3376 -1.426365,0.76721"
id="path1019"
inkscape:connector-curvature="0" />
- <path
- inkscape:connector-curvature="0"
- id="path1021"
- d="m 2.9877138,206.90916 2.3387093,1.1148 -1.8117581,0.96124"
- style="fill:none;stroke:#000000;stroke-width:0.3692753px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- sodipodi:nodetypes="ccc" />
<g
id="g8072"
transform="matrix(0.26458333,0,0,0.26458333,31.932368,289.45955)">
@@ -424,26 +418,50 @@
</g>
<g
aria-label="rst"
- transform="matrix(1.222748,0,0,1.0492555,-2.3457457,-42.340377)"
+ transform="matrix(1.413799,0,0,1.1735793,-9.3371149,-71.529608)"
style="font-style:normal;font-weight:normal;font-size:3.05783534px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.07644589"
id="text891">
<path
- d="m 9.0711192,234.49721 c -0.032767,-0.0147 -0.068704,-0.0251 -0.1078129,-0.0317 -0.038052,-0.008 -0.080331,-0.0112 -0.1268388,-0.0112 -0.1648903,0 -0.2917289,0.0415 -0.380516,0.1244 -0.08773,0.0821 -0.1855393,0.20162 -0.1760605,0.3551 l 0.044465,0.71992 H 8.0310419 v -1.36664 h 0.2933145 v 0.21232 c 0.061305,-0.083 0.1411081,-0.14436 0.239408,-0.18426 0.0983,-0.0407 0.2177397,-0.061 0.3583193,-0.061 0.020083,0 0.04228,10e-4 0.066591,0.004 0.024311,0.001 0.051264,0.006 0.080859,0.009 z"
+ d="m 9.0711192,234.49721 c -0.032767,-0.0147 -0.068704,-0.0251 -0.1078129,-0.0317 -0.038052,-0.008 -0.080331,-0.0112 -0.1268388,-0.0112 -0.1648903,0 -0.2917289,0.0638 -0.380516,0.14669 -0.08773,0.0821 -0.1868162,0.15867 -0.1760605,0.33281 l 0.044465,0.71992 H 8.0310419 v -1.36664 h 0.2933145 v 0.21232 c 0.061305,-0.083 0.1411081,-0.14436 0.239408,-0.18426 0.0983,-0.0407 0.2177397,-0.061 0.3583193,-0.061 0.020083,0 0.04228,10e-4 0.066591,0.004 0.024311,0.001 0.051264,0.006 0.080859,0.009 z"
style="stroke-width:0.07121481"
id="path893"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccscsccccccsccc" />
<path
- d="m 10.289021,233.56532 0.02193,0.20603 c -0.07116,-0.005 -0.294283,-0.16214 -0.366304,-0.14561 -0.072021,0.0163 -0.144466,0.0433 -0.217336,0.081 -0.1109244,0.0575 -0.1901173,0.12049 -0.2375787,0.18908 -0.046652,0.0682 -0.06157,0.14197 -0.044754,0.22135 0.012817,0.0605 0.103376,0.0438 0.1504493,0.0582 0.046886,0.0135 0.07293,0.059 0.1993614,0.028 l 0.08072,-0.0198 c 0.167101,-0.0425 0.291554,-0.0445 0.373361,-0.006 0.08242,0.037 0.137333,0.12023 0.164756,0.24969 0.03123,0.14741 0.0057,0.2901 -0.07644,0.42808 -0.08137,0.13755 -0.209506,0.25161 -0.384394,0.34217 -0.07287,0.0377 -0.150782,0.0686 -0.233736,0.0927 -0.081943,0.0246 -0.1701355,0.043 -0.2645776,0.0553 l -0.077252,-0.40465 c 0.093191,0.007 0.2027738,0.13827 0.2883404,0.12234 0.085359,-0.0169 0.167307,-0.0457 0.245845,-0.0864 0.1052562,-0.0545 0.1818192,-0.11725 0.2296882,-0.18815 0.04767,-0.0719 0.0634,-0.14608 0.04719,-0.22261 -0.01501,-0.0709 -0.04717,-0.11451 -0.09647,-0.13092 -0.04848,-0.0168 -0.1456552,-0.007 -0.2915253,0.0298 l -0.08223,0.019 c -0.1456523,0.0377 -0.2566554,0.0375 -0.3330094,-5.8e-4 -0.076547,-0.039 -0.1278312,-0.11992 -0.1538526,-0.24276 -0.031627,-0.14929 -0.010706,-0.28805 0.062762,-0.41628 0.073469,-0.12821 0.1935997,-0.23551 0.360391,-0.32188 0.082587,-0.0427 0.1618163,-0.0759 0.237689,-0.0995 0.075873,-0.0235 0.2688093,0.11181 0.3363513,0.10828 z"
+ d="m 10.289021,233.56532 0.02193,0.20603 c -0.07116,-0.005 -0.294283,-0.16214 -0.366304,-0.14561 -0.072021,0.0163 -0.144466,0.0433 -0.217336,0.081 -0.1109244,0.0575 -0.1901173,0.12049 -0.2375787,0.18908 -0.046652,0.0682 -0.023318,0.10854 -0.0065,0.18792 0.012817,0.0605 0.065124,0.0772 0.1121976,0.0916 0.046886,0.0135 0.07293,0.059 0.1993614,0.028 l 0.08072,-0.0198 c 0.1671007,-0.0425 0.2915537,-0.0445 0.3733607,-0.006 0.08242,0.037 0.137333,0.12023 0.164756,0.24969 0.03123,0.14741 0.0057,0.2901 -0.07644,0.42808 -0.08137,0.13755 -0.209506,0.25161 -0.3843937,0.34217 -0.07287,0.0377 -0.150782,0.0686 -0.233736,0.0927 -0.081943,0.0246 -0.1701355,0.043 -0.2645776,0.0553 l -0.077252,-0.40465 c 0.093191,0.007 0.2027738,0.13827 0.2883404,0.12234 0.085359,-0.0169 0.167307,-0.0457 0.245845,-0.0864 0.1052559,-0.0545 0.1818189,-0.11725 0.2296879,-0.18815 0.04767,-0.0719 0.0634,-0.14608 0.04719,-0.22261 -0.01501,-0.0709 -0.04717,-0.11451 -0.09647,-0.13092 -0.04848,-0.0168 -0.1456549,-0.007 -0.291525,0.0298 l -0.08223,0.019 c -0.1456523,0.0377 -0.2566554,0.0375 -0.3330094,-5.8e-4 -0.076547,-0.039 -0.1278312,-0.11992 -0.1538526,-0.24276 -0.031627,-0.14929 -0.010706,-0.28805 0.062762,-0.41628 0.073469,-0.12821 0.1935997,-0.23551 0.360391,-0.32188 0.082587,-0.0427 0.1618163,-0.0759 0.237689,-0.0995 0.075873,-0.0235 0.268809,0.11181 0.336351,0.10828 z"
style="stroke-width:0.07076394"
id="path895"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccccccccsccccccccccccccccc" />
<path
- d="m 11.046782,233.80131 v 0.44994 l 0.565878,0.27815 v 0.20233 l -0.565878,-0.27816 v 0.86025 q 0,0.19384 0.05524,0.27618 0.05674,0.083 0.228441,0.16743 l 0.282193,0.13871 v 0.21789 l -0.282193,-0.13871 q -0.318026,-0.15632 -0.438966,-0.32754 -0.12094,-0.17265 -0.12094,-0.46976 v -0.86025 l -0.201566,-0.0991 v -0.20232 l 0.201566,0.0991 v -0.44993 z"
+ d="m 11.046782,233.80131 v 0.44994 l 0.565878,0.27815 v 0.20233 l -0.565878,-0.27816 v 0.86025 c 0,0.12923 0.01841,0.22129 0.05524,0.27618 0.03783,0.0553 0.113974,0.11114 0.228441,0.16743 l 0.282193,0.13871 v 0.21789 l -0.282193,-0.13871 c -0.212017,-0.10421 -0.358339,-0.21339 -0.438966,-0.32754 -0.08063,-0.1151 -0.191158,-0.24996 -0.178318,-0.44747 l 0.05738,-0.88254 -0.201566,-0.0991 v -0.20232 l 0.201566,0.0991 0.0096,-0.33849 z"
style="stroke-width:0.07441686"
id="path897"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccsccccccscccccc" />
+ </g>
+ <g
+ aria-label="clk"
+ style="font-style:normal;font-weight:normal;font-size:3.01942134px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.07548553"
+ id="text902"
+ transform="matrix(1.2868125,0,0,1.2016106,-1.1878405,-36.707047)">
+ <path
+ d="m 3.6000297,207.03596 0.043669,0.24979 q -0.1356702,-0.0406 -0.26736,-0.0491 -0.1303315,-0.0101 -0.2582822,0.0123 -0.2862896,0.05 -0.4156848,0.24329 -0.1296485,0.1918 -0.077599,0.48952 0.052049,0.29773 0.2393318,0.4356 0.1870293,0.13643 0.4733188,0.0864 0.1279508,-0.0224 0.2473641,-0.0747 0.1207716,-0.054 0.2346053,-0.13827 l 0.043161,0.24689 q -0.1140082,0.0738 -0.2421933,0.12314 -0.1265858,0.049 -0.2753284,0.075 -0.4046439,0.0707 -0.6833218,-0.11851 -0.2786762,-0.18925 -0.3472285,-0.58137 -0.069568,-0.39794 0.1304773,-0.66789 0.201645,-0.27023 0.6206834,-0.34349 0.1359476,-0.0238 0.2700612,-0.0203 0.1338724,0.002 0.2643118,0.0316 z"
+ style="stroke-width:0.07921578"
+ id="path904"
inkscape:connector-curvature="0" />
+ <path
+ d="m 4.0847222,206.44221 h 0.2712761 l 0.077104,2.29406 H 4.0847222 Z"
+ style="stroke-width:0.07548553"
+ id="path906"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ d="m 4.9779654,206.5745 h 0.2727505 l -0.130566,1.02462 1.199952,-0.57448 0.012348,0.19267 -0.9648516,0.77255 0.8112643,0.8787 H 5.8250244 l -0.7458795,-0.80646 -0.093012,0.80646 H 4.713382 Z"
+ style="stroke-width:0.07548553"
+ id="path908"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccccc" />
</g>
</g>
</svg>
diff --git a/src/ComputerscarePatchSequencer.cpp b/src/ComputerscarePatchSequencer.cpp
@@ -439,16 +439,16 @@ struct ComputerscarePatchSequencerWidget : ModuleWidget {
}
//clock input
- addInput(Port::create<InPort>(Vec(24, 33), Port::INPUT, module, ComputerscarePatchSequencer::TRG_INPUT));
+ addInput(Port::create<InPort>(Vec(24, 37), Port::INPUT, module, ComputerscarePatchSequencer::TRG_INPUT));
//reset input
- addInput(Port::create<InPort>(Vec(3, 3), Port::INPUT, module, ComputerscarePatchSequencer::RESET_INPUT));
+ addInput(Port::create<InPort>(Vec(24, 3), Port::INPUT, module, ComputerscarePatchSequencer::RESET_INPUT));
//manual clock button
- addParam(ParamWidget::create<LEDButton>(Vec(7 , 52), module, ComputerscarePatchSequencer::MANUAL_CLOCK_PARAM, 0.0, 1.0, 0.0));
+ addParam(ParamWidget::create<LEDButton>(Vec(7 , 37), module, ComputerscarePatchSequencer::MANUAL_CLOCK_PARAM, 0.0, 1.0, 0.0));
//reset button
- addParam(ParamWidget::create<LEDButton>(Vec(33 , 3), module, ComputerscarePatchSequencer::RESET_PARAM, 0.0, 1.0, 0.0));
+ addParam(ParamWidget::create<LEDButton>(Vec(7 , 3), module, ComputerscarePatchSequencer::RESET_PARAM, 0.0, 1.0, 0.0));
//randomize input
