Browse Source

added red and green ventil.

- But when there's no value, it's grey value.

Signed-off-by: nicolaisi <nicholas.jerome@kit.edu>
nicolaisi 8 years ago
parent
commit
6ff64f41b1
6 changed files with 43 additions and 11 deletions
  1. 5 1
      cache.yaml
  2. BIN
      static/ventil_green.png
  3. BIN
      static/ventil_red.png
  4. 2 2
      status.html
  5. 32 8
      style.yaml
  6. 4 0
      varname.yaml

+ 5 - 1
cache.yaml

@@ -1,2 +1,6 @@
+311-RBY-1-5051: ''
 320-MOD-0-0001: '2'
-320-RTY-3-3101: '107.9949111938477'
+320-RTP-3-1101: '91.55384063720703'
+320-RTY-3-2101: '102.1227493286133'
+320-RTY-3-3101: '99.11091613769531'
+411-REI-1-1110-0030: ''

BIN
static/ventil_green.png


BIN
static/ventil_red.png


+ 2 - 2
status.html

@@ -109,10 +109,10 @@ function myTimer() {
                         var on_attr = $("#" + key).attr('data-on');
                         var off_attr = $("#" + key).attr('data-off');
  			if (parseFloat(response[key]) == parseFloat(on_attr)) {
- 			    $("img", "#" + key).attr("src", "{{ static_url('ventil_active.png') }}");
+ 			    $("img", "#" + key).attr("src", "{{ static_url('ventil_green.png') }}");
       			}
  			if (parseFloat(response[key]) == parseFloat(off_attr)) {
- 			    $("img", "#" + key).attr("src", "{{ static_url('ventil_inactive.png') }}");
+ 			    $("img", "#" + key).attr("src", "{{ static_url('ventil_red.png') }}");
       			}
 		    } else if (data_type == "integer-to-string") {
                         var dict_attr = JSON.parse($("#" + key).attr('data-dict'));

+ 32 - 8
style.yaml

@@ -1,17 +1,41 @@
+320-MOD-0-0001:
+  dict: '{"1":"bake out","2":"Cool-Down","3":"Argon-Preparation","4":"Standby","5":"Standard
+    Operation","6":"Regeneration","7":"Warm-Up","8":"CKrS Calibration"}'
+  header:
+    size: 28px
+    title: 'Operation mode    '
+    weight: '400'
+  height: 211
+  left: 223px
+  top: 98px
+  type: integer-to-string
+  unit:
+    size: 28px
+    title: ''
+    weight: '400'
+  width: 107
 320-RTY-3-3101:
   condition: ''
   header:
     size: 28px
-    title: ' '
+    title: '   '
     weight: '400'
-  height: 98
-  larger: '70'
-  left: 747px
-  lesser: '0'
-  top: 263px
+  height: 96
+  larger: '77'
+  left: 182px
+  lesser: '77'
+  top: 834px
   type: data
   unit:
     size: 28px
-    title: K
+    title: '  K'
     weight: '400'
-  width: 160
+  width: 164
+411-REI-1-1110-0030:
+  height: 51
+  left: 517px
+  'off': '1'
+  'on': '0'
+  top: 142px
+  type: ventil
+  width: 50

+ 4 - 0
varname.yaml

@@ -1,2 +1,6 @@
+311-RBY-1-5051: db_server=cscryo&db_name=ControlSystem_Cryo&db_group=310DPS_Magnetsteuerung&db_mask=39
 320-MOD-0-0001: db_server=cscps&db_name=ControlSystem_CPS&db_group=320_SYS&db_mask=0
+320-RTP-3-1101: db_server=cscps&db_name=ControlSystem_CPS&db_group=320_STR_Strahlrohr&db_mask=180
+320-RTY-3-2101: db_server=cscps&db_name=ControlSystem_CPS&db_group=320_STR_Strahlrohr&db_mask=213
 320-RTY-3-3101: db_server=cscps&db_name=ControlSystem_CPS&db_group=320_STR_Strahlrohr&db_mask=222
+411-REI-1-1110-0030: db_server=aircoils&db_name=aircoils_rep&db_group=0&db_mask=84