Mercurial > hg > svgui

changeset 81:b9f71b8ae21e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* 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)
author Chris Cannam
date Thu, 27 Apr 2006 11:49:34 +0000
parents d99d67a5b93a
children 82482231b6b1
files layer/TimeInstantLayer.h layer/TimeValueLayer.h
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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;
--- 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;