also enumerator items as datacells

Reviewed-on: #13

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;

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);
@@ -560,16 +566,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)
-        )
+        ))
     );
 }
 

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",