commit dcc3c35b51cabc9fff303e4efdfe1694540f14bb
parent 789252ae485e31eb2384de186c423fe602a0d105
Author: Matt Demanett <matt@demanett.net>
Date: Tue, 23 Jan 2018 00:47:21 -0500
Detune: finalize layout.
Diffstat:
3 files changed, 14 insertions(+), 58 deletions(-)
diff --git a/res-src/Detune-src.svg b/res-src/Detune-src.svg
@@ -31,14 +31,6 @@
</g>
</symbol>
- <symbol id="knob-small" viewBox="0 0 45px 45px">
- <g transform="translate(22.5 22.5)">
- <polyline points="-3,0 3,0" stroke-width="1" stroke="#00f" />
- <polyline points="0,-3 0,3" stroke-width="1" stroke="#00f" />
- <circle cx="0" cy="0" r="7.5" stroke-width="1" stroke="#00f" fill="none" />
- </g>
- </symbol>
-
<symbol id="knobguide" viewBox="0 0 45px 45px">
<g transform="translate(22.5 22.5)">
<g transform="rotate(-240) translate(15 0)">
@@ -72,27 +64,7 @@
<polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
</g>
<g transform="rotate(60) translate(15 0)">
- <text font-size="5.0pt" transform="translate(3 0) rotate(-60) translate(-4 2.2)">10</text>
- </g>
- </g>
- </symbol>
-
- <symbol id="knobguide-multiple" viewBox="0 0 45px 45px">
- <g transform="translate(22.5 22.5)">
- <g transform="rotate(-180) translate(10 0)">
- <text font-size="5.0pt" transform="translate(1 0) rotate(180) translate(-2.2 2.2)">1</text>
- </g>
- <g transform="rotate(-135) translate(10 0)">
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
- </g>
- <g transform="rotate(-90) translate(10 0)">
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
- </g>
- <g transform="rotate(-45) translate(10 0)">
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
- </g>
- <g transform="rotate(0) translate(10 0)">
- <text font-size="5.0pt" transform="translate(1.3 0) rotate(0) translate(-2.2 2.2)">5</text>
+ <text font-size="5.0pt" transform="translate(3 0) rotate(-60) translate(-4 2.2)">50</text>
</g>
</g>
</symbol>
@@ -128,8 +100,8 @@
<polyline points="0,0 45,0 45,380 0,380 0,0" stroke="#f2f2f2" stroke-width="1" fill="none" />
<!-- <polyline points="22.5,0 22.5,380" stroke-width="0.5" stroke="#0f0" /> -->
- <!-- <rect width="45" height="7" fill="#0f0" transform="translate(0 63)" /> -->
- <!-- <rect width="45" height="7" fill="#0f0" transform="translate(0 99)" /> -->
+ <!-- <rect width="45" height="15" fill="#0f0" transform="translate(0 63)" /> -->
+ <!-- <rect width="45" height="15" fill="#0f0" transform="translate(0 129)" /> -->
<!-- <rect width="45" height="7" fill="#0f0" transform="translate(0 159)" /> -->
<g transform="rotate(-90) translate(-376 13)">
@@ -146,13 +118,7 @@
<use xlink:href="#knobguide" transform="translate(0 -3)" />
</g>
- <g transform="translate(0 76)">
- <text font-size="6pt" letter-spacing="2px" transform="translate(13.5 0)">x10</text>
- <use id="CENTS_MULTIPLE_PARAM" xlink:href="#knob-small" transform="translate(0 -8)" />
- <use xlink:href="#knobguide-multiple" transform="translate(0 -8)" />
- </g>
-
- <g transform="translate(5.5 106)">
+ <g transform="translate(5.5 73)">
<rect width="34" height="51" rx="5" fill="#fafafa" />
<use id="CV_INPUT" xlink:href="#input" transform="translate(5 3)" />
<text font-size="5pt" letter-spacing="2px" transform="translate(11 35)">CV</text>
@@ -163,7 +129,7 @@
</g>
</g>
- <g transform="translate(0 165)">
+ <g transform="translate(0 134)">
<g transform="translate(5.5 0)">
<rect width="34" height="10" fill="#fafafa" transform="translate(0 28)" />
<rect width="34" height="35" rx="5" fill="#fafafa" />
@@ -176,9 +142,9 @@
<use id="THRU_OUTPUT" xlink:href="#output" transform="translate(5 0)" />
<text font-size="5pt" letter-spacing="2px" transform="translate(5.5 32)">THRU</text>
<use id="OUT_PLUS_OUTPUT" xlink:href="#output" transform="translate(5 36)" />
- <text font-size="5pt" letter-spacing="2px" transform="translate(5.9 68)">OUT+</text>
+ <text font-size="5pt" letter-spacing="2px" transform="translate(5.5 68)">OUT+</text>
<use id="OUT_MINUS_OUTPUT" xlink:href="#output" transform="translate(5 72)" />
- <text font-size="5pt" letter-spacing="2px" transform="translate(5.9 104)">OUT-</text>
+ <text font-size="5pt" letter-spacing="2px" transform="translate(6.5 104)">OUT-</text>
</g>
</g>
</svg>
diff --git a/res/Detune.svg b/res/Detune.svg
Binary files differ.
diff --git a/src/Detune.cpp b/src/Detune.cpp
@@ -7,7 +7,6 @@ using namespace bogaudio::dsp;
struct Detune : Module {
enum ParamsIds {
CENTS_PARAM,
- CENTS_MULTIPLE_PARAM,
QUANTIZE_PARAM,
NUM_PARAMS
};
@@ -100,17 +99,16 @@ DetuneWidget::DetuneWidget() {
// generated by svg_widgets.rb
auto centsParamPosition = Vec(9.5, 31.5);
- auto centsMultipleParamPosition = Vec(14.5, 82.5);
- auto quantizeParamPosition = Vec(26.9, 144.9);
+ auto quantizeParamPosition = Vec(26.9, 111.9);
- auto cvInputPosition = Vec(10.5, 109.0);
- auto inInputPosition = Vec(10.5, 168.0);
+ auto cvInputPosition = Vec(10.5, 76.0);
+ auto inInputPosition = Vec(10.5, 137.0);
- auto thruOutputPosition = Vec(10.5, 206.0);
- auto outPlusOutputPosition = Vec(10.5, 242.0);
- auto outMinusOutputPosition = Vec(10.5, 278.0);
+ auto thruOutputPosition = Vec(10.5, 175.0);
+ auto outPlusOutputPosition = Vec(10.5, 211.0);
+ auto outMinusOutputPosition = Vec(10.5, 247.0);
- auto quantizeLightPosition = Vec(21.0, 148.0);
+ auto quantizeLightPosition = Vec(21.0, 115.0);
// end generated by svg_widgets.rb
{
@@ -118,14 +116,6 @@ DetuneWidget::DetuneWidget() {
dynamic_cast<Knob*>(w)->snap = true;
addParam(w);
}
- {
- auto w = createParam<Knob16>(centsMultipleParamPosition, module, Detune::CENTS_MULTIPLE_PARAM, 1.0, 5.0, 1.0);
- auto k = dynamic_cast<SVGKnob*>(w);
- k->snap = true;
- k->minAngle = -0.5 * M_PI;
- k->maxAngle = 0.5 * M_PI;
- addParam(w);
- }
addParam(createParam<StatefulButton9>(quantizeParamPosition, module, Detune::QUANTIZE_PARAM, 0.0, 1.0, 1.0));
addInput(createInput<Port24>(cvInputPosition, module, Detune::CV_INPUT));
