From 00ce63c7a0440c52450d5cefcfb5d3571d80bad9 Mon Sep 17 00:00:00 2001
From: Markus Grigull <web@grigull.me>
Date: Fri, 4 May 2018 10:06:55 +0200
Subject: [PATCH] Upgrade gauge widget to simulation model

---
 src/components/widget-gauge.js | 13 ++++++++-----
 src/components/widget-table.js |  8 ++++++--
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/components/widget-gauge.js b/src/components/widget-gauge.js
index 0f2b7bd..91add2b 100644
--- a/src/components/widget-gauge.js
+++ b/src/components/widget-gauge.js
@@ -35,9 +35,13 @@ class WidgetGauge extends Component {
   }
 
   componentWillReceiveProps(nextProps) {
-    // update value
-    const simulator = nextProps.widget.simulator;
+    if (nextProps.simulationModel == null) {
+      return;
+    }
 
+    const simulator = nextProps.simulationModel.simulator;
+    
+    // update value
     if (nextProps.data == null || nextProps.data[simulator] == null
       || nextProps.data[simulator].output.values.length === 0  
       || nextProps.data[simulator].output.values[0].length === 0) {
@@ -176,9 +180,8 @@ class WidgetGauge extends Component {
     const componentClass = this.props.editing ? "gauge-widget editing" : "gauge-widget";
     let signalType = null;
 
-    if (this.props.simulation) {
-      const simulationModel = this.props.simulation.models.filter((model) => model.simulator.node === this.props.widget.simulator.node && model.simulator.simulator === this.props.widget.simulator.simulator)[0];
-      signalType = (simulationModel != null && simulationModel.length > 0 && this.props.widget.signal < simulationModel.length) ? simulationModel.outputMapping[this.props.widget.signal].type : '';
+    if (this.props.simulationModel != null) {
+      signalType = (this.props.simulationModel != null && this.props.simulationModel.outputLength > 0 && this.props.widget.signal < this.props.simulationModel.outputLength) ? this.props.simulationModel.outputMapping[this.props.widget.signal].type : '';
     }
 
     return (
diff --git a/src/components/widget-table.js b/src/components/widget-table.js
index a69cfc3..0e4b2ef 100644
--- a/src/components/widget-table.js
+++ b/src/components/widget-table.js
@@ -35,10 +35,14 @@ class WidgetTable extends Component {
   }
 
   componentWillReceiveProps(nextProps) {
-    // check data
+    if (nextProps.simulationModel == null) {
+      return;
+    }
+
     const simulator = nextProps.simulationModel.simulator;
 
-    if (nextProps.data == null || nextProps.simulationModel == null
+    // check data
+    if (nextProps.data == null
       || nextProps.data[simulator] == null
       || nextProps.data[simulator].output.length === 0 
       || nextProps.data[simulator].output.values.length === 0