comparison layer/TimeRulerLayer.cpp @ 1325:bc2cb82050a0 zoom

Gradual ZoomLevel updates

     // We always use the exact incms in our calculations for where to
     // draw the actual ticks or lines.
 
     int minPixelSpacing = 50;
     sv_frame_t incFrame = lrint((incms * sampleRate) / 1000);
-    int incX = int(incFrame / v->getZoomLevel());
+    int incX = int(round(v->getZoomLevel().framesToPixels(incFrame)));
     int ticks = 10;
     if (incX < minPixelSpacing * 2) {
         ticks = quarter ? 4 : 5;
     }
 

         // a different pixel when scrolling a small amount and
         // re-drawing with a different start frame).
 
         double dms = ms;
         sv_frame_t frame = lrint((dms * sampleRate) / 1000.0);
-        frame /= v->getZoomLevel();
-        frame *= v->getZoomLevel(); // so frame corresponds to an exact pixel
+        ZoomLevel zoom = v->getZoomLevel();
+        if (zoom.zone == ZoomLevel::FramesPerPixel) {
+            frame /= zoom.level;
+            frame *= zoom.level; // so frame corresponds to an exact pixel
+        }
 
         if (frame == prevframe && prevframe != 0) {
             cerr << "ERROR: frame == prevframe (== " << frame
                  << ") in TimeRulerLayer::paint" << endl;
             throw std::logic_error("frame == prevframe in TimeRulerLayer::paint");

 
         for (int i = 1; i < ticks; ++i) {
 
             dms = ms + (i * double(incms)) / ticks;
             frame = lrint((dms * sampleRate) / 1000.0);
-            frame /= v->getZoomLevel();
-            frame *= v->getZoomLevel(); // exact pixel as above
+            if (zoom.zone == ZoomLevel::FramesPerPixel) {
+                frame /= zoom.level;
+                frame *= zoom.level; // exact pixel as above
+            } 
 
             x = v->getXForFrame(frame);
 
             if (x < rect.x() || x >= rect.x() + rect.width()) {
 #ifdef DEBUG_TIME_RULER_LAYER