comparison 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.

 #include "data/model/WaveFileModel.h"
 #include "data/model/WritableWaveFileModel.h"
 #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"
 #include "base/Command.h"
 #include "view/View.h"

     }
 
     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;
         }
     }
 

         SVDEBUG << "Document::addAdditionalModel: auto-alignment is on, aligning model if possible" << endl;
         alignModel(model);
     }
 
     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,

     }
 
     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;
     }
 
     if (toDelete) {
 

 	    }
 	}
 
 	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();
 	emit modelAboutToBeDeleted(model);
 	m_models.erase(model);