#include <QFontMetrics>
#include <QPainter>
-#include <pv/util.hpp>
#include <pv/widgets/popup.hpp>
using std::max;
const int TimeMarker::Offset = 1;
TimeMarker::TimeMarker(View &view, const QColor &colour, double time) :
- view_(view),
+ TimeItem(view),
colour_(colour),
time_(time),
value_action_(NULL),
const float x = (time_ - view_.offset()) / view_.scale();
QFontMetrics m(QApplication::font());
- QSize text_size = m.boundingRect(
- pv::util::format_time(time_, view_.tick_prefix(), 2)).size();
+ const float text_width =
+ max(m.boundingRect(get_text()).size().width(), ArrowSize);
+ const float text_height = m.boundingRect("Tg").size().height();
const QSizeF label_size(
- text_size.width() + View::LabelPadding.width() * 2,
- text_size.height() + View::LabelPadding.height() * 2);
+ text_width + View::LabelPadding.width() * 2,
+ text_height + View::LabelPadding.height() * 2);
const float top = rect.height() - label_size.height() -
TimeMarker::Offset - TimeMarker::ArrowSize - 0.5f;
const float height = label_size.height();
- return QRectF(x - label_size.width() / 2 - 0.5f, top,
+ return QRectF(x - label_size.width() / 2, top,
label_size.width(), height);
}
void TimeMarker::paint_label(QPainter &p, const QRect &rect)
{
+ if (!enabled())
+ return;
+
const qreal x = (time_ - view_.offset()) / view_.scale();
const QRectF r(get_label_rect(rect));
p.drawPolygon(points, countof(points));
p.setPen(select_text_colour(colour_));
- p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter,
- pv::util::format_time(time_, view_.tick_prefix(), 2));
+ p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter, get_text());
}
pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)