Fix plot scale

WebSites/pos/dashboard.json

@@ -65,7 +65,7 @@
 						"legend": true,
 						"height": 4,
 						"value": "timelength = datasources[\"POS\"][\"RFQ-010:RFS-EVR-101:RFSyncWdt-SP\"][\"value\"]/1000*2;\n\npwxdata = datasources[\"POS\"][\"RFQ-010:RFS-DIG-101:Dwn6-XAxis\"][\"value\"];\npwydata = datasources[\"POS\"][\"RFQ-010:RFS-DIG-101:Dwn6-Cmp0\"][\"value\"];\nvxdata = datasources[\"POS\"][\"RFQ-010:RFS-DIG-101:Dwn0-XAxis\"][\"value\"];\nvydata = datasources[\"POS\"][\"RFQ-010:RFS-DIG-101:Dwn0-Cmp0\"][\"value\"];\nrxdata = datasources[\"POS\"][\"RFQ-010:RFS-DIG-101:Dwn3-XAxis\"][\"value\"];\nrydata = datasources[\"POS\"][\"RFQ-010:RFS-DIG-101:Dwn3-Cmp0\"][\"value\"];\n\npwdata = [];\nvdata = [];\nrdata = [];\n\nfor (i=0; i < pwxdata.length; i++) {\n    if (pwxdata[i] > timelength) {\n        break;\n    }\n\tpwdata.push([pwxdata[i], pwydata[i]]);\n}\n\nfor (i=0; i < vxdata.length; i++) {\n    if (vxdata[i] > timelength) {\n        break;\n    }\n\tvdata.push([vxdata[i], vydata[i]]);\n}\n\nfor (i=0; i < rxdata.length; i++) {\n    if (rxdata[i] > timelength) {\n        break;\n    }\n\trdata.push([rxdata[i], rydata[i]]);\n}\n\ndata = [{label: 'Power applied', data: pwdata, color: \"green\"},\n        {label: 'Voltage measured', data: vdata, color: \"red\", yaxis: 2},\n        {label: 'Power reflected', data: rdata, color: \"yellow\"}];\n\nreturn data;",
-						"xticks": "timelength = datasources[\"POS\"][\"RFQ-010:RFS-EVR-101:RFSyncWdt-SP\"][\"value\"]/1000*2;\nxdata = datasources[\"POS\"][\"RFQ-010:RFS-DIG-101:Dwn6-XAxis\"][\"value\"];\n\nfinalvalue = 0;\nfor (i=0; i < xdata.length; i++) {\n    if (xdata[i] > timelength) {\n        break;\n    }\n\tfinalvalue = i;\n}\n\n\nxtick = [];\nfor (i = 0; i < 11; i += 1) {\n\txtick.push([finalvalue*i/10, (finalvalue*i/10).toFixed(3).toString()]);\n}\n\nxtick[5][1] = xtick[5][1]+\"<br>t [ms]\";\nreturn xtick;",
+						"xticks": "timelength = datasources[\"POS\"][\"RFQ-010:RFS-EVR-101:RFSyncWdt-SP\"][\"value\"]/1000*2;\nxdata = datasources[\"POS\"][\"RFQ-010:RFS-DIG-101:Dwn6-XAxis\"][\"value\"];\n\nif (timelength > xdata[xdata.length-1]) {\n    timelength = xdata[xdata.length-1];\n}\n\nxtick = [];\nfor (i = 0; i < 11; i += 1) {\n\txtick.push([timelength*i/10, (timelength*i/10).toFixed(3).toString()]);\n}\n\nxtick[5][1] = xtick[5][1]+\"<br>t [ms]\";\nreturn xtick;\n\n",
 						"yticks": "datasources[\"Clock\"][\"numeric_value\"]\n\nif (typeof axes === 'undefined') {\n    return;\n}\n\naxes.yaxis.options.position = \"left\";\naxes.yaxis.options.min = 0;\n\nytick = [];\nfor (i = 0; i < axes.yaxis.ticks.length-1; i += 1) {\n\tytick.push([axes.yaxis.ticks[i][\"v\"], axes.yaxis.ticks[i][\"label\"]]);\n}\n\nytick.push([axes.yaxis.ticks[axes.yaxis.ticks.length-1][\"v\"], \"P [kW]\"]);\naxes.yaxis.options.ticks = ytick;\n\naxes.y2axis.options.position = \"right\";\naxes.y2axis.options.min = 0;\n\ny2tick = [];\nfor (i = 0; i < axes.y2axis.ticks.length-1; i += 1) {\n\ty2tick.push([axes.y2axis.ticks[i][\"v\"], axes.y2axis.ticks[i][\"label\"]]);\n}\n\ny2tick.push([axes.y2axis.ticks[axes.y2axis.ticks.length-1][\"v\"], \"V [kV]\"]);\naxes.y2axis.options.ticks = y2tick;\n\nreturn ytick;",
 						"points": false,
 						"tooltip": false,
@@ -431,48 +431,6 @@
 				}
 			]
 		},
-		{
-			"title": "TS2 - Vacuum",
-			"width": 1,
-			"row": {
-				"1": 61,
-				"2": 41,
-				"3": 47,
-				"4": 33,
-				"7": 1,
-				"9": 1,
-				"12": 1,
-				"13": 1,
-				"14": 1,
-				"15": 1
-			},
-			"col": {
-				"1": 1,
-				"2": 1,
-				"3": 1,
-				"4": 1,
-				"7": 7,
-				"9": 7,
-				"12": 7,
-				"13": 7,
-				"14": 7,
-				"15": 7
-			},
-			"col_width": 2,
-			"widgets": [
-				{
-					"type": "flot_extended_plugin",
-					"settings": {
-						"plot_type": "line",
-						"legend": true,
-						"height": 3,
-						"value": "data = [{label: 'Cavity 1', data: datasources[\"TS2\"][\"TS2-010CRM:Vac-VGC-10000:PrsR\"]},\n        {label: 'Cavity 2', data: datasources[\"TS2\"][\"TS2-010CRM:Vac-VGC-20000:PrsR\"]},\n        {label: 'Cavity 3', data: datasources[\"TS2\"][\"TS2-010CRM:Vac-VGC-30000:PrsR\"]},\n        {label: 'Cavity 4', data: datasources[\"TS2\"][\"TS2-010CRM:Vac-VGC-40000:PrsR\"]}];\n\nreturn data;",
-						"x_timestamp": true,
-						"zoom": ""
-					}
-				}
-			]
-		},
 		{
 			"title": "Current time",
 			"width": 1,
@@ -518,6 +476,48 @@
 					}
 				}
 			]
+		},
+		{
+			"title": "TS2 - Vacuum",
+			"width": 1,
+			"row": {
+				"1": 61,
+				"2": 41,
+				"3": 47,
+				"4": 33,
+				"7": 1,
+				"9": 1,
+				"12": 1,
+				"13": 1,
+				"14": 1,
+				"15": 1
+			},
+			"col": {
+				"1": 1,
+				"2": 1,
+				"3": 1,
+				"4": 1,
+				"7": 7,
+				"9": 7,
+				"12": 7,
+				"13": 7,
+				"14": 7,
+				"15": 7
+			},
+			"col_width": 2,
+			"widgets": [
+				{
+					"type": "flot_extended_plugin",
+					"settings": {
+						"plot_type": "line",
+						"legend": true,
+						"height": 3,
+						"value": "data = [{label: 'Cavity 1', data: datasources[\"TS2\"][\"TS2-010CRM:Vac-VGC-10000:PrsR\"]},\n        {label: 'Cavity 2', data: datasources[\"TS2\"][\"TS2-010CRM:Vac-VGC-20000:PrsR\"]},\n        {label: 'Cavity 3', data: datasources[\"TS2\"][\"TS2-010CRM:Vac-VGC-30000:PrsR\"]},\n        {label: 'Cavity 4', data: datasources[\"TS2\"][\"TS2-010CRM:Vac-VGC-40000:PrsR\"]}];\n\nreturn data;",
+						"x_timestamp": true,
+						"zoom": ""
+					}
+				}
+			]
 		}
 	],
 	"datasources": [