comparison data/model/Model.cpp @ 1767:aa0b56d72f27

Ensure the right model ID gets sent with the signal for alignment changes
author Chris Cannam
date Thu, 18 Jul 2019 13:17:49 +0100
parents ee7fd2c01d87
children 13bd41bd8a17
comparison
equal deleted inserted replaced
1766:85b9b466a59f 1767:aa0b56d72f27
45 SVDEBUG << "Model(" << this << "): accepting alignment model " 45 SVDEBUG << "Model(" << this << "): accepting alignment model "
46 << alignmentModel << endl; 46 << alignmentModel << endl;
47 47
48 if (auto model = ModelById::get(m_alignmentModel)) { 48 if (auto model = ModelById::get(m_alignmentModel)) {
49 disconnect(model.get(), SIGNAL(completionChanged(ModelId)), 49 disconnect(model.get(), SIGNAL(completionChanged(ModelId)),
50 this, SIGNAL(alignmentCompletionChanged(ModelId))); 50 this, SLOT(alignmentModelCompletionChanged(ModelId)));
51 } 51 }
52 52
53 m_alignmentModel = alignmentModel; 53 m_alignmentModel = alignmentModel;
54 54
55 if (auto model = ModelById::get(m_alignmentModel)) { 55 if (auto model = ModelById::get(m_alignmentModel)) {
56 connect(model.get(), SIGNAL(completionChanged(ModelId)), 56 connect(model.get(), SIGNAL(completionChanged(ModelId)),
57 this, SIGNAL(alignmentCompletionChanged(ModelId))); 57 this, SLOT(alignmentModelCompletionChanged(ModelId)));
58 } 58 }
59 }
60
61 void
62 Model::alignmentModelCompletionChanged(ModelId)
63 {
64 emit alignmentCompletionChanged(getId());
59 } 65 }
60 66
61 const ModelId 67 const ModelId
62 Model::getAlignment() const 68 Model::getAlignment() const
63 { 69 {