undoes 8d00b423ad on msetpoint.html and msp_config.html

This commit is contained in:
krieger_j committed 2026-08-28 15:38:27 +02:00
1 parent 692ec363b2
commit a890b2562d
2 files changed
+61 -61

No files matched your search

+33 -33
View File
@@ -50,7 +50,7 @@
<span id="info" style="margin-top: 5px; margin-left: 10px; background-color: var(--myellow);"></span>
<span id="warning" style="margin-top: 5px; margin-left: 10px; background-color: var(--mred);"></span>
<span class="modbvalue" style="float: right;margin-top: 5px; margin-right: 5px;"
data-odb-path="/Equipment/Beamline_elements/Settings/Filename Values"></span>
data-odb-path="/Equipment/EPICS/Settings/Filename Values"></span>
</td>
</tr>
<tr style="user-select: none">
@@ -128,7 +128,7 @@
}
function msetpoint_init() {
mjsonrpc_db_get_value('/Equipment/Beamline_elements').then(
mjsonrpc_db_get_value('/Equipment/EPICS').then(
rpc => {
let epics = rpc.result.data[0];
if (epics === null) {
@@ -153,14 +153,14 @@
// create or adjust Filevalue values
if (epics.settings.filevalue === undefined) {
epics.settings.filevalue = resizeArray(epics.settings.filevalue, l);
mjsonrpc_db_create([{"path": "/Equipment/Beamline_elements/Settings/Filevalue",
mjsonrpc_db_create([{"path": "/Equipment/EPICS/Settings/Filevalue",
"type": TID_FLOAT, "array_length": l}]).then(rpc =>
modbset("/Equipment/Beamline_elements/Settings/Filevalue", epics.settings.filevalue));
modbset("/Equipment/EPICS/Settings/Filevalue", epics.settings.filevalue));
} else {
if (epics.settings.filevalue.length !== l) {
epics.settings.filevalue = resizeArray(epics.settings.filevalue, l);
mjsonrpc_db_resize(["/Equipment/Beamline_elements/Settings/Filevalue"], [l]).then(rpc =>
modbset("/Equipment/Beamline_elements/Settings/Filevalue", epics.settings.filevalue));
mjsonrpc_db_resize(["/Equipment/EPICS/Settings/Filevalue"], [l]).then(rpc =>
modbset("/Equipment/EPICS/Settings/Filevalue", epics.settings.filevalue));
}
}
@@ -168,37 +168,37 @@
epics.variables = {};
epics.variables.demand = new Array(l).fill(0);
epics.variables.measured = new Array(l).fill(0);
mjsonrpc_db_create([{"path": "/Equipment/Beamline_elements/Variables", "type": TID_KEY},
{"path": "/Equipment/Beamline_elements/Variables/Demand", "type": TID_FLOAT, "array_length": l},
{"path": "/Equipment/Beamline_elements/Variables/Measured", "type": TID_FLOAT, "array_length": l}
mjsonrpc_db_create([{"path": "/Equipment/EPICS/Variables", "type": TID_KEY},
{"path": "/Equipment/EPICS/Variables/Demand", "type": TID_FLOAT, "array_length": l},
{"path": "/Equipment/EPICS/Variables/Measured", "type": TID_FLOAT, "array_length": l}
]);
}
// create or adjust Demand values
if (epics.variables.demand === undefined) {
epics.variables.demand = resizeArray(epics.variables.demand, l);
mjsonrpc_db_create([{"path": "/Equipment/Beamline_elements/Variables/Demand",
mjsonrpc_db_create([{"path": "/Equipment/EPICS/Variables/Demand",
"type": TID_FLOAT, "array_length": l}]).then(rpc =>
modbset("/Equipment/Beamline_elements/Variables/Demand", epics.variables.demand));
modbset("/Equipment/EPICS/Variables/Demand", epics.variables.demand));
} else {
if (epics.variables.demand.length !== l) {
epics.variables.demand = resizeArray(epics.variables.demand, l);
mjsonrpc_db_resize(["/Equipment/Beamline_elements/Variables/Demand"], [l]).then(rpc =>
modbset("/Equipment/Beamline_elements/Variables/Demand", epics.variables.demand));
mjsonrpc_db_resize(["/Equipment/EPICS/Variables/Demand"], [l]).then(rpc =>
modbset("/Equipment/EPICS/Variables/Demand", epics.variables.demand));
}
}
// create or adjust Measured values
if (epics.variables.measured === undefined) {
epics.variables.measured = resizeArray(epics.variables.measured, l);
mjsonrpc_db_create([{"path": "/Equipment/Beamline_elements/Variables/Measured",
mjsonrpc_db_create([{"path": "/Equipment/EPICS/Variables/Measured",
"type": TID_FLOAT, "array_length": l}]).then(rpc =>
modbset("/Equipment/Beamline_elements/Variables/Measured", epics.variables.measured));
modbset("/Equipment/EPICS/Variables/Measured", epics.variables.measured));
} else {
if (epics.variables.measured.length !== l) {
epics.variables.measured = resizeArray(epics.variables.measured, l);
mjsonrpc_db_resize(["/Equipment/Beamline_elements/Variables/Measured"], [l]).then(rpc =>
modbset("/Equipment/Beamline_elements/Variables/Measured", epics.variables.measured));
mjsonrpc_db_resize(["/Equipment/EPICS/Variables/Measured"], [l]).then(rpc =>
modbset("/Equipment/EPICS/Variables/Measured", epics.variables.measured));
}
}
@@ -209,7 +209,7 @@
interval = 1000;
mhttpd_set_refresh_interval(interval);
} catch (e) {
dlgAlert("Invalid or missing \"/Equipment/Beamline_elements/Settings\" in ODB<br />" +
dlgAlert("Invalid or missing \"/Equipment/EPICS/Settings\" in ODB<br />" +
"Please load a valid beamline configuration file");
return;
}
@@ -235,7 +235,7 @@
spTable[i].selected = false;
spTable[i].lastSelected = false;
} catch (e) {
dlgAlert("Invalid or missing \"/Equipment/Beamline_elements/Settings\" in ODB<br />" +
dlgAlert("Invalid or missing \"/Equipment/EPICS/Settings\" in ODB<br />" +
"Please load a valid beamline configuration file");
return;
}
@@ -283,7 +283,7 @@
td = tr.insertCell();
if (spTable[i].incdec !== 0)
td.innerHTML = "<div class=\"modbvalue\" style=\"text-align: right;\" " +
"data-odb-path=\"/Equipment/Beamline_elements/Settings/Filevalue[" + i + "]\" " +
"data-odb-path=\"/Equipment/EPICS/Settings/Filevalue[" + i + "]\" " +
"data-format=\"" + format + "\"" +
"></div>";
@@ -301,7 +301,7 @@
if (epics.settings["allow write access"] === true) {
td.innerHTML = "<div class=\"modbvalue\" style=\"display: inline-block;\" " +
"data-odb-path=\"/Equipment/Beamline_elements/Variables/Demand[" + i + "]\" " +
"data-odb-path=\"/Equipment/EPICS/Variables/Demand[" + i + "]\" " +
"data-odb-editable='1' " +
"data-format=\"" + format + "\" " +
"onchange='changedDemand(" + i + ",this)'" +
@@ -310,7 +310,7 @@
td.innerHTML += "<button onclick='checkIncDec(" + i + "," + (-spTable[i].incdec) + ");'>-</button>";
} else {
td.innerHTML = "<div class=\"modbvalue\" style=\"display: inline-block;\" " +
"data-odb-path=\"/Equipment/Beamline_elements/Variables/Demand[" + i + "]\" " +
"data-odb-path=\"/Equipment/EPICS/Variables/Demand[" + i + "]\" " +
"data-format=\"" + format + "\" " +
"></div>&nbsp;";
}
@@ -325,7 +325,7 @@
// Measured value
td = tr.insertCell();
td.innerHTML = "<div class=\"modbvalue\" style=\"text-align: right;\" " +
"data-odb-path=\"/Equipment/Beamline_elements/Variables/Measured[" + i + "]\" " +
"data-odb-path=\"/Equipment/EPICS/Variables/Measured[" + i + "]\" " +
"data-format=\"" + format + "\" " +
"onchange='changedMeasured(" + i + ",this)'" +
"></div>";
@@ -340,8 +340,8 @@
td.style.width = "10px";
td.style.borderRight = "0";
let varName = "Beamline_elements:" + spTable[i].names + " Measured," +
"Beamline_elements:" + spTable[i].names + " Demand";
let varName = "EPICS:" + spTable[i].names + " Measured," +
"EPICS:" + spTable[i].names + " Demand";
if (spTable[i].history === "1")
td.innerHTML = "<button style=\"padding: 0;\" onclick='hist(\"" + varName +
"\");'><img src='icons/activity.svg' title='Show graph' /></button>";
@@ -404,7 +404,7 @@
function bbClose(flag, index) {
if (flag === true) {
mhttpd_refresh_pause(true);
modbset("/Equipment/Beamline_elements/Variables/Demand["+index+"]", 0);
modbset("/Equipment/EPICS/Variables/Demand["+index+"]", 0);
mhttpd_refresh_pause(false);
}
}
@@ -412,7 +412,7 @@
function bbOpen(flag, index) {
if (flag === true) {
mhttpd_refresh_pause(true);
modbset("/Equipment/Beamline_elements/Variables/Demand["+index+"]", 1);
modbset("/Equipment/EPICS/Variables/Demand["+index+"]", 1);
mhttpd_refresh_pause(false);
}
}
@@ -654,7 +654,7 @@
try {
let j = JSON.parse(text);
if (j.Equipment && j.Equipment.Beamline_elements) {
if (j.Equipment && j.Equipment.EPICS) {
dlgAlert("File \"" + filename + "\" is not a valid beamline <b>settings</b> file.<br /><br />You are probably trying to load a beamline <b>configuration</b> file.");
return;
} else if (j.spTable === undefined) {
@@ -677,8 +677,8 @@
a.push(e.fileValue);
mhttpd_refresh_pause(true);
modbset("/Equipment/Beamline_elements/Settings/Filename Values", filename);
modbset("/Equipment/Beamline_elements/Settings/Filevalue", a);
modbset("/Equipment/EPICS/Settings/Filename Values", filename);
modbset("/Equipment/EPICS/Settings/Filevalue", a);
setEquals();
mhttpd_refresh_pause(false);
@@ -703,10 +703,10 @@
function check_frontend() {
mjsonrpc_call("cm_exist", {"name": "Beamline_elements Frontend"}).then( function(rpc) {
mjsonrpc_call("cm_exist", {"name": "EPICS Frontend"}).then( function(rpc) {
if (rpc.result.status !== 1)
document.getElementById("warning").innerHTML =
"&nbsp;<a href=\"?cmd=Programs\">Beamline_elements Frontend</a> not running!&nbsp;";
"&nbsp;<a href=\"?cmd=Programs\">EPICS Frontend</a> not running!&nbsp;";
else
document.getElementById("warning").innerHTML = "";
window.setTimeout(check_frontend, 5000);
@@ -748,7 +748,7 @@
let elem = '';
for (let i=0 ; i<spTable.length ; i++)
if (spTable[i].selected) {
modbset('/Equipment/Beamline_elements/Settings/Command[' + i + ']', command);
modbset('/Equipment/EPICS/Settings/Command[' + i + ']', command);
elem += spTable[i].names + ", ";
}
+28 -28
View File
@@ -34,9 +34,9 @@
Title: <span class="modbvalue" data-odb-editable="1"
data-odb-path="/Experiment/Name"></span>
&nbsp;&nbsp;Filename: <span class="modbvalue" data-odb-editable="1"
data-odb-path="/Equipment/Beamline_elements/Settings/Filename Config"></span>
data-odb-path="/Equipment/EPICS/Settings/Filename Config"></span>
&nbsp;&nbsp;EPICS Gateway: <span class="modbvalue" data-odb-editable="1"
data-odb-path="/Equipment/Beamline_elements/Settings/EPICS Gateway"></span>
data-odb-path="/Equipment/EPICS/Settings/EPICS Gateway"></span>
</div>
<span style="float: right">
<button class="dlgButton" onclick="saveConfigPicker();">Save</button>
@@ -77,7 +77,7 @@
<th class="mtableheader" title="Threshold for which the measured value box turns red">
Warning thr.
</th>
<th class="mtableheader" title="Beamline_elements Process Variable name">
<th class="mtableheader" title="EPICS Process Variable name">
PV name
</th>
<th class="mtableheader">
@@ -124,16 +124,16 @@
function addModbValue(tr, ic, odbName, i) {
let td = tr.cells[ic] === undefined ? tr.insertCell() : tr.cells[ic];
td.innerHTML = "<div class=\"modbvalue\" style=\"text-align: right;\" " +
"data-odb-path=\"/Equipment/Beamline_elements/Settings/" + odbName + "[" + i + "]\" " +
"data-odb-path=\"/Equipment/EPICS/Settings/" + odbName + "[" + i + "]\" " +
"data-odb-editable='1'></div>";
}
function msetpointConfig_init(flagConfig) {
db_get_value('/Equipment/Beamline_elements',
db_get_value('/Equipment/EPICS',
rpc => {
let epics = rpc.result.data[0];
if (epics === null) {
dlgAlert('/Equipment/Beamline_elements not present in ODB<br />' +
dlgAlert('/Equipment/EPICS not present in ODB<br />' +
'Please click on the <b>Load</b> button to load a beamline configuration');
} else {
let table = document.getElementById('spTable');
@@ -178,14 +178,14 @@
td = tr.cells[++ic] === undefined ? tr.insertCell() : tr.cells[ic];
td.innerHTML = "<input type=\"checkbox\" class=\"modbcheckbox\" " +
"data-odb-path=\"/Equipment/Beamline_elements/Settings/Group[" + i + "]\" " +
"data-odb-path=\"/Equipment/EPICS/Settings/Group[" + i + "]\" " +
"data-odb-editable='1' " +
"></input>";
td.style.textAlign = "center";
td = tr.cells[++ic] === undefined ? tr.insertCell() : tr.cells[ic];
let html = "<select class=\"modbselect\" " +
"data-odb-path=\"/Equipment/Beamline_elements/Settings/Device type[" + i + "]\">\n";
"data-odb-path=\"/Equipment/EPICS/Settings/Device type[" + i + "]\">\n";
for (let i=1 ; i<dt_string.length ; i++)
html +=" <option value='" + i +"'>" + dt_string[i] + "</option>";
html += "</select>";
@@ -234,8 +234,8 @@
let settings = {};
settings["Equipment"] = {};
settings.Equipment["Beamline_elements"] = {};
settings.Equipment.Beamline_elements["Settings"] = data[1];
settings.Equipment["EPICS"] = {};
settings.Equipment.EPICS["Settings"] = data[1];
let jsonSettings = JSON.stringify(settings, null, ' ');
jsonSettings = jsonSettings.slice(1, -2) + '\n}\n'; // strip leading '{' and last '}', add last '}'
@@ -249,7 +249,7 @@
if (filename.indexOf('.json') === -1)
filename += '.json';
mjsonrpc_db_copy(["/Experiment/Name", "/Equipment/Beamline_elements/Settings", "/History/Display/Beamline_elements"]).then(rpc => {
mjsonrpc_db_copy(["/Experiment/Name", "/Equipment/EPICS/Settings", "/History/Display/EPICS"]).then(rpc => {
let json = compose_json(filename, rpc.result.data);
@@ -270,7 +270,7 @@
if (filename.indexOf('.json') === -1)
filename += '.json';
mjsonrpc_db_copy(["/Experiment/Name", "/Equipment/Beamline_elements/Settings"]).then(rpc => {
mjsonrpc_db_copy(["/Experiment/Name", "/Equipment/EPICS/Settings"]).then(rpc => {
let json = compose_json(filename, rpc.result.data);
@@ -346,8 +346,8 @@
dlgAlert("File \"" + filename + "\" is not a valid beamline <b>configuration</b> file.<br /><br />You are probably trying to load a beamline <b>settings</b> file.");
return;
}
else if (json.Equipment === undefined || json.Equipment.Beamline_elements === undefined) {
dlgAlert("File \"" + filename + "\" does not contain a Beamline_elements equipment");
else if (json.Equipment === undefined || json.Equipment.EPICS === undefined) {
dlgAlert("File \"" + filename + "\" does not contain an EPICS equipment");
return;
}
@@ -355,9 +355,9 @@
let oldExpName = rpc.result.data[0];
mjsonrpc_db_delete(["/Equipment/Beamline_elements/Settings"]).then(rpc => {
mjsonrpc_db_delete(["/Equipment/EPICS/Settings"]).then(rpc => {
modbset("/", json);
variables_init(json.Equipment.Beamline_elements.Settings.Names.length);
variables_init(json.Equipment.EPICS.Settings.Names.length);
if (oldExpName.substring(0, 9) !== 'MSetPoint')
modbset('/Experiment/Name', oldExpName);
@@ -381,7 +381,7 @@
e.Variables["Measured"] = new Array(l).fill(0);
e.Variables["Measured/key"] = { "type": 9, "num_values": l, "access_mode": 7, "last_written": 0 };
modbset("/Equipment/Beamline_elements", e);
modbset("/Equipment/EPICS", e);
}
function pageReload() {
@@ -401,11 +401,11 @@
function config(flag) {
mjsonrpc_call("cm_exist", {"name": "Beamline_elements Frontend"}).then( function(rpc) {
mjsonrpc_call("cm_exist", {"name": "EPICS Frontend"}).then( function(rpc) {
if (rpc.result.status !== 1)
doConfig(flag);
else
dlgAlert("Please stop Beamline_elements Frontend before changing elements");
dlgAlert("Please stop EPICS Frontend before changing elements");
});
}
@@ -418,7 +418,7 @@
];
function elemAdd(index) {
mjsonrpc_db_copy(["/Equipment/Beamline_elements/Settings"]).then(rpc => {
mjsonrpc_db_copy(["/Equipment/EPICS/Settings"]).then(rpc => {
let settings = rpc.result.data[0];
@@ -434,14 +434,14 @@
for (d of devList)
settings[d].splice(index, 0, settings[d][index]);
mjsonrpc_db_paste(["/Equipment/Beamline_elements/Settings"], [settings]).then (rpc => {
mjsonrpc_db_paste(["/Equipment/EPICS/Settings"], [settings]).then (rpc => {
msetpointConfig_init(true);
});
});
}
function elemRemove(index) {
mjsonrpc_db_copy(["/Equipment/Beamline_elements/Settings"]).then(rpc => {
mjsonrpc_db_copy(["/Equipment/EPICS/Settings"]).then(rpc => {
let settings = rpc.result.data[0];
@@ -453,14 +453,14 @@
for (d of devList)
settings[d].splice(index, 1);
mjsonrpc_db_paste(["/Equipment/Beamline_elements/Settings"], [settings]).then (rpc => {
mjsonrpc_db_paste(["/Equipment/EPICS/Settings"], [settings]).then (rpc => {
let elem = [];
let size = [];
let n = settings["Names"].length;
for (d of devList) {
elem.push("/Equipment/Beamline_elements/Settings/" + d);
elem.push("/Equipment/EPICS/Settings/" + d);
size.push(n);
}
@@ -475,14 +475,14 @@
if (index === 0)
return;
mjsonrpc_db_copy(["/Equipment/Beamline_elements/Settings"]).then(rpc => {
mjsonrpc_db_copy(["/Equipment/EPICS/Settings"]).then(rpc => {
let settings = rpc.result.data[0];
for (d of devList)
[settings[d][index], settings[d][index-1]] = [settings[d][index-1], settings[d][index]];
mjsonrpc_db_paste(["/Equipment/Beamline_elements/Settings"], [settings]).then (rpc => {
mjsonrpc_db_paste(["/Equipment/EPICS/Settings"], [settings]).then (rpc => {
msetpointConfig_init(true);
});
});
@@ -490,7 +490,7 @@
function elemDown(index) {
mjsonrpc_db_copy(["/Equipment/Beamline_elements/Settings"]).then(rpc => {
mjsonrpc_db_copy(["/Equipment/EPICS/Settings"]).then(rpc => {
let settings = rpc.result.data[0];
@@ -500,7 +500,7 @@
for (d of devList)
[settings[d][index], settings[d][index+1]] = [settings[d][index+1], settings[d][index]];
mjsonrpc_db_paste(["/Equipment/Beamline_elements/Settings"], [settings]).then (rpc => {
mjsonrpc_db_paste(["/Equipment/EPICS/Settings"], [settings]).then (rpc => {
msetpointConfig_init(true);
});
});