diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Additional-Home-View/MAP-Home-Dev/view.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Additional-Home-View/MAP-Home-Dev/view.json
index 36336d6..5bf874d 100644
--- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Additional-Home-View/MAP-Home-Dev/view.json
+++ b/MTN6_SCADA/com.inductiveautomation.perspective/views/Additional-Home-View/MAP-Home-Dev/view.json
@@ -66,11 +66,20 @@
"height": 1,
"width": 1
},
+ "propConfig": {
+ "props.source": {
+ "binding": {
+ "config": {
+ "expression": "\"http://127.0.0.1:5500/Global%20Overview.svg?var\" + toMillis(now(1000)) "
+ },
+ "type": "expr"
+ }
+ }
+ },
"props": {
"fit": {
"mode": "fill"
- },
- "source": "http://127.0.0.1:5500/Global%20Overview.svg"
+ }
},
"type": "ia.display.image"
},
@@ -81,8 +90,8 @@
"position": {
"height": 0.0278,
"width": 0.0833,
- "x": 0.1745,
- "y": 0.1759
+ "x": 0.0691,
+ "y": 0.1477
},
"props": {
"params": {
@@ -101,8 +110,8 @@
"position": {
"height": 0.0278,
"width": 0.0833,
- "x": 0.1396,
- "y": 0.552
+ "x": 0.065,
+ "y": 0.553
},
"props": {
"params": {
@@ -121,8 +130,8 @@
"position": {
"height": 0.0278,
"width": 0.0833,
- "x": 0.3801,
- "y": 0.292
+ "x": 0.3465,
+ "y": 0.2375
},
"props": {
"params": {
@@ -140,9 +149,12 @@
},
"position": {
"height": 0.0278,
+ "rotate": {
+ "anchor": "50% -165%"
+ },
"width": 0.0833,
- "x": 0.4977,
- "y": 0.2396
+ "x": 0.4955,
+ "y": 0.1559
},
"props": {
"params": {
@@ -161,8 +173,8 @@
"position": {
"height": 0.0278,
"width": 0.0833,
- "x": 0.4772,
- "y": 0.0351
+ "x": 0.4594,
+ "y": 0.0215
},
"props": {
"params": {
@@ -181,8 +193,8 @@
"position": {
"height": 0.0278,
"width": 0.0833,
- "x": 0.4712,
- "y": 0.8063
+ "x": 0.4625,
+ "y": 0.742
},
"props": {
"params": {
@@ -201,8 +213,8 @@
"position": {
"height": 0.0278,
"width": 0.0833,
- "x": 0.4967,
- "y": 0.9011
+ "x": 0.528,
+ "y": 0.9089
},
"props": {
"params": {
@@ -221,8 +233,8 @@
"position": {
"height": 0.0278,
"width": 0.0833,
- "x": 0.7545,
- "y": 0.3648
+ "x": 0.7631,
+ "y": 0.428
},
"props": {
"params": {
@@ -241,8 +253,8 @@
"position": {
"height": 0.0278,
"width": 0.0833,
- "x": 0.5772,
- "y": 0.4872
+ "x": 0.5567,
+ "y": 0.3403
},
"props": {
"params": {
diff --git a/image_server/Global Overview.svg b/image_server/Global Overview.svg
index 7f5aa28..677117f 100644
--- a/image_server/Global Overview.svg
+++ b/image_server/Global Overview.svg
@@ -4,9 +4,9 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ inkscape:current-layer="layer3" />
+ style="display:inline;fill:#ffffff;fill-opacity:1;stroke-width:1.64959;stroke-dasharray:none">
+ width="19.628881"
+ height="345.90814"
+ x="826.62189"
+ y="674.36176" />
+ width="19.628881"
+ height="101.85012"
+ x="826.62231"
+ y="570.06946" />
+ width="19.628881"
+ height="345.9725"
+ x="826.62231"
+ y="126.9102" />
+ width="174.47058"
+ height="19.628881"
+ x="857.82703"
+ y="91.192451" />
+ width="77.676369"
+ height="19.419107"
+ x="1034.9559"
+ y="91.192032" />
+ width="135.42268"
+ height="19.419107"
+ x="1115.1561"
+ y="91.192032" />
+ width="251.09528"
+ height="19.419107"
+ x="1253.306"
+ y="91.192032" />
+ width="19.686384"
+ height="18.259256"
+ x="741.44379"
+ y="1020.906" />
+ width="19.686384"
+ height="18.259256"
+ x="719.6911"
+ y="1020.906" />
+ width="19.686384"
+ height="18.259256"
+ x="675.86334"
+ y="1020.906" />
+ width="19.686384"
+ height="18.259256"
+ x="697.7832"
+ y="1020.906" />
+ width="19.679892"
+ height="18.411247"
+ x="740.56122"
+ y="826.96564" />
+ width="19.679892"
+ height="18.411247"
+ x="718.02527"
+ y="827.02594" />
+ width="19.679892"
+ height="18.411243"
+ x="695.51495"
+ y="826.96564" />
+ width="32.206192"
+ height="18.41213"
+ x="660.52698"
+ y="826.90497" />
+ width="19.67061"
+ height="18.629572"
+ x="741.41772"
+ y="619.37769" />
+ width="19.67061"
+ height="18.629572"
+ x="719.66504"
+ y="619.37769" />
+ width="19.67061"
+ height="18.629572"
+ x="697.75714"
+ y="619.37769" />
+ width="19.67061"
+ height="18.629572"
+ x="675.83734"
+ y="619.37769" />
+ width="19.62888"
+ height="19.628881"
+ x="741.52948"
+ y="299.78806" />
+ width="19.62888"
+ height="19.628881"
+ x="719.77686"
+ y="299.78806" />
+ width="19.681475"
+ height="18.374052"
+ x="697.84259"
+ y="299.76178" />
+ width="19.681475"
+ height="18.374052"
+ x="675.92267"
+ y="299.76178" />
+ width="19.680096"
+ height="18.406393"
+ x="741.31921"
+ y="433.56549" />
+ width="19.680096"
+ height="18.406393"
+ x="719.56653"
+ y="433.56549" />
+ width="19.680096"
+ height="18.406393"
+ x="697.65863"
+ y="433.56549" />
+ width="91.824188"
+ height="18.40798"
+ x="603.59552"
+ y="433.56473" />
+ width="19.62888"
+ height="19.628881"
+ x="741.37463"
+ y="254.96652" />
+ width="19.62888"
+ height="19.628881"
+ x="719.62201"
+ y="254.96652" />
+ width="19.62888"
+ height="19.628881"
+ x="697.71405"
+ y="254.96652" />
+ width="27.369061"
+ height="19.628881"
+ x="668.05396"
+ y="254.96652" />
+ width="19.62888"
+ height="19.628881"
+ x="741.63495"
+ y="204.70395" />
+ width="19.62888"
+ height="19.628881"
+ x="719.88226"
+ y="204.70395" />
+ width="19.62888"
+ height="19.628881"
+ x="697.97437"
+ y="204.70395" />
+ width="21.158325"
+ height="19.628881"
+ x="674.52496"
+ y="204.70395" />
+ width="11.248247"
+ height="17.696146"
+ x="718.30115"
+ y="444.23123"
+ inkscape:transform-center-x="0.23557562"
+ inkscape:transform-center-y="0.96494647" />
+ width="11.403888"
+ height="15.770384"
+ x="651.90948"
+ y="446.23489"
+ inkscape:transform-center-x="0.23880695"
+ inkscape:transform-center-y="0.51260216" />
+ width="11.552107"
+ height="15.979183"
+ x="632.01324"
+ y="446.02637"
+ inkscape:transform-center-x="0.24201593"
+ inkscape:transform-center-y="0.36458392" />
+ width="11.23259"
+ height="18.097214"
+ x="738.57074"
+ y="444.11707"
+ inkscape:transform-center-x="0.23526352"
+ inkscape:transform-center-y="1.0186609" />
-
-
-
-
-
-
-
-
-
-
+ style="stroke:#f0ee73;stroke-width:1.02206;stroke-dasharray:none;stroke-opacity:1" />
+ style="stroke:#f0ee73;stroke-width:1.02206;stroke-dasharray:none;stroke-opacity:1" />
+ style="stroke:#f0ee73;stroke-width:1.02206;stroke-dasharray:none;stroke-opacity:1" />
+ style="stroke:#f0ee73;stroke-width:1.02206;stroke-dasharray:none;stroke-opacity:1" />
+ style="stroke:#f0ee73;stroke-width:1.02206;stroke-dasharray:none;stroke-opacity:1" />
@@ -2799,717 +3319,667 @@
style="display:inline"
transform="matrix(0.50696722,0,0,0.50696722,425.88735,532.9116)">
+ transform="rotate(-90)" />
+ transform="rotate(-90)" />
+ transform="rotate(-90)" />
-
+ width="26.967455"
+ height="19.46312"
+ x="-146.80859"
+ y="425.09976"
+ transform="rotate(-90)" />
+ transform="rotate(-90)" />
-
+ transform="rotate(-90)" />
+ transform="rotate(-90)" />
+ transform="rotate(-90)" />
+ transform="rotate(-90)" />
-
+ transform="rotate(-90)" />
+ transform="rotate(-90)" />
-
+ transform="rotate(-90)" />
+ transform="rotate(-90)" />
-
+ transform="rotate(-90)" />
+ transform="rotate(-90)" />
+ transform="rotate(-90)" />
+ transform="rotate(-90)" />
+ transform="rotate(-90)" />
+ transform="rotate(-90)" />
+ transform="rotate(-90)" />
+ transform="rotate(-90)" />
+ transform="rotate(-90)" />
+ transform="rotate(-90)" />
+ transform="rotate(-90)" />
+ transform="rotate(-90)" />
+ transform="rotate(-90)" />
+ transform="rotate(-90)" />
+ transform="rotate(-90)" />
+ transform="rotate(-90)" />
+ transform="rotate(-90)" />
+ width="26.789263"
+ height="19.463104"
+ x="-146.80859"
+ y="465.42014"
+ transform="rotate(-90)" />
+ transform="rotate(-90)" />
+ width="26.789263"
+ height="19.463135"
+ x="-146.80859"
+ y="505.74069"
+ transform="rotate(-90)" />
+ transform="rotate(-90)" />
+ width="26.611069"
+ height="19.463135"
+ x="-146.80859"
+ y="546.06128"
+ transform="rotate(-90)" />
+ transform="rotate(-90)" />
+ transform="rotate(-90)" />
+ transform="rotate(-90)" />
@@ -3521,1278 +3991,1278 @@
style="display:inline"
transform="matrix(0.60684104,0,0,0.60684104,102.45867,222.91428)">
+ inkscape:transform-center-x="0.2767656"
+ inkscape:transform-center-y="3.5442617" />
+ inkscape:transform-center-x="-0.47935241"
+ inkscape:transform-center-y="0.97186744" />
+ inkscape:transform-center-x="4.8376709"
+ inkscape:transform-center-y="23.866541" />
+ inkscape:transform-center-x="4.8360843"
+ inkscape:transform-center-y="23.839312" />
+ inkscape:transform-center-x="4.8233824"
+ inkscape:transform-center-y="23.869608" />
+ inkscape:transform-center-x="4.8430047"
+ inkscape:transform-center-y="23.865487" />
+ inkscape:transform-center-x="-0.47932663"
+ inkscape:transform-center-y="0.97185393" />
+ inkscape:transform-center-x="-0.479333"
+ inkscape:transform-center-y="0.97186409" />
+ inkscape:transform-center-x="-0.47935609"
+ inkscape:transform-center-y="0.97187941" />
+ inkscape:transform-center-x="4.8369164"
+ inkscape:transform-center-y="23.866769" />
+ inkscape:transform-center-x="4.8352944"
+ inkscape:transform-center-y="23.867242" />
+ inkscape:transform-center-x="4.8366538"
+ inkscape:transform-center-y="24.126052" />
+ inkscape:transform-center-x="4.8368372"
+ inkscape:transform-center-y="23.866793" />
+ inkscape:transform-center-x="4.8179111"
+ inkscape:transform-center-y="23.870803" />
+ inkscape:transform-center-x="4.8417787"
+ inkscape:transform-center-y="23.958564" />
+ inkscape:transform-center-x="-0.47935575"
+ inkscape:transform-center-y="0.97186135" />
+ inkscape:transform-center-x="-0.47936496"
+ inkscape:transform-center-y="0.97186554" />
+ inkscape:transform-center-x="-0.47577992"
+ inkscape:transform-center-y="0.9735781" />
+ inkscape:transform-center-x="-0.47779874"
+ inkscape:transform-center-y="0.97263303" />
+ inkscape:transform-center-x="-0.47934818"
+ inkscape:transform-center-y="0.97186625" />
+ inkscape:transform-center-x="-0.29476985"
+ inkscape:transform-center-y="1.0428471" />
+ inkscape:transform-center-x="-0.29479058"
+ inkscape:transform-center-y="1.0428633" />
+ inkscape:transform-center-x="-0.29477885"
+ inkscape:transform-center-y="1.0428468" />
+ inkscape:transform-center-x="-0.29476335"
+ inkscape:transform-center-y="1.042842" />
+ inkscape:transform-center-x="4.8346616"
+ inkscape:transform-center-y="23.867289" />
+ inkscape:transform-center-x="0.7481116"
+ inkscape:transform-center-y="0.43404721" />
+ inkscape:transform-center-x="0.75974166"
+ inkscape:transform-center-y="0.43377397" />
+ inkscape:transform-center-x="0.74790238"
+ inkscape:transform-center-y="0.4340383" />
+ transform="matrix(1.0220575,0,0,1.0220575,37.719637,61.135773)"
+ style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#3335df;stroke-width:1;stroke-dasharray:none;stroke-opacity:1">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ inkscape:transform-center-x="-2.8348617"
+ inkscape:transform-center-y="-1.7916742"
+ style="stroke:#c95dc9;stroke-width:0.754392;stroke-dasharray:1.50879, 0.754392;stroke-dashoffset:0;stroke-opacity:1" />
+ inkscape:transform-center-x="1.7916741"
+ inkscape:transform-center-y="-2.8348593"
+ style="stroke:#c95dc9;stroke-width:0.754392;stroke-dasharray:1.50879, 0.754392;stroke-dashoffset:0;stroke-opacity:1" />
+ inkscape:transform-center-x="-2.8348534"
+ inkscape:transform-center-y="-1.7916752"
+ style="stroke:#c95dc9;stroke-width:0.754392;stroke-dasharray:1.50879, 0.754392;stroke-dashoffset:0;stroke-opacity:1" />
+ inkscape:transform-center-x="5.0278243"
+ inkscape:transform-center-y="-5.5915208"
+ style="stroke:#c95dc9;stroke-width:0.746148;stroke-dasharray:0.746148, 1.4923;stroke-dashoffset:0;stroke-opacity:1" />
+ inkscape:transform-center-x="1.7916762"
+ inkscape:transform-center-y="-2.8348937"
+ style="stroke:#c95dc9;stroke-width:0.754392;stroke-dasharray:1.50879, 0.754392;stroke-dashoffset:0;stroke-opacity:1" />
+ inkscape:transform-center-x="1.7916779"
+ inkscape:transform-center-y="-2.834855"
+ style="stroke:#c95dc9;stroke-width:0.754392;stroke-dasharray:1.50879, 0.754392;stroke-dashoffset:0;stroke-opacity:1" />
+ inkscape:transform-center-x="1.7916727"
+ inkscape:transform-center-y="-2.8349022"
+ style="stroke:#c95dc9;stroke-width:0.754392;stroke-dasharray:1.50879, 0.754392;stroke-dashoffset:0;stroke-opacity:1" />
+ inkscape:transform-center-x="1.7916729"
+ inkscape:transform-center-y="-2.8348943"
+ style="stroke:#c95dc9;stroke-width:0.754392;stroke-dasharray:1.50879, 0.754392;stroke-dashoffset:0;stroke-opacity:1" />
+ inkscape:transform-center-x="1.791675"
+ inkscape:transform-center-y="-2.8348544"
+ style="stroke:#c95dc9;stroke-width:0.754392;stroke-dasharray:1.50879, 0.754392;stroke-dashoffset:0;stroke-opacity:1" />
+ inkscape:transform-center-x="1.7916722"
+ inkscape:transform-center-y="-2.8348567"
+ style="stroke:#c95dc9;stroke-width:0.754392;stroke-dasharray:1.50879, 0.754392;stroke-dashoffset:0;stroke-opacity:1" />
+ inkscape:transform-center-x="1.7916723"
+ inkscape:transform-center-y="-2.8348601"
+ style="stroke:#c95dc9;stroke-width:0.754392;stroke-dasharray:1.50879, 0.754392;stroke-dashoffset:0;stroke-opacity:1" />
+ inkscape:transform-center-x="2.82124"
+ inkscape:transform-center-y="3.700342"
+ style="stroke:#c95dc9;stroke-width:0.754392;stroke-dasharray:2.26318, 2.26318;stroke-dashoffset:0;stroke-opacity:1" />
+ inkscape:transform-center-x="5.027815"
+ inkscape:transform-center-y="-5.5915231"
+ style="stroke:#c95dc9;stroke-width:0.746148;stroke-dasharray:0.746148, 1.4923;stroke-dashoffset:0;stroke-opacity:1" />
+ inkscape:transform-center-x="1.7916734"
+ inkscape:transform-center-y="-2.8348382"
+ style="stroke:#c95dc9;stroke-width:0.754392;stroke-dasharray:1.50879, 0.754392;stroke-dashoffset:0;stroke-opacity:1" />
+ inkscape:transform-center-x="1.7916781"
+ inkscape:transform-center-y="-2.8349026"
+ style="stroke:#c95dc9;stroke-width:0.754392;stroke-dasharray:1.50879, 0.754392;stroke-dashoffset:0;stroke-opacity:1" />
+ inkscape:transform-center-x="1.7916759"
+ inkscape:transform-center-y="-2.8348603"
+ style="stroke:#c95dc9;stroke-width:0.754392;stroke-dasharray:1.50879, 0.754392;stroke-dashoffset:0;stroke-opacity:1" />
+ inkscape:transform-center-x="5.0278461"
+ inkscape:transform-center-y="-5.5915528"
+ style="stroke:#c95dc9;stroke-width:0.746148;stroke-dasharray:0.746148, 1.4923;stroke-dashoffset:0;stroke-opacity:1" />
+ inkscape:transform-center-x="-2.8290717"
+ inkscape:transform-center-y="-2.1251469"
+ style="stroke:#c95dc9;stroke-width:0.754392;stroke-dasharray:1.50879, 0.754392;stroke-dashoffset:0;stroke-opacity:1" />
+ inkscape:transform-center-x="4.0759023"
+ inkscape:transform-center-y="1.0835884"
+ style="stroke:#c95dc9;stroke-width:0.754392;stroke-dasharray:1.50879, 0.754392;stroke-dashoffset:0;stroke-opacity:1" />
+ inkscape:transform-center-x="1.791676"
+ inkscape:transform-center-y="-2.834854"
+ style="stroke:#c95dc9;stroke-width:0.754392;stroke-dasharray:1.50879, 0.754392;stroke-dashoffset:0;stroke-opacity:1" />
+ inkscape:transform-center-x="2.6045954"
+ inkscape:transform-center-y="-3.1267497"
+ style="stroke:#c95dc9;stroke-width:0.754392;stroke-dasharray:2.26317, 2.26317;stroke-dashoffset:0;stroke-opacity:1" />
+ inkscape:transform-center-x="2.8478523"
+ inkscape:transform-center-y="2.8596348"
+ style="stroke:#c95dc9;stroke-width:0.754392;stroke-dasharray:2.26317, 2.26317;stroke-dashoffset:0;stroke-opacity:1" />
+ inkscape:transform-center-x="1.7916715"
+ inkscape:transform-center-y="-2.8348603"
+ style="stroke:#c95dc9;stroke-width:0.754392;stroke-dasharray:1.50879, 0.754392;stroke-dashoffset:0;stroke-opacity:1" />
+ inkscape:transform-center-x="1.7916744"
+ inkscape:transform-center-y="-2.834859"
+ style="stroke:#c95dc9;stroke-width:0.754392;stroke-dasharray:1.50879, 0.754392;stroke-dashoffset:0;stroke-opacity:1" />
+ inkscape:transform-center-x="1.7916729"
+ inkscape:transform-center-y="-2.8348589"
+ style="stroke:#c95dc9;stroke-width:0.754392;stroke-dasharray:1.50879, 0.754392;stroke-dashoffset:0;stroke-opacity:1" />
+ inkscape:transform-center-x="1.7916781"
+ inkscape:transform-center-y="-2.8349015"
+ style="stroke:#c95dc9;stroke-width:0.754392;stroke-dasharray:1.50879, 0.754392;stroke-dashoffset:0;stroke-opacity:1" />
+ inkscape:transform-center-x="1.7916706"
+ inkscape:transform-center-y="-2.834856"
+ style="stroke:#c95dc9;stroke-width:0.754392;stroke-dasharray:1.50879, 0.754392;stroke-dashoffset:0;stroke-opacity:1" />
+ inkscape:transform-center-x="5.0278243"
+ inkscape:transform-center-y="-5.591518"
+ style="stroke:#c95dc9;stroke-width:0.746148;stroke-dasharray:0.746148, 1.4923;stroke-dashoffset:0;stroke-opacity:1" />
+ inkscape:transform-center-x="1.7916784"
+ inkscape:transform-center-y="-2.8348987"
+ style="stroke:#c95dc9;stroke-width:0.754392;stroke-dasharray:1.50879, 0.754392;stroke-dashoffset:0;stroke-opacity:1" />