Make the WaveShaper display system-wide (#888)

Make the waveshaper display system wide style level setting. Default it to the old display (single curve).
surge-synthesizer · May 23, 2023 · de63808 · de63808
1 parent 30ae08c
commit de63808
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 21 deletions.
diff --git a/src/Waveshaper.cpp b/src/Waveshaper.cpp
@@ -50,8 +50,10 @@ struct WaveshaperWidget : widgets::XTModuleWidget
                                                 [m]() { m->doDCBlock = !m->doDCBlock; }));
 
             menu->addChild(rack::createMenuItem(
-                "Show Transform and Response", CHECKMARK(m->showTransformCurve),
-                [m]() { m->showTransformCurve = !m->showTransformCurve; }));
+                "Show Transform and Response", CHECKMARK(style()->getWaveshaperShowsBothCurves()),
+                [this]() {
+                    style()->setWaveshaperShowsBothCurves(!style()->getWaveshaperShowsBothCurves());
+                }));
         }
     }
 };
@@ -94,7 +96,7 @@ struct WaveshaperPlotWidget : public rack::widget::TransparentWidget, style::Sty
         auto fac = 2.0;
         auto inputRes = (int)box.size.x * fac;
         auto dx = 1.0 / inputRes;
-        auto cmul = module ? (module->showTransformCurve ? 6.0 : 4.0) : 4.0;
+        auto cmul = module ? (style()->getWaveshaperShowsBothCurves() ? 6.0 : 4.0) : 4.0;
         for (int i = 0; i < inputRes; ++i)
         {
             auto x = dx * i;
@@ -124,6 +126,9 @@ struct WaveshaperPlotWidget : public rack::widget::TransparentWidget, style::Sty
 
     virtual void onStyleChanged() override
     {
+        // If transform display has changed bounds adjust
+        calculateInputSignal();
+        recalcPath();
         bdw->dirty = true;
         bdwPlot->dirty = true;
         bdwResponse->dirty = true;
@@ -146,7 +151,6 @@ struct WaveshaperPlotWidget : public rack::widget::TransparentWidget, style::Sty
     int dirtyCount{0};
     int sumDeact{-1};
     int sumAbs{-1};
-    bool stc{false};
     uint32_t wtloadCompare{842932918};
 
     bool isDirty()
@@ -176,14 +180,6 @@ struct WaveshaperPlotWidget : public rack::widget::TransparentWidget, style::Sty
             }
 
             dval = wstype != lastType || ddb != lastDrive || bias != lastBias;
-
-            if (module->showTransformCurve != stc)
-            {
-                dval = true;
-                calculateInputSignal();
-                stc = module->showTransformCurve;
-                bdw->dirty = true; // special - gotta redo the background
-            }
         }
         return dval;
     }
@@ -296,7 +292,7 @@ struct WaveshaperPlotWidget : public rack::widget::TransparentWidget, style::Sty
         if (!module)
             return;
 
-        if (!module->showTransformCurve)
+        if (!style()->getWaveshaperShowsBothCurves())
             return;
 
         auto bx = bdwResponse->box;

diff --git a/src/Waveshaper.h b/src/Waveshaper.h
@@ -195,7 +195,6 @@ struct Waveshaper : public modules::XTModule
     int monoChannelOffset{0};
 
     std::atomic<bool> doDCBlock{true};
-    std::atomic<bool> showTransformCurve{true};
     bool wasDoDCBlock{true};
     /*
      * This is a bit annoying - i don't want to break 2.0.3.0 patches by turning on
@@ -571,7 +570,6 @@ struct Waveshaper : public modules::XTModule
     {
         auto ws = json_object();
         json_object_set_new(ws, "doDCBlock", json_boolean(doDCBlock));
-        json_object_set_new(ws, "showTransformCurve", json_boolean(showTransformCurve));
         return ws;
     }
 
@@ -587,12 +585,6 @@ struct Waveshaper : public modules::XTModule
         {
             doDCBlock = true;
         }
-
-        auto stc = json_object_get(modJ, "showTransformCurve");
-        if (stc)
-        {
-            showTransformCurve = json_boolean_value(stc);
-        }
     }
 };
 

diff --git a/src/XTStyle.cpp b/src/XTStyle.cpp
@@ -146,6 +146,7 @@ void XTStyle::initialize()
         handleBool("showModulationAnimationOnKnobs", setShowModulationAnimationOnKnobs, true);
         handleBool("showModulationAnimationOnDisplay", setShowModulationAnimationOnDisplay, true);
         handleBool("showShadows", setShowShadows, true);
+        handleBool("waveshaperShowsBothCurves", setWaveshaperShowsBothCurves, false);
 
         json_decref(fd);
     }
@@ -161,6 +162,7 @@ static bool showKnobValuesAtRest{true};
 static bool showModulationAnimationOnKnobs{true};
 static bool showModulationAnimationOnDisplay{true};
 static bool showShadows{true};
+static bool waveshaperShowsBothCurves{false};
 
 static std::shared_ptr<XTStyle> constructDefaultStyle()
 {
@@ -255,6 +257,17 @@ void XTStyle::setShowShadows(bool b)
     }
 }
 
+bool XTStyle::getWaveshaperShowsBothCurves() { return waveshaperShowsBothCurves; }
+void XTStyle::setWaveshaperShowsBothCurves(bool b)
+{
+    if (b != waveshaperShowsBothCurves)
+    {
+        waveshaperShowsBothCurves = b;
+        updateJSON();
+        notifyStyleListeners();
+    }
+}
+
 void XTStyle::setGlobalModulationColor(sst::surgext_rack::style::XTStyle::LightColor c)
 {
     if (c != defaultGlobalModulationColor)
@@ -319,6 +332,8 @@ void XTStyle::updateJSON()
     json_object_set_new(rootJ, "showModulationAnimationOnDisplay",
                         json_boolean(showModulationAnimationOnDisplay));
     json_object_set_new(rootJ, "showShadows", json_boolean(showShadows));
+    json_object_set_new(rootJ, "waveshaperShowsBothCurves",
+                        json_boolean(waveshaperShowsBothCurves));
     FILE *f = std::fopen(defaultsFile.c_str(), "w");
     if (f)
     {

diff --git a/src/XTStyle.h b/src/XTStyle.h
@@ -83,6 +83,9 @@ struct XTStyle
     static bool getShowShadows();
     static void setShowShadows(bool b);
 
+    static bool getWaveshaperShowsBothCurves();
+    static void setWaveshaperShowsBothCurves(bool b);
+
     static std::string lightColorName(LightColor c);
     static NVGcolor lightColorColor(LightColor c);