comparison src/app/waveform/waveform.component.ts @ 296:cda9307d9eb7

Start updating code to piper-js api with updated FeatureCollection

   FeatureExtractionService
 } from '../services/feature-extraction/feature-extraction.service';
 import {Subscription} from 'rxjs/Subscription';
 import {
   FeatureCollection,
-  FixedSpacedFeatures,
-  SimpleResponse
+  SimpleResponse,
+  VectorFeatures,
+  MatrixFeatures,
+  TrackFeature,
+  TrackFeatures
 } from 'piper/HigherLevelUtilities';
 import {toSeconds} from 'piper';
 import {FeatureList, Feature} from 'piper/Feature';
 import * as Hammer from 'hammerjs';
 import {WavesSpectrogramLayer} from '../spectrogram/Spectrogram';

     const height = this.trackDiv.nativeElement.getBoundingClientRect().height;
     const waveTrack = this.timeline.getTrackById(`wave-${this.trackIdPrefix}`);
 
     // TODO refactor all of this
     switch (features.shape) {
-      case 'vector': {
-        const stepDuration = (features as FixedSpacedFeatures).stepDuration;
-        const featureData = (features.data as Float32Array);
+    case 'vector': {
+	const collected = features.collected as VectorFeatures;
+        const stepDuration = collected.stepDuration;
+        const featureData = collected.data;
         if (featureData.length === 0) {
           return;
         }
         const plotData = [...featureData].map((feature, i) => {
           return {

           this.timeline.timeContext
         );
         break;
       }
       case 'list': {
-        const featureData = (features.data as FeatureList);
+	const featureData = features.collected as FeatureList;
         if (featureData.length === 0) {
           return;
         }
         // TODO look at output descriptor instead of directly inspecting features
         const hasDuration = outputDescriptor.configured.hasDuration;

           );
         }
         break;
       }
       case 'matrix': {
-        const stepDuration = (features as FixedSpacedFeatures).stepDuration;
+	const collected = features.collected as MatrixFeatures;
+        const stepDuration = collected.stepDuration;
         // !!! + start time
-        const matrixData = (features.data as Float32Array[]);
+        const matrixData = collected.data;
 
         if (matrixData.length === 0) {
           return;
         }