From 380723a166aa5982bee0231301aca68ff6a476ee Mon Sep 17 00:00:00 2001
From: Emanuele Laface <emanuele.laface@esss.se>
Date: Fri, 14 Jun 2019 12:08:36 +0200
Subject: [PATCH] Fix position of the doppler
---
WebSites/instruments/dashboard.json | 90 +++++++++++++++++------------
1 file changed, 53 insertions(+), 37 deletions(-)
diff --git a/WebSites/instruments/dashboard.json b/WebSites/instruments/dashboard.json
index 6d0f417..52eec61 100644
--- a/WebSites/instruments/dashboard.json
+++ b/WebSites/instruments/dashboard.json
@@ -75,6 +75,7 @@
"width": 1,
"row": {
"1": 17,
+ "2": 17,
"3": 17,
"4": 17,
"9": 17,
@@ -82,6 +83,7 @@
},
"col": {
"1": 1,
+ "2": 1,
"3": 1,
"4": 1,
"9": 1,
@@ -114,6 +116,7 @@
"width": 1,
"row": {
"1": 35,
+ "2": 17,
"3": 17,
"4": 17,
"9": 17,
@@ -121,6 +124,7 @@
},
"col": {
"1": 1,
+ "2": 2,
"3": 2,
"4": 2,
"9": 2,
@@ -153,7 +157,7 @@
"width": 1,
"row": {
"1": 53,
- "2": 17,
+ "2": 35,
"3": 35,
"4": 17,
"5": 17,
@@ -207,7 +211,7 @@
},
"col": {
"1": 1,
- "2": 1,
+ "2": 2,
"3": 2,
"4": 4,
"7": 3,
@@ -237,6 +241,47 @@
}
]
},
+ {
+ "title": "Doppler Shift",
+ "width": 1,
+ "row": {
+ "1": 109,
+ "2": 73,
+ "3": 73,
+ "4": 45,
+ "9": 45,
+ "12": 45
+ },
+ "col": {
+ "1": 1,
+ "2": 1,
+ "3": 1,
+ "4": 1,
+ "9": 1,
+ "12": 1
+ },
+ "col_width": 4,
+ "widgets": [
+ {
+ "type": "html",
+ "settings": {
+ "html": "<img width=\"100%\" height=\"100%\" id=\"dplImage\", src=\"/data/dpl.png\"></img>\n<script>\nsetInterval(function() {Â \nvar dplImage = document.getElementById('dplImage');Â \ndplImage.src = '/data/dpl.png?rnd=' + Math.random();Â \n}, 1000);Â \n</script>",
+ "height": 2
+ }
+ },
+ {
+ "type": "flot_extended_plugin",
+ "settings": {
+ "plot_type": "line",
+ "legend": true,
+ "height": 4,
+ "value": "[{label: \"H\"+\"+\".sup()+\" = \"+datasources[\"Instruments\"][\"LEBT-010:PBI-Dpl-001:FIT1-FracProton\"][\"value\"]+\" %<BR>\"\n +\"H\"+\"+\".sup()+\"2\".sub()+\" = \"+datasources[\"Instruments\"][\"LEBT-010:PBI-Dpl-001:FIT1-FracH2\"][\"value\"]+\" %<BR>\"\n +\"H\"+\"+\".sup()+\"3\".sub()+\" = \"+datasources[\"Instruments\"][\"LEBT-010:PBI-Dpl-001:FIT1-FracH3\"][\"value\"]+\" %\",\n data:datasources[\"Instruments\"][\"LEBT-010:PBI-Dpl-001:FIT1-Y_RBV\"][\"value\"]}]",
+ "yticks": "[]",
+ "zoom": "xy"
+ }
+ }
+ ]
+ },
{
"title": "Permanent Tank Emittance Meter",
"width": 1,
@@ -248,6 +293,7 @@
"9": 35,
"10": 35,
"11": 35,
+ "12": 35,
"13": 35
},
"col": {
@@ -258,6 +304,7 @@
"9": 2,
"10": 2,
"11": 2,
+ "12": 2,
"13": 2
},
"col_width": 2,
@@ -281,7 +328,8 @@
"4": 35,
"10": 35,
"11": 35,
- "12": 35
+ "12": 35,
+ "13": 35
},
"col": {
"1": 1,
@@ -290,7 +338,8 @@
"4": 3,
"10": 1,
"11": 1,
- "12": 1
+ "12": 1,
+ "13": 1
},
"col_width": 2,
"widgets": [
@@ -302,39 +351,6 @@
}
}
]
- },
- {
- "title": "Doppler Shift",
- "width": 1,
- "row": {
- "4": 45,
- "12": 45
- },
- "col": {
- "4": 1,
- "12": 1
- },
- "col_width": 4,
- "widgets": [
- {
- "type": "html",
- "settings": {
- "html": "<img width=\"100%\" height=\"100%\" id=\"dplImage\", src=\"/data/dpl.png\"></img>\n<script>\nsetInterval(function() {Â \nvar dplImage = document.getElementById('dplImage');Â \ndplImage.src = '/data/dpl.png?rnd=' + Math.random();Â \n}, 1000);Â \n</script>",
- "height": 2
- }
- },
- {
- "type": "flot_extended_plugin",
- "settings": {
- "plot_type": "line",
- "legend": true,
- "height": 4,
- "value": "[{label: \"H\"+\"+\".sup()+\" = \"+datasources[\"Instruments\"][\"LEBT-010:PBI-Dpl-001:FIT1-FracProton\"][\"value\"]+\" %<BR>\"\n +\"H\"+\"+\".sup()+\"2\".sub()+\" = \"+datasources[\"Instruments\"][\"LEBT-010:PBI-Dpl-001:FIT1-FracH2\"][\"value\"]+\" %<BR>\"\n +\"H\"+\"+\".sup()+\"3\".sub()+\" = \"+datasources[\"Instruments\"][\"LEBT-010:PBI-Dpl-001:FIT1-FracH3\"][\"value\"]+\" %\",\n data:datasources[\"Instruments\"][\"LEBT-010:PBI-Dpl-001:FIT1-Y_RBV\"][\"value\"]}]",
- "yticks": "[]",
- "zoom": "xy"
- }
- }
- ]
}
],
"datasources": [
--
GitLab