# HG changeset patch
# User Chris Cannam
# Date 1144689779 0
# Node ID af2725b5d6fefba58b986b1a8e590a7299a3bf06
# Parent  163f3428bbe09d675fd56b8e7af4f5be2a2f4ee4
* Implement harmonic cursor in spectrogram
* Implement layer export.  This doesn't quite do the right thing for the SV
  XML layer export yet -- it doesn't include layer display information, so
  when imported, it only creates an invisible model.  Could also do with
  fixing CSV file import so as to work correctly for note and text layers.

diff -r 163f3428bbe0 -r af2725b5d6fe base/Layer.h
--- a/base/Layer.h	Mon Apr 10 13:52:32 2006 +0000
+++ b/base/Layer.h	Mon Apr 10 17:22:59 2006 +0000
@@ -78,15 +78,14 @@
     virtual int getVerticalScaleWidth(View *, QPainter &) const { return 0; }
     virtual void paintVerticalScale(View *, QPainter &, QRect) const { }
 
+    virtual bool getCrosshairExtents(View *, QPainter &, QPoint cursorPos,
+                                     std::vector<QRect> &) const { return false; }
+    virtual void paintCrosshairs(View *, QPainter &, QPoint) const { }
+
     virtual QString getFeatureDescription(View *, QPoint &) const {
 	return "";
     }
 
-    //!!! We also need a method (like the vertical scale method) for
-    //drawing additional scales like a colour scale.  That is, unless
-    //all applicable layers can actually do this from
-    //paintVerticalScale as well?
-
     enum SnapType {
 	SnapLeft,
 	SnapRight,
diff -r 163f3428bbe0 -r af2725b5d6fe base/Model.cpp
--- a/base/Model.cpp	Mon Apr 10 13:52:32 2006 +0000
+++ b/base/Model.cpp	Mon Apr 10 17:22:59 2006 +0000
@@ -50,8 +50,6 @@
 }
 
 #ifdef INCLUDE_MOCFILES
-#ifdef INCLUDE_MOCFILES
 #include "Model.moc.cpp"
 #endif
-#endif
 
diff -r 163f3428bbe0 -r af2725b5d6fe base/Model.h
--- a/base/Model.h	Mon Apr 10 13:52:32 2006 +0000
+++ b/base/Model.h	Mon Apr 10 17:22:59 2006 +0000
@@ -96,6 +96,8 @@
     virtual QString toXmlString(QString indent = "",
 				QString extraAttributes = "") const;
 
+    virtual QString toDelimitedDataString(QString) const { return ""; }
+
 signals:
     /**
      * Emitted when a model has been edited (or more data retrieved