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

Profile: minor coding style issues concerning axis-ticks

Browse source 
1) Fix the English of a comment.
2) Remove a number of int-to-double compares:

Make "steps" an integer variable (the number of steps).
Rename the old double "steps" variable to "stepsInRange". This gives
a non-integer number of steps and is necessary to calculate the
correct step size

3) Replace a "x = x/y" by a "x /= y" construct.

4) Remove an unnecessary if clause.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-05-19 07:37:58 +02:00 • committed by Dirk Hohndel
parent 555f2f9565
commit 7836a78dca
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
profile-widget/divecartesianaxis.cpp
View file

@ -128,13 +128,11 @@ void DiveCartesianAxis::setLinesVisible(bool arg1)
} }
template <typename T> template <typename T>
void emptyList(QList<T *> &list, double steps) void emptyList(QList<T *> &list, int steps)
{ {
if (!list.isEmpty() && list.size() > steps) { while (list.size() > steps) {
while (list.size() > steps) { T *removedItem = list.takeLast();
T *removedItem = list.takeLast(); Animations::animDelete(removedItem);
Animations::animDelete(removedItem);
}
} }
} }
@ -145,7 +143,8 @@ void DiveCartesianAxis::updateTicks(color_index_t color)
QLineF m = line(); QLineF m = line();
// unused so far: // unused so far:
// QGraphicsView *view = scene()->views().first(); // QGraphicsView *view = scene()->views().first();
double steps = (max - min) / interval; double stepsInRange = (max - min) / interval;
int steps = (int)stepsInRange;
double currValueText = min; double currValueText = min;
double currValueLine = min; double currValueLine = min;
@ -155,8 +154,8 @@ void DiveCartesianAxis::updateTicks(color_index_t color)
emptyList(labels, steps); emptyList(labels, steps);
emptyList(lines, steps); emptyList(lines, steps);
// Move the remaining Ticks / Text to it's corerct position // Move the remaining ticks / text to their correct positions
// Regartind the possibly new values for the Axis // regarding the possible new values for the axis
qreal begin, stepSize; qreal begin, stepSize;
if (orientation == TopToBottom) { if (orientation == TopToBottom) {
begin = m.y1(); begin = m.y1();
@ -171,7 +170,7 @@ void DiveCartesianAxis::updateTicks(color_index_t color)
begin = m.x2(); begin = m.x2();
stepSize = (m.x2() - m.x1()); stepSize = (m.x2() - m.x1());
} }
stepSize = stepSize / steps; stepSize /= stepsInRange;
for (int i = 0, count = labels.size(); i < count; i++, currValueText += interval) { for (int i = 0, count = labels.size(); i < count; i++, currValueText += interval) {
qreal childPos = (orientation == TopToBottom || orientation == LeftToRight) ? qreal childPos = (orientation == TopToBottom || orientation == LeftToRight) ?