Fixed #45 - Moots panel toggles GATE/TRIGGER.

cosinekitty · Apr 22, 2024 · 7705c50 · 7705c50
1 parent 922310b
commit 7705c50
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 9 deletions.
diff --git a/res/moots.svg b/res/moots.svg
diff --git a/res/moots_label_gate.svg b/res/moots_label_gate.svg
diff --git a/res/moots_label_trigger.svg b/res/moots_label_trigger.svg
diff --git a/src/moots.cpp b/src/moots.cpp
@@ -264,13 +264,22 @@ namespace Sapphire
         struct MootsWidget : ModuleWidget
         {
             MootsModule* mootsModule;
+            SvgOverlay* gateLabel{};
+            SvgOverlay* triggerLabel{};
 
             explicit MootsWidget(MootsModule* module)
                 : mootsModule(module)
             {
                 setModule(module);
                 setPanel(createPanel(asset::plugin(pluginInstance, "res/moots.svg")));
 
+                gateLabel = SvgOverlay::Load("res/moots_label_gate.svg");
+                addChild(gateLabel);
+
+                triggerLabel = SvgOverlay::Load("res/moots_label_trigger.svg");
+                triggerLabel->hide();
+                addChild(triggerLabel);
+
                 addParam(createLightParamCentered<VCVLightBezelLatch<>>(mm2px(Vec(25.05,  17.25)), module, TOGGLEBUTTON1_PARAM, MOOTLIGHT1));
                 addParam(createLightParamCentered<VCVLightBezelLatch<>>(mm2px(Vec(25.05,  38.75)), module, TOGGLEBUTTON2_PARAM, MOOTLIGHT2));
                 addParam(createLightParamCentered<VCVLightBezelLatch<>>(mm2px(Vec(25.05,  60.25)), module, TOGGLEBUTTON3_PARAM, MOOTLIGHT3));
@@ -344,6 +353,21 @@ namespace Sapphire
                     ));
                 }
             }
+
+            void step() override
+            {
+                if (mootsModule && gateLabel && triggerLabel)
+                {
+                    // Toggle between showing "GATE" or "TRIGGER" depending on the toggle state.
+                    bool showGate = (mootsModule->controlMode == ControlMode::Gate);
+                    if (gateLabel->isVisible() != showGate)
+                    {
+                        gateLabel->setVisible(showGate);
+                        triggerLabel->setVisible(!showGate);
+                    }
+                }
+                ModuleWidget::step();
+            }
         };
     }
 }

diff --git a/util/make_sapphire_svg.py b/util/make_sapphire_svg.py
@@ -563,20 +563,26 @@ def GenerateHissPanel() -> int:
 </g>
 '''
 
+MOOTS_PANEL_WIDTH = 10
+
 
 def GenerateMootsPanel() -> int:
     svgFileName = '../res/moots.svg'
-    PANEL_WIDTH = 10
-    panel = Panel(PANEL_WIDTH)
+    panel = Panel(MOOTS_PANEL_WIDTH)
     pl = Element('g', 'PanelLayer')
     panel.append(pl)
-    controls = ControlLayer()
-    pl.append(controls)
+    #controls = ControlLayer()
+    #pl.append(controls)
     pl.append(LiteralXml(MootsPanelLayerXml))
-    xmid = panel.mmWidth / 2
-    yControlLabel = 74.5
+    return Save(panel, svgFileName)
+
+
+def GenerateMootsLabel(svgFileName:str, text:str) -> int:
+    panel = Panel(MOOTS_PANEL_WIDTH)
+    x = panel.mmWidth / 2
+    y = 74.5
     with Font(SAPPHIRE_FONT_FILENAME) as font:
-        pl.append(CenteredControlTextPath(font, "CONTROL", xmid, yControlLabel, pointSize = 8.0))
+        panel.append(CenteredControlTextPath(font, text, x, y, pointSize = 8.0))
     return Save(panel, svgFileName)
 
 
@@ -591,5 +597,7 @@ def GenerateMootsPanel() -> int:
         GeneratePolynucleusPanel() or
         GenerateHissPanel() or
         GenerateMootsPanel() or
+        GenerateMootsLabel('../res/moots_label_gate.svg', 'GATE') or
+        GenerateMootsLabel('../res/moots_label_trigger.svg', 'TRIGGER') or
         Print('SUCCESS')
     )