Mercurial > hg > ugly-duckling

changeset 277:ce44d0fbda3b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch 'dev/custom-material-theme' of github.com:piper-audio/ugly-duckling into cc-vertical-scale
author Lucas Thompson <dev@lucas.im>
date Tue, 02 May 2017 22:11:38 +0100
parents 74f36b4777ff (diff) 080216cdff3f (current diff)
children 7714e4fc1e57
files package.json
diffstat 2 files changed, 13 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/package.json	Tue May 02 17:16:38 2017 +0100
+++ b/package.json	Tue May 02 22:11:38 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": {
--- a/src/app/waveform/waveform.component.ts	Tue May 02 17:16:38 2017 +0100
+++ b/src/app/waveform/waveform.component.ts	Tue May 02 22:11:38 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(