diff layer/SpectrogramLayer.h @ 1085:179ea8a2f650 spectrogram-minor-refactor

Add VerticalBinLayer to SpectrogramLayer
author Chris Cannam
date Fri, 01 Jul 2016 17:54:31 +0100
parents cb4c9fb37ddc
children 163cb9b98104
line wrap: on
line diff
--- a/layer/SpectrogramLayer.h	Fri Jul 01 11:37:46 2016 +0100
+++ b/layer/SpectrogramLayer.h	Fri Jul 01 17:54:31 2016 +0100
@@ -27,6 +27,7 @@
 #include "data/model/FFTModel.h"
 
 #include "ScrollableImageCache.h"
+#include "VerticalBinLayer.h"
 
 #include <QMutex>
 #include <QWaitCondition>
@@ -48,6 +49,7 @@
  */
 
 class SpectrogramLayer : public SliceableLayer,
+                         public VerticalBinLayer,
 			 public PowerOfSqrtTwoZoomConstraint
 {
     Q_OBJECT
@@ -208,6 +210,10 @@
     double getYForFrequency(const LayerGeometryProvider *v, double frequency) const;
     double getFrequencyForY(const LayerGeometryProvider *v, int y) const;
 
+    //!!! VerticalBinLayer methods. Note overlap with get*BinRange()
+    double getYForBin(LayerGeometryProvider *, double bin) const;
+    double getBinForY(LayerGeometryProvider *, double y) const;
+    
     virtual int getCompletion(LayerGeometryProvider *v) const;
     virtual QString getError(LayerGeometryProvider *v) const;