diff --git a/images/chaops.png b/images/chaops.png index 982868a..138159b 100644 Binary files a/images/chaops.png and b/images/chaops.png differ diff --git a/res/chaops.svg b/res/chaops.svg index 502ad20..bb6dc2c 100644 --- a/res/chaops.svg +++ b/res/chaops.svg @@ -5,9 +5,10 @@ - - - - + + + + + diff --git a/src/sapphire_panel.cpp b/src/sapphire_panel.cpp index 870ad29..38f6812 100644 --- a/src/sapphire_panel.cpp +++ b/src/sapphire_panel.cpp @@ -9,15 +9,15 @@ namespace Sapphire static const ModuleMap TheModuleMap { { "chaops", { - {"freeze_button", { 15.240, 90.000}}, - {"memory_address_display", { 15.240, 29.000}}, - {"memsel_atten", { 15.240, 18.000}}, - {"memsel_cv", { 6.240, 18.000}}, - {"memsel_knob", { 24.240, 18.000}}, - {"recall_button", { 23.240, 40.000}}, - {"recall_trigger", { 23.240, 50.000}}, - {"store_button", { 7.240, 40.000}}, - {"store_trigger", { 7.240, 50.000}}, + {"freeze_button", { 15.240, 115.000}}, + {"memory_address_display", { 15.240, 32.000}}, + {"memsel_atten", { 15.240, 21.000}}, + {"memsel_cv", { 6.240, 21.000}}, + {"memsel_knob", { 24.240, 21.000}}, + {"recall_button", { 23.240, 43.000}}, + {"recall_trigger", { 23.240, 53.000}}, + {"store_button", { 7.240, 43.000}}, + {"store_trigger", { 7.240, 53.000}}, }}, { "elastika", { {"audio_left_input", { 7.500, 115.000}}, diff --git a/util/make_sapphire_svg.py b/util/make_sapphire_svg.py index eeb0d36..729ddf4 100755 --- a/util/make_sapphire_svg.py +++ b/util/make_sapphire_svg.py @@ -99,17 +99,18 @@ def GenerateChaosOperatorsPanel(cdict:Dict[str,ControlLayer]) -> int: cdict[name] = controls = ControlLayer() xmid = panel.mmWidth / 2 - yMemorySelect = 18.0 - yMemoryDisplay = 29.0 - yMemoryButton = 40.0 - yMemoryTriggerPorts = 50.0 - yFreezeButton = 90.0 + dyMemory = 3.0 + yMemorySelect = 18.0 + dyMemory + yMemoryDisplay = 29.0 + dyMemory + yMemoryButton = 40.0 + dyMemory + yMemoryTriggerPorts = 50.0 + dyMemory + yFreezeButton = 115.0 dxButton = 8.0 xStore = xmid - dxButton xRecall = xmid + dxButton arcRadius = 1.5 - yRecallLine = 56.0 - yStoreLine = 62.0 + yRecallLine = 56.0 + dyMemory + yStoreLine = 62.0 + dyMemory xRightPanel = panel.mmWidth - 1.0 dxDisplay = 4.75 dyButtonText = 7.0 @@ -156,6 +157,7 @@ def RecallLineArt() -> Path: pl.append(ModelNamePath(panel, font, name)) pl.append(StoreLineArt()) pl.append(RecallLineArt()) + pl.append(CenteredControlTextPath(font, 'MEMORY', xmid, yMemorySelect - dyButtonText)) pl.append(CenteredControlTextPath(font, 'FREEZE', xmid, yFreezeButton - dyButtonText)) AddFlatControlGroup(pl, controls, xmid, yMemorySelect, 'memsel') controls.append(Component('store_button', xStore, yMemoryButton))