diff --git a/profile-widget/divecartesianaxis.cpp b/profile-widget/divecartesianaxis.cpp index 21c5b147b..491a33b30 100644 --- a/profile-widget/divecartesianaxis.cpp +++ b/profile-widget/divecartesianaxis.cpp @@ -8,7 +8,8 @@ #include "profile-widget/divelineitem.h" #include "profile-widget/profilescene.h" -static const double labelSpace = 2.0; // space between label and ticks +static const double labelSpaceHorizontal = 2.0; // space between label and ticks +static const double labelSpaceVertical = 2.0; // space between label and ticks QPen DiveCartesianAxis::gridPen() const { @@ -123,7 +124,7 @@ double DiveCartesianAxis::textWidth(const QString &s) const { QFont fnt = DiveTextItem::getFont(dpr, labelScale); QFontMetrics fm(fnt); - return fm.size(Qt::TextSingleLine, s).width() + labelSpace * dpr; + return fm.size(Qt::TextSingleLine, s).width() + labelSpaceHorizontal * dpr; } double DiveCartesianAxis::width() const @@ -131,6 +132,13 @@ double DiveCartesianAxis::width() const return textWidth("999"); } +double DiveCartesianAxis::height() const +{ + QFont fnt = DiveTextItem::getFont(dpr, labelScale); + QFontMetrics fm(fnt); + return fm.height() + labelSpaceVertical * dpr; +} + void DiveCartesianAxis::updateTicks(int animSpeed, color_index_t color) { if (!changed && !printMode) diff --git a/profile-widget/divecartesianaxis.h b/profile-widget/divecartesianaxis.h index e131fe601..98f7f157c 100644 --- a/profile-widget/divecartesianaxis.h +++ b/profile-widget/divecartesianaxis.h @@ -49,7 +49,8 @@ public: void setLineSize(qreal lineSize); void setLine(const QLineF& line); virtual void updateTicks(int animSpeed, color_index_t color = TIME_GRID); - double width() const; + double width() const; // only for vertical axes + double height() const; // only for horizontal axes signals: void sizeChanged();