comparison view/View.h @ 1475:84c4ddb38415 by-id

Further layer updates

 #include "base/ZoomConstraint.h"
 #include "base/PropertyContainer.h"
 #include "ViewManager.h"
 #include "base/XmlExportable.h"
 #include "base/BaseTypes.h"
+
+#include "data/model/Model.h"
 
 // #define DEBUG_VIEW_WIDGET_PAINT 1
 
 class Layer;
 class ViewPropertyContainer;

     double scaleSize(double size) const override;
     int scalePixelSize(int size) const override;
     double scalePenWidth(double width) const override;
     QPen scalePen(QPen pen) const override;
 
-    typedef std::set<Model *> ModelSet;
+    typedef std::set<ModelId> ModelSet;
     ModelSet getModels();
 
     //!!!
-    Model *getAligningModel() const;
+    ModelId getAligningModel() const;
     sv_frame_t alignFromReference(sv_frame_t) const;
     sv_frame_t alignToReference(sv_frame_t) const;
     sv_frame_t getAlignedPlaybackFrame() const;
 
     void updatePaintRect(QRect r) override { update(r); }