From 649c7ecdf0cab5c19349654ba6f6ea11a9d8c338 Mon Sep 17 00:00:00 2001
From: Emanuele Laface <ema@morla.esss.lu.se>
Date: Fri, 28 Feb 2020 13:52:05 +0100
Subject: [PATCH] Fixed pvs screen
---
PythonServer/screens/ts2_tpcircuits.py | 2 +-
WebSites/pvs/dashboard.json | 64 +++++++++++++++-----------
2 files changed, 37 insertions(+), 29 deletions(-)
diff --git a/PythonServer/screens/ts2_tpcircuits.py b/PythonServer/screens/ts2_tpcircuits.py
index 61d1bb9..d369acc 100755
--- a/PythonServer/screens/ts2_tpcircuits.py
+++ b/PythonServer/screens/ts2_tpcircuits.py
@@ -9,7 +9,7 @@ class ts2_tpcircuitsScreen(Thread):
self.stop_signal = stop_signal
def run(self):
- pvs = ['TS2-010CRM:Cryo-LT-001:MeasValue', 'TS2-010CRM:Cryo-LT-002:MeasValue', 'TS2-010CRM:Cryo-TE-010:MeasValue', 'TS2-010CRM:Cryo-TE-020:MeasValue', 'TS2-010CRM:Cryo-TE-030:MeasValue', 'TS2-010CRM:Cryo-TE-007:MeasValue', 'TS2-010CRM:Cryo-TE-008:MeasValue', 'TS2-010CRM:Cryo-TE-009:MeasValue', 'TS2-010CRM:Cryo-TE-002:MeasValue', 'TS2-010CRM:Cryo-TE-093:MeasValue']
+ pvs = ['TS2-010CRM:Cryo-LT-001:MeasValue', 'TS2-010CRM:Cryo-LT-002:MeasValue', 'TS2-010CRM:Cryo-TE-010:MeasValue', 'TS2-010CRM:Cryo-TE-020:MeasValue', 'TS2-010CRM:Cryo-TE-030:MeasValue', 'TS2-010CRM:Cryo-TE-007:MeasValue', 'TS2-010CRM:Cryo-TE-008:MeasValue', 'TS2-010CRM:Cryo-TE-009:MeasValue', 'TS2-010CRM:Cryo-TE-002:MeasValue', 'TS2-010CRM:Cryo-TE-093:MeasValue', 'TS2-010CRM:Cryo-PT-004:MeasValue','TS2-010CRM:Cryo-PT-003:MeasValue','TS2-010CRM:Cryo-TE-091:MeasValue','TS2-010CRM:Cryo-TE-092:MeasValue','TS2-010CRM:Cryo-TE-094:MeasValue','TS2-010CDL:Cryo-PT-82301:MeasValue','TS2-010CRM:Cryo-PT-002:MeasValue','TS2-010CRM:Cryo-TE-001:MeasValue']
epics_dict={}
for pv in pvs:
diff --git a/WebSites/pvs/dashboard.json b/WebSites/pvs/dashboard.json
index b0f445c..9cd0476 100644
--- a/WebSites/pvs/dashboard.json
+++ b/WebSites/pvs/dashboard.json
@@ -29,6 +29,36 @@
}
]
},
+ {
+ "title": "Archiver",
+ "width": 1,
+ "row": {
+ "1": 47,
+ "2": 47,
+ "3": 47,
+ "4": 29,
+ "12": 29,
+ "13": 29
+ },
+ "col": {
+ "1": 1,
+ "2": 1,
+ "3": 1,
+ "4": 1,
+ "12": 3,
+ "13": 3
+ },
+ "col_width": 2,
+ "widgets": [
+ {
+ "type": "html",
+ "settings": {
+ "html": "<div id=\"result_ar\" style=\"overflow: visible;\"></div>",
+ "height": 8
+ }
+ }
+ ]
+ },
{
"title": "PV Search",
"width": 1,
@@ -135,14 +165,18 @@
"title": "Channel Finder",
"width": 1,
"row": {
+ "1": 65,
"2": 65,
+ "3": 65,
"4": 29,
"11": 29,
"12": 29
},
"col": {
+ "1": 1,
"2": 1,
- "4": 1,
+ "3": 1,
+ "4": 3,
"11": -9,
"12": -9
},
@@ -156,32 +190,6 @@
}
}
]
- },
- {
- "title": "Archiver",
- "width": 1,
- "row": {
- "2": 47,
- "4": 29,
- "12": 29,
- "13": 29
- },
- "col": {
- "2": 1,
- "4": 3,
- "12": 3,
- "13": 3
- },
- "col_width": 2,
- "widgets": [
- {
- "type": "html",
- "settings": {
- "html": "<div id=\"result_ar\" style=\"overflow: visible;\"></div>",
- "height": 8
- }
- }
- ]
}
],
"datasources": [
@@ -194,4 +202,4 @@
}
],
"columns": 4
-}
+}
\ No newline at end of file
--
GitLab