comparison view/Pane.cpp @ 678:26c5f7fd4807 imaf_enc

Merge from the default branch
author Chris Cannam
date Mon, 04 Nov 2013 17:12:32 +0000
parents 3437e0fad7ae 7cb6112c59ca
children 97ea68f62c1f
comparison
equal deleted inserted replaced
677:5e5ab4e8d64b 678:26c5f7fd4807
1118 1118
1119 int sw = 0; 1119 int sw = 0;
1120 if (m_manager && m_manager->shouldShowVerticalScale()) { 1120 if (m_manager && m_manager->shouldShowVerticalScale()) {
1121 for (LayerList::iterator vi = m_layers.end(); vi != m_layers.begin(); ) { 1121 for (LayerList::iterator vi = m_layers.end(); vi != m_layers.begin(); ) {
1122 --vi; 1122 --vi;
1123 QPainter paint(image);
1124 sw = (*vi)->getVerticalScaleWidth 1123 sw = (*vi)->getVerticalScaleWidth
1125 (this, m_manager->shouldShowVerticalColourScale(), paint); 1124 (this, m_manager->shouldShowVerticalColourScale(), paint);
1126 break; 1125 break;
1127 } 1126 }
1128 } 1127 }