comparison framework/Align.h @ 664:06db8f3ceb95 single-point

Update so Document owns the alignment model's input aggregate model, just as any other model
author Chris Cannam
date Thu, 04 Apr 2019 11:16:29 +0100
parents b23db4cef02f
children 0960e27c3232
comparison
equal deleted inserted replaced
663:351b1302064e 664:06db8f3ceb95
21 #include <QProcess> 21 #include <QProcess>
22 #include <set> 22 #include <set>
23 23
24 class Model; 24 class Model;
25 class AlignmentModel; 25 class AlignmentModel;
26 class Document;
26 27
27 class Align : public QObject 28 class Align : public QObject
28 { 29 {
29 Q_OBJECT 30 Q_OBJECT
30 31
45 * The Align object must survive after this call, for at least as 46 * The Align object must survive after this call, for at least as
46 * long as the alignment takes. The usual expectation is that the 47 * long as the alignment takes. The usual expectation is that the
47 * Align object will simply share the process or document 48 * Align object will simply share the process or document
48 * lifespan. 49 * lifespan.
49 */ 50 */
50 bool alignModel(Model *reference, Model *other); // via user preference 51 bool alignModel(Document *doc,
52 Model *reference,
53 Model *other); // via user preference
51 54
52 bool alignModelViaTransform(Model *reference, Model *other); 55 bool alignModelViaTransform(Document *doc,
53 bool alignModelViaProgram(Model *reference, Model *other, QString program); 56 Model *reference,
57 Model *other);
58
59 bool alignModelViaProgram(Document *doc,
60 Model *reference,
61 Model *other,
62 QString program);
54 63
55 /** 64 /**
56 * Return true if the alignment facility is available (relevant 65 * Return true if the alignment facility is available (relevant
57 * plugin installed, etc). 66 * plugin installed, etc).
58 */ 67 */