From b3a43af6fdfab488bc65268997125f4f8e3723dd Mon Sep 17 00:00:00 2001 From: Markus Zolliker Date: Wed, 8 Apr 2026 12:57:29 +0200 Subject: [PATCH] fixes on linse-c and add jtccr --- flaskserver.py | 3 + templates/jtccr.svg | 1148 +++++++++++++++++++++++++++++++++++++++ templates/leidenghs.svg | 389 ++++++++----- templates/secop.js | 5 +- 4 files changed, 1418 insertions(+), 127 deletions(-) create mode 100644 templates/jtccr.svg diff --git a/flaskserver.py b/flaskserver.py index ad9c5fd..7cc9515 100755 --- a/flaskserver.py +++ b/flaskserver.py @@ -11,6 +11,9 @@ app = Flask(__name__) class Args: def __init__(self, name, port='8050', webport='8051'): + if '.' in name: + name, port = name.split('.') + webport = str(int(port) + 1) args = dict( html = 'common.html', svg = 'common.svg', diff --git a/templates/jtccr.svg b/templates/jtccr.svg new file mode 100644 index 0000000..367b564 --- /dev/null +++ b/templates/jtccr.svg @@ -0,0 +1,1148 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + from cryostat + to cryostat + to He-recovery + to aux pump + from He-bottle(12 bar) + + + 1.1 bar + + + + 8 bar + + + + 7 bar + + + + + 20 bar + + + + + 4 bar + + + + + P4 + 1-16 bar + + + + + P3 + 1-10 bar + + + + + P2 + + + + + P1 + + + + + + + + + + pressreg0-18bar + + + + LN2trap + + + + dump15l + + + + dump30l + + + + + jtcompressor + + + + + + + V5 + + + + + V9 + + + + + V8 + + + + + V4 + + + + + V6 + + + V3 + + + + + + + V7 + + + + + V10 + + + + + V2 + + + + + V1 + + + + + M1 + + * mbar + * mbar + * mbar + * mbar + + MV9 + + + + jtpump + + + + diff --git a/templates/leidenghs.svg b/templates/leidenghs.svg index 7712833..18ba028 100644 --- a/templates/leidenghs.svg +++ b/templates/leidenghs.svg @@ -8,8 +8,8 @@ version="1.1" id="leiden_svg" xml:space="preserve" - inkscape:version="1.4 (86a8ad7, 2024-10-11)" - sodipodi:docname="leiden_GHS.svg" + inkscape:version="1.4.3 (0d15f75, 2025-12-25)" + sodipodi:docname="leidenghs.svg" inkscape:export-filename="leiden_GHS.png" inkscape:export-xdpi="96" inkscape:export-ydpi="96" @@ -28,15 +28,15 @@ inkscape:deskcolor="#d1d1d1" inkscape:document-units="mm" inkscape:lockguides="false" - inkscape:zoom="1.0930766" - inkscape:cx="464.28585" - inkscape:cy="415.79885" - inkscape:window-width="1920" - inkscape:window-height="1129" - inkscape:window-x="-8" - inkscape:window-y="-8" - inkscape:window-maximized="1" - inkscape:current-layer="Ventile" />0V01V117V176V67V713V1314V143V32V28V811V1110V1012V129V94V415V1516V165V53He3Hep6p7p0* mbar* mbar* mbarp9p10* mbar* mbar4He24He3He23He { let [parmod, ...func] = elem.id.split('-'); - console.log(parmod, func); const [mod, param] = parmod.split(':'); // console.log(mod, param, func); if (func.includes("click")) { @@ -140,7 +139,7 @@ function doConnect() { } function onOpen(evt) { - writeToScreen("Connected to DIL5\n"); + writeToScreen("Connected to "+ wsaddr + "\n"); doSend("describe"); /* for (var mod in ctr_state) { @@ -161,7 +160,7 @@ function onClose(evt) { function onError(evt) { if (evt.data === undefined) { - writeToScreen("Unable to connect to DIL5 as websocket is not connectable\n"); + writeToScreen("Unable to connect to "+ wsaddr + "\n"); } else { writeToScreen("error: " + evt.data + '\n'); websocket.close();