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

Change the axis update method to move the lines.

Browse source 
Change the axis update method to move the lines alongside the texts.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2014-02-15 22:15:45 -02:00 • committed by Dirk Hohndel
parent 0c5fd7db8e
commit 38e25458ee
1 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -118,7 +118,8 @@ void DiveCartesianAxis::updateTicks()
// unused so far: // unused so far:
// QGraphicsView *view = scene()->views().first(); // QGraphicsView *view = scene()->views().first();
double steps = (max - min) / interval; double steps = (max - min) / interval;
double currValue = min; double currValueText = min;
double currValueLine = min;
if (steps < 1) if (steps < 1)
return; return;
@ -144,15 +145,12 @@ void DiveCartesianAxis::updateTicks()
} }
stepSize = stepSize / steps; stepSize = stepSize / steps;
for (int i = 0, count = labels.size(); i < count; i++, currValue += interval) { for (int i = 0, count = labels.size(); i < count; i++, currValueText += interval) {
qreal childPos; qreal childPos = (orientation == TopToBottom || orientation == LeftToRight) ?
if (orientation == TopToBottom || orientation == LeftToRight) { begin + i * stepSize :
childPos = begin + i * stepSize; begin - i * stepSize;
} else {
childPos = begin - i * stepSize;
}
labels[i]->setText(textForValue(currValue)); labels[i]->setText(textForValue(currValueText));
if ( orientation == LeftToRight || orientation == RightToLeft) { if ( orientation == LeftToRight || orientation == RightToLeft) {
labels[i]->animateMoveTo(childPos, m.y1() + tick_size); labels[i]->animateMoveTo(childPos, m.y1() + tick_size);
} else { } else {
@ -160,8 +158,20 @@ void DiveCartesianAxis::updateTicks()
} }
} }
for (int i = 0, count = lines.size(); i < count; i++, currValueLine += interval) {
qreal childPos = (orientation == TopToBottom || orientation == LeftToRight) ?
begin + i * stepSize :
begin - i * stepSize;
if ( orientation == LeftToRight || orientation == RightToLeft) {
lines[i]->animateMoveTo(childPos, m.y1());
} else {
lines[i]->animateMoveTo(m.x1(), childPos);
}
}
// Add's the rest of the needed Ticks / Text. // Add's the rest of the needed Ticks / Text.
for (int i = labels.size(); i < steps; i++, currValue += interval) { for (int i = labels.size(); i < steps; i++, currValueText += interval) {
qreal childPos; qreal childPos;
if (orientation == TopToBottom || orientation == LeftToRight) { if (orientation == TopToBottom || orientation == LeftToRight) {
childPos = begin + i * stepSize; childPos = begin + i * stepSize;
@ -169,9 +179,9 @@ void DiveCartesianAxis::updateTicks()
childPos = begin - i * stepSize; childPos = begin - i * stepSize;
} }
DiveTextItem *label = new DiveTextItem(this); DiveTextItem *label = new DiveTextItem(this);
label->setText(textForValue(currValue)); label->setText(textForValue(currValueText));
label->setBrush(QBrush(textColor)); label->setBrush(QBrush(textColor));
label->setBrush(colorForValue(currValue)); label->setBrush(colorForValue(currValueText));
label->setScale(fontLabelScale()); label->setScale(fontLabelScale());
labels.push_back(label); labels.push_back(label);
if (orientation == RightToLeft || orientation == LeftToRight) { if (orientation == RightToLeft || orientation == LeftToRight) {