commit d04b95a75d3c5dbb56a0682b0165608c7bdaf4bd
parent f4bc1438204a1ef2480b7793fbcb10384d851505
Author: Adam M <[email protected]>
Date: Sun, 14 Jul 2019 11:46:57 -0500
Panel updates
Diffstat:
5 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/res/ComputerscareSolyPequencerPanel.svg b/res/ComputerscareSolyPequencerPanel.svg
@@ -27,8 +27,8 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="5.6568542"
- inkscape:cx="45.272139"
- inkscape:cy="347.36359"
+ inkscape:cx="31.605912"
+ inkscape:cy="11.585765"
inkscape:document-units="mm"
inkscape:current-layer="g1669"
showgrid="false"
@@ -142,7 +142,7 @@
<path
inkscape:connector-curvature="0"
id="path1647"
- d="m 8.8786219,205.72349 -7.3856972,-7.67753 0.738749,15.65303 -0.93662,65.71451 -0.76588703,10.38104 0.308947,5.56858 1.45447203,1.27054 13.5938013,0.37061 0.0077,-89.15204 z"
+ d="m 8.8786219,205.72349 -7.3856972,-7.67753 0.738749,15.65303 -0.93662,65.71451 -0.76588703,10.38104 0.308947,5.56858 1.45447203,1.27054 13.5938013,0.37061 -0.0109,-89.15307 z"
style="opacity:1;vector-effect:none;fill:#ececec;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26300001;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
sodipodi:nodetypes="cccccccccc" />
<g
@@ -276,7 +276,7 @@
</g>
<path
style="fill:#232224;fill-opacity:1;stroke:none;stroke-width:0.45396167;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 15.86846,207.82352 -2.133724,-2.61788 0.05706,5.65713 1.081142,1.37551 1.016091,0.20535 z"
+ d="m 15.875695,207.83696 -2.140959,-2.63132 0.05706,5.65713 1.081142,1.37551 1.021259,0.21155 z"
id="path890"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccc" />
diff --git a/res/ComputerscareTolyPoolsPanel.svg b/res/ComputerscareTolyPoolsPanel.svg
@@ -26,9 +26,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="1.4142136"
- inkscape:cx="31.315772"
- inkscape:cy="250.53616"
+ inkscape:zoom="128"
+ inkscape:cx="30.992765"
+ inkscape:cy="281.89783"
inkscape:document-units="mm"
inkscape:current-layer="g1669"
showgrid="false"
@@ -281,7 +281,7 @@
sodipodi:nodetypes="cccccc" />
<path
style="fill:#6c687b;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 8.8485033,211.06154 0.4694463,-0.89346 6.5597684,1.73952 -2.265989,1.06103 -5.6843273,-0.90508 z"
+ d="m 8.1851814,222.05754 -0.1186011,-0.0832 7.3297167,-1.1709 -1.769895,0.86259 -5.5284672,1.08553 z"
id="path892"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccc" />
@@ -292,20 +292,20 @@
d="m 1.1094411,202.5618 1.0068811,-0.0501 4.8564349,0.42743 -1.3820584,1.19971 -5.58532408,-0.89921 z"
style="fill:#6c687b;fill-opacity:1;stroke:none;stroke-width:0.42375344;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
- sodipodi:nodetypes="cccccc"
+ sodipodi:nodetypes="ccccccccccccc"
inkscape:connector-curvature="0"
id="path875"
- d="m 6.9903212,202.91281 -1.4200624,1.22577 2.3552867,7.92602 0.9075091,-0.91638 0.578878,-0.85915 z"
+ d="m 6.9903212,202.91281 -1.4200624,1.22577 1.3983993,8.33223 1.2236518,1.52633 -1.1221889,3.546 0.4916224,4.39373 0.5383978,0.81637 0.3134349,-0.54346 -0.3493643,-0.2382 L 7.793,217.15828 8.8048239,213.97742 7.5281627,212.4581 Z"
style="fill:#2e2d30;fill-opacity:1;stroke:none;stroke-width:0.36093959;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
style="fill:#b3b0b0;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 15.46004 l -6.4737929,-1.63703 -2.4065342,-7.33738 -4.8643051,-0.42375 z"
+ d="M 2.0835936,196.45833 H 15.874998 l 0.0086,15.03248 -0.504652,9.34071 -7.3166504,1.14936 -0.2673762,-4.7678 1.0075295,-3.23552 -1.2763978,-1.55888 -0.5313382,-9.47472 -4.8643051,-0.42375 z"
id="rect888"
inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccccc" />
+ sodipodi:nodetypes="ccccccccccc" />
<path
- style="fill:none;stroke:#000000;stroke-width:0.84216493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 5.4739898,197.25652 c 0.034704,0.69277 -0.1847332,1.40074 0.3267229,2.05254 -0.00504,0.54793 0.3966103,1.04897 0.4349301,1.58939 0.018928,0.28497 0.081888,0.57213 0.1151545,0.85366"
+ style="fill:none;stroke:#000000;stroke-width:1.11629593;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 4.5077403,197.29795 c 0.062112,0.68008 -0.330627,1.37509 0.5847539,2.01495 -0.00902,0.53789 0.709835,1.02975 0.7784181,1.56027 0.033877,0.27975 0.1465594,0.56165 0.2060983,0.83802"
id="path876"
inkscape:connector-curvature="0" />
<path
@@ -314,19 +314,19 @@
id="path878"
inkscape:connector-curvature="0" />
<path
- style="fill:none;stroke:#25273b;stroke-width:0.65126884;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 8.8350763,198.50365 c -1.1198248,0.0429 -0.715326,0.66875 -0.2549697,0.91669 0.3480573,0.28976 1.9166524,0.69027 2.1919744,0.26503 0.351701,-0.2665 0.512553,-0.68414 -0.139884,-0.9152 -0.53361,-0.13827 -1.1924563,-0.18084 -1.7971207,-0.26652 z"
+ style="fill:none;stroke:#25273b;stroke-width:0.81431049;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 8.8769792,197.52737 c -1.058207,0.071 -0.6759655,1.10638 -0.2409401,1.51657 0.3289056,0.47938 1.8111899,1.14198 2.0713619,0.43846 0.332349,-0.44089 0.48435,-1.13184 -0.132187,-1.5141 -0.504248,-0.22875 -1.1268418,-0.29918 -1.6982348,-0.44093 z"
id="path880"
inkscape:connector-curvature="0" />
<path
- style="fill:none;stroke:#25273b;stroke-width:0.65126884;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 11.677333,196.83761 c 0.0795,0.4467 0.457961,0.85228 0.489628,1.30431 0.182296,0.19429 0.176271,0.42788 0.166052,0.64584 0.109241,0.23295 0.04117,1.1119 0.135372,1.34562"
+ style="fill:none;stroke:#25273b;stroke-width:0.76312572;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 11.357361,196.86136 c 0.104462,0.46676 0.601754,0.89056 0.643364,1.36289 0.239534,0.20302 0.231617,0.4471 0.21819,0.67485 0.143541,0.24342 0.0541,1.16184 0.177876,1.40606"
id="path882"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
<path
- style="fill:none;stroke:#000000;stroke-width:0.48074684;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 13.233357,197.87427 c 0.644312,0.071 1.370814,1.00196 1.51475,0.30759 0.04772,-0.28826 -0.0714,-0.94386 -0.0079,-1.00452 -1.7e-5,0.70289 8.4e-5,1.40576 9e-6,2.10866 -0.02078,0.12833 -0.07994,0.24747 -0.16954,0.35223 -0.130699,0.1528 -0.326173,0.27499 -0.56179,0.35046"
+ style="fill:none;stroke:#000000;stroke-width:0.57034051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 13.274673,197.32724 c 0.611505,0.73907 1.301016,2.83428 1.437623,1.94613 0.04529,-0.38054 -0.06776,-1.46995 -0.0075,-1.49744 -1.6e-5,1.04235 8e-5,2.08477 9e-6,3.12707 -0.01972,0.16988 -0.07587,0.28837 -0.160908,0.35559 -0.124044,0.098 -0.309565,0.0869 -0.533185,-0.0329"
id="path884"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccsc" />
@@ -352,8 +352,8 @@
id="path893"
inkscape:connector-curvature="0" />
<path
- style="fill:none;stroke:#11140d;stroke-width:0.50122505;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 14.638417,202.36021 c -0.394254,-0.35124 -1.207932,0.57755 -0.663959,0.87366 0.198803,0.32433 1.091613,-0.0101 0.643461,0.87205 -0.14666,0.18497 -0.348383,0.25112 -0.541161,0.24675"
+ style="fill:none;stroke:#11140d;stroke-width:0.54939044;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 15.031736,202.36624 c -0.567011,-0.29342 -1.737229,0.48247 -0.954896,0.72983 0.285915,0.27094 1.56994,-0.008 0.925415,0.72849 -0.210924,0.15452 -0.501039,0.20978 -0.778289,0.20613"
id="path895"
inkscape:connector-curvature="0" />
</g>
diff --git a/src/Computerscare.hpp b/src/Computerscare.hpp
@@ -81,11 +81,11 @@ struct IsoButton : SvgSwitch {
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/computerscare-iso-button-up.svg")));
}
};
-struct SmallIsoButton : SvgSwitch {
+struct SmallIsoButton : app::SvgSwitch {
SmallIsoButton() {
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/computerscare-iso-button-small-up.svg")));
-
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/computerscare-iso-button-small-down.svg")));
+ shadow->opacity = 0.f;
}
};
struct ComputerscareIsoThree : app::SvgSwitch {
@@ -97,13 +97,10 @@ struct ComputerscareIsoThree : app::SvgSwitch {
};
struct ThreeVerticalXSwitch : app::SvgSwitch {
ThreeVerticalXSwitch() {
- fb = new widget::FramebufferWidget;
- addChild(fb);
- sw = new widget::SvgWidget;
- fb->addChild(sw);
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/vertical-x-1.svg")));
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/vertical-x-2.svg")));
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/vertical-x-3.svg")));
+ shadow->opacity = 0.f;
}
};
struct ComputerscareDebugFour : app::SvgSwitch {
diff --git a/src/ComputerscareSolyPequencer.cpp b/src/ComputerscareSolyPequencer.cpp
@@ -60,6 +60,7 @@ struct ComputerscareSolyPequencer : Module {
int numOutputChannels = numClock > 0 ? numClock : 1;
bool globalClocked = globalManualClockTrigger.process(params[MANUAL_CLOCK_BUTTON].getValue());
outputs[POLY_OUTPUT].setChannels(numOutputChannels);
+ if (inputs[POLY_INPUT].isConnected()) {
for (int j = 0; j < numOutputChannels; j++) {
if (globalClocked || clockTriggers[j].process(inputs[CLOCK_INPUT].getVoltage(j))) {
currentStep[j]++;
@@ -73,8 +74,10 @@ struct ComputerscareSolyPequencer : Module {
}
}
- for (int c = 0; c < numOutputChannels; c++) {
- outputs[POLY_OUTPUT].setVoltage(inputs[POLY_INPUT].getVoltage(currentStep[c]), c);
+
+ for (int c = 0; c < numOutputChannels; c++) {
+ outputs[POLY_OUTPUT].setVoltage(inputs[POLY_INPUT].getVoltage(currentStep[c]), c);
+ }
}
if (globalManualResetTrigger.process(params[MANUAL_RESET_BUTTON].getValue())) {
resetAll();
diff --git a/src/ComputerscareTolyPools.cpp b/src/ComputerscareTolyPools.cpp
@@ -144,18 +144,18 @@ struct ComputerscareTolyPoolsWidget : ModuleWidget {
//addParam
- addInput(createInput<InPort>(Vec(4, 24), module, ComputerscareTolyPools::POLY_INPUT));
+ addInput(createInput<InPort>(Vec(1 , 50), module, ComputerscareTolyPools::POLY_INPUT));
- addLabeledKnob("Num Output Channels", 2, 106, module, ComputerscareTolyPools::NUM_CHANNELS_KNOB, -5, -30, 0);
- addInput(createInput<InPort>(Vec(4, 136), module, ComputerscareTolyPools::NUM_CHANNELS_CV));
+ addLabeledKnob("Num Output Channels", 1, 136, module, ComputerscareTolyPools::NUM_CHANNELS_KNOB, -5, -30, 0);
+ addInput(createInput<InPort>(Vec(4, 166), module, ComputerscareTolyPools::NUM_CHANNELS_CV));
- addLabeledKnob("Rotation", 2, 206, module, ComputerscareTolyPools::ROTATE_KNOB, -5, -10, 1);
- addInput(createInput<InPort>(Vec(4,236), module, ComputerscareTolyPools::ROTATE_CV));
+ addLabeledKnob("Rotation", 2, 216, module, ComputerscareTolyPools::ROTATE_KNOB, -5, -5, 1);
+ addInput(createInput<InPort>(Vec(4,246), module, ComputerscareTolyPools::ROTATE_CV));
- addOutput(createOutput<PointingUpPentagonPort>(Vec(30, 24), module, ComputerscareTolyPools::NUM_CHANNELS_OUTPUT));
- addOutput(createOutput<PointingUpPentagonPort>(Vec(20, 324), module, ComputerscareTolyPools::POLY_OUTPUT));
+ addOutput(createOutput<OutPort>(Vec(28, 30), module, ComputerscareTolyPools::POLY_OUTPUT));
+ addOutput(createOutput<PointingUpPentagonPort>(Vec(31, 66), module, ComputerscareTolyPools::NUM_CHANNELS_OUTPUT));
}
void addLabeledKnob(std::string label, int x, int y, ComputerscareTolyPools *module, int index, float labelDx, float labelDy, int type) {
@@ -174,7 +174,7 @@ struct ComputerscareTolyPoolsWidget : ModuleWidget {
outputChannelLabel->box.pos = Vec(x + labelDx, y - 12 + labelDy);
outputChannelLabel->fontSize = 15;
outputChannelLabel->textAlign = 1;
- outputChannelLabel->breakRowWidth = 50;
+ outputChannelLabel->breakRowWidth = 55;
outputChannelLabel->value = label;
