improved text placement

Reviewed-on: #16

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}`);
         
     }

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.css

@@ -4,11 +4,11 @@
 }
 
 :root {
-    --background: ivory;
+    --background: white;
     --active: royalblue;
-    --nonactive: lightsteelblue;
+    --nonactive: rgb(205, 205, 205);
     --alert: red;
-    --textcolor: #737373;
+    --textcolor: black;
 }
 
 @import url('https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap');
@@ -21,49 +21,143 @@ body {
     font-family: "Poppins", sans-serif;
 }
 
-html, body {
+html,
+body {
     width: 100%;
     height: 100%;
     margin: 0px;
     border: 0;
-  overflow-x: hidden; /* no horizontal scrollbar*/
+    overflow-x: scroll;
     overflow-y: scroll;
-  display: block;    /* No floating content on sides */
+    display: block;
+    /* No floating content on sides */
 }
 
-ul {
-    list-style-type: none;
+/*navigation*/
+.header {
+    display: flex;
+    flex-flow: row nowrap;
+    justify-content: space-between;
+    align-items: center;
+    margin: 1em;
+    border-bottom: 1px solid var(--active);
+}
+
+.header button {
+    border: 1px solid var(--active);
+    color: var(--active);
+    background-color: white;
+    padding: 4px;
+    text-align: center;
+    display: inline-block;
+    padding: 0.5em;
+    margin: 4px;
+    font-size: 0.9em;
+    min-width: 4.5em;
+}
+
+td button {
+    background-color: white;
+    color: var(--active);
+    border: 1px solid var(--active);
+}
+
+/* :::::::::::::: SELECTING MODULATORS/ENUMERATORS */
+
+.header button.highlighted-button {
+    color: var(--active);
+    border: 1px solid var(--active);
+}
+
+.header button.unhighlighted-button {
+    color: var(--nonactive);
+    border: 1px solid var(--nonactive);
+}
+
+/* table */
+table {
+    margin: 1em;
+    padding: 0em;
+    border-collapse: collapse;
+    background-color: lightsteelblue;
+}
+
+/* points datacells should have a min-width*/
+.enum-count {
+    min-width: 5.6em;
+}
+
+th {
+    padding: 0.4em 0.3em;
+    text-align: left;
+}
+
+thead {
+    color: white;
+    background-color: var(--active);
+}
+
+tr,
+td {
+    margin: 0em;
+}
+
+td:last-child {
+    white-space: nowrap;
+    overflow: hidden;
+    padding: 0;
+}
+
+/* input types */
+/* dropdown list */
+select {
+    width: 100%;
+}
+
+/*
+option, select>* {
+    font-size: 0.8em !important;
+    padding: 0em !important;
+    margin: 0em !important;
+    min-height: 0em !important;
+}
+*/
+option {
+    background-color: var(--active);
+}
+
+option:not(:checked) {
+    background-color: white;
+}
+
+/* input */
+input,
+select {
+    border: 1px solid var(--active);
+    color: var(--active);
     margin: 0;
     padding: 0;
-    overflow: hidden;
-    background-color: #333333;
+    line-height: 1.5em;
+    height: 1.5em;
+    box-sizing: border-box;
 }
 
-li {
-    float: left;
-}
-
-table {
-    overflow: scroll;
+input {
+    padding-left: 5px;
+    /*slight padding on left*/
 }
 
 input[type=number] {
     width: 50px;
-    margin: 0;
-    padding: 0;
 }
 
 input[type=text] {
     width: 60px;
-    margin: 0;
-    padding: 0;
     font-weight: bold;
 }
 
 .timeInput {
     width: 80px;
-  margin: 0;
-  padding: 0;
 }
 
 #matrix {
@@ -80,7 +174,7 @@ input[type=text] {
 
 .numbox-clicked {
     user-select: none;
-    border : solid;
+    border: solid;
     font-size: 12vw;
 }
 
@@ -94,7 +188,7 @@ input[type=text] {
     font-size: 5vw;
 }
 
-    /* The switch - the box around the slider */
+/* The switch - the box around the slider */
 .switch {
     position: relative;
     display: inline-block;
@@ -110,51 +204,38 @@ input[type=text] {
 }
 
 /* The slider */
-.slider {
-  position: absolute;
-  cursor: pointer;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: #ccc;
-  -webkit-transition: .4s;
-  transition: .4s;
-}
-
-.slider:before {
-  position: absolute;
-  content: "";
-  height: 13px;
-  width: 13px;
-  left: 2px;
-  bottom: 2px;
+input[type="range"] {
+    appearance: none;
+    -webkit-appearance: none;
+    height: 8px;
+    border-radius: 6px;
     background-color: white;
-  -webkit-transition: .4s;
-  transition: .4s;
+    outline: none;
+    opacity: 0.7;
+    -webkit-transition: .2s;
+    transition: opacity .2s;
+    overflow: hidden;
 }
 
-input:checked + .slider {
-  background-color: #2196F3;
+/*slider knob*/
+input[type="range"]::-webkit-slider-runnable-track {
+    -webkit-appearance: none;
+    color: var(--active);
+    margin-top: -1px;
 }
 
-input:focus + .slider {
-  box-shadow: 0 0 1px #2196F3;
-}
-
-input:checked + .slider:before {
-  -webkit-transform: translateX(13px);
-  -ms-transform: translateX(13px);
-  transform: translateX(13px);
-}
-
-/* Rounded sliders */
-.slider.round {
-  border-radius: 17px;
-}
-
-.slider.round:before {
+input[type="range"]::-webkit-slider-thumb {
+    -webkit-appearance: none;
+    appearance: none;
+    width: 20px;
+    height: 20px;
     border-radius: 50%;
+    background: var(--active);
+    box-shadow: -80px 0 0 80px var(--active);
+}
+
+input[type="range"]::-moz-range-progress {
+    background-color: var(--active);
 }
 
 h5 {
@@ -162,10 +243,6 @@ h5 {
     padding: 0;
 }
 
-.enum-count {
-  background-color: aquamarine;
-}
-
 .label {
     background-color: aliceblue;
     padding: 0 4px 0 4px;
@@ -175,12 +252,13 @@ h5 {
 }
 
 .base-val {
-  background-color: lightgray;
-  border-color: #333333;
-  border-width: 1px;
+    border: none;
+    color: white;
+    text-align: center;
+    font-size: 0.9em;
     width: 50px;
-  margin-left: 2px;
-  margin-top: 1px;
+    margin: 0;
+    padding: 0;
 }
 
 .linked {
@@ -190,6 +268,8 @@ h5 {
     font-size: small;
     margin-left: 2px;
     margin-top: 5px;
+    display: none;
+    /*hide*/
 }
 
 
@@ -197,6 +277,7 @@ h5 {
     0% {
         color: black;
     }
+
     100% {
         color: red;
     }
@@ -205,27 +286,13 @@ h5 {
 #pulse {
     animation: pulse-animation 0.2s normal;
 }
-/* :::::::::::::: SELECTING MODULATORS/ENUMERATORS */
 
-.highlighted-button {
-  background-color: gray;
-}
-
-.unhighlighted-button {
-  background-color: white;
-}
 /* :::::::::::::: LOCK CSS */
 
 .locked-component {
     pointer-events: none;
     background-color: #333333;
-  color : white;
-}
-
-.header {
-  display: flex;
-  width: 100%;
-  flex-direction: flex;
+    color: white;
 }
 
 /* Locked */
@@ -240,6 +307,7 @@ h5 {
     -webkit-transition: all 0.1s ease-in-out;
     transition: all 0.1s ease-in-out;
 }
+
 .lock:after {
     content: "";
     display: block;
@@ -253,6 +321,7 @@ h5 {
     -webkit-transition: all 0.1s ease-in-out;
     transition: all 0.1s ease-in-out;
 }
+
 .lock:before {
     content: "";
     display: block;
@@ -269,31 +338,38 @@ h5 {
     -webkit-transition: all 0.1s ease-in-out;
     transition: all 0.1s ease-in-out;
 }
+
 /* Locked Hover */
 .lock:hover:before {
     height: 12px;
 }
+
 /* Unlocked */
 .unlocked {
     transform: rotate(10deg);
 }
+
 .unlocked:before {
     bottom: 130%;
     left: 31%;
     margin-left: -11.5px;
     transform: rotate(-45deg);
 }
+
 .unlocked,
 .unlocked:before {
     border-color: var(--unlocked-color);
 }
+
 .unlocked:after {
     background: var(--unlocked-color);
 }
+
 /* Unlocked Hover */
 .unlocked:hover {
     transform: rotate(3deg);
 }
+
 .unlocked:hover:before {
     height: 10px;
     left: 40%;

lfogui.html

@@ -7,6 +7,7 @@
 -->
 
 <head>
+    <meta charset="utf-8">
     <link rel="stylesheet" href="./lfogui.css">
 </head>
 
@@ -19,10 +20,7 @@
     <script src="./common.js"></script>
     <script src="./enums.js"></script>
     <script src="./modulators.js"></script>
-  <script src="./lfogui.js">
-  
-    
-  </script>
+    <script src="./lfogui.js"></script>
 
 </body>
 

lfogui.js

@@ -30,7 +30,7 @@ const LockModes = Object.freeze({
 var modPhases = Array(MAXLFOS).fill(0);
 var firstUpdateTime = Date.now();
 
-const MODULATORLABELS = ["inst", "type", "shape", "param", "timebase", "min", "max", "phase", "center"];
+const MODULATORLABELS = ["inst", "type", "shape", "param", "timebase", "min", "max", "phase", "center", "result", "", ""];
 const ENUMERATORLABELS = ["inst", "parameter", "# points"];
 
 
@@ -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 \u{25BE}` : `Show \u{25B8}`;
+
     /// 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);
@@ -276,6 +282,11 @@ function MasterLfoHandler() {
             setTicks(event.detail);
         }
 
+        function handleChangeViewMode(event){
+            setEnabled(true);
+            setViewMode(event.detail);
+        }
+
         function setNN(event) {
 
             for (let i = 0; i < MAXLFOS; i++) {
@@ -346,6 +357,7 @@ function MasterLfoHandler() {
         window.addEventListener('userFunction', handleChangeUserFunction);
         window.addEventListener('userDefinedType', handleChangeUserDefinedType);
         window.addEventListener('maxTicks', handleMaxTicks);
+        window.addEventListener('viewMode', handleChangeViewMode);
 
         return () => {
             window.removeEventListener('loadDict', handleLoad);
@@ -360,6 +372,7 @@ function MasterLfoHandler() {
             window.removeEventListener('userFunction', handleChangeUserFunction);
             window.removeEventListener('userDefinedType', handleChangeUserDefinedType);
             window.removeEventListener('maxTicks', handleMaxTicks);
+            window.removeEventListener('viewMode', handleChangeViewMode);
         };
     }, [...allModArrays, ...allEnumArrays, ...allEnumMats, userDefinedWaves, userDefinedFunctions, userDefinedTypes, modCenterVals, render, beatsInMeasure, ticks]);
 
@@ -439,6 +452,7 @@ function MasterLfoHandler() {
                                 allModSetters[j](array);
                             }
                         }
+                        SendSaveEvent();
                         rerender(!render);
 
                     }
@@ -448,6 +462,7 @@ function MasterLfoHandler() {
                         let newArr = modVisibleArr.slice();
                         newArr[id] = false;
                         setModVisibleArr(newArr);
+                        SendSaveEvent();
                     }
 
                 }
@@ -471,9 +486,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 +540,7 @@ function MasterLfoHandler() {
                             }
                         }
                         rerender(!render);
+                        SendSaveEvent();
                     }
                 },
                 removeEnum: () => {
@@ -526,6 +548,7 @@ function MasterLfoHandler() {
                         let newArr = enumVisibleArr.slice();
                         newArr[id] = false;
                         setEnumVisibleArr(newArr);
+                        SendSaveEvent();
                     }
                 }
             }, null)
@@ -560,16 +583,21 @@ 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'),
+            e('div', {className: 'nav'}, 
+                displayIfEnabled(e('button', { onClick: () => setViewMode(ViewModes.MOD), className: modButtonClass}, 'Modulators')),
+                displayIfEnabled(e('button', { onClick: () => setViewMode(ViewModes.ENUM), className: enumButtonClass }, 'Enumerators'))
+            ),
+            e('button', { onClick: toggleEnabled, id: 'hide-button'}, toggleEnabledText),
+
             //allows lock mode
             //e('span', { className: lockClass, onClick: toggleLockMode }, null) 
         ),
 
+        displayIfEnabled(
             e('table', { id: 'table' },
-            e('thead', null, e('tr', { id: 'headers' }, ...labels.map(x => e('th', null, x)))),
+            e('thead', null, e('tr', { id: 'headers' }, ...labels.map(x => e('th', {id: x == '# points' ? 'points' : x}, x)))),
             e('tbody', null, ...grid)
-        )
+        ))
     );
 }
 
@@ -607,6 +635,10 @@ if (!DEBUG) {
         window.dispatchEvent(new CustomEvent('userWave', { 'detail': data }));
     });
 
+    window.max.bindInlet("viewMode", (mode) => {
+        window.dispatchEvent(new CustomEvent('viewMode', { 'detail': parseInt(mode) }));
+    });
+
     window.max.bindInlet("userFunction", (index, ...points) => {
         //list of 101 points between 0-100
         let data = { points, index };

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