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

profile: special case time axis

Browse source 
Rounding the axes dimensions to "nice" number may have been a
good idea, but for the time-axis it feels weird.

Therefore revert the time axis to the previous behavior:
range is set according to the data. To differentiate between
time an other axes, use the position: the time axis is the
only axis at the bottom. Yes, that's ugly but pragmatic.

Since we have that flag also use it for the special casing
of the text-display. Spares us one virtual function dispatch.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2021-10-03 21:15:36 +02:00 • committed by Dirk Hohndel
parent 3e11c13100
commit a7a7bd182e
2 changed files with 30 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
profile-widget/divecartesianaxis.cpp
View file

@ -181,24 +181,34 @@ void DiveCartesianAxis::updateTicks(int animSpeed)
// Choose full multiples of the interval as minumum and maximum values // Choose full multiples of the interval as minumum and maximum values
double minDisplay = transform.to(dataMin); double minDisplay = transform.to(dataMin);
double maxDisplay = transform.to(dataMax); double maxDisplay = transform.to(dataMax);
double firstDisplay = floor(minDisplay / intervalDisplay * (1.0 + 1e-5)) * intervalDisplay;
double lastDisplay = ceil(maxDisplay / intervalDisplay * (1.0 - 1e-5)) * intervalDisplay; // The time axis is special: use the full width in that case.
// Other axes round to the next "nice" number
double firstDisplay, lastDisplay;
double currValueText, currValueLine;
if (position == Position::Bottom) {
firstDisplay = ceil(minDisplay / intervalDisplay * (1.0 - 1e-5)) * intervalDisplay;
lastDisplay = floor(maxDisplay / intervalDisplay * (1.0 + 1e-5)) * intervalDisplay;
currValueText = currValueLine = transform.from(firstDisplay);
} else {
firstDisplay = floor(minDisplay / intervalDisplay * (1.0 + 1e-5)) * intervalDisplay;
lastDisplay = ceil(maxDisplay / intervalDisplay * (1.0 - 1e-5)) * intervalDisplay;
min = transform.from(firstDisplay);
max = transform.from(lastDisplay);
currValueText = currValueLine = min;
}
numTicks = lrint((lastDisplay - firstDisplay) / intervalDisplay) + 1; numTicks = lrint((lastDisplay - firstDisplay) / intervalDisplay) + 1;
numTicks = std::max(numTicks, 0); numTicks = std::max(numTicks, 0);
min = transform.from(firstDisplay);
max = transform.from(lastDisplay);
double currValueText = min;
double currValueLine = min;
emptyList(labels, numTicks, animSpeed); emptyList(labels, numTicks, animSpeed);
emptyList(lines, numTicks, animSpeed); emptyList(lines, numTicks, animSpeed);
if (numTicks == 0) if (numTicks == 0)
return; return;
interval = numTicks > 1 ? (max - min) / (numTicks - 1) : 0; interval = position == Position::Bottom ?
double stepSize = numTicks > 1 ? size / (numTicks - 1) : 0; intervalDisplay / transform.a : // special case for time axis.
numTicks > 1 ? (max - min) / (numTicks - 1) : 0;
double stepSize = interval * size / (max - min);
// Move the remaining grid lines / labels to their correct positions // Move the remaining grid lines / labels to their correct positions
// regarding the possible new values for the axis // regarding the possible new values for the axis
@ -343,7 +353,15 @@ double DiveCartesianAxis::Transform::from(double y) const
QString DiveCartesianAxis::textForValue(double value) const QString DiveCartesianAxis::textForValue(double value) const
{ {
return QStringLiteral("%L1").arg(transform.to(value), 0, 'f', fractionalDigits); if (position == Position::Bottom) {
// The bottom axis is the time axis and that needs special treatment.
int nr = lrint(value) / 60;
if (maximum() - minimum() < 600.0)
return QString("%1:%2").arg(nr).arg((int)value % 60, 2, 10, QChar('0'));
return QString::number(nr);
} else {
return QStringLiteral("%L1").arg(transform.to(value), 0, 'f', fractionalDigits);
}
} }
qreal DiveCartesianAxis::valueAt(const QPointF &p) const qreal DiveCartesianAxis::valueAt(const QPointF &p) const
@ -416,11 +434,3 @@ QColor TimeAxis::colorForValue(double) const
{ {
return QColor(Qt::blue); return QColor(Qt::blue);
} }
QString TimeAxis::textForValue(double value) const
{
int nr = lrint(value) / 60;
if (maximum() < 600)
return QString("%1:%2").arg(nr).arg((int)value % 60, 2, 10, QChar('0'));
return QString::number(nr);
}

3
profile-widget/divecartesianaxis.h
View file

@ -58,7 +58,7 @@ protected:
QPen gridPen; QPen gridPen;
color_index_t gridColor; color_index_t gridColor;
ProfileScene &scene; ProfileScene &scene;
virtual QString textForValue(double value) const; QString textForValue(double value) const;
virtual QColor colorForValue(double value) const; virtual QColor colorForValue(double value) const;
Orientation orientation; Orientation orientation;
QList<DiveTextItem *> labels; QList<DiveTextItem *> labels;
@ -96,7 +96,6 @@ class TimeAxis : public DiveCartesianAxis {
public: public:
using DiveCartesianAxis::DiveCartesianAxis; using DiveCartesianAxis::DiveCartesianAxis;
private: private:
QString textForValue(double value) const override;
QColor colorForValue(double value) const override; QColor colorForValue(double value) const override;
}; };