comparison layer/SpectrogramLayer.h @ 97:a0e7edf9703a

* Use fractional window overlaps in the spectrogram, instead of percentages
  (90% is kind of meaningless when none of your window sizes are divisible
  by 10!)
* ResizeableBitmap -> ResizeableBitset and the odd other tidy up

 
 #include "base/Layer.h"
 #include "base/Window.h"
 #include "base/RealTime.h"
 #include "base/Thread.h"
-#include "base/ResizeableBitmap.h"
 #include "model/PowerOfSqrtTwoZoomConstraint.h"
 #include "model/DenseTimeValueModel.h"
 
 #include <QMutex>
 #include <QWaitCondition>

     int getChannel() const;
 
     void setWindowSize(size_t);
     size_t getWindowSize() const;
     
-    void setWindowOverlap(size_t percent);
-    size_t getWindowOverlap() const;
+    void setWindowHopLevel(size_t percent);
+    size_t getWindowHopLevel() const;
 
     void setWindowType(WindowType type);
     WindowType getWindowType() const;
 
     /**

     const DenseTimeValueModel *m_model; // I do not own this
     
     int                 m_channel;
     size_t              m_windowSize;
     WindowType          m_windowType;
-    size_t              m_windowOverlap;
+    size_t              m_windowHopLevel;
     float               m_gain;
     float               m_threshold;
     int                 m_colourRotation;
     size_t              m_minFrequency;
     size_t              m_maxFrequency;

     bool getXBinSourceRange(View *v, int x, RealTime &timeMin, RealTime &timeMax) const;
     bool getXYBinSourceRange(View *v, int x, int y, float &min, float &max,
 			     float &phaseMin, float &phaseMax) const;
 
     size_t getWindowIncrement() const {
-	return m_windowSize - m_windowSize * m_windowOverlap / 100;
+        if (m_windowHopLevel == 0) return m_windowSize;
+        else if (m_windowHopLevel == 1) return (m_windowSize * 3) / 4;
+        else return m_windowSize / (1 << (m_windowHopLevel - 1));
     }
 };
 
 #endif