comparison widgets/Pane.cpp @ 70:bf306158803d

* Add stub for item-edit dialog (for editing properties of an item on double-
  click) -- doesn't actually do anything yet
* Add code to invoke said non-working item-edit dialog on double-click in
  time-value, time-instants and note layers
* Add overlay mode (no text, basic text, all text)

     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();
-	}
-
-	verticalScaleWidth = (*vi)->getVerticalScaleWidth(this, paint);
-
-	if (verticalScaleWidth > 0 && r.left() < verticalScaleWidth) {
+    if (m_manager &&
+        m_manager->getOverlayMode() != ViewManager::NoOverlays) {
+
+        for (LayerList::iterator vi = m_layers.end(); vi != m_layers.begin(); ) {
+            --vi;
+
+            if (dynamic_cast<WaveformLayer *>(*vi)) {
+                waveformModel = (*vi)->getModel();
+            }
+
+            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, -1, verticalScaleWidth, height()+1);
-
-	    paint.setBrush(Qt::NoBrush);
-	    (*vi)->paintVerticalScale
-		(this, paint, QRect(0, 0, verticalScaleWidth, height()));
-
-	    paint.restore();
-	}
-	
-	if (m_identifyFeatures) {
-
-	    QPoint pos = m_identifyPoint;
-	    QString desc = (*vi)->getFeatureDescription(this, pos);
-	    
-	    if (desc != "") {
-
-		paint.save();
-
-		int tabStop =
-		    paint.fontMetrics().width(tr("Some lengthy prefix:"));
-
-		QRect boundingRect = 
-		    paint.fontMetrics().boundingRect
-		    (rect(),
-		     Qt::AlignRight | Qt::AlignTop | Qt::TextExpandTabs,
-		     desc, tabStop);
-
-		if (hasLightBackground()) {
-		    paint.setPen(Qt::NoPen);
-		    paint.setBrush(QColor(250, 250, 250, 200));
-		} else {
-		    paint.setPen(Qt::NoPen);
-		    paint.setBrush(QColor(50, 50, 50, 200));
-		}
-
-		int extra = paint.fontMetrics().descent();
-		paint.drawRect(width() - boundingRect.width() - 10 - extra,
-			       10 - extra,
-			       boundingRect.width() + 2 * extra,
-			       boundingRect.height() + extra);
-
-		if (hasLightBackground()) {
-		    paint.setPen(QColor(150, 20, 0));
-		} else {
-		    paint.setPen(QColor(255, 150, 100));
-		}
+                paint.save();
+
+                paint.setPen(Qt::black);
+                paint.setBrush(Qt::white);
+                paint.drawRect(0, -1, verticalScaleWidth, height()+1);
+
+                paint.setBrush(Qt::NoBrush);
+                (*vi)->paintVerticalScale
+                    (this, paint, QRect(0, 0, verticalScaleWidth, height()));
+
+                paint.restore();
+            }
+	
+            if (m_identifyFeatures) {
+
+                QPoint pos = m_identifyPoint;
+                QString desc = (*vi)->getFeatureDescription(this, pos);
+	    
+                if (desc != "") {
+
+                    paint.save();
+
+                    int tabStop =
+                        paint.fontMetrics().width(tr("Some lengthy prefix:"));
+
+                    QRect boundingRect = 
+                        paint.fontMetrics().boundingRect
+                        (rect(),
+                         Qt::AlignRight | Qt::AlignTop | Qt::TextExpandTabs,
+                         desc, tabStop);
+
+                    if (hasLightBackground()) {
+                        paint.setPen(Qt::NoPen);
+                        paint.setBrush(QColor(250, 250, 250, 200));
+                    } else {
+                        paint.setPen(Qt::NoPen);
+                        paint.setBrush(QColor(50, 50, 50, 200));
+                    }
+
+                    int extra = paint.fontMetrics().descent();
+                    paint.drawRect(width() - boundingRect.width() - 10 - extra,
+                                   10 - extra,
+                                   boundingRect.width() + 2 * extra,
+                                   boundingRect.height() + extra);
+
+                    if (hasLightBackground()) {
+                        paint.setPen(QColor(150, 20, 0));
+                    } else {
+                        paint.setPen(QColor(255, 150, 100));
+                    }
 		
-		QTextOption option;
-		option.setWrapMode(QTextOption::NoWrap);
-		option.setAlignment(Qt::AlignRight | Qt::AlignTop);
-		option.setTabStop(tabStop);
-		paint.drawText(QRectF(width() - boundingRect.width() - 10, 10,
-				      boundingRect.width(),
-				      boundingRect.height()),
-			       desc,
-			       option);
-
-		paint.restore();
-	    }
-	}
-
-	break;
+                    QTextOption option;
+                    option.setWrapMode(QTextOption::NoWrap);
+                    option.setAlignment(Qt::AlignRight | Qt::AlignTop);
+                    option.setTabStop(tabStop);
+                    paint.drawText(QRectF(width() - boundingRect.width() - 10, 10,
+                                          boundingRect.width(),
+                                          boundingRect.height()),
+                                   desc,
+                                   option);
+
+                    paint.restore();
+                }
+            }
+
+            break;
+        }
     }
     
     int sampleRate = getModelsSampleRate();
     paint.setBrush(Qt::NoBrush);
 

 		// y already set correctly
 		break;
 	    }
 	}
 
-	if (sampleRate) {
-
-	    QString text(QString::fromStdString
-			 (RealTime::frame2RealTime
-			  (m_centreFrame, sampleRate).toText(true)));
-
-	    int tw = paint.fontMetrics().width(text);
-	    int x = width()/2 - 4 - tw;
-
-	    drawVisibleText(paint, x, y, text, OutlinedText);
-	}
-
-	QString text = QString("%1").arg(m_centreFrame);
-
-	int tw = paint.fontMetrics().width(text);
-	int x = width()/2 + 4;
-
-	drawVisibleText(paint, x, y, text, OutlinedText);
+        if (m_manager &&
+            m_manager->getOverlayMode() != ViewManager::NoOverlays) {
+
+            if (sampleRate) {
+
+                QString text(QString::fromStdString
+                             (RealTime::frame2RealTime
+                              (m_centreFrame, sampleRate).toText(true)));
+                
+                int tw = paint.fontMetrics().width(text);
+                int x = width()/2 - 4 - tw;
+                
+                drawVisibleText(paint, x, y, text, OutlinedText);
+            }
+            
+            QString text = QString("%1").arg(m_centreFrame);
+            
+            int tw = paint.fontMetrics().width(text);
+            int x = width()/2 + 4;
+            
+            drawVisibleText(paint, x, y, text, OutlinedText);
+        }
 
     } else {
 
 	paint.setPen(QColor(50, 50, 50));
     }
 
     if (waveformModel &&
+        m_manager &&
+        m_manager->getOverlayMode() != ViewManager::NoOverlays &&
 	r.y() + r.height() >= height() - fontHeight - 6) {
 
 	size_t mainModelRate = m_manager->getMainModelSampleRate();
 	size_t playbackRate = m_manager->getPlaybackSampleRate();
 	    

 			    height() - fontHeight + fontAscent - 6,
 			    desc, OutlinedText);
 	}
     }
 
-    if (r.y() + r.height() >= height() - m_layers.size() * fontHeight - 6) {
+    if (m_manager &&
+        m_manager->getOverlayMode() == ViewManager::AllOverlays &&
+        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) {