# HG changeset patch # User Lucas Thompson # Date 1496238586 -3600 # Node ID a3b45218c311f5e1393cd5a7ba7935fa396ed7f5 # Parent 9fe6e00e07003f576d3c47d1bdf3ba08183a4217 Move colour prop to base class diff -r 9fe6e00e0700 -r a3b45218c311 src/app/analysis-item/analysis-item.component.html --- a/src/app/analysis-item/analysis-item.component.html Wed May 31 13:59:29 2017 +0100 +++ b/src/app/analysis-item/analysis-item.component.html Wed May 31 14:49:46 2017 +0100 @@ -19,11 +19,13 @@ > - diff -r 9fe6e00e0700 -r a3b45218c311 src/app/visualisations/tracks/tracks.components.ts --- a/src/app/visualisations/tracks/tracks.components.ts Wed May 31 13:59:29 2017 +0100 +++ b/src/app/visualisations/tracks/tracks.components.ts Wed May 31 14:49:46 2017 +0100 @@ -33,7 +33,6 @@ this.currentState = generatePlotData(input); this.update(); } - @Input() colour: string; get tracks(): TracksFeature { return this.mFeature; diff -r 9fe6e00e0700 -r a3b45218c311 src/app/visualisations/waveform/waveform.component.ts --- a/src/app/visualisations/waveform/waveform.component.ts Wed May 31 13:59:29 2017 +0100 +++ b/src/app/visualisations/waveform/waveform.component.ts Wed May 31 14:49:46 2017 +0100 @@ -56,7 +56,7 @@ const waveformLayer = new wavesUI.helpers.WaveformLayer(buffer, { top: (height - totalWaveHeight) / 2 + waveHeight * ch, height: waveHeight, - color: '#0868ac', + color: this.colour, channel: ch }); this.addLayer(waveformLayer, this.waveTrack, this.timeline.timeContext); diff -r 9fe6e00e0700 -r a3b45218c311 src/app/visualisations/waves-base.component.ts --- a/src/app/visualisations/waves-base.component.ts Wed May 31 13:59:29 2017 +0100 +++ b/src/app/visualisations/waves-base.component.ts Wed May 31 14:49:46 2017 +0100 @@ -20,6 +20,7 @@ } @Input() timeline: Timeline; @Input() onSeek: OnSeekHandler; + @Input() colour: string; protected layers: Layer[]; protected zoomOnMouseDown: number;