mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use the same behavior as the old time markers

Browse source 
This commit adds the same behavior for the old time markers on the new
ones.

Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2014-01-27 17:09:08 -02:00 • committed by Dirk Hohndel
parent 7a07665d89
commit 9f6ebf96a7
3 changed files with 30 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
qt-ui/profile/divecartesianaxis.cpp
View file

@ -71,6 +71,7 @@ void DiveCartesianAxis::updateTicks()
}
if (steps < 1)
return;
if (!labels.isEmpty() && labels.size() > steps) {
while (labels.size() > steps) {
DiveTextItem *removedText = labels.takeLast();
@ -102,12 +103,14 @@ void DiveCartesianAxis::updateTicks()
} else {
childPos = begin - i * stepSize;
}
labels[i]->setText(textForValue(currValue));
if ( orientation == LeftToRight || orientation == RightToLeft) {
labels[i]->animateMoveTo(childPos, m.y1() + tickSize);
} else {
labels[i]->animateMoveTo(m.x1() - tickSize, childPos);
}
labels[i]->setVisible( i % 2 );
}
// Add's the rest of the needed Ticks / Text.
@ -121,9 +124,6 @@ void DiveCartesianAxis::updateTicks()
DiveTextItem *label = NULL;
if (showText){
QString text = textForValue(currValue);
if(text.isEmpty())
continue; // Do not create or do anything with an empty string.
label = new DiveTextItem(this);
label->setText(textForValue(currValue));
label->setBrush(QBrush(textColor));
@ -143,6 +143,7 @@ void DiveCartesianAxis::updateTicks()
label->animateMoveTo(m.x1() - tickSize, childPos);
}
}
label->setVisible( i % 2 );
}
}
@ -283,7 +284,10 @@ QColor TimeAxis::colorForValue(double value)
QString TimeAxis::textForValue(double value)
{
return QString::number(value / 60);
int nr = value / 60;
if (maximum() < 600 )
return QString("%1:%2").arg(nr).arg( (int)value%60, 2, 10, QChar('0'));
return QString::number(nr);
}
QString TemperatureAxis::textForValue(double value)