Swiper removed

- Swiper removal work in progress
+ Fine debugging for every js-file
This commit is contained in:
Daniel
2025-03-17 11:07:50 +01:00
parent 680434e5e8
commit ca2945ac22
8 changed files with 419 additions and 156 deletions

View File

@ -1,6 +1,9 @@
// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
// % COMMUNICATION
// local debugging: print the name of every executed funtion to the console
var debug_communication_daniel = 0;
var timeoutID; // We need this ID to reset the timer every 30 seconds
// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@ -8,6 +11,10 @@ var timeoutID; // We need this ID to reset the timer every 30 seconds
function buildUpdateConnection() {
if (debug_communication_daniel) {
console.log("%cfunction: buildUpdateConnection", "color:white;background:darkblue");
}
// Establishes server-sent-event-connection, which is used for all sorts of
// updates and exists as long as the client is running.
// Executed at programstart (see also SEAWebClientMain.js).
@ -58,6 +65,10 @@ function buildUpdateConnection() {
}
function handleUpdateMessage(src, message) {
if (debug_communication_daniel) {
console.log("%cfunction: handleUpdateMessage", "color:white;background:darkblue");
}
// Handles incoming SSE-messages depending on type of message.
if (debugCommunication > 1) {
@ -86,7 +97,7 @@ function handleUpdateMessage(src, message) {
sizeChange();
} else {
clientTitle = message.instrument + " " + message.device;
console.log('loadBlocks', message);
// console.log('loadBlocks', message);
loadFirstBlocks();
}
document.title = clientTitle;
@ -101,7 +112,7 @@ function handleUpdateMessage(src, message) {
device.style.width = 'auto'
instrument.innerHTML = message.instrument
device.innerHTML = message.device
console.log('ID', initCommands);
// console.log('ID', initCommands);
nextInitCommand();
break;
// console-update-message: Confirms a command.
@ -175,6 +186,10 @@ function handleUpdateMessage(src, message) {
}
function htmlEscape(str) {
if (debug_communication_daniel) {
console.log("%cfunction: htmlEscape", "color:white;background:darkblue");
}
str = "" + str;
if (!str) return "";
return str.replace(/&/g, '&').replace(/"/g, '"').replace(/'/g,
@ -182,6 +197,10 @@ function htmlEscape(str) {
}
function resetTimer(src) {
if (debug_communication_daniel) {
console.log("%cfunction: resetTimer", "color:white;background:darkblue");
}
// Executed every time a heartbeat-message is obtained.
// If no heartbeat-messages are obtained for a certain amount of time,
// an error-message is thrown.
@ -197,6 +216,10 @@ function resetTimer(src) {
}
function updateValues(message, src) {
if (debug_communication_daniel) {
console.log("%cfunction: updateValues", "color:white;background:darkblue");
}
// Handles changes of parameter-values
for (var i = 0; i < message.updates.length; i++) {
@ -246,6 +269,10 @@ function updateValues(message, src) {
// XMLHttpRequest
function reqJSON(s, url, successHandler, errorHandler) {
if (debug_communication_daniel) {
console.log("%cfunction: reqJSON", "color:white;background:darkblue");
}
var xhr = typeof XMLHttpRequest != 'undefined' ? new XMLHttpRequest()
: new ActiveXObject('Microsoft.XMLHTTP');
if (debugCommunication) {
@ -272,6 +299,10 @@ function reqJSON(s, url, successHandler, errorHandler) {
}
function reqJSONPOST(s, url, parameters, successHandler, errorHandler) {
if (debug_communication_daniel) {
console.log("%cfunction: reqJSONPOST", "color:white;background:darkblue");
}
var xhr = typeof XMLHttpRequest != 'undefined' ? new XMLHttpRequest()
: new ActiveXObject('Microsoft.XMLHTTP');
if (debugCommunication) {
@ -300,6 +331,10 @@ function reqJSONPOST(s, url, parameters, successHandler, errorHandler) {
function successHandler(s, message) {
if (debug_communication_daniel) {
console.log("%cfunction: successHandler", "color:white;background:darkblue");
}
// Handles incoming XMLHttp-messages depending on type of message.
// s: slide number or -1 for replacing slide in all slider instances
if (debugCommunication) {
@ -320,28 +355,46 @@ function successHandler(s, message) {
}
insertSlide(2, "", "parameters", createContent(2, {components:[]}));
} else {
if (s < 0) { // redraw: check for slides in all swiper instances
// not used any more?
for (var isw = 0; isw < MAXBLOCK; isw ++) {
var isl = findSlide(isw, message.path);
if (isl !== null) {
var slide = swiper[isw].slides[isl];
if (slide) {
console.log("redraw", isw, isl);
replaceSlideContent(slide, message.title,
createContent(isw, message));
}
}
}
} else if (message.path == '_overview') {
// NOT USED ANYMORE -> remove swiper
// if (s < 0) { // redraw: check for slides in all swiper instances
// // not used any more?
// for (var isw = 0; isw < MAXBLOCK; isw ++) {
// var isl = findSlide(isw, message.path);
// if (isl !== null) {
// var slide = swiper[isw].slides[isl];
// if (slide) {
// console.log("redraw", isw, isl);
// replaceSlideContent(slide, message.title,
// createContent(isw, message));
// }
// }
// }
// } else
if (message.path == '_overview') {
// remove comment of next line when you want overview _instead_ of Graphics
// isl = insertSlide(s, message.title, "_overview", createContent(sLocal, message));
// swiper[sLocal].slideTo(isl); /* go to found slide */
} else {
// insertSlide(s, message.title, message.path, createContent(s, message));
let sLocal = paramSlider[s];
isl = insertSlide(sLocal, message.title, 'parameters', createContent(sLocal, message));
swiper[sLocal].slideTo(isl); /* go to found slide */
// let sLocal = paramSlider[s];
// *************************************************************************************
// In the module-block a parameter was selected
// -> write parameter-block to grid-element2
// If nColumns < 3, hide modules (grid-element1) and show parameters (grid-element2)
// Set flag showParams (-> if there are only three columns, hide modules, not parameters)
// See also SEAWebClientMain.js
showParams = 1;
console.log ('col',nColumns);
isl = insertSlide(2, message.title, 'parameters', createContent(sLocal, message));
if(nColumns < 2) {
elements[1].style.display = "none"; // show modules
elements[2].style.display = "inline-block"; // hide parameters
}
// swiper[sLocal].slideTo(isl); /* go to found slide */
}
}
nextInitCommand();
@ -357,9 +410,9 @@ function successHandler(s, message) {
break;
// Response to a "console"-server-request.
case "accept-console":
// draw console, only on the first and the last swiper
insertSlide(0, "console", "console",
createContentConsole(sLocal));
// draw console
// insertSlide(0, "console", "console",
// createContentConsole(sLocal));
insertSlide(3, "console", "console",
createContentConsole(sLocal));
nextInitCommand();
@ -429,6 +482,10 @@ function successHandler(s, message) {
}
function errorHandler(status) {
if (debug_communication_daniel) {
console.log("%cfunction: errorHandler", "color:white;background:darkblue");
}
if (debugCommunication) {
console.log("error", status);
}