# HG changeset patch
# User Chris Cannam
# Date 1146138574 0
# Node ID b9f71b8ae21ea0f5f0edb665d7311b8e508a53e3
# Parent  d99d67a5b93a918c9e1f69f657ddf644ec02f4d0
* Ensure consistent ordering of layer text labels
* Fix erroneous SR mismatch warning when adding a wave-file model when
  no other wave-file model is present (only models that don't assert any
  particular playback samplerate)

diff -r d99d67a5b93a -r b9f71b8ae21e layer/TimeInstantLayer.h
--- a/layer/TimeInstantLayer.h	Wed Apr 26 16:00:13 2006 +0000
+++ b/layer/TimeInstantLayer.h	Thu Apr 27 11:49:34 2006 +0000
@@ -85,7 +85,7 @@
 
     virtual int getCompletion() const { return m_model->getCompletion(); }
 
-    virtual bool needsTextLabelHeight() const { return true; }
+    virtual bool needsTextLabelHeight() const { return m_model->hasTextLabels(); }
 
     virtual bool getValueExtents(float &min, float &max, QString &unit) const {
         return false;
diff -r d99d67a5b93a -r b9f71b8ae21e layer/TimeValueLayer.h
--- a/layer/TimeValueLayer.h	Wed Apr 26 16:00:13 2006 +0000
+++ b/layer/TimeValueLayer.h	Thu Apr 27 11:49:34 2006 +0000
@@ -103,7 +103,7 @@
     virtual int getCompletion() const { return m_model->getCompletion(); }
 
     virtual bool needsTextLabelHeight() const {
-        return m_plotStyle == PlotSegmentation;
+        return m_plotStyle == PlotSegmentation && m_model->hasTextLabels();
     }
 
     virtual bool getValueExtents(float &min, float &max, QString &unit) const;