Mercurial > hg > svgui
comparison 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 |
comparison
equal
deleted
inserted
replaced
1312:fcc1f45f7bd5 | 1317:c2fa7bb1eca9 |
---|---|
1236 } | 1236 } |
1237 | 1237 |
1238 int | 1238 int |
1239 TimeValueLayer::getVerticalScaleWidth(LayerGeometryProvider *v, bool, QPainter &paint) const | 1239 TimeValueLayer::getVerticalScaleWidth(LayerGeometryProvider *v, bool, QPainter &paint) const |
1240 { | 1240 { |
1241 if (!m_model || shouldAutoAlign()) { | 1241 if (!m_model) { |
1242 return 0; | |
1243 } else if (shouldAutoAlign() && !valueExtentsMatchMine(v)) { | |
1242 return 0; | 1244 return 0; |
1243 } else if (m_plotStyle == PlotSegmentation) { | 1245 } else if (m_plotStyle == PlotSegmentation) { |
1244 if (m_verticalScale == LogScale) { | 1246 if (m_verticalScale == LogScale) { |
1245 return LogColourScale().getWidth(v, paint); | 1247 return LogColourScale().getWidth(v, paint); |
1246 } else { | 1248 } else { |