properly saving on adding rows, changing enum length, changing enum params

also enumerator items as datacells
enumerators as table, jweb bit wider
2025-07-01 09:53:39 +02:00 · 2025-07-01 09:20:30 +02:00 · 2025-07-01 09:18:02 +02:00 · 2025-06-30 11:59:31 +02:00 · 2025-06-30 11:58:56 +02:00 · 2025-06-30 11:00:09 +02:00
5 changed files with 73 additions and 48 deletions
--- a/common.js
+++ b/common.js
@@ -43,15 +43,19 @@ function Switch(props){
        e('span', {className: 'slider round'}, null))
 }

+function SendSaveEvent(){
+    setTimeout(() => {
+            window.dispatchEvent(new CustomEvent('saveDict', {'detail' : "localStorage"}));
+        }, 50)
+}
+
 function CreateParamChanger(arr, setArr, index, postCB=() => {}, preCB=(val) => val){
    return (event) => {
        let newArr = arr.slice();
        newArr[index] = preCB(event.target.value);
        setArr(newArr);
        postCB();
-        setTimeout(() => {
-            window.dispatchEvent(new CustomEvent('saveDict', {'detail' : "localStorage"}));
-        }, 50)
+        SendSaveEvent();
        
        log(`${index} ${event.target.value}`);
    }
@@ -64,9 +68,7 @@ function CreateMatrixParamChanger(matrix, setMatrix, i, j){
        });
        newMatrix[i][j] = event.target.value;
        setMatrix(newMatrix);
-        setTimeout(() => {
-            window.dispatchEvent(new CustomEvent('saveDict', {'detail' : "localStorage"}));
-        }, 50)
+        SendSaveEvent();
        log(`${i}, ${j} ${event.target.value}`);
        
    }
--- a/enums.js
+++ b/enums.js
@@ -4,14 +4,18 @@



+function DataCell(element) {
+    return e('td', null, element);
+}
+
 // NOT A REACT FUNCTIONAL COMPONENT.  MERELY RETURNS AN ARRAY WHICH IS UNPACKED
 function EnumeratorItems(index, enumBreakPoints, setEnumBreakPoints, enumNames, setEnumNames, djParam, locked){
    let items = [];
    for (let i = 0; i < MAXENUMPOINTS; i++){
        
-        items.push(ListItem(e(TextBox, {locked, onChange: CreateMatrixParamChanger(enumNames, setEnumNames, index, i), value: enumNames[index][i], id:`text-${djParam}-${enumNames[index][i]}`}, null)));
+        items.push(DataCell(e(TextBox, {locked, onChange: CreateMatrixParamChanger(enumNames, setEnumNames, index, i), value: enumNames[index][i], id:`text-${djParam}-${enumNames[index][i]}`}, null)));
        // Add 1 to make up for the lower enum bound
-        items.push(ListItem(e(NumberBox, {locked, onChange: CreateMatrixParamChanger(enumBreakPoints, setEnumBreakPoints, index, i + 1), value:enumBreakPoints[index][i + 1]}, null)));
+        items.push(DataCell(e(NumberBox, {locked, onChange: CreateMatrixParamChanger(enumBreakPoints, setEnumBreakPoints, index, i + 1), value:enumBreakPoints[index][i + 1]}, null)));
    }
    return items;
 }
@@ -19,15 +23,15 @@ function EnumeratorItems(index, enumBreakPoints, setEnumBreakPoints, enumNames,
 function EnumeratorRow(props){
    let linkedText = props.linked ? "<- mods" : "";

-    let content = e('ul', {className: 'lfo-item', id: `${props.djParam}-enum-row`},
-        ListItem(DropDown({locked:props.locked, onChange: props.setInstanceNum, value:props.instanceNum, options: INSTANCEOPTIONS})), 
-        ListItem(DropDown({locked:props.locked, onChange: props.setDjParam, value: props.djParam, options: MODPARAMOPTIONS})), 
-        ListItem(e(NumberBox, {locked:props.locked, onChange: props.setEnumItemCounts, step:1, value:props.enumItems, className: 'enum-count'}, null)),
-        ListItem(e(NumberBox, {locked:props.locked, onChange: CreateMatrixParamChanger(props.enumBreakPoints, props.setEnumBreakPoints, props.index, 0), value:props.enumBreakPoints[props.index][0], step:0.1}, null)),
+    let content = e('tr', {className: 'lfo-item', id: `${props.djParam}-enum-row`},
+        DataCell(DropDown({locked:props.locked, onChange: props.setInstanceNum, value:props.instanceNum, options: INSTANCEOPTIONS})), 
+        DataCell(DropDown({locked:props.locked, onChange: props.setDjParam, value: props.djParam, options: MODPARAMOPTIONS})), 
+        DataCell(e(NumberBox, {locked:props.locked, onChange: props.setEnumItemCounts, step:1, value:props.enumItems, className: 'enum-count'}, null)),
+        DataCell(e(NumberBox, {locked:props.locked, onChange: CreateMatrixParamChanger(props.enumBreakPoints, props.setEnumBreakPoints, props.index, 0), value:props.enumBreakPoints[props.index][0], step:0.1}, null)),
        ...(EnumeratorItems(props.index, props.enumBreakPoints, props.setEnumBreakPoints, props.enumNames, props.setEnumNames, props.djParam, props.locked).slice(0, props.enumItems * 2)),
-        ListItem(e(Button, {locked:props.locked, text:'+', onClick: props.addEnum}, null)), 
-        ListItem(e(Button, {locked:props.locked, text:'-', onClick: props.removeEnum}, null)),
-        ListItem(e("div", {className:"linked"}, linkedText))
+        DataCell(e(Button, {locked:props.locked, text:'+', onClick: props.addEnum}, null)), 
+        DataCell(e(Button, {locked:props.locked, text:'-', onClick: props.removeEnum}, null)),
+        DataCell(e("div", {className:"linked"}, linkedText))
    );
    if (props.visible){
        return content;
--- a/example.maxpat
+++ b/example.maxpat
--- a/lfogui.js
+++ b/lfogui.js
@@ -65,12 +65,6 @@ function MasterLfoHandler() {
    initVisArr[0] = true;

    const [viewMode, setViewMode] = React.useState(ViewModes.MOD);
-    const toggleViewMode = () => {
-        if (viewMode === ViewModes.MOD)
-            setViewMode(ViewModes.ENUM);
-        else
-            setViewMode(ViewModes.MOD);
-    };

    const [lockMode, setLockMode] = React.useState(LockModes.UNLOCK);
    const toggleLockMode = () => {
@@ -80,6 +74,18 @@ function MasterLfoHandler() {
            setLockMode(LockModes.UNLOCK);
    };

+    const [enabled, setEnabled] = React.useState(false);
+    const toggleEnabled = () => {
+        setEnabled(!enabled);
+    };
+
+    const displayIfEnabled = (content) => {
+        if (enabled)
+            return content
+    }
+
+    let toggleEnabledText = enabled ? "Hide" : "Show";
+
    /// MODULATOR ARRAYS
    let userDefinedWavesBase = [];
    let userDefinedFunctionsBase = [];
@@ -96,7 +102,7 @@ function MasterLfoHandler() {
    const [modTypeArr, setModTypeArr] = React.useState(Array(MAXLFOS).fill('LFO'));
    const [modInstanceNumArr, setModInstanceNumArr] = React.useState(Array(MAXLFOS).fill('1'));

-    const [modCenterVals, setModCenterVals] = React.useState({ '1': {}, '2': {}, '3': {}, '4': {} });
+    const [modCenterVals, setModCenterVals] = React.useState({ '1': {}, '2': {}, '3': {}, '4': {}, '5': {}, '6': {}});

    const [ticks, setTicks] = React.useState(0);
    const [beatsInMeasure, setBeatsInMeasure] = React.useState(4);
@@ -439,6 +445,7 @@ function MasterLfoHandler() {
                                allModSetters[j](array);
                            }
                        }
+                        SendSaveEvent();
                        rerender(!render);

                    }
@@ -448,6 +455,7 @@ function MasterLfoHandler() {
                        let newArr = modVisibleArr.slice();
                        newArr[id] = false;
                        setModVisibleArr(newArr);
+                        SendSaveEvent();
                    }

                }
@@ -471,9 +479,15 @@ function MasterLfoHandler() {
                enumItems: enumItemCounts[i],
                setEnumItemCounts: CreateParamChanger(enumItemCounts, setEnumItemCounts, i),
                enumBreakPoints: enumBreakPoints,
-                setEnumBreakPoints: setEnumBreakPoints,
+                setEnumBreakPoints: (val) => {
+                    setEnumBreakPoints(val);
+                    SendSaveEvent
+                },
                enumNames: enumNames,
-                setEnumNames: setEnumNames,
+                setEnumNames: (val) => {
+                    setEnumNames(val);
+                    SendSaveEvent
+                },
                visible: enumVisibleArr[i],
                djParam: enumDjParamArr[i],
                setDjParam: CreateParamChanger(enumDjParamArr, setEnumDjParamArr, i),
@@ -519,6 +533,7 @@ function MasterLfoHandler() {
                            }
                        }
                        rerender(!render);
+                        SendSaveEvent();
                    }
                },
                removeEnum: () => {
@@ -526,6 +541,7 @@ function MasterLfoHandler() {
                        let newArr = enumVisibleArr.slice();
                        newArr[id] = false;
                        setEnumVisibleArr(newArr);
+                        SendSaveEvent();
                    }
                }
            }, null)
@@ -560,16 +576,19 @@ function MasterLfoHandler() {

    return e('div', null,
        e('div', { className: 'header' },
-            e('button', { onClick: () => setViewMode(ViewModes.MOD), className: modButtonClass}, 'Modulators'),
-            e('button', { onClick: () => setViewMode(ViewModes.ENUM), className: enumButtonClass }, 'Enumerators'),
+            displayIfEnabled(e('button', { onClick: () => setViewMode(ViewModes.MOD), className: modButtonClass}, 'Modulators')),
+            displayIfEnabled(e('button', { onClick: () => setViewMode(ViewModes.ENUM), className: enumButtonClass }, 'Enumerators')),
+            e('button', { onClick: toggleEnabled, }, toggleEnabledText),
+
            //allows lock mode
            //e('span', { className: lockClass, onClick: toggleLockMode }, null) 
        ),

-        e('table', { id: 'table' },
+        displayIfEnabled(
+            e('table', { id: 'table' },
            e('thead', null, e('tr', { id: 'headers' }, ...labels.map(x => e('th', null, x)))),
            e('tbody', null, ...grid)
-        )
+        ))
    );
 }

--- a/modulators.js
+++ b/modulators.js
@@ -7,7 +7,7 @@ var TYPEOPTIONS = ["LFO", "Noise"];
 var SHAPETYPES = ["Sine", "SawUp", "SawDown", "Tri", "Square", "Custom_1", "Custom_2", "Custom_3", "Custom_4"];
 var NOISETYPES = ["Rand", "Line Int.", "Sine Int."]

-var INSTANCEOPTIONS = ["1", "2", "3", "4"];
+var INSTANCEOPTIONS = ["1", "2", "3", "4", "5", "6"];

 const MODPARAMOPTIONS = ["NONE", "stream", "pulse_length", "eventfulness", "event_length", "metriclarity", 
    "harmoniclarity", "melodic_cohesion", "melody_scope", "tonic_pitch", "pitch_center", "pitch_range", "dynamics",
Author	SHA1	Message	Date
Kieran	a19717a759	properly saving on adding rows, changing enum length, changing enum params	2025-07-01 09:53:39 +02:00
Eveline-97	34549daf67	also enumerator items as datacells	2025-07-01 09:20:30 +02:00
Eveline-97	dd47c0b030	enumerators as table, jweb bit wider	2025-07-01 09:18:02 +02:00
kieran-mcauliffe	290ff73524	Merge pull request 'more instances of DJster' (#13 ) from more-dj-instances into main Reviewed-on: #13	2025-06-30 11:59:31 +02:00
Kieran	9b1a9f2e03	more instances	2025-06-30 11:58:56 +02:00
kieran-mcauliffe	b96f2aa53b	Merge pull request 'button for showing and hiding everything' (#12 ) from showhide-button into main Reviewed-on: #12	2025-06-30 11:00:09 +02:00
Kieran	edcddde844	button for showing and hiding everything	2025-06-30 10:58:51 +02:00
kieran-mcauliffe	e41567c101	Merge pull request 'buttons for switching between modes' (#11 ) from button-headers into main Reviewed-on: #11	2025-06-30 10:22:01 +02:00