Mercurial > hg > svapp

changeset 681:c7406ebcd51c by-id

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update for ModelById
author Chris Cannam
date Mon, 24 Jun 2019 16:14:12 +0100
parents a82b9d410393
children 161063152ddd
files framework/Align.cpp framework/SVFileReader.cpp
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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);
--- 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;
                 }
             }