Mercurial > hg > svapp
comparison framework/Document.cpp @ 656:d8beda8a2126 single-point
Merge from branch osc-script
author | Chris Cannam |
---|---|
date | Thu, 28 Mar 2019 10:39:53 +0000 |
parents | 8ad6327b01cc |
children | 029c224384d1 |
comparison
equal
deleted
inserted
replaced
653:365c61ac7680 | 656:d8beda8a2126 |
---|---|
703 Document::addAggregateModel(AggregateWaveModel *model) | 703 Document::addAggregateModel(AggregateWaveModel *model) |
704 { | 704 { |
705 connect(model, SIGNAL(modelInvalidated()), | 705 connect(model, SIGNAL(modelInvalidated()), |
706 this, SLOT(aggregateModelInvalidated())); | 706 this, SLOT(aggregateModelInvalidated())); |
707 m_aggregateModels.insert(model); | 707 m_aggregateModels.insert(model); |
708 SVDEBUG << "Document::addAggregateModel(" << model << ")" << endl; | |
708 } | 709 } |
709 | 710 |
710 void | 711 void |
711 Document::aggregateModelInvalidated() | 712 Document::aggregateModelInvalidated() |
712 { | 713 { |
713 QObject *s = sender(); | 714 QObject *s = sender(); |
714 AggregateWaveModel *aggregate = qobject_cast<AggregateWaveModel *>(s); | 715 AggregateWaveModel *aggregate = qobject_cast<AggregateWaveModel *>(s); |
716 SVDEBUG << "Document::aggregateModelInvalidated(" << aggregate << ")" << endl; | |
715 if (aggregate) releaseModel(aggregate); | 717 if (aggregate) releaseModel(aggregate); |
716 } | 718 } |
717 | 719 |
718 Model * | 720 Model * |
719 Document::addDerivedModel(const Transform &transform, | 721 Document::addDerivedModel(const Transform &transform, |