Mercurial > hg > svgui
comparison view/Pane.cpp @ 869:6c08e99ca0f3 tonioni
Merge from default branch
author | Chris Cannam |
---|---|
date | Mon, 10 Nov 2014 09:20:06 +0000 |
parents | 59a22f3bf86d |
children | 0cdaf382f21e 7463ece5d5e8 |
comparison
equal
deleted
inserted
replaced
860:4a5d144bd5d0 | 869:6c08e99ca0f3 |
---|---|
467 if (waveformModel && workModel && haveSomeTimeXAxis) break; | 467 if (waveformModel && workModel && haveSomeTimeXAxis) break; |
468 } | 468 } |
469 | 469 |
470 m_scaleWidth = 0; | 470 m_scaleWidth = 0; |
471 | 471 |
472 if (workModel) { | 472 if (workModel && hasTopLayerTimeXAxis()) { |
473 drawModelTimeExtents(r, paint, workModel); | 473 drawModelTimeExtents(r, paint, workModel); |
474 } | 474 } |
475 | 475 |
476 if (m_manager && m_manager->shouldShowVerticalScale() && topLayer) { | 476 if (m_manager && m_manager->shouldShowVerticalScale() && topLayer) { |
477 drawVerticalScale(r, topLayer, paint); | 477 drawVerticalScale(r, topLayer, paint); |