diff base/Layer.h @ 20:742e6882e187

* Refactor sparse models. Previously the 1D and time-value models duplicated a lot of code; now there is a base class (SparseModel) templated on the stored point type, and the subclasses define point types with the necessary characteristics. * Add NoteModel, a new SparseModel subclass. * Reorganise local feature description display. Instead of asking the layer to draw its own, just query it for a textual description and draw that in Pane. Greatly simplifies this part of the layer code. * Add local feature descriptions to colour 3D plot and waveform layers. * Add pitch in MIDI-pitch-and-cents to spectrogram layer. * Give AudioGenerator its own mutex to shorten lock times in CallbackPlaySource. * Minor adjustments to layers menu &c
author Chris Cannam
date Thu, 02 Feb 2006 16:10:19 +0000
parents 4563a72c1d8b
children 6ace4286ba06
line wrap: on
line diff
--- a/base/Layer.h	Wed Feb 01 14:49:49 2006 +0000
+++ b/base/Layer.h	Thu Feb 02 16:10:19 2006 +0000
@@ -63,14 +63,8 @@
     virtual int getVerticalScaleWidth(QPainter &) const { return 0; }
     virtual void paintVerticalScale(QPainter &, QRect) const { }
 
-    //!!! I don't like these.  The layer should return a structured
-    //string-based description list and the pane should render it
-    //itself.
-
-    virtual QRect getFeatureDescriptionRect(QPainter &, QPoint) const {
-	return QRect(0, 0, 0, 0);
-    }
-    virtual void paintLocalFeatureDescription(QPainter &, QRect, QPoint) const {
+    virtual QString getFeatureDescription(QPoint &) const {
+	return "";
     }
 
     //!!! We also need a method (like the vertical scale method) for