diff --git a/res/RoganSLBlue30-bg.svg b/res/RoganSLBlue30-bg.svg new file mode 100644 index 0000000..178aab2 --- /dev/null +++ b/res/RoganSLBlue30-bg.svg @@ -0,0 +1,74 @@ + +image/svg+xml + + + + + + + + diff --git a/res/RoganSLBlue30-fg.svg b/res/RoganSLBlue30-fg.svg new file mode 100644 index 0000000..1a216b9 --- /dev/null +++ b/res/RoganSLBlue30-fg.svg @@ -0,0 +1,104 @@ + +image/svg+xml + + + + + + + + + + + + + diff --git a/res/RoganSLBlue30.svg b/res/RoganSLBlue30.svg new file mode 100644 index 0000000..564355b --- /dev/null +++ b/res/RoganSLBlue30.svg @@ -0,0 +1,124 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/RoganSLBlue40-bg.svg b/res/RoganSLBlue40-bg.svg new file mode 100644 index 0000000..62b1b72 --- /dev/null +++ b/res/RoganSLBlue40-bg.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + diff --git a/res/RoganSLBlue40-fg.svg b/res/RoganSLBlue40-fg.svg new file mode 100644 index 0000000..f35d6c3 --- /dev/null +++ b/res/RoganSLBlue40-fg.svg @@ -0,0 +1,90 @@ + +image/svg+xml + + + + + + + + + + + + + diff --git a/res/RoganSLBlue40.svg b/res/RoganSLBlue40.svg new file mode 100644 index 0000000..4946ba2 --- /dev/null +++ b/res/RoganSLBlue40.svg @@ -0,0 +1,117 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/BasicModule.cpp b/src/BasicModule.cpp index 8c0b4ea..a85541e 100644 --- a/src/BasicModule.cpp +++ b/src/BasicModule.cpp @@ -123,7 +123,7 @@ void BasicWidget::addControls(BasicModule *module, std::shared_ptr i icomp, Vec(knobX, knobY + 1 * dy), module, Comp::SEMITONE_PARAM)); - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(knobX, knobY + 2 * dy), module, Comp::FINE_PARAM)); diff --git a/src/BootyModule.cpp b/src/BootyModule.cpp index fd1eaaa..90c9aa0 100644 --- a/src/BootyModule.cpp +++ b/src/BootyModule.cpp @@ -3,6 +3,7 @@ #include "FrequencyShifter.h" #include "WidgetComposite.h" #include "ctrl/SqMenuItem.h" +#include "ctrl/SQWidgets.h" #ifdef _BOOTY #include "DrawTimer.h" @@ -254,7 +255,7 @@ BootyWidget::BootyWidget(BootyModule *module) : ModuleWidget(module) } // knob on row 1 - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(18, row1), module, diff --git a/src/CH10Module.cpp b/src/CH10Module.cpp index fd83a95..5447be7 100644 --- a/src/CH10Module.cpp +++ b/src/CH10Module.cpp @@ -142,7 +142,7 @@ const float vcoCVRow = vcoSemiRow + rowSpacing; inline void CH10Widget::makeVCO(CH10Module* module, int whichVCO, std::shared_ptr icomp) { const float x = whichVCO ? vcoBCol : vcoACol; - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(x, vcoOctRow), module, diff --git a/src/CHBModule.cpp b/src/CHBModule.cpp index 2ee997d..954b86b 100644 --- a/src/CHBModule.cpp +++ b/src/CHBModule.cpp @@ -162,7 +162,7 @@ void CHBWidget::addRow1(CHBModule *module, std::shared_ptr icomp) { const float row = row1; - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(col1, row), module, @@ -187,7 +187,7 @@ void CHBWidget::addRow1(CHBModule *module, std::shared_ptr icomp) addLabel(Vec(col3 - 26, row - labelAboveKnob), "Semi"), CHB::PARAM_SEMIS); - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(col4, row1), module, @@ -199,21 +199,21 @@ void CHBWidget::addRow2(CHBModule *module, std::shared_ptr icomp) { const float row = row2; - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(col1, row), module, CHB::PARAM_FALL)); addLabel(Vec(col1 - 18, row - labelAboveKnob), "Fall"); - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(col3, row), module, CHB::PARAM_PITCH_MOD_TRIM)); addLabel(Vec(col3 - 20, row - labelAboveKnob), "Mod"); - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(col4, row), module, @@ -240,7 +240,7 @@ void CHBWidget::addRow3(CHBModule *module, std::shared_ptr icomp) { const float row = row3; - gainParam = SqHelper::createParamCentered( + gainParam = SqHelper::createParamCentered( icomp, Vec(col1, row), module, @@ -249,7 +249,7 @@ void CHBWidget::addRow3(CHBModule *module, std::shared_ptr icomp) addLabel(Vec(col1 - 21, row - labelAboveKnob), "Gain"); //even - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(col2, row), module, @@ -257,7 +257,7 @@ void CHBWidget::addRow3(CHBModule *module, std::shared_ptr icomp) addLabel(Vec(col2 - 21.5, row - labelAboveKnob), "Even"); // slope - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(col3, row), module, @@ -265,7 +265,7 @@ void CHBWidget::addRow3(CHBModule *module, std::shared_ptr icomp) addLabel(Vec(col3 - 23, row - labelAboveKnob), "Slope"); //odd - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(col4, row), module, diff --git a/src/CHBgModule.cpp b/src/CHBgModule.cpp index dc42df1..920a5de 100644 --- a/src/CHBgModule.cpp +++ b/src/CHBgModule.cpp @@ -133,21 +133,21 @@ inline void CHBgWidget::addVCOKnobs(CHBgModule *module) -5.0f, 4.0f, 0.f)); addLabel(Vec(col2 - 27, row1 - labelAboveKnob), "Octave"); - addParam(createParamCentered( + addParam(createParamCentered( Vec(col3, row1), module, module->chb.PARAM_TUNE, -7.0f, 7.0f, 0)); addLabel(Vec(col3 - 22, row1 - labelAboveKnob), "Tune"); - addParam(createParamCentered( + addParam(createParamCentered( Vec(col2, row2), module, module->chb.PARAM_PITCH_MOD_TRIM, 0, 1.0f, 0.0f)); addLabel(Vec(col2 - 20, row2 - labelAboveKnob), "Mod"); - addParam(createParamCentered( + addParam(createParamCentered( Vec(col3, row2), module, module->chb.PARAM_LINEAR_FM_TRIM, @@ -159,7 +159,7 @@ inline void CHBgWidget::addOtherKnobs(CHBgModule *module) { // gain - gainParam = createParamCentered( + gainParam = createParamCentered( Vec(col1, row2), module, module->chb.PARAM_EXTGAIN, @@ -176,7 +176,7 @@ inline void CHBgWidget::addOtherKnobs(CHBgModule *module) // slope const float col2p5 = (col2 + col3) / 2; - addParam(createParamCentered( + addParam(createParamCentered( Vec(col2p5, 188), module, module->chb.PARAM_SLOPE, @@ -184,7 +184,7 @@ inline void CHBgWidget::addOtherKnobs(CHBgModule *module) addLabel(Vec(col2p5 - 23, 188 - labelAboveKnob), "Slope"); //even - addParam(createParamCentered( + addParam(createParamCentered( Vec(col2, row3), module, module->chb.PARAM_MAG_EVEN, @@ -192,7 +192,7 @@ inline void CHBgWidget::addOtherKnobs(CHBgModule *module) addLabel(Vec(col2 - 21.5, row3 - labelAboveKnob), "Even"); //odd - addParam(createParamCentered( + addParam(createParamCentered( Vec(col3, row3), module, module->chb.PARAM_MAG_ODD, diff --git a/src/ChaosKittyModule.cpp b/src/ChaosKittyModule.cpp index 4895e4e..ab8c1e9 100644 --- a/src/ChaosKittyModule.cpp +++ b/src/ChaosKittyModule.cpp @@ -105,25 +105,25 @@ ChaosKittyWidget::ChaosKittyWidget(ChaosKittyModule *module) module, Comp::CHAOS_INPUT)); - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(xParam, yRow1), module, Comp::CHAOS_PARAM)); - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(xParam, yRow2), module, Comp::BRIGHTNESS_PARAM)); - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(xParam, yRow3), module, Comp::RESONANCE_PARAM)); - auto octaveControl = SqHelper::createParamCentered( + auto octaveControl = SqHelper::createParamCentered( icomp, Vec(40, 240), module, diff --git a/src/ColoredNoiseModule.cpp b/src/ColoredNoiseModule.cpp index 0534b70..5d52917 100644 --- a/src/ColoredNoiseModule.cpp +++ b/src/ColoredNoiseModule.cpp @@ -8,6 +8,7 @@ #include "NoiseDrawer.h" #include "ctrl/SqMenuItem.h" #include "SqStream.h" +#include "ctrl/SQWidgets.h" #ifdef _TIME_DRAWING static DrawTimer drawTimer("Colors"); @@ -252,7 +253,7 @@ ColoredNoiseWidget::ColoredNoiseWidget(ColoredNoiseModule *module) : ModuleWidge label->color = SqHelper::COLOR_WHITE; addChild(label); - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(22, 80), module, diff --git a/src/CompressorModule.cpp b/src/CompressorModule.cpp index c0f8c9c..ec9b177 100644 --- a/src/CompressorModule.cpp +++ b/src/CompressorModule.cpp @@ -169,7 +169,7 @@ void CompressorWidget::addControls(CompressorModule *module, std::shared_ptr( + addParam(SqHelper::createParam( icomp, //Vec(knobX, knobY + 0 * dy), Vec(8, 174), @@ -180,7 +180,7 @@ void CompressorWidget::addControls(CompressorModule *module, std::shared_ptr( + addParam(SqHelper::createParam( icomp, //Vec(knobX2, knobY + 0 * dy), Vec(52, 174), @@ -191,7 +191,7 @@ void CompressorWidget::addControls(CompressorModule *module, std::shared_ptr( + addParam(SqHelper::createParam( icomp, // Vec(knobX, knobY + 1 * dy), Vec(8, 121), @@ -202,7 +202,7 @@ void CompressorWidget::addControls(CompressorModule *module, std::shared_ptr( + addParam(SqHelper::createParam( icomp, //Vec(knobX2, knobY + 1 * dy), Vec(8, 225), @@ -213,7 +213,7 @@ void CompressorWidget::addControls(CompressorModule *module, std::shared_ptr( + addParam(SqHelper::createParam( icomp, //Vec(knobX, knobY + 2 * dy), Vec(52, 121), diff --git a/src/CompressorModule2.cpp b/src/CompressorModule2.cpp index 5a95867..8f5e0d8 100644 --- a/src/CompressorModule2.cpp +++ b/src/CompressorModule2.cpp @@ -355,7 +355,7 @@ void CompressorWidget2::addControls(Compressor2Module* module, std::shared_ptr( + addParam(SqHelper::createParam( icomp, Vec(52, 211), module, Comp::ATTACK_PARAM)); @@ -365,7 +365,7 @@ void CompressorWidget2::addControls(Compressor2Module* module, std::shared_ptr( + addParam(SqHelper::createParam( icomp, Vec(98, 211), module, Comp::RELEASE_PARAM)); @@ -375,7 +375,7 @@ void CompressorWidget2::addControls(Compressor2Module* module, std::shared_ptr( + addParam(SqHelper::createParam( icomp, Vec(6, 211), module, Comp::THRESHOLD_PARAM)); @@ -401,7 +401,7 @@ void CompressorWidget2::addControls(Compressor2Module* module, std::shared_ptr( + addParam(SqHelper::createParam( icomp, Vec(6, 268), module, Comp::WETDRY_PARAM)); @@ -411,7 +411,7 @@ void CompressorWidget2::addControls(Compressor2Module* module, std::shared_ptr( + addParam(SqHelper::createParam( icomp, Vec(98, 268), module, Comp::MAKEUPGAIN_PARAM)); diff --git a/src/DGModule.cpp b/src/DGModule.cpp index 7b13302..4f6d69c 100644 --- a/src/DGModule.cpp +++ b/src/DGModule.cpp @@ -112,25 +112,25 @@ DGWidget::DGWidget(DGModule *module) std::shared_ptr icomp = Comp::getDescription(); - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(gainX, y), module, Daveguide::OCTAVE_PARAM)); addLabel(Vec(gainX + labelDeltaX, y + labelDeltaY), "octave"); - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(offsetX, y), module, Daveguide::TUNE_PARAM)); addLabel(Vec(offsetX + labelDeltaX, y + labelDeltaY), "tune"); - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(gainX, y2), module, Daveguide::DECAY_PARAM)); addLabel(Vec(gainX + labelDeltaX, y2 + labelDeltaY), "decay"); - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(offsetX, y2), module, Daveguide::FC_PARAM)); diff --git a/src/EV3Module.cpp b/src/EV3Module.cpp index aef867c..9cbd2a2 100644 --- a/src/EV3Module.cpp +++ b/src/EV3Module.cpp @@ -360,13 +360,13 @@ void EV3Widget::makeSection(EV3Module *module, int index, std::shared_ptr( + addParam(SqHelper::createParamCentered( icomp, Vec(x, y2), module, Comp::FINE1_PARAM + delta * index)); addLabel(Vec(x - 20, y2 - 34), "Fine"); - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(x2, y2), module, Comp::FM1_PARAM + delta * index)); diff --git a/src/EVModule.cpp b/src/EVModule.cpp index 0a581b6..2ca6836 100644 --- a/src/EVModule.cpp +++ b/src/EVModule.cpp @@ -197,7 +197,7 @@ EVWidget::EVWidget(EVModule *module) : ModuleWidget(module) addChild(Widget::create(Vec(15 * 6, 0))); addChild(Widget::create(Vec(15 * 6, 365))); - octaveKnob = ParamWidget::create(Vec(34, 32), + octaveKnob = ParamWidget::create(Vec(34, 32), module, module->vco.OCTAVE_PARAM, -5.0, 4.0, 0.0); addParam(octaveKnob); diff --git a/src/F2Module.cpp b/src/F2Module.cpp index df54834..498632a 100644 --- a/src/F2Module.cpp +++ b/src/F2Module.cpp @@ -207,7 +207,7 @@ void F2Widget::addKnobs(F2Module* module, std::shared_ptr icomp) { Vec(14 - 6, 166), "Fc"); #endif - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(7, 185), module, Comp::FC_PARAM)); @@ -221,7 +221,7 @@ void F2Widget::addKnobs(F2Module* module, std::shared_ptr icomp) { Vec(55 - 8, 166), "Q"); #endif - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(45, 185), module, Comp::Q_PARAM)); @@ -235,7 +235,7 @@ void F2Widget::addKnobs(F2Module* module, std::shared_ptr icomp) { Vec(95 - 8, 166), "R"); #endif - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(84, 185), module, Comp::R_PARAM)); @@ -249,7 +249,7 @@ void F2Widget::addKnobs(F2Module* module, std::shared_ptr icomp) { Vec(10 - 8, 32), "Vol"); #endif - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(7, 50), module, Comp::VOL_PARAM)); diff --git a/src/F4Module.cpp b/src/F4Module.cpp index c75083d..10cc523 100644 --- a/src/F4Module.cpp +++ b/src/F4Module.cpp @@ -92,15 +92,15 @@ void F4Widget::addKnobs(F4Module *module, std::shared_ptr icomp) module, Comp::LIMITER_PARAM)); addLabel(Vec(80-11, 80), "Lim"); - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(knobX, knobY + 0* dy), module, Comp::FC_PARAM)); - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(knobX, knobY + 1* dy), module, Comp::Q_PARAM)); - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(knobX, knobY + 2* dy), module, Comp::R_PARAM)); diff --git a/src/FiltModule.cpp b/src/FiltModule.cpp index 19d967a..5f18c87 100644 --- a/src/FiltModule.cpp +++ b/src/FiltModule.cpp @@ -136,7 +136,7 @@ void FiltWidget::addParams(FiltModule *module, std::shared_ptr icomp const float labelDx = 22; const float labelY = -38; - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(x1, y1), module, @@ -145,7 +145,7 @@ void FiltWidget::addParams(FiltModule *module, std::shared_ptr icomp Vec(x1+8-labelDx, y1 + labelY), "Fc"); - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(x2, y1), module, @@ -154,7 +154,7 @@ void FiltWidget::addParams(FiltModule *module, std::shared_ptr icomp Vec(x2+10-labelDx, y1 + labelY), "Q"); - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(x3, y1), module, @@ -163,7 +163,7 @@ void FiltWidget::addParams(FiltModule *module, std::shared_ptr icomp Vec(x3+1-labelDx, y1 + labelY), "Drive"); - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(x4, y1), module, @@ -198,7 +198,7 @@ void FiltWidget::addParams(FiltModule *module, std::shared_ptr icomp } // second row - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(x1, y2), module, @@ -207,7 +207,7 @@ void FiltWidget::addParams(FiltModule *module, std::shared_ptr icomp Vec(x1+2-labelDx, y2 + labelY), "Edge"); - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(x2, y2), module, @@ -216,7 +216,7 @@ void FiltWidget::addParams(FiltModule *module, std::shared_ptr icomp Vec(x2-labelDx, y2 + labelY), "Caps"); - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(x3, y2), module, @@ -225,7 +225,7 @@ void FiltWidget::addParams(FiltModule *module, std::shared_ptr icomp Vec(x3+2-labelDx, y2 + labelY), "Bass"); - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(x4, y2), module, diff --git a/src/FunVModule.cpp b/src/FunVModule.cpp index e8d8e11..4f84c1b 100644 --- a/src/FunVModule.cpp +++ b/src/FunVModule.cpp @@ -4,6 +4,7 @@ #ifdef _FUN #include "WidgetComposite.h" +#include "ctrl/SqWidgets.h" #include "ctrl/SqHelper.h" #include "ctrl/SqMenuItem.h" #include "FunVCOComposite.h" @@ -115,7 +116,7 @@ void FunVWidget::addTop3(FunVModule * module, float verticalShift) addLabel(Vec(left -4, 48+ verticalShift), "anlg"); addLabel(Vec(left -3, 108+ verticalShift), "dgtl"); - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(center, 61 + verticalShift), module, @@ -134,26 +135,26 @@ void FunVWidget::addTop3(FunVModule * module, float verticalShift) void FunVWidget::addMiddle4(FunVModule * module, float verticalShift) { - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(23, 143 + verticalShift), module, Comp::FINE_PARAM)); addLabel(Vec(25, 124 +verticalShift), "fine"); - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(91, 143 + verticalShift), module, Comp::PW_PARAM)); addLabel(Vec(84, 124 +verticalShift), "p width"); - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(23, 208 + verticalShift), module, Comp::FM_PARAM)); addLabel(Vec(19, 188 +verticalShift), "fm cv"); - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(91, 208 + verticalShift), module, diff --git a/src/LFNBModule.cpp b/src/LFNBModule.cpp index 71e37ed..f089f94 100644 --- a/src/LFNBModule.cpp +++ b/src/LFNBModule.cpp @@ -132,7 +132,7 @@ void LFNBWidget::addStage(int index) { // make a temporary one for instantiation controls, // in case module is null. - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(knobX, knobY + index * knobDy), module, Comp::EQ0_PARAM + index)); @@ -212,7 +212,7 @@ void LFNBWidget::addKnobs(LFNBModule* module, std::shared_ptr icomp) float trimDy = 6; // float lavelDy = 6; - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(knobX, knobY), module, Comp::FC0_PARAM )); @@ -224,7 +224,7 @@ void LFNBWidget::addKnobs(LFNBModule* module, std::shared_ptr icomp) module, Comp::FC0_TRIM_PARAM )); knobY += knobDy; - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(knobX, knobY), module, Comp::Q0_PARAM)); @@ -236,7 +236,7 @@ void LFNBWidget::addKnobs(LFNBModule* module, std::shared_ptr icomp) module, Comp::Q0_TRIM_PARAM )); knobY += knobDy; - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(knobX, knobY), module, Comp::FC1_PARAM )); @@ -248,7 +248,7 @@ void LFNBWidget::addKnobs(LFNBModule* module, std::shared_ptr icomp) module, Comp::FC1_TRIM_PARAM )); knobY += knobDy; - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(knobX, knobY), module, Comp::Q1_PARAM)); diff --git a/src/LFNModule.cpp b/src/LFNModule.cpp index 6feca98..6e734a7 100644 --- a/src/LFNModule.cpp +++ b/src/LFNModule.cpp @@ -126,7 +126,7 @@ void LFNWidget::addStage(int index) { // make a temporary one for instantiation controls, // in case module is null. - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(knobX, knobY + index * knobDy), module, Comp::EQ0_PARAM + index)); @@ -168,7 +168,7 @@ LFNWidget::LFNWidget(LFNModule *module) : module(module) addLabel( Vec(54, inputY - knobDy - 18), "out", SqHelper::COLOR_WHITE); - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(10, knobY - 1 * knobDy), module, diff --git a/src/Mix4Module.cpp b/src/Mix4Module.cpp index b067e35..2bb5de7 100644 --- a/src/Mix4Module.cpp +++ b/src/Mix4Module.cpp @@ -211,7 +211,7 @@ void Mix4Widget::makeStrip( const float extraDy = 5; y -= (channelDy + extraDy); - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(x, y), module, @@ -219,7 +219,7 @@ void Mix4Widget::makeStrip( volY = y; y -= (channelDy + extraDy); - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(x, y), module, @@ -228,14 +228,14 @@ void Mix4Widget::makeStrip( y -= (channelDy + extraDy); - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(x, y), module, channel + Comp::SENDb0_PARAM)); y -= (channelDy + extraDy); - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(x, y), module, diff --git a/src/Mix8Module.cpp b/src/Mix8Module.cpp index 1aee95f..e59f591 100644 --- a/src/Mix8Module.cpp +++ b/src/Mix8Module.cpp @@ -211,7 +211,7 @@ void Mix8Widget::makeStrip( const float extraDy = 6; y -= (channelDy + extraDy); - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(x, y), module, @@ -224,7 +224,7 @@ void Mix8Widget::makeStrip( volY = y; y -= (channelDy + extraDy); - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(x, y), module, @@ -236,7 +236,7 @@ void Mix8Widget::makeStrip( } y -= (channelDy + extraDy); - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(x, y), module, @@ -314,7 +314,7 @@ void Mix8Widget::makeMaster(Mix8Module* module, std::shared_ptr icom // const float zz2 = mute->getValue(); y = volY; - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(x, y), module, @@ -323,7 +323,7 @@ void Mix8Widget::makeMaster(Mix8Module* module, std::shared_ptr icom "M"); y -= 55; - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(x, y), module, diff --git a/src/MixMModule.cpp b/src/MixMModule.cpp index b8e720b..4e3a721 100644 --- a/src/MixMModule.cpp +++ b/src/MixMModule.cpp @@ -276,7 +276,7 @@ void MixMWidget::makeStrip( y -= (channelDy + extraDy); - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(x, y), module, @@ -291,7 +291,7 @@ void MixMWidget::makeStrip( volY = y; y -= (channelDy + extraDy); - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(x, y), module, @@ -305,7 +305,7 @@ void MixMWidget::makeStrip( #endif y -= (channelDy + extraDy); - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(x, y), module, @@ -319,7 +319,7 @@ void MixMWidget::makeStrip( #endif y -= (channelDy + extraDy); - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(x, y), module, @@ -437,7 +437,7 @@ void MixMWidget::makeMaster(MixMModule* module, std::shared_ptr icom y = volY; - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(x, y-12), module, @@ -445,7 +445,7 @@ void MixMWidget::makeMaster(MixMModule* module, std::shared_ptr icom y -= (channelDy + extraDy) * 2; - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(x, y), module, @@ -455,7 +455,7 @@ void MixMWidget::makeMaster(MixMModule* module, std::shared_ptr icom "R2"); #endif y -= (channelDy + extraDy); - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(x, y), module, diff --git a/src/MixStereoModule.cpp b/src/MixStereoModule.cpp index d83bdad..301803f 100644 --- a/src/MixStereoModule.cpp +++ b/src/MixStereoModule.cpp @@ -211,7 +211,7 @@ void MixStereoWidget::makeGroup( const float extraDy = 5; y -= (channelDy + extraDy); - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(x, y), module, @@ -219,21 +219,21 @@ void MixStereoWidget::makeGroup( volY = y; y -= (channelDy + extraDy); - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(x, y), module, group + Comp::PAN0_PARAM)); y -= (channelDy + extraDy); - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(x, y), module, group + Comp::SENDb0_PARAM)); y -= (channelDy + extraDy); - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(x, y), module, diff --git a/src/SampModule.cpp b/src/SampModule.cpp index 8aa0425..d012a93 100644 --- a/src/SampModule.cpp +++ b/src/SampModule.cpp @@ -566,7 +566,7 @@ void SampWidget::addKnobs(SampModule* module, std::shared_ptr icomp) Vec(knobsX - 6 - dx, labelY), "Vol"); #endif - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(201, 219), module, @@ -576,7 +576,7 @@ void SampWidget::addKnobs(SampModule* module, std::shared_ptr icomp) Vec(knobsX - 6, labelY), "Pitch"); #endif - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(105, 219), module, @@ -592,7 +592,7 @@ void SampWidget::addKnobs(SampModule* module, std::shared_ptr icomp) Vec(knobsX - 6 + 1 * dx, labelY), "Depth"); #endif - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(153, 219), module, diff --git a/src/ShaperModule.cpp b/src/ShaperModule.cpp index 45f4a28..4121583 100644 --- a/src/ShaperModule.cpp +++ b/src/ShaperModule.cpp @@ -5,6 +5,7 @@ #include "ctrl/ToggleButton.h" #include "WidgetComposite.h" #include "ctrl/SqMenuItem.h" +#include "ctrl/SqWidgets.h" #include "Shaper.h" @@ -120,7 +121,7 @@ void ShaperWidget::addSelector(ShaperModule* module, std::shared_ptr { const float x = 37; const float y = 80; - auto p = SqHelper::createParamCentered( + auto p = SqHelper::createParamCentered( icomp, Vec(x, y), module, Shaper::PARAM_SHAPE); @@ -153,14 +154,14 @@ ShaperWidget::ShaperWidget(ShaperModule* module) const float gainY = 232; const float offsetY = 147; - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(gainX, gainY), module, Shaper::PARAM_GAIN)); addLabel(Vec(8, 191), "Gain"); - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(offsetX, offsetY), module, Shaper::PARAM_OFFSET)); diff --git a/src/SinesModule.cpp b/src/SinesModule.cpp index 77428df..230ab4c 100644 --- a/src/SinesModule.cpp +++ b/src/SinesModule.cpp @@ -166,11 +166,11 @@ void SinesWidget::addDrawbars(SinesModule *module, std::shared_ptr i Comp::DRAWBAR1_INPUT + i)); } - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(231, 81), module, Comp::PERCUSSION1_PARAM)); - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(188, 81), module, Comp::PERCUSSION2_PARAM)); @@ -193,7 +193,7 @@ void SinesWidget::addJacks(SinesModule *module, std::shared_ptr icom module, Comp::MAIN_OUTPUT)); - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(11, 81), module, Comp::ATTACK_PARAM)); @@ -203,7 +203,7 @@ void SinesWidget::addJacks(SinesModule *module, std::shared_ptr icom module, Comp::ATTACK_INPUT)); - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(55, 81), module, Comp::RELEASE_PARAM)); diff --git a/src/Slew4Module.cpp b/src/Slew4Module.cpp index 5474413..9643eeb 100644 --- a/src/Slew4Module.cpp +++ b/src/Slew4Module.cpp @@ -149,21 +149,21 @@ static const float jackY2 = 342; void Slew4Widget::addOther(Slew4Module*, std::shared_ptr icomp) { - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(knobX, knobY), module, Comp::PARAM_RISE)); addLabel(Vec(knobX - 20, knobY - labelAboveKnob), "Rise"); - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(knobX + knobDx, knobY), module, Comp::PARAM_FALL)); addLabel(Vec(knobX + 2 + knobDx - 20, knobY - labelAboveKnob), "Fall"); - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(knobX + 2 * knobDx, knobY), module, diff --git a/src/SubModule.cpp b/src/SubModule.cpp index c1de5a7..22b1b70 100644 --- a/src/SubModule.cpp +++ b/src/SubModule.cpp @@ -176,7 +176,7 @@ void SubWidget::addKnobs(SubModule *module, std::shared_ptr icomp, i addLabelx(Vec(side ? 262 : 49, knobY1 - labelAboveKnob), "Semi"), Comp::SEMITONE1_PARAM + side); - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(side ? knobX4 : knobX3, knobY1), module, @@ -185,21 +185,21 @@ void SubWidget::addKnobs(SubModule *module, std::shared_ptr icomp, i // second row - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(side ? knobX6 : knobX1, knobY2), module, Comp::VCO1_LEVEL_PARAM + side)); //addLabel(Vec(xfunc(knobX1, side) - 4, knobY2 - labelAboveKnob), "Vol"); - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(side ? knobX5 : knobX2, knobY2), module, Comp::SUB1A_LEVEL_PARAM + side)); //addLabel(Vec(xfunc(knobX2, side) - 8, knobY2 - labelAboveKnob), "Sub A"); - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(side ? knobX4 : knobX3, knobY2), module, diff --git a/src/SuperModule.cpp b/src/SuperModule.cpp index 968ef33..ef17e39 100644 --- a/src/SuperModule.cpp +++ b/src/SuperModule.cpp @@ -132,7 +132,7 @@ const float labelOffsetSmall = -32; void superWidget::addPitchKnobs(SuperModule* module, std::shared_ptr icomp) { // Octave - Rogan1PSBlue* oct = SqHelper::createParamCentered( + RoganSLBlue40* oct = SqHelper::createParamCentered( icomp, Vec(col1, row1), module, @@ -146,7 +146,7 @@ void superWidget::addPitchKnobs(SuperModule* module, std::shared_ptr semitoneDisplay.setOctLabel(l, Super::OCTAVE_PARAM); // Semi - auto semi = SqHelper::createParamCentered( + auto semi = SqHelper::createParamCentered( icomp, Vec(col2, row1), module, @@ -160,7 +160,7 @@ void superWidget::addPitchKnobs(SuperModule* module, std::shared_ptr semitoneDisplay.setSemiLabel(l, Super::SEMI_PARAM); // Fine - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(col1, row2), module, @@ -171,7 +171,7 @@ void superWidget::addPitchKnobs(SuperModule* module, std::shared_ptr "Fine"); // FM - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(col2, row2), module, @@ -184,7 +184,7 @@ void superWidget::addPitchKnobs(SuperModule* module, std::shared_ptr void superWidget::addOtherKnobs(SuperModule *, std::shared_ptr icomp) { // Detune - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(col1, row3), module, @@ -199,7 +199,7 @@ void superWidget::addOtherKnobs(SuperModule *, std::shared_ptr icomp module, Comp::DETUNE_TRIM_PARAM)); - addParam(SqHelper::createParamCentered( + addParam(SqHelper::createParamCentered( icomp, Vec(col2, row3), module, diff --git a/src/TremoloModule.cpp b/src/TremoloModule.cpp index ce7faa8..5f4faff 100644 --- a/src/TremoloModule.cpp +++ b/src/TremoloModule.cpp @@ -7,6 +7,7 @@ #include "WidgetComposite.h" #include "Tremolo.h" #include "ctrl/SqMenuItem.h" +#include "ctrl/SqWidgets.h" #ifdef _TIME_DRAWING static DrawTimer drawTimer("Chopper"); @@ -162,7 +163,7 @@ void TremoloWidget::addMainSection(TremoloModule *module, std::shared_ptr( + addParam(SqHelper::createParam( icomp, Vec(knobX, knobY + 0 * knobDy), module, @@ -181,7 +182,7 @@ void TremoloWidget::addMainSection(TremoloModule *module, std::shared_ptr( + addParam(SqHelper::createParam( icomp, Vec(knobX, knobY + 1 * knobDy), module, @@ -200,7 +201,7 @@ void TremoloWidget::addMainSection(TremoloModule *module, std::shared_ptr( + addParam(SqHelper::createParam( icomp, Vec(knobX, knobY + 2 * knobDy), module, @@ -219,7 +220,7 @@ void TremoloWidget::addMainSection(TremoloModule *module, std::shared_ptr( + addParam(SqHelper::createParam( icomp, Vec(knobX, knobY + 3 * knobDy), module, diff --git a/src/VocalFilterModule.cpp b/src/VocalFilterModule.cpp index db6a7bd..cf99809 100644 --- a/src/VocalFilterModule.cpp +++ b/src/VocalFilterModule.cpp @@ -6,6 +6,7 @@ #include "WidgetComposite.h" #include "VocalFilter.h" #include "ctrl/SqMenuItem.h" +#include "ctrl/SqWidgets.h" using Comp = VocalFilter; @@ -192,7 +193,7 @@ VocalFilterWidget::VocalFilterWidget(VocalFilterModule* module) const float trimDx = 3; // move to the right to match input Label* label; - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(col2, row2L), module, Comp::FILTER_VOWEL_PARAM)); @@ -213,7 +214,7 @@ VocalFilterWidget::VocalFilterWidget(VocalFilterModule* module) label->color = SqHelper::COLOR_BLACK; addChild(label); - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(col3, row2R), module, Comp::FILTER_FC_PARAM)); @@ -233,7 +234,7 @@ VocalFilterWidget::VocalFilterWidget(VocalFilterModule* module) label->color = SqHelper::COLOR_BLACK; addChild(label); - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(col2, row3L), module, Comp::FILTER_Q_PARAM)); @@ -253,7 +254,7 @@ VocalFilterWidget::VocalFilterWidget(VocalFilterModule* module) label->text = "Brite"; label->color = SqHelper::COLOR_BLACK; addChild(label); - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(col3, row3R), module, Comp::FILTER_BRIGHTNESS_PARAM)); diff --git a/src/VocalModule.cpp b/src/VocalModule.cpp index 7e8467f..d19bd52 100644 --- a/src/VocalModule.cpp +++ b/src/VocalModule.cpp @@ -5,6 +5,7 @@ #include "WidgetComposite.h" #include "VocalAnimator.h" #include "ctrl/SqMenuItem.h" +#include "ctrl/SqWidgets.h" #ifdef _TIME_DRAWING static DrawTimer drawTimer("Growler"); @@ -69,15 +70,6 @@ struct VocalWidget : ModuleWidget #endif }; -template -struct MuteLight : BASE -{ - MuteLight() - { - this->box.size = mm2px(Vec(6.0f, 6.0f)); - } -}; - struct NKK2 : SqHelper::SvgSwitch { NKK2() @@ -155,7 +147,7 @@ VocalWidget::VocalWidget(VocalModule *module) module, Comp::LFO2_OUTPUT)); - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(lfoRateKnobX, lfoRateKnobY), module, @@ -196,7 +188,7 @@ VocalWidget::VocalWidget(VocalModule *module) const float inputX = mainBlockX + 8; const float inputY = mainBlockY + 108; - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(knobX, knobY), module, @@ -213,7 +205,7 @@ VocalWidget::VocalWidget(VocalModule *module) module, Comp::FILTER_FC_TRIM_PARAM)); - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(knobX + colSpacingX, knobY), module, @@ -230,7 +222,7 @@ VocalWidget::VocalWidget(VocalModule *module) module, Comp::FILTER_Q_TRIM_PARAM)); - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(knobX + 2 * colSpacingX, knobY), module, diff --git a/src/WVCOModule.cpp b/src/WVCOModule.cpp index c93a24c..2c31475 100644 --- a/src/WVCOModule.cpp +++ b/src/WVCOModule.cpp @@ -367,7 +367,7 @@ void WVCOWidget::addKnobs(WVCOModule *module, std::shared_ptr icomp) Comp::FREQUENCY_MULTIPLIER_PARAM)); //addLabel(Vec(knobX2 - 6, knobY1 - labelAboveKnob), "Ratio"); - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(knobX3, knobY1), module, @@ -389,7 +389,7 @@ void WVCOWidget::addKnobs(WVCOModule *module, std::shared_ptr icomp) // second row // 1 level - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(knobX1, knobY2), module, @@ -397,7 +397,7 @@ void WVCOWidget::addKnobs(WVCOModule *module, std::shared_ptr icomp) //addLabel(Vec(knobX1 - 8, knobY2 - labelAboveKnob), "Level"); // 2 fm-0 - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(knobX2, knobY2), module, @@ -405,7 +405,7 @@ void WVCOWidget::addKnobs(WVCOModule *module, std::shared_ptr icomp) //addLabel(Vec(knobX2 - 10, knobY2 - labelAboveKnob), "Depth"); // 3 Fdbk - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(knobX3, knobY2), module, @@ -413,7 +413,7 @@ void WVCOWidget::addKnobs(WVCOModule *module, std::shared_ptr icomp) //addLabel(Vec(knobX3 - 6, knobY2 - labelAboveKnob), "Fbck"); // 4 SHAPE - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(knobX4, knobY2), module, @@ -431,28 +431,28 @@ void WVCOWidget::addKnobs(WVCOModule *module, std::shared_ptr icomp) Comp::SNAP_PARAM)); #endif - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(39, knobY3), module, Comp::ATTACK_PARAM)); // addLabel(Vec(knobX1 + 4, knobY3 - labelAboveKnob), "A"); - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(82, knobY3), module, Comp::DECAY_PARAM)); // ddLabel(Vec(knobX2 + 4, knobY3 - labelAboveKnob), "D"); - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(127, knobY3), module, Comp::SUSTAIN_PARAM)); // addLabel(Vec(knobX3 + 4, knobY3 - labelAboveKnob), "S"); - addParam(SqHelper::createParam( + addParam(SqHelper::createParam( icomp, Vec(169, knobY3), module, diff --git a/src/ctrl/SqWidgets.h b/src/ctrl/SqWidgets.h index d883c95..f6efce2 100644 --- a/src/ctrl/SqWidgets.h +++ b/src/ctrl/SqWidgets.h @@ -8,20 +8,34 @@ #include /** - * Like Rogan1PSBlue, but smaller. + * Like RoganSLBlue40, but smaller. */ -struct Blue30Knob : SvgKnob +struct RoganSLBlue30 : Rogan { - Blue30Knob() + RoganSLBlue30() { minAngle = -0.83*M_PI; maxAngle = 0.83*M_PI; - SqHelper::setSvg(this, SqHelper::loadSvg("res/Blue30.svg")); + setSvg(SqHelper::loadSvg("res/RoganSLBlue30.svg")); + bg->setSvg(SqHelper::loadSvg("res/RoganSLBlue30-bg.svg")); + fg->setSvg(SqHelper::loadSvg("res/RoganSLBlue30-fg.svg")); } }; -struct Blue30SnapKnob : Blue30Knob +struct RoganSLBlue40 : Rogan +{ + RoganSLBlue40() + { + minAngle = -0.83*M_PI; + maxAngle = 0.83*M_PI; + setSvg(SqHelper::loadSvg("res/RoganSLBlue40.svg")); + bg->setSvg(SqHelper::loadSvg("res/RoganSLBlue40-bg.svg")); + fg->setSvg(SqHelper::loadSvg("res/RoganSLBlue40-fg.svg")); + } +}; + +struct Blue30SnapKnob : RoganSLBlue30 { Blue30SnapKnob() { diff --git a/src/grammar/RuleRowEditor.cpp b/src/grammar/RuleRowEditor.cpp index 8c29e0e..6313a50 100644 --- a/src/grammar/RuleRowEditor.cpp +++ b/src/grammar/RuleRowEditor.cpp @@ -20,7 +20,7 @@ RuleRowEditor::RuleRowEditor(StochasticProductionRuleEntryPtr e) : entry(e) { module->configParam(paramId, 0, 100, prob * 100, "probability"); - auto p = new Blue30Knob(); + auto p = new RoganSLBlue30(); p->box.pos.x = 150; p->box.pos.y = 4; //p->getParamQuantity() = module->paramQuantities[paramId];