diff --git a/src/components/CanGraph.js b/src/components/CanGraph.js index a23435d..9c950fb 100644 --- a/src/components/CanGraph.js +++ b/src/components/CanGraph.js @@ -37,19 +37,19 @@ export default class CanGraph extends Component { if(this.view) { // only update if segment is new let segmentChanged = false; - // if(this.segmentIsNew(nextProps.segment)) { - // if(nextProps.segment.length > 0) { - // // Set segmented domain - // this.view.signal('segment', nextProps.segment) - // } else { - // // Reset segment to full domain - // const xVals = this.props.data.map((d) => d.xRel); - // const min = Math.min.apply(null, xVals); - // const max = Math.max.apply(null, xVals); - // this.view.signal('segment', [min, max]); - // } - // segmentChanged = true; - // } + if(this.segmentIsNew(nextProps.segment)) { + if(nextProps.segment.length > 0) { + // Set segmented domain + this.view.signal('segment', nextProps.segment) + } else { + // Reset segment to full domain + const xVals = this.props.data.map((d) => d.xRel); + const min = Math.min.apply(null, xVals); + const max = Math.max.apply(null, xVals); + this.view.signal('segment', [min, max]); + } + segmentChanged = true; + } if(nextProps.currentTime != this.props.currentTime) { this.view.signal('videoTime', nextProps.currentTime); @@ -78,8 +78,16 @@ export default class CanGraph extends Component { } onSignalSegment(signal, segment) { - console.log(signal, segment); + if(!Array.isArray(segment)) { + return; + } + this.props.onSegmentChanged(segment); + if(this.view) { + const state = this.view.getState(); + state.subcontext[0].signals.brush = 0; + this.view = this.view.setState(state); + } } render() { diff --git a/src/components/explorer.js b/src/components/explorer.js index d59b1f2..faa0685 100644 --- a/src/components/explorer.js +++ b/src/components/explorer.js @@ -38,7 +38,6 @@ export default class Explorer extends Component { this.onSignalPlotPressed = this.onSignalPlotPressed.bind(this); this.onSignalUnplotPressed = this.onSignalUnplotPressed.bind(this); this.onSegmentChanged = this.onSegmentChanged.bind(this); - this.resetSegment = this.resetSegment.bind(this); this.showAddSignal = this.showAddSignal.bind(this); this.onGraphTimeClick = this.onGraphTimeClick.bind(this); this.onUserSeek = this.onUserSeek.bind(this); @@ -186,15 +185,6 @@ export default class Explorer extends Component { return msg.entries[userSeekIndex].time; } - relativeSegment() { - const {segment} = this.state; - if(segment.length === 2) { - return [segment[0] - this.props.firstCanTime, - segment[1] - this.props.firstCanTime]; - } - return []; - } - addSignalsHeader() { const {shouldShowAddSignal} = this.state; return (
: null} + {this.state.segment.length > 0 ? +Reset Segment
+