# HG changeset patch # User Lucas Thompson # Date 1493757079 -3600 # Node ID 74f36b4777ff17e0ab9821a3d3f2017a0ac98a4f # Parent 9c9ac77d74484410a730aa80379ff78ead49a319# Parent 88ac87b1800e913980ea9330a02ab21afa6980e5 Merge branch 'master' of github.com:cannam/ugly-duckling into cc-vertical-scale diff -r 9c9ac77d7448 -r 74f36b4777ff package.json --- a/package.json Fri Apr 28 15:46:23 2017 +0100 +++ b/package.json Tue May 02 21:31:19 2017 +0100 @@ -27,7 +27,7 @@ "piper": "github:piper-audio/piper-js", "requirejs": "^2.3.3", "rxjs": "^5.1.0", - "waves-ui": "github:cannam/waves-ui", + "waves-ui": "github:cannam/waves-ui#b7675bcb81fc79a8b24eff2e1e3606a754df88aa", "zone.js": "0.8.7" }, "devDependencies": { diff -r 9c9ac77d7448 -r 74f36b4777ff src/app/waveform/waveform.component.ts --- a/src/app/waveform/waveform.component.ts Fri Apr 28 15:46:23 2017 +0100 +++ b/src/app/waveform/waveform.component.ts Tue May 02 21:31:19 2017 +0100 @@ -651,10 +651,22 @@ waveTrack, this.timeline.timeContext ); + const scaleLayer = new wavesUI.helpers.ScaleLayer({ + tickColor: colour, + textColor: colour, + height: height, + yDomain: [ min, max ] + }); + this.addLayer( + scaleLayer, + waveTrack, + this.timeline.timeContext + ); this.highlightLayer = new wavesUI.helpers.HighlightLayer(lineLayer, { opacity: 0.7, height: height, color: '#c33c54', + labelOffset: 38, yDomain: [ min, max ] }); this.addLayer(