diff layer/TimeValueLayer.cpp @ 1317:c2fa7bb1eca9 import-audio-data

Merge from default branch
author Chris Cannam
date Tue, 04 Sep 2018 13:19:32 +0100
parents 1d7921b1852f
children d79e21855aef
line wrap: on
line diff
--- a/layer/TimeValueLayer.cpp	Thu Jun 28 14:49:00 2018 +0100
+++ b/layer/TimeValueLayer.cpp	Tue Sep 04 13:19:32 2018 +0100
@@ -1238,7 +1238,9 @@
 int
 TimeValueLayer::getVerticalScaleWidth(LayerGeometryProvider *v, bool, QPainter &paint) const
 {
-    if (!m_model || shouldAutoAlign()) {
+    if (!m_model) {
+        return 0;
+    } else if (shouldAutoAlign() && !valueExtentsMatchMine(v)) {
         return 0;
     } else if (m_plotStyle == PlotSegmentation) {
         if (m_verticalScale == LogScale) {