From 9f3145aedf535eaa232098ee74d66f7874749000 Mon Sep 17 00:00:00 2001
From: Markus Grigull <web@grigull.me>
Date: Wed, 12 Jul 2017 11:22:52 +0200
Subject: [PATCH] Update plot widget to new simulator connection

---
 src/components/dialog/edit-widget-signals-control.js | 8 ++++----
 src/components/widget-plot.js                        | 7 +++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/components/dialog/edit-widget-signals-control.js b/src/components/dialog/edit-widget-signals-control.js
index 76b832b..c52b928 100644
--- a/src/components/dialog/edit-widget-signals-control.js
+++ b/src/components/dialog/edit-widget-signals-control.js
@@ -28,7 +28,7 @@ class EditWidgetSignalsControl extends Component {
 
     this.state = {
       widget: {
-        simulator: ''
+        simulator: {}
       }
     };
   }
@@ -58,12 +58,12 @@ class EditWidgetSignalsControl extends Component {
 
     if (this.props.simulation) {
       // get selected simulation model
-      const simulationModel = this.props.simulation.models.find( model => model.simulator === this.state.widget.simulator );
+      const simulationModel = this.props.simulation.models.find( model => model.simulator.node === this.state.widget.simulator.node && model.simulator.simulator === this.state.widget.simulator.simulator );
 
       // If simulation model update the signals to render
       signalsToRender = simulationModel? simulationModel.mapping : [];
     }
-    
+
     return (
         <FormGroup>
           <ControlLabel>Signals</ControlLabel>
@@ -81,4 +81,4 @@ class EditWidgetSignalsControl extends Component {
   }
 }
 
-export default EditWidgetSignalsControl;
\ No newline at end of file
+export default EditWidgetSignalsControl;
diff --git a/src/components/widget-plot.js b/src/components/widget-plot.js
index ff0b1b1..c02aa97 100644
--- a/src/components/widget-plot.js
+++ b/src/components/widget-plot.js
@@ -27,7 +27,6 @@ import PlotLegend from './widget-plot/plot-legend';
 class WidgetPlot extends Component {
 
   render() {
-
     const simulator = this.props.widget.simulator;
     const simulation = this.props.simulation;
     let legendSignals = [];
@@ -36,10 +35,10 @@ class WidgetPlot extends Component {
     // Proceed if a simulation with models and a simulator are available
     if (simulator && simulation && simulation.models.length > 0) {
 
-      const model = simulation.models.find( (model) => model.simulator === simulator );
+      const model = simulation.models.find( model => model.simulator.node === simulator.node && model.simulator.simulator === simulator.simulator );
       const chosenSignals = this.props.widget.signals;
 
-      simulatorData = this.props.data[simulator];
+      simulatorData = this.props.data[simulator.node][simulator.simulator];
 
       // Query the signals that will be displayed in the legend
       legendSignals = model.mapping.reduce( (accum, model_signal, signal_index) => {
@@ -53,7 +52,7 @@ class WidgetPlot extends Component {
     return (
       <div className="plot-widget" ref="wrapper">
         <h4>{this.props.widget.name}</h4>
-        
+
         <div className="widget-plot">
           <Plot signals={ this.props.widget.signals } time={ this.props.widget.time } simulatorData={ simulatorData } yAxisLabel={ this.props.widget.ylabel } />
         </div>