Commit bd45e59f authored by Dorian Goepp's avatar Dorian Goepp

Merge branch 'dgoepp/fixes#1' into 'master'

Dgoepp/fixes#1

See merge request behaviors-ai/the_dashboard!5
parents b08c0181 00c71891
......@@ -5,12 +5,12 @@ import FlexLayout, {Actions} from "flexlayout-react";
import {decorate, observable} from "mobx"
// The React Components that are going into tabs
import {VideoStream, DemoVideoStream} from "./VideoStream"
import { RosLineChart, DemoLineChart } from "./LineChart"
import { RosHGauge } from "./HorizontalGauge"
import { RosMemoryRanked, DemoMemoryRanked } from './MemoryRanked'
import { RosInteractionTrace, DemoInteractionTrace } from './InteractionTrace'
import { RosLatestInteraction, DemoLatestInteraction } from './LatestInteraction'
import { RosMood, DemoMood } from './Mood'
import {RosLineChart, DemoLineChart} from "./LineChart"
import {RosHGauge} from "./HorizontalGauge"
import {RosMemoryRanked, DemoMemoryRanked} from './MemoryRanked'
import {RosInteractionTrace, DemoInteractionTrace} from './InteractionTrace'
import {RosLatestInteraction, DemoLatestInteraction} from './LatestInteraction'
import {RosMood, DemoMood} from './Mood'
import DemoString from './String'
// get the default configuration for the layout
......
......@@ -13,11 +13,13 @@ class VideoStream extends Component {
url: hasUrl ? this.props.url : this.defaultImage
};
this.props.ros.getTopics(function(infos){
if (undefined !== infos.topics.find(elem => elem === this.topic)) {
this.setState({url: 'http://localhost:8081/stream?topic=' + this.topic});
}
}.bind(this))
if (this.props.ros) {
this.props.ros.getTopics(function(infos){
if (undefined !== infos.topics.find(elem => elem === this.topic)) {
this.setState({url: 'http://localhost:8081/stream?topic=' + this.topic});
}
}.bind(this))
}
}
handleSettingsChange(event) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment