changeset 489:ab43880f1cd5

Rename to something a bit more appropriate.

--- a/src/app/visualisations/curve/curve.component.ts	Wed Jul 05 18:42:12 2017 +0100
+++ b/src/app/visualisations/curve/curve.component.ts	Wed Jul 05 18:52:12 2017 +0100
@@ -12,7 +12,7 @@
 import {
   PlayheadManager,
   PlayheadRenderer,
-  VerticallyBounded,
+  VerticallyLabelled,
   VerticalScaleRenderer,
   VerticalValueInspectorRenderer,
   WavesComponent
@@ -32,7 +32,7 @@
     ></ugly-tracks>`,
   changeDetection: ChangeDetectionStrategy.OnPush,
   providers: [
-    {provide: VerticallyBounded, useExisting: CurveComponent },
+    {provide: VerticallyLabelled, useExisting: CurveComponent },
     {provide: VerticalScaleRenderer, useExisting: CurveComponent},
     {provide: VerticalValueInspectorRenderer, useExisting: CurveComponent},
     {provide: PlayheadRenderer, useExisting: CurveComponent },
@@ -66,7 +66,7 @@
     this.tracksComponent.renderScale(range);
   }
 
-  get range(): [number, number] {
-    return this.tracksComponent.range;
+  get labels(): [number, number] {
+    return this.tracksComponent.labels;
   }
 }

--- a/src/app/visualisations/grid/grid.component.ts	Wed Jul 05 18:42:12 2017 +0100
+++ b/src/app/visualisations/grid/grid.component.ts	Wed Jul 05 18:52:12 2017 +0100
@@ -3,7 +3,10 @@
  */
 import {
   VerticallyBinnedWavesComponent,
-  WavesComponent, PlayheadRenderer, VerticallyBounded, VerticalScaleRenderer
+  WavesComponent,
+  PlayheadRenderer,
+  VerticallyLabelled,
+  VerticalScaleRenderer
 } from '../waves-base.component';
 import {
   ChangeDetectionStrategy,
@@ -21,7 +24,7 @@
   styleUrls: ['../waves-template.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   providers: [
-    {provide: VerticallyBounded, useExisting: GridComponent },
+    {provide: VerticallyLabelled, useExisting: GridComponent },
     {provide: VerticalScaleRenderer, useExisting: GridComponent},
     {provide: PlayheadRenderer, useExisting: GridComponent },
     {provide: WavesComponent, useExisting: GridComponent}
@@ -64,7 +67,7 @@
     ];
   }
 
-  get range(): string[] {
+  get labels(): string[] {
     if (!this.feature.binNames || this.feature.binNames.length === 0) {
       const binCount = (this.feature.data.length > 0 ?
                         this.feature.data[0].length : 0);

--- a/src/app/visualisations/notes/notes.component.ts	Wed Jul 05 18:42:12 2017 +0100
+++ b/src/app/visualisations/notes/notes.component.ts	Wed Jul 05 18:52:12 2017 +0100
@@ -4,7 +4,7 @@
 import {
   InspectableVerticallyBoundedComponent,
   PlayheadRenderer,
-  VerticallyBounded,
+  VerticallyLabelled,
   VerticalScaleRenderer,
   VerticalValueInspectorRenderer,
   WavesComponent
@@ -23,7 +23,7 @@
   styleUrls: ['../waves-template.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   providers: [
-    { provide: VerticallyBounded, useExisting: NotesComponent },
+    { provide: VerticallyLabelled, useExisting: NotesComponent },
     { provide: VerticalScaleRenderer, useExisting: NotesComponent },
     {provide: VerticalValueInspectorRenderer, useExisting: NotesComponent },
     {provide: PlayheadRenderer, useExisting: NotesComponent},
@@ -33,7 +33,7 @@
 export class NotesComponent extends InspectableVerticallyBoundedComponent<Note[]> {
   private currentVerticalRange: [number, number];
 
-  get range(): [number, number] {
+  get labels(): [number, number] {
     return this.currentVerticalRange;
   }
 

--- a/src/app/visualisations/tracks/tracks.components.ts	Wed Jul 05 18:42:12 2017 +0100
+++ b/src/app/visualisations/tracks/tracks.components.ts	Wed Jul 05 18:52:12 2017 +0100
@@ -4,7 +4,7 @@
 import {
   InspectableVerticallyBoundedComponent,
   PlayheadRenderer,
-  VerticallyBounded,
+  VerticallyLabelled,
   VerticalScaleRenderer,
   VerticalValueInspectorRenderer,
   WavesComponent
@@ -24,7 +24,7 @@
   styleUrls: ['../waves-template.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   providers: [
-    {provide: VerticallyBounded, useExisting: TracksComponent },
+    {provide: VerticallyLabelled, useExisting: TracksComponent },
     {provide: VerticalScaleRenderer, useExisting: TracksComponent},
     {provide: VerticalValueInspectorRenderer, useExisting: TracksComponent},
     {provide: PlayheadRenderer, useExisting: TracksComponent },
@@ -40,7 +40,7 @@
     this.feature = input;
   }
 
-  get range(): [number, number] {
+  get labels(): [number, number] {
     return this.currentState && this.currentState.data.length > 0 ?
       this.currentState.yDomain : null;
   }

--- a/src/app/visualisations/vertical-scale.component.ts	Wed Jul 05 18:42:12 2017 +0100
+++ b/src/app/visualisations/vertical-scale.component.ts	Wed Jul 05 18:52:12 2017 +0100
@@ -34,7 +34,7 @@
 
   ngAfterViewInit(): void {
     this.bounded.forEach(component => {
-      this.cachedRange = component.range;
+      this.cachedRange = component.labels;
       if (this.cachedRange) {
         component.renderScale(this.cachedRange);
       }

--- a/src/app/visualisations/waves-base.component.ts	Wed Jul 05 18:42:12 2017 +0100
+++ b/src/app/visualisations/waves-base.component.ts	Wed Jul 05 18:52:12 2017 +0100
@@ -11,12 +11,12 @@
 const trackIdGenerator = countingIdProvider(0);
 
 // has to be an abstract class vs as interface for Angular's DI
-export abstract class VerticallyBounded<T> {
-  abstract get range(): T;
+export abstract class VerticallyLabelled<T> {
+  abstract get labels(): T;
 }
 
-export abstract class VerticalScaleRenderer<T> extends VerticallyBounded<T> {
-  abstract renderScale(range: T): void;
+export abstract class VerticalScaleRenderer<T> extends VerticallyLabelled<T> {
+  abstract renderScale(labels: T): void;
 }
 
 export abstract class VerticalValueInspectorRenderer
@@ -226,14 +226,14 @@
 export abstract class VerticallyBoundedWavesComponent
 <T extends ShapedFeatureData> extends WavesComponent<T>
   implements VerticalScaleRenderer<[number, number]> {
-  abstract range: [number, number];
+  abstract labels: [number, number];
 
-  renderScale(range: [number, number]): void {
+  renderScale(labels: [number, number]): void {
     this.addLayer(new Waves.helpers.ScaleLayer({
       tickColor: this.colour,
       textColor: this.colour,
       height: this.height,
-      yDomain: range
+      yDomain: labels
     }));
   }
 }
@@ -241,14 +241,14 @@
 export abstract class VerticallyBinnedWavesComponent
 <T extends ShapedFeatureData> extends WavesComponent<T>
   implements VerticalScaleRenderer<string[]> {
-  abstract range: string[];
+  abstract labels: string[];
 
-  renderScale(binNames: string[]): void {
+  renderScale(labels: string[]): void {
     this.addLayer(new Waves.helpers.DiscreteScaleLayer({
       tickColor: this.colour,
       textColor: this.colour,
       height: this.height,
-      binNames
+      labels
     }));
   }
 }