Add CALC support to Byte

JeffersonLab · Jun 28, 2021 · a241967 · a241967
1 parent c94572c
commit a241967
Showing 1 changed file with 18 additions and 0 deletions.
diff --git a/src/main/webapp/resources/widgets/ByteClass/widget.js b/src/main/webapp/resources/widgets/ByteClass/widget.js
@@ -36,6 +36,24 @@ jlab.wedm.BytePvObserverInit = function () {
                 $bits = $obj.find(".bit"),
                 index;
 
+        if (jlab.wedm.isCalcExpr(this.pvSet.ctrlPvExpr)) {
+            var pvs = [];
+            for (var i = 0; i < this.pvSet.ctrlPvs.length; i++) {
+                var name = this.pvSet.ctrlPvs[i],
+                    val;
+
+                val = this.pvNameToValueMap[name];
+
+                if (typeof val === 'undefined') {
+                    /*Still more PVs we need values from*/
+                    return;
+                }
+                pvs.push(val);
+            }
+
+            value = jlab.wedm.evalCalcExpr(this.pvSet.ctrlPvExpr, pvs);
+        }
+
         /*console.log("value: " + value);*/
 
         //$(".ActiveByte[data-pv='" + this.pv + "']").text(value);