diff framework/Document.cpp @ 588:d122d3595a32

Store aggregate models in the document and release them when they are invalidated (because their components have been released). They're no longer leaked, but we still don't save them in the session file.

--- a/framework/Document.cpp	Mon Feb 27 13:24:11 2017 +0000
+++ b/framework/Document.cpp	Mon Feb 27 16:26:37 2017 +0000
@@ -22,6 +22,7 @@
 #include "data/model/DenseThreeDimensionalModel.h"
 #include "data/model/DenseTimeValueModel.h"
 #include "data/model/FlexiNoteModel.h"
+#include "data/model/AggregateWaveModel.h"
 
 #include "layer/Layer.h"
 #include "widgets/CommandHistory.h"
@@ -544,6 +545,7 @@
     for (ModelMap::iterator i = m_models.begin(); i != m_models.end(); ++i) {
         if (i->second.additional) {
             Model *m = i->first;
+            m->aboutToDelete();
             emit modelAboutToBeDeleted(m);
             delete m;
         }
@@ -697,6 +699,22 @@
     emit modelAdded(model);
 }
 
+void
+Document::addAggregateModel(AggregateWaveModel *model)
+{
+    connect(model, SIGNAL(modelInvalidated()),
+            this, SLOT(aggregateModelInvalidated()));
+    m_aggregateModels.insert(model);
+}
+
+void
+Document::aggregateModelInvalidated()
+{
+    QObject *s = sender();
+    AggregateWaveModel *aggregate = qobject_cast<AggregateWaveModel *>(s);
+    if (aggregate) releaseModel(aggregate);
+}
+
 Model *
 Document::addDerivedModel(const Transform &transform,
                           const ModelTransformer::Input &input,
@@ -775,18 +793,20 @@
     bool toDelete = false;
 
     if (m_models.find(model) != m_models.end()) {
-	
 	if (m_models[model].refcount == 0) {
-	    cerr << "WARNING: Document::releaseModel: model " << model
-		      << " reference count is zero already!" << endl;
+	    SVCERR << "WARNING: Document::releaseModel: model " << model
+                   << " reference count is zero already!" << endl;
 	} else {
 	    if (--m_models[model].refcount == 0) {
 		toDelete = true;
 	    }
 	}
+    } else if (m_aggregateModels.find(model) != m_aggregateModels.end()) {
+        SVDEBUG << "Document::releaseModel: is an aggregate model" << endl;
+        toDelete = true;
     } else { 
-	cerr << "WARNING: Document::releaseModel: Unfound model "
-		  << model << endl;
+	SVCERR << "WARNING: Document::releaseModel: Unfound model "
+               << model << endl;
 	toDelete = true;
     }
 
@@ -803,9 +823,9 @@
 
 	if (sourceCount > 0) {
 	    SVDEBUG << "Document::releaseModel: Deleting model "
-		      << model << " even though it is source for "
-		      << sourceCount << " other derived model(s) -- resetting "
-		      << "their source fields appropriately" << endl;
+                    << model << " even though it is source for "
+                    << sourceCount << " other derived model(s) -- resetting "
+                    << "their source fields appropriately" << endl;
 	}
 
         model->aboutToDelete();