comparison widgets/Pane.cpp @ 55:128ebfeeebee

* Add Insert Instant function in main window
* Ensure selections and window geometry are saved in session file
* Add wait cursor on session file save
* Various improvements to display of texts in pane (clearer readability)
* Use commands for setting properties on layers and panes
  (still need to batch up multiple sets on the same property)
* Fix failure of spectrogram to refresh when initial part became visible
* Some fixes & paint optimisations in View &c
* Make curve mode for time value layers work properly when resolution == 1
* Some vague improvements for time value layer vertical scale

     }
 
     const Model *waveformModel = 0; // just for reporting purposes
     int verticalScaleWidth = 0;
     
+    int fontHeight = paint.fontMetrics().height();
+    int fontAscent = paint.fontMetrics().ascent();
+
     for (LayerList::iterator vi = m_layers.end(); vi != m_layers.begin(); ) {
 	--vi;
 
 	if (dynamic_cast<WaveformLayer *>(*vi)) {
 	    waveformModel = (*vi)->getModel();

 	}
 
 	break;
     }
     
+    int sampleRate = getModelsSampleRate();
+    paint.setBrush(Qt::NoBrush);
+
     if (m_centreLineVisible) {
 
 	if (hasLightBackground()) {
 	    paint.setPen(QColor(50, 50, 50));
 	} else {
 	    paint.setPen(QColor(200, 200, 200));
 	}	
-	paint.setBrush(Qt::NoBrush);
 	paint.drawLine(width() / 2, 0, width() / 2, height() - 1);
-	
-//    QFont font(paint.font());
-//    font.setBold(true);
-//    paint.setFont(font);
-
-	int sampleRate = getModelsSampleRate();
-	int y = height() - paint.fontMetrics().height()
-	    + paint.fontMetrics().ascent() - 6;
+
+	paint.setPen(QColor(50, 50, 50));
+
+	int y = height() - fontHeight
+	    + fontAscent - 6;
 	
 	LayerList::iterator vi = m_layers.end();
 	
 	if (vi != m_layers.begin()) {
 	    
 	    switch ((*--vi)->getPreferredFrameCountPosition()) {
 		
 	    case Layer::PositionTop:
-		y = paint.fontMetrics().ascent() + 6;
+		y = fontAscent + 6;
 		break;
 		
 	    case Layer::PositionMiddle:
-		y = (height() - paint.fontMetrics().height()) / 2
-		    + paint.fontMetrics().ascent();
+		y = (height() - fontHeight) / 2
+		    + fontAscent;
 		break;
 
 	    case Layer::PositionBottom:
 		// y already set correctly
 		break;

 			  (m_centreFrame, sampleRate).toText(true)));
 
 	    int tw = paint.fontMetrics().width(text);
 	    int x = width()/2 - 4 - tw;
 
-	    if (hasLightBackground()) {
-		paint.setPen(palette().background().color());
-		for (int dx = -1; dx <= 1; ++dx) {
-		    for (int dy = -1; dy <= 1; ++dy) {
-			if ((dx && dy) || !(dx || dy)) continue;
-			paint.drawText(x + dx, y + dy, text);
-		    }
-		}
-		paint.setPen(QColor(50, 50, 50));
-	    } else {
-		paint.setPen(QColor(200, 200, 200));
-	    }
-
-	    paint.drawText(x, y, text);
+	    drawVisibleText(paint, x, y, text, OutlinedText);
 	}
 
 	QString text = QString("%1").arg(m_centreFrame);
 
 	int tw = paint.fontMetrics().width(text);
 	int x = width()/2 + 4;
-    
-	if (hasLightBackground()) {
-	    paint.setPen(palette().background().color());
-	    for (int dx = -1; dx <= 1; ++dx) {
-		for (int dy = -1; dy <= 1; ++dy) {
-		    if ((dx && dy) || !(dx || dy)) continue;
-		    paint.drawText(x + dx, y + dy, text);
-		}
-	    }
-	    paint.setPen(QColor(50, 50, 50));
+
+	drawVisibleText(paint, x, y, text, OutlinedText);
+
+    } else {
+
+	paint.setPen(QColor(50, 50, 50));
+    }
+
+    if (waveformModel &&
+	r.y() + r.height() >= height() - fontHeight - 6) {
+
+	size_t mainModelRate = m_manager->getMainModelSampleRate();
+	size_t playbackRate = m_manager->getPlaybackSampleRate();
+	    
+	QString srNote = "";
+
+	// Show (R) for waveform models that will be resampled on
+	// playback, and (X) for waveform models that will be played
+	// at the wrong rate because their rate differs from that of
+	// the main model.
+
+	if (sampleRate == mainModelRate) {
+	    if (sampleRate != playbackRate) srNote = " " + tr("(R)");
 	} else {
-	    paint.setPen(QColor(200, 200, 200));
-	}
-	paint.drawText(x, y, text);
-
-	if (waveformModel) {
-
-	    size_t mainModelRate = m_manager->getMainModelSampleRate();
-	    size_t playbackRate = m_manager->getPlaybackSampleRate();
-	    
-	    QString srNote = "";
-
-	    // Show (R) for waveform models that will be resampled on
-	    // playback, and (X) for waveform models that will be
-	    // played at the wrong rate because their rate differs
-	    // 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(verticalScaleWidth + 5,
-			   //width() - paint.fontMetrics().width(desc) - 5,
-			   height() - paint.fontMetrics().height() +
-			   paint.fontMetrics().ascent() - 6,
-			   desc);
-	}
+	    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);
+
+	if (r.x() < verticalScaleWidth + 5 + paint.fontMetrics().width(desc)) {
+	    drawVisibleText(paint, verticalScaleWidth + 5,
+			    height() - fontHeight + fontAscent - 6,
+			    desc, OutlinedText);
+	}
+    }
+
+    if (r.y() + r.height() >= height() - m_layers.size() * fontHeight - 6) {
 
 	std::vector<QString> texts;
 	int maxTextWidth = 0;
 
 	for (LayerList::iterator i = m_layers.begin(); i != m_layers.end(); ++i) {

 	    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) {
+	if (r.x() + r.width() >= width() - maxTextWidth - 5) {
+	    
+	    for (int i = 0; i < texts.size(); ++i) {
+
+		if (i == texts.size() - 1) {
 		    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();
+		
+		drawVisibleText(paint, width() - maxTextWidth - 5,
+				lly - fontHeight + fontAscent,
+				texts[i], OutlinedText);
+		
+		lly -= fontHeight;
+	    }
 	}
     }
 
     if (m_clickedInRange && m_shiftPressed) {
 	if (m_manager && (m_manager->getToolMode() == ViewManager::NavigateMode)) {

 	    }
 	}
 
 //!!!	if (mode != ViewManager::DrawMode) {
 
+	if (getSelectedLayer()) {
+
 	    bool previouslyIdentifying = m_identifyFeatures;
 	    m_identifyFeatures = true;
 	    
 	    if (m_identifyFeatures != previouslyIdentifying ||
 		m_identifyPoint != prevPoint) {
 		update();
 	    }
+	}
+
 //	}
 
 	return;
     }
 

 QString
 Pane::toXmlString(QString indent, QString extraAttributes) const
 {
     return View::toXmlString
 	(indent,
-	 QString("type=\"pane\" centreLineVisible=\"%1\" %2")
-	 .arg(m_centreLineVisible).arg(extraAttributes));
+	 QString("type=\"pane\" centreLineVisible=\"%1\" height=\"%2\" %3")
+	 .arg(m_centreLineVisible).arg(height()).arg(extraAttributes));
 }
 
 
 #ifdef INCLUDE_MOCFILES
 #include "Pane.moc.cpp"