comparison widgets/Pane.cpp @ 44:ad214997dddb

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

     setObjectName("Pane");
     setMouseTracking(true);
 }
 
 bool
-Pane::shouldIlluminateLocalFeatures(const Layer *layer, QPoint &pos)
+Pane::shouldIlluminateLocalFeatures(const Layer *layer, QPoint &pos) const
 {
     QPoint discard;
     bool b0, b1;
 
     if (layer == getSelectedLayer() &&

 }
 
 bool
 Pane::shouldIlluminateLocalSelection(QPoint &pos,
 				     bool &closeToLeft,
-				     bool &closeToRight)
+				     bool &closeToRight) const
 {
     if (m_identifyFeatures &&
 	m_manager &&
 	m_manager->getToolMode() == ViewManager::EditMode &&
 	!m_manager->getSelections().empty() &&

 
 	if (dynamic_cast<WaveformLayer *>(*vi)) {
 	    waveformModel = (*vi)->getModel();
 	}
 
-	int sw = (*vi)->getVerticalScaleWidth(paint);
+	int sw = (*vi)->getVerticalScaleWidth(this, paint);
 
 	if (sw > 0 && r.left() < sw) {
 
 //	    Profiler profiler("Pane::paintEvent - painting vertical scale", true);
 

 	    paint.setPen(Qt::black);
 	    paint.setBrush(Qt::white);
 	    paint.drawRect(0, 0, sw, height());
 
 	    paint.setBrush(Qt::NoBrush);
-	    (*vi)->paintVerticalScale(paint, QRect(0, 0, sw, height()));
+	    (*vi)->paintVerticalScale(this, paint, QRect(0, 0, sw, height()));
 
 	    paint.restore();
 	}
 	
 	if (m_identifyFeatures) {
 
 	    QPoint pos = m_identifyPoint;
-	    QString desc = (*vi)->getFeatureDescription(pos);
+	    QString desc = (*vi)->getFeatureDescription(this, pos);
 	    
 	    if (desc != "") {
 
 		paint.save();
 

 
     paint.end();
 }
 
 Selection
-Pane::getSelectionAt(int x, bool &closeToLeftEdge, bool &closeToRightEdge)
+Pane::getSelectionAt(int x, bool &closeToLeftEdge, bool &closeToRightEdge) const
 {
     closeToLeftEdge = closeToRightEdge = false;
 
     if (!m_manager) return Selection();
 

 	    size_t resolution = 1;
 	    int snapFrame = mouseFrame;
 	
 	    Layer *layer = getSelectedLayer();
 	    if (layer) {
-		layer->snapToFeatureFrame(snapFrame, resolution, Layer::SnapLeft);
+		layer->snapToFeatureFrame(this, snapFrame,
+					  resolution, Layer::SnapLeft);
 	    }
 	    
 	    if (snapFrame < 0) snapFrame = 0;
 	    m_selectionStartFrame = snapFrame;
 	    if (m_manager) {

 
     } else if (mode == ViewManager::DrawMode) {
 
 	Layer *layer = getSelectedLayer();
 	if (layer && layer->isLayerEditable()) {
-	    layer->drawStart(e);
+	    layer->drawStart(this, e);
 	}
 
     } else if (mode == ViewManager::EditMode) {
 
 	if (!editSelectionStart(e)) {
 	    Layer *layer = getSelectedLayer();
 	    if (layer && layer->isLayerEditable()) {
-		layer->editStart(e);
+		layer->editStart(this, e);
 	    }
 	}
     }
 
     emit paneInteractedWith();

 
     } else if (mode == ViewManager::DrawMode) {
 
 	Layer *layer = getSelectedLayer();
 	if (layer && layer->isLayerEditable()) {
-	    layer->drawEnd(e);
+	    layer->drawEnd(this, e);
 	    update();
 	}
 
     } else if (mode == ViewManager::EditMode) {
 
 	if (!editSelectionEnd(e)) {
 	    Layer *layer = getSelectedLayer();
 	    if (layer && layer->isLayerEditable()) {
-		layer->editEnd(e);
+		layer->editEnd(this, e);
 		update();
 	    }
 	}
     }
 

 	int snapFrameLeft = mouseFrame;
 	int snapFrameRight = mouseFrame;
 	
 	Layer *layer = getSelectedLayer();
 	if (layer) {
-	    layer->snapToFeatureFrame(snapFrameLeft, resolution, Layer::SnapLeft);
-	    layer->snapToFeatureFrame(snapFrameRight, resolution, Layer::SnapRight);
+	    layer->snapToFeatureFrame(this, snapFrameLeft,
+				      resolution, Layer::SnapLeft);
+	    layer->snapToFeatureFrame(this, snapFrameRight,
+				      resolution, Layer::SnapRight);
 	}
 	
 //	std::cerr << "snap: frame = " << mouseFrame << ", start frame = " << m_selectionStartFrame << ", left = " << snapFrameLeft << ", right = " << snapFrameRight << std::endl;
 
 	if (snapFrameLeft < 0) snapFrameLeft = 0;

 
     } else if (mode == ViewManager::DrawMode) {
 
 	Layer *layer = getSelectedLayer();
 	if (layer && layer->isLayerEditable()) {
-	    layer->drawDrag(e);
+	    layer->drawDrag(this, e);
 	}
 
     } else if (mode == ViewManager::EditMode) {
 
 	if (!editSelectionDrag(e)) {
 	    Layer *layer = getSelectedLayer();
 	    if (layer && layer->isLayerEditable()) {
-		layer->editDrag(e);
+		layer->editDrag(this, e);
 	    }
 	}
     }
 }
 

 
     if (mode == ViewManager::EditMode) {
 
 	Layer *layer = getSelectedLayer();
 	if (layer && layer->isLayerEditable()) {
-	    layer->editOpen(e);
+	    layer->editOpen(this, e);
 	}
     }
 }
 
 void