Mercurial > hg > svapp
changeset 160:64b09e5bda21
* rtmidi & activity updates
| author | Chris Cannam |
|---|---|
| date | Tue, 24 Feb 2009 17:25:55 +0000 |
| parents | 06fc6fc21739 |
| children | f90e277d2876 |
| files | framework/Document.cpp framework/Document.h framework/MainWindowBase.cpp framework/MainWindowBase.h |
| diffstat | 4 files changed, 16 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/framework/Document.cpp Tue Feb 24 16:44:43 2009 +0000 +++ b/framework/Document.cpp Tue Feb 24 17:25:55 2009 +0000 @@ -263,8 +263,13 @@ { Model *oldMainModel = m_mainModel; m_mainModel = model; - + emit modelAdded(m_mainModel); + if (model) { + emit activity(tr("Set main model to %1").arg(model->objectName())); + } else { + emit activity(tr("Clear main model")); + } std::vector<Layer *> obsoleteLayers; std::set<QString> failedTransformers;
--- a/framework/Document.h Tue Feb 24 16:44:43 2009 +0000 +++ b/framework/Document.h Tue Feb 24 17:25:55 2009 +0000 @@ -236,6 +236,8 @@ QString message); void alignmentFailed(QString transformName, QString message); + void activity(QString); + protected: void releaseModel(Model *model);
--- a/framework/MainWindowBase.cpp Tue Feb 24 16:44:43 2009 +0000 +++ b/framework/MainWindowBase.cpp Tue Feb 24 17:25:55 2009 +0000 @@ -713,8 +713,11 @@ void MainWindowBase::insertInstant() { - int frame = m_viewManager->getPlaybackFrame(); - insertInstantAt(frame); + if (m_playSource && m_playSource->isPlaying()) { + insertInstantAt(m_playSource->getCurrentPlayingFrame()); + } else { + insertInstantAt(m_viewManager->getPlaybackFrame()); + } } void @@ -1714,6 +1717,8 @@ this, SLOT(modelRegenerationWarning(QString, QString, QString))); connect(m_document, SIGNAL(alignmentFailed(QString, QString)), this, SLOT(alignmentFailed(QString, QString))); + + emit replacedDocument(); } bool
--- a/framework/MainWindowBase.h Tue Feb 24 16:44:43 2009 +0000 +++ b/framework/MainWindowBase.h Tue Feb 24 17:25:55 2009 +0000 @@ -142,6 +142,7 @@ void canSelectNextLayer(bool); void canSave(bool); void hideSplash(); + void replacedDocument(); public slots: virtual void preferenceChanged(PropertyContainer::PropertyName);