comparison widgets/Pane.cpp @ 51:d2eac322d71b

* Tidying and bug fixes in document stuff and file load/save
* Add list of layer names (and source model names where appropriate) to pane

     if (e) {
 	paint.setClipRect(r);
     }
 
     const Model *waveformModel = 0; // just for reporting purposes
+    int verticalScaleWidth = 0;
     
     for (LayerList::iterator vi = m_layers.end(); vi != m_layers.begin(); ) {
 	--vi;
 
 	if (dynamic_cast<WaveformLayer *>(*vi)) {
 	    waveformModel = (*vi)->getModel();
 	}
 
-	int sw = (*vi)->getVerticalScaleWidth(this, paint);
-
-	if (sw > 0 && r.left() < sw) {
+	verticalScaleWidth = (*vi)->getVerticalScaleWidth(this, paint);
+
+	if (verticalScaleWidth > 0 && r.left() < verticalScaleWidth) {
 
 //	    Profiler profiler("Pane::paintEvent - painting vertical scale", true);
 
 //	    std::cerr << "Pane::paintEvent: calling paint.save() in vertical scale block" << std::endl;
 	    paint.save();
 
 	    paint.setPen(Qt::black);
 	    paint.setBrush(Qt::white);
-	    paint.drawRect(0, 0, sw, height());
+	    paint.drawRect(0, 0, verticalScaleWidth, height());
 
 	    paint.setBrush(Qt::NoBrush);
-	    (*vi)->paintVerticalScale(this, paint, QRect(0, 0, sw, height()));
+	    (*vi)->paintVerticalScale
+		(this, paint, QRect(0, 0, verticalScaleWidth, height()));
 
 	    paint.restore();
 	}
 	
 	if (m_identifyFeatures) {

 	    // from that of the main model.
 
 	    if (sampleRate == mainModelRate) {
 		if (sampleRate != playbackRate) srNote = " " + tr("(R)");
 	    } else {
+		std::cerr << "Sample rate = " << sampleRate << ", main model rate = " << mainModelRate << std::endl;
 		srNote = " " + tr("(X)");
 	    }
 
 	    QString desc = tr("%1 / %2Hz%3")
 		.arg(RealTime::frame2RealTime(waveformModel->getEndFrame(),
 					      sampleRate)
 		     .toText(false).c_str())
 		.arg(sampleRate)
 		.arg(srNote);
 
-	    paint.drawText(width() - paint.fontMetrics().width(desc) - 5,
+	    paint.drawText(verticalScaleWidth + 5,
+			   //width() - paint.fontMetrics().width(desc) - 5,
 			   height() - paint.fontMetrics().height() +
 			   paint.fontMetrics().ascent() - 6,
 			   desc);
+	}
+
+	std::vector<QString> texts;
+	int maxTextWidth = 0;
+
+	for (LayerList::iterator i = m_layers.begin(); i != m_layers.end(); ++i) {
+
+	    QString layerName = (*i)->objectName();
+	    QString modelName;
+	    if ((*i)->getModel()) modelName = (*i)->getModel()->objectName();
+	    
+	    QString text;
+	    if (modelName != "") {
+		text = QString("%1: %2").arg(modelName).arg(layerName);
+	    } else {
+		text = layerName;
+	    }
+	    
+	    texts.push_back(text);
+	    int tw = paint.fontMetrics().width(text);
+	    if (tw > maxTextWidth) maxTextWidth = tw;
+	}
+
+	int lly = height() - 6;
+
+	for (int i = 0; i < texts.size(); ++i) {
+
+	    if (i == texts.size() - 1) {
+		if (m_lightBackground) {
+		    paint.setPen(Qt::black);
+		} else {
+		    paint.setPen(Qt::white);
+		}
+	    }
+
+	    paint.drawText(width() - maxTextWidth - 5,
+			   lly - paint.fontMetrics().height() +
+			   paint.fontMetrics().ascent(),
+			   texts[i]);
+	    
+	    lly -= paint.fontMetrics().height();
 	}
     }
 
     if (m_clickedInRange && m_shiftPressed) {
 	if (m_manager && (m_manager->getToolMode() == ViewManager::NavigateMode)) {