Fixes #29

JeffersonLab · Oct 11, 2022 · d175356 · d175356
1 parent 0a38545
commit d175356
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 18 deletions.
diff --git a/examples/edl/wedm/tests/loc.edl b/examples/edl/wedm/tests/loc.edl
@@ -48,3 +48,19 @@ newPos
 objType "monitors"
 endObjectProperties
 
+# (Circle)
+object activeCircleClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 5
+y 127
+w 12
+h 12
+lineColor index  14
+lineWidth  1
+fill
+fillColor index 101
+alarmPv CALC\\\{A||B\}(LOC\\V1=i:0,LOC\\V2=i:1)
+endObjectProperties
diff --git a/src/main/webapp/resources/js/screen.js b/src/main/webapp/resources/js/screen.js
@@ -277,6 +277,20 @@ jlab.wedm.PvObserver = function (id, pvSet) {
 
         return pvs;
     };
+
+    jlab.wedm.PvObserver.prototype.handleCalcExpr = function(value) {
+        if (jlab.wedm.isCalcExpr(this.pvSet.colorPvExpr)) {
+            var pvs = this.toOrderedExpressionValues(this.pvSet.colorPvs);
+
+            if(pvs == null) {
+                return null; // We don't have complete set of variables yet!
+            }
+
+            value = jlab.wedm.evalCalcExpr(this.pvSet.colorPvExpr, pvs);
+        }
+
+        return value;
+    };
 };
 
 jlab.wedm.isLocalExpr = function (expr) {
@@ -426,9 +440,11 @@ jlab.wedm.parseLocalVar = function (expr) {
                 } else {
                     local.value = 0;
                 }
-            } else if (type !== "s") { // if not enum or string must be integer or double
+            } else if (type !== "s") { // if not enum or string must be integer or double or byte
                 if (local.value === '') { // Default is zero for numbers
                     local.value = 0;
+                } else { // Convert str to number else CALC expressions with LOC vars break on logical or and such
+                    local.value = local.value * 1;
                 }
             }
 

diff --git a/src/main/webapp/resources/widgets/activeRectangleClass/widget.js b/src/main/webapp/resources/widgets/activeRectangleClass/widget.js
@@ -84,22 +84,35 @@ jlab.wedm.ShapePvObserverInit = function () {
                 color,
                 stmt,
                 lineRuleIndex = $obj.attr("data-line-color-rule"),
-                fillRuleIndex = $obj.attr("data-fill-color-rule");
+                fillRuleIndex = $obj.attr("data-fill-color-rule"),
+                value = update.value;
 
         $obj[0].classList.remove("waiting-for-state");
 
         if (lineRuleIndex !== undefined) {
             stmt = jlab.wedm.colorRules[lineRuleIndex];
 
-            color = jlab.wedm.evalColorExpr.call(this, stmt, update.value);
+            value = this.handleCalcExpr(value);
+
+            if(value == null) {
+                return; // Still waiting for more updates
+            }
+
+            color = jlab.wedm.evalColorExpr.call(this, stmt, value);
 
             $shape.attr("stroke", color);
         }
 
         if (fillRuleIndex !== undefined) {
             stmt = jlab.wedm.colorRules[fillRuleIndex];
 
-            color = jlab.wedm.evalColorExpr.call(this, stmt, update.value);
+            value = this.handleCalcExpr(value);
+
+            if(value == null) {
+                return; // Still waiting for more updates
+            }
+
+            color = jlab.wedm.evalColorExpr.call(this, stmt, value);
 
             $shape.attr("fill", color);
         }

diff --git a/src/main/webapp/resources/widgets/activeXTextClass/widget.js b/src/main/webapp/resources/widgets/activeXTextClass/widget.js
@@ -89,20 +89,6 @@ jlab.wedm.StaticTextPvObserverInit = function () {
         }
     };
 
-    jlab.wedm.StaticTextPvObserver.prototype.handleCalcExpr = function(value) {
-        if (jlab.wedm.isCalcExpr(this.pvSet.colorPvExpr)) {
-            var pvs = this.toOrderedExpressionValues(this.pvSet.colorPvs);
-
-            if(pvs == null) {
-                return null; // We don't have complete set of variables yet!
-            }
-
-            value = jlab.wedm.evalCalcExpr(this.pvSet.colorPvExpr, pvs);
-        }
-
-        return value;
-    };
-
     jlab.wedm.StaticTextPvObserver.prototype.handleColorUpdate = function (update) {
         var $obj = $("#" + this.id),
                 color,