From e8893f165ed1fba7c7ea0d56770dfbefac8ae704 Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Fri, 26 Jun 2020 15:57:47 +0200
Subject: [PATCH] Lamp and plot widgets consider signal scaling #130

---
 src/widget/widget-plot/plot-legend.js |  2 +-
 src/widget/widgets/lamp.js            |  4 ++--
 src/widget/widgets/plot.js            | 27 +++++++++++++++++++++++++--
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/widget/widget-plot/plot-legend.js b/src/widget/widget-plot/plot-legend.js
index f3f4cd6..5ac618c 100644
--- a/src/widget/widget-plot/plot-legend.js
+++ b/src/widget/widget-plot/plot-legend.js
@@ -27,7 +27,7 @@ class PlotLegend extends React.Component {
       <ul>
         {this.props.signals.map(signal =>
           <li key={signal.id} className="signal-legend" style={{ color: colorScale(signal.id) }}>
-            <span className="signal-legend-name">{signal.name}</span>
+            <span className="signal-legend-name">{signal.name + "(x" + signal.scalingFactor + ")"}</span>
             <span style={{ marginLeft: '0.3em' }} className="signal-unit">{signal.unit}</span>
           </li>
         )}
diff --git a/src/widget/widgets/lamp.js b/src/widget/widgets/lamp.js
index 939caed..c0ca9a0 100644
--- a/src/widget/widgets/lamp.js
+++ b/src/widget/widgets/lamp.js
@@ -49,8 +49,8 @@ class WidgetLamp extends Component {
 
     // check if value has changed
     const data = props.data[icID].output.values[signal[0].index-1];
-    if (data != null && Number(state.value) !== data[data.length - 1].y) {
-      return { value: data[data.length - 1].y };
+    if (data != null && Number(state.value) !== signal[0].scalingFactor * data[data.length - 1].y) {
+      return { value: signal[0].scalingFactor * data[data.length - 1].y };
     }
 
     return null;
diff --git a/src/widget/widgets/plot.js b/src/widget/widgets/plot.js
index 20245e2..e87e7d1 100644
--- a/src/widget/widgets/plot.js
+++ b/src/widget/widgets/plot.js
@@ -49,13 +49,31 @@ class WidgetPlot extends React.Component {
           if (sig.direction === "out") {
             if (props.data[icID] != null && props.data[icID].output != null && props.data[icID].output.values != null) {
               if (props.data[icID].output.values[sig.index-1] !== undefined) {
-                data.push(props.data[icID].output.values[sig.index-1]);
+                let values = props.data[icID].output.values[sig.index-1];
+                if(sig.scalingFactor !== 1) {
+                  let scaledValues = JSON.parse(JSON.stringify(values));
+                  for (let i=0; i< scaledValues.length; i++){
+                    scaledValues[i].y = scaledValues[i].y * sig.scalingFactor;
+                  }
+                  data.push(scaledValues);
+                } else {
+                  data.push(values);
+                }
               }
             }
           } else if (sig.direction === "in") {
             if (props.data[icID] != null && props.data[icID].input != null && props.data[icID].input.values != null) {
               if (props.data[icID].input.values[sig.index-1] !== undefined) {
-                data.push(props.data[icID].input.values[sig.index-1]);
+                let values = props.data[icID].output.values[sig.index-1];
+                if(sig.scalingFactor !== 1) {
+                  let scaledValues = JSON.parse(JSON.stringify(values));
+                  for (let i=0; i< scaledValues.length; i++){
+                    scaledValues[i].y = scaledValues[i].y * sig.scalingFactor;
+                  }
+                  data.push(scaledValues);
+                } else {
+                  data.push(values);
+                }
               }
             }
           }
@@ -67,6 +85,11 @@ class WidgetPlot extends React.Component {
 
   }
 
+
+  scaleData(data, scaleFactor){
+    // data is an array of value pairs x,y
+  }
+
   render() {
     return <div className="plot-widget" ref="wrapper">
       <div className="widget-plot">