commit d7db9cd19ac19a0acea80b74016b3976eb75fa6c
parent 64de7abbb047763fd07baeaece7ce347dac19a44
Author: Adam M <[email protected]>
Date: Thu, 17 Jan 2019 20:25:54 -0600
Update small effed knob, actually save the scale in Peas
Diffstat:
2 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/res/computerscare-small-knob-effed.svg b/res/computerscare-small-knob-effed.svg
@@ -65,10 +65,10 @@
inkscape:connector-curvature="0"
sodipodi:nodetypes="sssssss" />
<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:#245559;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.14128505;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 9.7828699,42.24466 c -0.1119802,0.710525 -0.3019306,2.198982 -0.3019306,2.198982 l -0.1777448,0.588651 -0.2034123,0.598305 -0.015928,0.735707 0.3232394,0.557847 0.2878686,0.63051 -0.677338,2.045933 c 0.8672158,0.08816 0.899553,0.07243 1.6385118,-0.476766 l -0.360153,-1.171141 -0.186429,-0.959997 -0.01518,-0.940737 0.118954,-0.407286 0.01716,-0.507655 -0.10054,-2.914717 c -0.3472123,0.13136 -0.3516893,-0.0043 -0.3540543,0.06194 -0.00161,0.04384 0.026642,-0.157446 0.00682,-0.03954 0,0 -0.03003,0.03963 -0.037906,0.02583 -0.0077,-0.0138 0.037884,-0.02583 0.037884,-0.02583 z"
+ 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:#245559;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.23041919;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 9.6493062,42.217346 c 0.6901338,1.262844 -0.548965,3.216837 -0.548965,3.216837 l -0.3231724,0.861123 -0.3698409,0.875245 -0.02896,1.076248 0.4536482,0.994808 0.2552772,1.369224 -0.8293436,2.367331 c 1.5767568,0.128967 1.6355518,0.105956 2.9791143,-0.697449 l -0.654823,-1.713233 -0.338963,-1.404356 -0.0276,-1.376181 0.21628,-0.595809 -0.415667,-1.10013 1.174804,-3.480722 -0.910737,-0.425652 c -0.6312958,0.192164 -0.6394358,-0.0063 -0.6437358,0.09061 -0.00293,0.06413 0.04844,-0.230324 0.0124,-0.05784 0,0 -0.071022,0.01167 -0.06892,0.03779 0.0016,0.01993 0.05652,0.02005 0.05652,0.02005 z"
id="Button_Pointer"
inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccccccccccccccscacc" />
+ sodipodi:nodetypes="ccccccccccccccccscacc" />
</g>
</svg>
diff --git a/src/ComputerscareOhPeas.cpp b/src/ComputerscareOhPeas.cpp
@@ -121,6 +121,32 @@ struct ComputerscareOhPeas : Module {
}
void step() override;
+ json_t *toJson() override
+ {
+ json_t *rootJ = json_object();
+
+ json_t *sequencesJ = json_array();
+ for (int i = 0; i < 1; i++) {
+ json_t *sequenceJ = json_string(textField->text.c_str());
+ json_array_append_new(sequencesJ, sequenceJ);
+ }
+ json_object_set_new(rootJ, "sequences", sequencesJ);
+
+ return rootJ;
+ }
+
+ void fromJson(json_t *rootJ) override
+ {
+ json_t *sequencesJ = json_object_get(rootJ, "sequences");
+ if (sequencesJ) {
+ for (int i = 0; i < 1; i++) {
+ json_t *sequenceJ = json_array_get(sequencesJ, i);
+ if (sequenceJ)
+ textField->text = json_string_value(sequenceJ);
+ }
+ }
+ }
+
void setQuant(Quantizer q) {
std::string value = this->textField->text;
@@ -146,8 +172,6 @@ void ComputerscareOhPeas::step() {
B = inputs[SCALE_CV+i].value;
A = inputs[CHANNEL_INPUT+i].value;
-
-
c = params[OFFSET_TRIM+i].value;
C = inputs[OFFSET_CV+i].value;
d = params[OFFSET_VAL+i].value;
