commit 0b0674f23cce47c5e00052305452c577f6b4a895
parent 9e8baa4f9549db123a2966d4cff99d968ae68d21
Author: Matt Demanett <matt@demanett.net>
Date: Sun, 7 Jan 2018 21:20:24 -0500
Some layout refinements on utilities.
Diffstat:
11 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/res-src/Manual-src.svg b/res-src/Manual-src.svg
@@ -50,7 +50,7 @@
</g>
</g>
- <g transform="translate(0 25)">
+ <g transform="translate(0 18)">
<g transform="translate(0 0)">
<g transform="translate(5.5 0)">
<rect width="34" height="10" fill="#fafafa" transform="translate(0 25)" />
diff --git a/res-src/Noise-src.svg b/res-src/Noise-src.svg
@@ -51,7 +51,7 @@
</g>
</g>
- <g transform="translate(0 25)">
+ <g transform="translate(0 18)">
<g transform="translate(7.5 0)">
<rect width="34" height="168" rx="5" fill="#bbb" transform="translate(-2 0)" />
<use id="WHITE_OUTPUT" xlink:href="#output" transform="translate(3 6)" />
@@ -65,7 +65,7 @@
</g>
</g>
- <g transform="translate(0 240)">
+ <g transform="translate(0 242)">
<text font-size="6pt" letter-spacing="2px" transform="translate(13 -4)">ABS</text>
<g transform="translate(5.5 0)">
<rect width="34" height="10" fill="#fafafa" transform="translate(0 28)" />
diff --git a/res-src/SampleHold-src.svg b/res-src/SampleHold-src.svg
@@ -58,7 +58,7 @@
</g>
<g transform="translate(0 25)">
- <text font-size="6pt" letterspacing="2px" transform="translate(8 0)">1</text>
+ <text font-size="6pt" letterspacing="2px" transform="translate(5.5 0)">1</text>
<!-- <polyline points="0,0 21,0" stroke-width="1" stroke="#333" transform="translate(14 -3)" /> -->
<g transform="translate(0 5)">
@@ -88,7 +88,7 @@
</g>
<g transform="translate(0 185)">
- <text font-size="6pt" letterspacing="2px" transform="translate(8 0)">2</text>
+ <text font-size="6pt" letterspacing="2px" transform="translate(4.4 0)">2</text>
<g transform="translate(0 5)">
<g transform="translate(5.5 0)">
diff --git a/res-src/VCA-src.svg b/res-src/VCA-src.svg
@@ -34,7 +34,7 @@
<symbol id="knobguide" viewBox="0 0 45px 45px">
<g transform="translate(22.5 22.5)">
<g transform="rotate(-240) translate(15 0)">
- <text font-size="5.0pt" transform="translate(2 0) rotate(240) translate(-2.2 2.2)">0</text>
+ <text font-size="5.0pt" transform="translate(3 0) rotate(240) translate(-2.2 2.2)">0</text>
</g>
<g transform="rotate(-210) translate(15 0)">
<polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
@@ -64,7 +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(2 0) rotate(-60) translate(-4 2.2)">10</text>
+ <text font-size="5.0pt" transform="translate(3 0) rotate(-60) translate(-4 2.2)">10</text>
</g>
</g>
</symbol>
@@ -103,12 +103,12 @@
</g>
<g transform="translate(0 25)">
- <text font-size="6pt" letter-spacing="2px" transform="translate(7 0)">1</text>
- <use id="LEVEL1_PARAM" xlink:href="#knob" transform="translate(0 -2)" />
- <use xlink:href="#knobguide" transform="translate(0 -2)" />
+ <text font-size="6pt" letter-spacing="2px" transform="translate(5.5 0)">1</text>
+ <use id="LEVEL1_PARAM" xlink:href="#knob" transform="translate(0 -6)" />
+ <use xlink:href="#knobguide" transform="translate(0 -6)" />
</g>
- <g transform="translate(0 67)">
+ <g transform="translate(0 63)">
<g transform="translate(5.5 0)">
<rect width="34" height="10" fill="#fafafa" transform="translate(0 63)" />
<rect width="34" height="70" rx="5" fill="#fafafa" />
@@ -125,13 +125,13 @@
</g>
</g>
- <g transform="translate(0 191)">
- <text font-size="6pt" letter-spacing="2px" transform="translate(7 0)">2</text>
- <use id="LEVEL2_PARAM" xlink:href="#knob" transform="translate(0 -2)" />
- <use xlink:href="#knobguide" transform="translate(0 -2)" />
+ <g transform="translate(0 186)">
+ <text font-size="6pt" letter-spacing="2px" transform="translate(5.5 0)">2</text>
+ <use id="LEVEL2_PARAM" xlink:href="#knob" transform="translate(0 -6)" />
+ <use xlink:href="#knobguide" transform="translate(0 -6)" />
</g>
- <g transform="translate(0 232)">
+ <g transform="translate(0 224)">
<g transform="translate(5.5 0)">
<rect width="34" height="10" fill="#fafafa" transform="translate(0 63)" />
<rect width="34" height="70" rx="5" fill="#fafafa" />
diff --git a/res/Manual.svg b/res/Manual.svg
Binary files differ.
diff --git a/res/Noise.svg b/res/Noise.svg
Binary files differ.
diff --git a/res/SampleHold.svg b/res/SampleHold.svg
Binary files differ.
diff --git a/res/VCA.svg b/res/VCA.svg
Binary files differ.
diff --git a/src/Manual.cpp b/src/Manual.cpp
@@ -81,16 +81,16 @@ ManualWidget::ManualWidget() {
addChild(createScrew<ScrewSilver>(Vec(box.size.x - 15, 365)));
// generated by svg_widgets.rb
- auto triggerParamPosition = Vec(13.5, 28.0);
-
- auto out1OutputPosition = Vec(10.5, 64.0);
- auto out2OutputPosition = Vec(10.5, 94.0);
- auto out3OutputPosition = Vec(10.5, 124.0);
- auto out4OutputPosition = Vec(10.5, 154.0);
- auto out5OutputPosition = Vec(10.5, 184.0);
- auto out6OutputPosition = Vec(10.5, 214.0);
- auto out7OutputPosition = Vec(10.5, 244.0);
- auto out8OutputPosition = Vec(10.5, 274.0);
+ auto triggerParamPosition = Vec(13.5, 22.0);
+
+ auto out1OutputPosition = Vec(10.5, 57.0);
+ auto out2OutputPosition = Vec(10.5, 87.0);
+ auto out3OutputPosition = Vec(10.5, 117.0);
+ auto out4OutputPosition = Vec(10.5, 147.0);
+ auto out5OutputPosition = Vec(10.5, 177.0);
+ auto out6OutputPosition = Vec(10.5, 207.0);
+ auto out7OutputPosition = Vec(10.5, 237.0);
+ auto out8OutputPosition = Vec(10.5, 267.0);
// end generated by svg_widgets.rb
addParam(createParam<Button18>(triggerParamPosition, module, Manual::TRIGGER_PARAM, 0.0, 1.0, 0.0));
diff --git a/src/Noise.cpp b/src/Noise.cpp
@@ -78,13 +78,13 @@ NoiseWidget::NoiseWidget() {
addChild(createScrew<ScrewSilver>(Vec(box.size.x - 15, 365)));
// generated by svg_widgets.rb
- auto absInputPosition = Vec(10.5, 243.0);
+ auto absInputPosition = Vec(10.5, 245.0);
- auto whiteOutputPosition = Vec(10.5, 31.0);
- auto pinkOutputPosition = Vec(10.5, 72.0);
- auto redOutputPosition = Vec(10.5, 113.0);
- auto gaussOutputPosition = Vec(10.5, 154.0);
- auto absOutputPosition = Vec(10.5, 281.0);
+ auto whiteOutputPosition = Vec(10.5, 24.0);
+ auto pinkOutputPosition = Vec(10.5, 65.0);
+ auto redOutputPosition = Vec(10.5, 106.0);
+ auto gaussOutputPosition = Vec(10.5, 147.0);
+ auto absOutputPosition = Vec(10.5, 283.0);
// end generated by svg_widgets.rb
addInput(createInput<Port24>(absInputPosition, module, Noise::ABS_INPUT));
diff --git a/src/VCA.cpp b/src/VCA.cpp
@@ -68,16 +68,16 @@ VCAWidget::VCAWidget() {
addChild(createScrew<ScrewSilver>(Vec(box.size.x - 15, 365)));
// generated by svg_widgets.rb
- auto level1ParamPosition = Vec(9.5, 32.5);
- auto level2ParamPosition = Vec(9.5, 198.5);
+ auto level1ParamPosition = Vec(9.5, 28.5);
+ auto level2ParamPosition = Vec(9.5, 189.5);
- auto cv1InputPosition = Vec(10.5, 70.0);
- auto in1InputPosition = Vec(10.5, 105.0);
- auto cv2InputPosition = Vec(10.5, 235.0);
- auto in2InputPosition = Vec(10.5, 270.0);
+ auto cv1InputPosition = Vec(10.5, 66.0);
+ auto in1InputPosition = Vec(10.5, 101.0);
+ auto cv2InputPosition = Vec(10.5, 227.0);
+ auto in2InputPosition = Vec(10.5, 262.0);
- auto out1OutputPosition = Vec(10.5, 143.0);
- auto out2OutputPosition = Vec(10.5, 308.0);
+ auto out1OutputPosition = Vec(10.5, 139.0);
+ auto out2OutputPosition = Vec(10.5, 300.0);
// end generated by svg_widgets.rb
addParam(createParam<Knob26>(level1ParamPosition, module, VCA::LEVEL1_PARAM, 0.0, 1.0, 0.5));
