comparison layer/ScrollableMagRangeCache.h @ 1353:86429ff00f05

Merge from branch zoom

  */
 class ScrollableMagRangeCache
 {
 public:
     ScrollableMagRangeCache() :
-        m_startFrame(0),
-        m_zoomLevel(0)
+        m_startFrame(0)
     {}
 
     void invalidate() {
         m_ranges = std::vector<MagnitudeRange>(m_ranges.size());
     }

         if (getWidth() != newWidth) {
             m_ranges = std::vector<MagnitudeRange>(newWidth);
         }
     }
         
-    int getZoomLevel() const {
+    ZoomLevel getZoomLevel() const {
         return m_zoomLevel;
     }
 
     /**
      * Set the zoom level. If the new zoom level differs from the
      * current one, the cache is invalidated. (Determining whether to
      * invalidate the cache here is the only thing the zoom level is
      * used for.)
      */
-    void setZoomLevel(int zoom) {
+    void setZoomLevel(ZoomLevel zoom) {
+        using namespace std::rel_ops;
         if (m_zoomLevel != zoom) {
             m_zoomLevel = zoom;
             invalidate();
         }
     }

     void sampleColumn(int column, const MagnitudeRange &r);
     
 private:
     std::vector<MagnitudeRange> m_ranges;
     sv_frame_t m_startFrame;
-    int m_zoomLevel;
+    ZoomLevel m_zoomLevel;
 };
 
 #endif