diff base/Layer.cpp @ 36:935a2419a77c

* Refactor Layer classes so as no longer to store a single View pointer; instead they need to be able to draw themselves on any View on demand. Layers with caches (e.g. spectrogram) will need to be further refactored so as to maintain a per-View cache * Begin refactoring MainWindow by pulling out the document stuff (set of layers, models etc) into a Document class. Not yet in use. This revision is fairly unstable.
author Chris Cannam
date Thu, 02 Mar 2006 16:58:49 +0000
parents 5e28cbb431d0
children e1a0cf2dcc79
line wrap: on
line diff
--- a/base/Layer.cpp	Wed Mar 01 18:13:01 2006 +0000
+++ b/base/Layer.cpp	Thu Mar 02 16:58:49 2006 +0000
@@ -15,10 +15,10 @@
 #include "layer/LayerFactory.h" //!!! shouldn't be including this here -- does that suggest we need to move this into layer/ ?
 #include "PlayParameterRepository.h"
 
-Layer::Layer(View *w) :
+Layer::Layer() :
     m_dormant(false)
 {
-    m_view = w;
+//    m_view = w;
 
     // Subclass must call this:
 //    w->addLayer(this);
@@ -26,7 +26,7 @@
 
 Layer::~Layer()
 {
-    m_view->removeLayer(this);
+//    m_view->removeLayer(this);
 }
 
 QString
@@ -42,7 +42,7 @@
     QObject::setObjectName(name);
     emit layerNameChanged();
 }
-
+/*
 int
 Layer::getXForFrame(long frame) const
 {
@@ -56,7 +56,7 @@
     if (m_view) return m_view->getFrameForX(x);
     else return 0;
 }
-
+*/
 QString
 Layer::toXmlString(QString indent, QString extraAttributes) const
 {
@@ -87,9 +87,9 @@
 }
 
 void
-Layer::showLayer(bool show)
+Layer::showLayer(View *view, bool show)
 {
-    setLayerDormant(!show);
+    setLayerDormant(view, !show);
     emit layerParametersChanged();
 }