diff --git a/UnicadoGUI/Frontend/src/routes/model/+page.svelte b/UnicadoGUI/Frontend/src/routes/model/+page.svelte index bf0d19b1f5f60162d7f74ba4a3b88d85fb31a5dd..3cae5d93f62130ecab5f2d8e4a6aef4b372c5caf 100644 --- a/UnicadoGUI/Frontend/src/routes/model/+page.svelte +++ b/UnicadoGUI/Frontend/src/routes/model/+page.svelte @@ -164,7 +164,7 @@ async function loadAvailableModules() { //transitionally reading from convergenceloop_conf.xml //TO-DO: replace with something more recent - const res = await fetch("http://127.0.0.1:8000//modules/selection"); + const res = await fetch("http://127.0.0.1:8000/modules/selection"); const data = await res.json(); modules = data['availableModules']; modules = Array.from(new Set(modules)); @@ -248,12 +248,13 @@ if (value["@description"] && value["@description"].toLowerCase().includes("switch")) { value.value = (value.value === 'true' || value.value === "1") //transform string input to boolean for easier binding modalModule.html.push(new SettingsSwitch(key, value["@description"], value)) - } else if (value["@description"] && value["@description"].toLowerCase().includes("selector")) { - let options = []; - for (let i = 0; i < 5; i++) { - if (value["@description"].includes("mode_" + i)) { - options.push("mode_" + i) - } + }else if(value["@description"] && (value["@description"].toLowerCase().includes("selector:")||value["@description"].toLowerCase().startsWith("selector"))){ + let options = [] + if(value["@description"].includes("mode_" )){ + options = value["@description"].match(/mode_\d+/g) + }else{ + let selectorString = value["@description"].split("Selector:")[1] + options=selectorString.split(" / ") } modalModule.html.push(new SettingsSelector(key, value["@description"], value, options)) }else if(isNumber(value.value)){ @@ -486,7 +487,7 @@ draggable="true" on:dragstart={event=>dragStart(event,groupIndex,groupitem.modules.indexOf(item))} on:click={getModuleConfClickWrapper(item)}> - {item} + {formatLabel(item)} </li> </div> {/each} @@ -495,7 +496,7 @@ {/each} </Row> <Modal isOpen={open} toggle={toggle} scrollable> - <ModalHeader toggle={toggle}>{modalModule.name} settings</ModalHeader> + <ModalHeader toggle={toggle}>{formatLabel(modalModule.name)} settings</ModalHeader> <ModalBody> {#each modalModule.html as element, index} {#if element.type == "switch"}