comparison view/ViewManager.cpp @ 1353:86429ff00f05

Merge from branch zoom

 
 ViewManager::ViewManager() :
     m_playSource(0),
     m_recordTarget(0),
     m_globalCentreFrame(0),
-    m_globalZoom(1024),
+    m_globalZoom(ZoomLevel::FramesPerPixel, 1024),
     m_playbackFrame(0),
     m_playbackModel(0),
     m_mainModelSampleRate(0),
     m_lastLeft(0), 
     m_lastRight(0),

 #endif
     m_globalCentreFrame = f;
     emit globalCentreFrameChanged(f);
 }
 
-int
+ZoomLevel
 ViewManager::getGlobalZoom() const
 {
 #ifdef DEBUG_VIEW_MANAGER
     cerr << "ViewManager::getGlobalZoom: returning " << m_globalZoom << endl;
 #endif

         }
     }
 }
 
 void
-ViewManager::viewZoomLevelChanged(int z, bool locked)
+ViewManager::viewZoomLevelChanged(ZoomLevel z, bool locked)
 {
     View *v = dynamic_cast<View *>(sender());
 
     if (!v) {
         SVDEBUG << "ViewManager::viewZoomLevelChanged: WARNING: sender is not a view" << endl;

 #endif
 
     emit viewZoomLevelChanged(v, z, locked);
 
     if (!dynamic_cast<Overview *>(v)) {
-        emit activity(tr("Zoom to %n sample(s) per pixel", "", z));
+        if (z.zone == ZoomLevel::FramesPerPixel) {
+            emit activity(tr("Zoom to %n sample(s) per pixel", "", z.level));
+        } else {
+            emit activity(tr("Zoom to %n pixels per sample", "", z.level));
+        }
     }
 }
 
 void
 ViewManager::setOverlayMode(OverlayMode mode)