comparison framework/Document.h @ 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.

 
 class Model;
 class Layer;
 class View;
 class WaveFileModel;
+class AggregateWaveModel;
 
 class AdditionalModelConverter;
 
 class Align;
 

      * Add an imported (non-derived, non-main) model.  This is
      * necessary to register any imported model that is associated
      * with a layer.
      */
     void addImportedModel(Model *);
+    
+    /**
+     * Add an aggregate model (one which represents a set of component
+     * wave models as one model per channel in a single wave
+     * model). Aggregate models are unusual in that they are created
+     * for a single transform each and have no refcount. (This
+     * probably isn't ideal!) They are recorded separately from other
+     * models, and will be deleted if any of their component models
+     * are removed.
+     */
+    void addAggregateModel(AggregateWaveModel *);
 
     /**
      * Associate the given model with the given layer.  The model must
      * have already been registered using one of the addXXModel
      * methods above.

     void alignmentComplete(AlignmentModel *);
     void alignmentFailed(QString message);
 
     void activity(QString);
 
+protected slots:
+    void aggregateModelInvalidated();
+    
 protected:
     void releaseModel(Model *model);
 
     /**
      * If model is suitable for alignment, align it against the main

      * Add an extra derived model (returned at the end of processing a
      * transform).
      */
     void addAdditionalModel(Model *);
 
+    std::set<Model *> m_aggregateModels;
+    
     class AddLayerCommand : public Command
     {
     public:
 	AddLayerCommand(Document *d, View *view, Layer *layer);
 	virtual ~AddLayerCommand();