diff 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
line wrap: on
line diff
--- a/framework/Align.h	Tue Apr 02 14:45:57 2019 +0100
+++ b/framework/Align.h	Thu Apr 04 11:16:29 2019 +0100
@@ -23,6 +23,7 @@
 
 class Model;
 class AlignmentModel;
+class Document;
 
 class Align : public QObject
 {
@@ -47,10 +48,18 @@
      * Align object will simply share the process or document
      * lifespan.
      */
-    bool alignModel(Model *reference, Model *other); // via user preference
+    bool alignModel(Document *doc,
+                    Model *reference,
+                    Model *other); // via user preference
     
-    bool alignModelViaTransform(Model *reference, Model *other);
-    bool alignModelViaProgram(Model *reference, Model *other, QString program);
+    bool alignModelViaTransform(Document *doc,
+                                Model *reference,
+                                Model *other);
+
+    bool alignModelViaProgram(Document *doc,
+                              Model *reference,
+                              Model *other,
+                              QString program);
 
     /**
      * Return true if the alignment facility is available (relevant