comparison view/ViewManager.cpp @ 503:133b378d8efe

* more activity updates
author Chris Cannam
date Tue, 24 Feb 2009 16:44:43 +0000
parents 73a58a4dfebd
children fb8b1b2f7dea
comparison
equal deleted inserted replaced
502:73a58a4dfebd 503:133b378d8efe
17 #include "base/AudioPlaySource.h" 17 #include "base/AudioPlaySource.h"
18 #include "base/RealTime.h" 18 #include "base/RealTime.h"
19 #include "data/model/Model.h" 19 #include "data/model/Model.h"
20 #include "widgets/CommandHistory.h" 20 #include "widgets/CommandHistory.h"
21 #include "View.h" 21 #include "View.h"
22 #include "Overview.h"
22 23
23 #include <QSettings> 24 #include <QSettings>
24 #include <QApplication> 25 #include <QApplication>
25 26
26 #include <iostream> 27 #include <iostream>
506 emit globalCentreFrameChanged(f); 507 emit globalCentreFrameChanged(f);
507 } else { 508 } else {
508 if (v) emit viewCentreFrameChanged(v, f); 509 if (v) emit viewCentreFrameChanged(v, f);
509 } 510 }
510 511
511 emit activity(tr("Scroll view to %1") 512 if (!dynamic_cast<Overview *>(v) || (mode != PlaybackIgnore)) {
512 .arg(RealTime::frame2RealTime 513 emit activity(tr("Scroll to %1")
513 (f, m_mainModelSampleRate).toText().c_str())); 514 .arg(RealTime::frame2RealTime
515 (f, m_mainModelSampleRate).toText().c_str()));
516 }
514 517
515 if (mode == PlaybackIgnore) { 518 if (mode == PlaybackIgnore) {
516 return; 519 return;
517 } 520 }
518 521
564 #ifdef DEBUG_VIEW_MANAGER 567 #ifdef DEBUG_VIEW_MANAGER
565 std::cout << "ViewManager::viewZoomLevelChanged(" << v << ", " << z << ", " << locked << ")" << std::endl; 568 std::cout << "ViewManager::viewZoomLevelChanged(" << v << ", " << z << ", " << locked << ")" << std::endl;
566 #endif 569 #endif
567 570
568 emit viewZoomLevelChanged(v, z, locked); 571 emit viewZoomLevelChanged(v, z, locked);
569 emit activity(tr("Zoom to %n sample(s) per pixel", "", z)); 572
573 if (!dynamic_cast<Overview *>(v)) {
574 emit activity(tr("Zoom to %n sample(s) per pixel", "", z));
575 }
570 } 576 }
571 577
572 void 578 void
573 ViewManager::setOverlayMode(OverlayMode mode) 579 ViewManager::setOverlayMode(OverlayMode mode)
574 { 580 {