# HG changeset patch
# User Chris Cannam
# Date 1561389252 -3600
# Node ID c7406ebcd51c423e779a6d1605f7d2180eb75a06
# Parent  a82b9d4103931650e3d3c7ffa54ef0530ba3d875
Update for ModelById

diff -r a82b9d410393 -r c7406ebcd51c framework/Align.cpp
--- a/framework/Align.cpp	Fri Jun 14 17:19:37 2019 +0100
+++ b/framework/Align.cpp	Mon Jun 24 16:14:12 2019 +0100
@@ -139,10 +139,10 @@
     AggregateWaveModel::ChannelSpecList components;
 
     components.push_back(AggregateWaveModel::ModelChannelSpec
-                         (reference, -1));
+                         (reference->getId(), -1));
 
     components.push_back(AggregateWaveModel::ModelChannelSpec
-                         (rm, -1));
+                         (rm->getId(), -1));
 
     AggregateWaveModel *aggregateModel = new AggregateWaveModel(components);
     doc->addAggregateModel(aggregateModel);
diff -r a82b9d410393 -r c7406ebcd51c framework/SVFileReader.cpp
--- a/framework/SVFileReader.cpp	Fri Jun 14 17:19:37 2019 +0100
+++ b/framework/SVFileReader.cpp	Mon Jun 24 16:14:12 2019 +0100
@@ -422,8 +422,10 @@
                     dynamic_cast<RangeSummarisableTimeValueModel *>
                     (m_models[componentId]);
                 if (rs) {
+                    //!!! NB difference between model id and model
+                    //!!! export id - we need to be clearer about this
                     specs.push_back(AggregateWaveModel::ModelChannelSpec
-                                    (rs, -1));
+                                    (rs->getId(), -1));
                     found = true;
                 }
             }